[SAJT] New file format for application job templates (#377)

* Update z_aff_example_sajt.sajt.json * Update zif_aff_sajt_v1.intf.abap * Update sajt-v1.json * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> * Update file-formats/sajt/type/zif_aff_sajt_v1.intf.abap Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> * Update z_aff_example_sajt.sajt.json * Update sajt-v1.json * Add files via upload * Delete zif_aff_sajt_v1.intf.json * Delete zif_aff_sajt_v1.intf.abap * Update sajt-v1.json * Update zif_aff_sajt_v1.intf.abap * Update zif_aff_sajt_v1.intf.abap * Update zif_aff_sajt_v1.intf.abap * Update sajt-v1.json Co-authored-by: Katharina Wurz <[email protected]> Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com>
SAP · Aug 29, 2022 · 623a67d · 623a67d
1 parent 843a9d4
commit 623a67d
Show file tree

Hide file tree

Showing 4 changed files with 217 additions and 167 deletions.
diff --git a/file-formats/sajt/README.md b/file-formats/sajt/README.md
@@ -1,5 +1,5 @@
 # SAJT File Format
 
- File | Cardinality | Definition | Schema | Example
- :--- | :---  | :--- | :--- | :---
- `<name>.sajt.json` | 1 | [`zif_aff_sajt_v1.intf.abap`](./type/zif_aff_sajt_v1.intf.abap) | [`sajt-v1.json`](./sajt-v1.json) | [`z_aff_example_sajt.sajt.json`](./examples/z_aff_example_sajt.sajt.json)
+File | Cardinality | Definition | Schema | Example
+:--- | :---  | :--- | :--- | :---
+`<name>.sajt.json` | 1 | [`zif_aff_sajt_v1.intf.abap`](./type/zif_aff_sajt_v1.intf.abap) | [`sajt-v1.json`](./sajt-v1.json) | [`z_aff_example_sajt.sajt.json`](./examples/z_aff_example_sajt.sajt.json)
diff --git a/file-formats/sajt/examples/z_aff_example_sajt.sajt.json b/file-formats/sajt/examples/z_aff_example_sajt.sajt.json
@@ -5,52 +5,38 @@
     "originalLanguage": "en"
   },
   "catalogName": "JCE_APJ_SIMPLE",
-  "parameters": [
-    {
-      "name": "P_COUNT",
-      "valueRanges": [
-        {
-          "sign": "include",
-          "option": "equals",
-          "low": "200"
-        }
-      ]
-    },
-    {
-      "name": "P_DESCR",
-      "valueRanges": [
-        {
-          "sign": "include",
-          "option": "equals",
-          "low": "My Default Description"
-        }
-      ]
-    },
-    {
-      "name": "P_SIMUL",
-      "valueRanges": [
-        {
-          "sign": "include",
-          "option": "equals",
-          "low": "X"
-        }
-      ]
-    },
-    {
-      "name": "S_ID",
-      "valueRanges": [
-        {
-          "sign": "include",
-          "option": "equals",
-          "low": "4711"
-        },
-        {
-          "sign": "include",
-          "option": "between",
-          "low": "AAA",
-          "high": "ZZZ"
-        }
-      ]
-    }
-  ]
+  "parameters": {
+    "singleValueParameters": [
+      {
+        "name": "P_COUNT",
+        "value": "200"
+      },
+      {
+        "name": "P_DESCR",
+        "value": "My Default Description"
+      },
+      {
+        "name": "P_SIMUL",
+        "value": "X"
+      }
+    ],
+    "valueRangesParameters": [
+      {
+        "name": "S_ID",
+        "valueRanges": [
+          {
+            "sign": "include",
+            "option": "equals",
+            "low": "4711"
+          },
+          {
+            "sign": "include",
+            "option": "between",
+            "low": "AAA",
+            "high": "ZZZ"
+          }
+        ]
+      }
+    ]
+  }
 }
