From 5443458749f2a240ed7c1e5ab1968af6c7892f99 Mon Sep 17 00:00:00 2001
From: Michael Schneider <micha.schneider@sap.com>
Date: Wed, 7 Apr 2021 17:30:56 +0200
Subject: [PATCH 1/2] Fix schema for ENHS

---
 file-formats/enhs/enhs.json                   |  5 +--
 .../examples/z_aff_example_enhs.enhs.json     |  4 +-
 .../examples/z_aff_example_func.func.json     | 39 ++++++++++++-------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/file-formats/enhs/enhs.json b/file-formats/enhs/enhs.json
index 5bde24bf4..022cd1a68 100644
--- a/file-formats/enhs/enhs.json
+++ b/file-formats/enhs/enhs.json
@@ -73,7 +73,6 @@
             },
             "additionalProperties": false,
             "required": [
-                "sapInternal",
                 "tool"
             ]
         },
@@ -280,9 +279,7 @@
                     }
                 },
                 "if": {
-                    "useFallbackClass": {
-                        "const": "true"
-                    }
+                    "properties": { "useFallbackClass": { "const": "true" } }
                 },
                 "then": {
                     "required": [
diff --git a/file-formats/enhs/examples/z_aff_example_enhs.enhs.json b/file-formats/enhs/examples/z_aff_example_enhs.enhs.json
index f80b1ebcf..551a67b6c 100644
--- a/file-formats/enhs/examples/z_aff_example_enhs.enhs.json
+++ b/file-formats/enhs/examples/z_aff_example_enhs.enhs.json
@@ -6,7 +6,6 @@
     "abapLanguageVersion": "standard"
   },
   "configuration": {
-    "sapInternal": "false",
     "tool": "badiDefinition"
   },
   "badiDefinitions": [
@@ -15,8 +14,7 @@
       "description": "This is an example Badi Definition",
       "interface": "Z_AFF_EXAMPLE_BADI_INTF",
       "instantiation": "creatingNewInstances",
-      "multipleUse": "true",
-      "sapInternal": "false",
+      "multipleUse": true,
       "useFallbackClass": false,
       "filterLimitation": false,
       "documentationId": "",
diff --git a/file-formats/fugr/examples/z_aff_example_func.func.json b/file-formats/fugr/examples/z_aff_example_func.func.json
index 18a23f6d4..551a67b6c 100644
--- a/file-formats/fugr/examples/z_aff_example_func.func.json
+++ b/file-formats/fugr/examples/z_aff_example_func.func.json
@@ -1,22 +1,31 @@
 {
   "header": {
-    "$schema": "http://github.com/sap/abap-file-formats/file-formats/fugr/func.json",
-    "description": "Example FUNC for ABAP file formats"
+    "$schema": "http://github.com/sap/abap-file-formats/file-formats/enhs/enhs.json",
+    "description": "Example ENHS for ABAP file formats",
+    "masterLanguage": "EN",
+    "abapLanguageVersion": "standard"
   },
-  "processingType": "normal",
-  "releaseState": "notReleased",
-  "exceptionClasses": true,
-  "includeNumber": "01",
-  "parameters": [
-    {
-      "name": "I_PARAM",
-      "description": "This is an example parameter"
-    }
-  ],
-  "exceptions": [
+  "configuration": {
+    "tool": "badiDefinition"
+  },
+  "badiDefinitions": [
     {
-      "name": "CX_STATIC_CHECK",
-      "description": "This is an example exception"
+      "name": "Z_AFF_EXAMPLE_BADI_DEFINITION",
+      "description": "This is an example Badi Definition",
+      "interface": "Z_AFF_EXAMPLE_BADI_INTF",
+      "instantiation": "creatingNewInstances",
+      "multipleUse": true,
+      "useFallbackClass": false,
+      "filterLimitation": false,
+      "documentationId": "",
+      "amdp": false,
+      "filters": [
+        {
+          "name": "EXAMPLE_FILTER",
+          "description": "This is an example Filter",
+          "type": "String"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file

From 6d805bd08261bdd18588d853c7379c7aa34fa75f Mon Sep 17 00:00:00 2001
From: Michael Schneider <micha.schneider@sap.com>
Date: Thu, 8 Apr 2021 12:20:08 +0200
Subject: [PATCH 2/2] Revert changes in function module

---
 .../examples/z_aff_example_func.func.json     | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/file-formats/fugr/examples/z_aff_example_func.func.json b/file-formats/fugr/examples/z_aff_example_func.func.json
index 551a67b6c..18a23f6d4 100644
--- a/file-formats/fugr/examples/z_aff_example_func.func.json
+++ b/file-formats/fugr/examples/z_aff_example_func.func.json
@@ -1,31 +1,22 @@
 {
   "header": {
-    "$schema": "http://github.com/sap/abap-file-formats/file-formats/enhs/enhs.json",
-    "description": "Example ENHS for ABAP file formats",
-    "masterLanguage": "EN",
-    "abapLanguageVersion": "standard"
+    "$schema": "http://github.com/sap/abap-file-formats/file-formats/fugr/func.json",
+    "description": "Example FUNC for ABAP file formats"
   },
-  "configuration": {
-    "tool": "badiDefinition"
-  },
-  "badiDefinitions": [
+  "processingType": "normal",
+  "releaseState": "notReleased",
+  "exceptionClasses": true,
+  "includeNumber": "01",
+  "parameters": [
+    {
+      "name": "I_PARAM",
+      "description": "This is an example parameter"
+    }
+  ],
+  "exceptions": [
     {
-      "name": "Z_AFF_EXAMPLE_BADI_DEFINITION",
-      "description": "This is an example Badi Definition",
-      "interface": "Z_AFF_EXAMPLE_BADI_INTF",
-      "instantiation": "creatingNewInstances",
-      "multipleUse": true,
-      "useFallbackClass": false,
-      "filterLimitation": false,
-      "documentationId": "",
-      "amdp": false,
-      "filters": [
-        {
-          "name": "EXAMPLE_FILTER",
-          "description": "This is an example Filter",
-          "type": "String"
-        }
-      ]
+      "name": "CX_STATIC_CHECK",
+      "description": "This is an example exception"
     }
   ]
 }
\ No newline at end of file