diff --git a/file-formats/sajt/sajt-v1.json b/file-formats/sajt/sajt-v1.json
@@ -57,120 +57,157 @@
       ]
     },
     "catalogName": {
-      "title": "Application Job Catalog Entry",
+      "title": "Job Catalog Entry",
       "description": "Name of the application job catalog entry to which the template refers",
       "type": "string",
       "maxLength": 40
     },
     "parameters": {
       "title": "Parameters",
       "description": "Parameters of the class which runs within the job",
-      "type": "array",
-      "items": {
-        "title": "Parameter Name and Values",
-        "description": "Name of the parameter and its values as ranges table",
-        "type": "object",
-        "properties": {
-          "name": {
-            "title": "Parameter Name",
-            "description": "Name of the parameter",
-            "type": "string",
-            "maxLength": 8
-          },
-          "valueRanges": {
-            "title": "Values",
-            "description": "Values of the parameter as ranges table",
-            "type": "array",
-            "items": {
-              "title": "Entry of Ranges Table",
-              "description": "Entry of ranges table",
-              "type": "object",
-              "properties": {
-                "sign": {
-                  "title": "Sign",
-                  "description": "Include/exclude values (I/E)",
-                  "type": "string",
-                  "enum": [
-                    "include",
-                    "exclude"
-                  ],
-                  "enumTitles": [
-                    "Include",
-                    "Exclude"
-                  ],
-                  "enumDescriptions": [
-                    "Include",
-                    "Exclude"
-                  ]
-                },
-                "option": {
-                  "title": "Option",
-                  "description": "Operator of the ranges condition (EQ/NE/GE/GT/LE/LT/CP/NP/BT/NB)",
-                  "type": "string",
-                  "enum": [
-                    "equals",
-                    "between",
-                    "greaterThan",
-                    "containsPattern",
-                    "notEqual",
-                    "notBetween",
-                    "notContainsPattern",
-                    "greaterEqual",
-                    "lessThan",
-                    "lessEqual"
-                  ],
-                  "enumTitles": [
-                    "Equals",
-                    "Between",
-                    "Greater Than",
-                    "Contains Pattern",
-                    "Not Equal",
-                    "Not Between",
-                    "Not Contains Pattern",
-                    "Greater Equal",
-                    "Less Than",
-                    "Less Equal"
-                  ],
-                  "enumDescriptions": [
-                    "Equals",
-                    "Between",
-                    "Greater than",
-                    "Contains pattern",
-                    "Not equal",
-                    "Not between",
-                    "Not contains pattern",
-                    "Greater equal",
-                    "Less than",
-                    "Less equal"
-                  ]
-                },
-                "low": {
-                  "title": "Low Value",
-                  "description": "Low value of the ranges condition",
-                  "type": "string",
-                  "maxLength": 255
-                },
-                "high": {
-                  "title": "High Value",
-                  "description": "High value of the ranges condition",
-                  "type": "string",
-                  "maxLength": 255
-                }
+      "type": "object",
+      "properties": {
+        "singleValueParameters": {
+          "title": "Parameters with Single Value",
+          "description": "List of parameters with single value",
+          "type": "array",
+          "items": {
+            "title": "Parameter Details",
+            "description": "Name of the parameter and its value",
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "Name of the parameter",
+                "type": "string",
+                "maxLength": 8
               },
-              "additionalProperties": false,
-              "required": [
-                "sign",
-                "option"
-              ]
-            }
+              "value": {
+                "title": "Value",
+                "description": "Value of the parameter",
+                "type": "string",
+                "maxLength": 255
+              }
+            },
+            "additionalProperties": false,
+            "required": [
+              "name",
+              "value"
+            ]
           }
         },
-        "additionalProperties": false,
-        "required": [
-          "name",
-          "valueRanges"
-        ]
-      }
+        "valueRangesParameters": {
+          "title": "Parameters with Value Ranges",
+          "description": "List of parameters with value ranges",
+          "type": "array",
+          "items": {
+            "title": "Parameter Details",
+            "description": "Name of the parameter and its values as ranges table",
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "Name of the parameter",
+                "type": "string",
+                "maxLength": 8
+              },
+              "valueRanges": {
+                "title": "Values",
+                "description": "Values of the parameter as ranges table",
+                "type": "array",
+                "items": {
+                  "title": "Entry of Ranges Table",
+                  "description": "Entry of ranges table",
+                  "type": "object",
+                  "properties": {
+                    "sign": {
+                      "title": "Sign",
+                      "description": "Include/exclude values (I/E)",
+                      "type": "string",
+                      "enum": [
+                        "include",
+                        "exclude"
+                      ],
+                      "enumTitles": [
+                        "Include",
+                        "Exclude"
+                      ],
+                      "enumDescriptions": [
+                        "Include",
+                        "Exclude"
+                      ]
+                    },
+                    "option": {
+                      "title": "Option",
+                      "description": "Operator of the ranges condition (EQ/NE/GE/GT/LE/LT/CP/NP/BT/NB)",
+                      "type": "string",
+                      "enum": [
+                        "equals",
+                        "between",
+                        "greaterThan",
+                        "containsPattern",
+                        "notEqual",
+                        "notBetween",
+                        "notContainsPattern",
+                        "greaterEqual",
+                        "lessThan",
+                        "lessEqual"
+                      ],
+                      "enumTitles": [
+                        "Equals",
+                        "Between",
+                        "Greater Than",
+                        "Contains Pattern",
+                        "Not Equal",
+                        "Not Between",
+                        "Not Contains Pattern",
+                        "Greater Equal",
+                        "Less Than",
+                        "Less Equal"
+                      ],
+                      "enumDescriptions": [
+                        "Equals",
+                        "Between",
+                        "Greater than",
+                        "Contains pattern",
+                        "Not equal",
+                        "Not between",
+                        "Not contains pattern",
+                        "Greater equal",
+                        "Less than",
+                        "Less equal"
+                      ]
+                    },
+                    "low": {
+                      "title": "Low Value",
+                      "description": "Low value of the ranges condition",
+                      "type": "string",
+                      "maxLength": 255
+                    },
+                    "high": {
+                      "title": "High Value",
+                      "description": "High value of the ranges condition",
+                      "type": "string",
+                      "maxLength": 255
+                    }
+                  },
+                  "additionalProperties": false,
+                  "required": [
+                    "sign",
+                    "option"
+                  ]
+                }
+              }
+            },
+            "additionalProperties": false,
+            "required": [
+              "name",
+              "valueRanges"
+            ]
+          }
+        }
+      },
+      "additionalProperties": false
     }
   },
   "additionalProperties": false,