From ba5c75cabd5b4d37194f5241b570594872b8cee7 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Fri, 3 May 2024 11:45:01 +0200 Subject: [PATCH 01/17] Add files for AIFD --- file-formats/aifd/README.md | 5 + file-formats/aifd/aifd-v1.json | 102 ++++++++++++++++++ .../aifd/type/zif_aff_aifd_v1.intf.abap | 37 +++++++ .../aifd/type/zif_aff_aifd_v1.intf.json | 7 ++ 4 files changed, 151 insertions(+) create mode 100644 file-formats/aifd/README.md create mode 100644 file-formats/aifd/aifd-v1.json create mode 100644 file-formats/aifd/type/zif_aff_aifd_v1.intf.abap create mode 100644 file-formats/aifd/type/zif_aff_aifd_v1.intf.json diff --git a/file-formats/aifd/README.md b/file-formats/aifd/README.md new file mode 100644 index 000000000..3fb0bf696 --- /dev/null +++ b/file-formats/aifd/README.md @@ -0,0 +1,5 @@ +# AIFD File Format + +File | Cardinality | Definition | Schema | Example +:--- | :--- | :--- | :--- | :--- +`.aifd.json` | 1 | [`zif_aff_aifd_v1.intf.abap`](./type/zif_aff_aifd_v1.intf.abap) | [`aifd-v1.json`](./aifd-v1.json) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json new file mode 100644 index 000000000..4cf19518e --- /dev/null +++ b/file-formats/aifd/aifd-v1.json @@ -0,0 +1,102 @@ +{ + "$comment": "This file is autogenerated, do not edit manually, see https://github.com/SAP/abap-file-formats for more information.", + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/SAP/abap-file-formats/blob/main/file-formats/aifd/aifd-v1.json", + "title": "AIFD Object Type", + "description": "Object type AIFD", + "type": "object", + "properties": { + "formatVersion": { + "title": "ABAP File Format Version", + "description": "The ABAP file format version", + "type": "string", + "const": "1" + }, + "header": { + "title": "Header", + "description": "Header", + "type": "object", + "properties": { + "description": { + "title": "Description", + "description": "Description of the ABAP object", + "type": "string", + "maxLength": 60 + }, + "originalLanguage": { + "title": "Original Language", + "description": "Original language of the ABAP object", + "type": "string", + "minLength": 2 + }, + "abapLanguageVersion": { + "title": "ABAP Language Version", + "description": "ABAP language version", + "type": "string", + "enum": [ + "standard", + "keyUser", + "cloudDevelopment" + ], + "enumTitles": [ + "Standard", + "ABAP for Key Users", + "ABAP Cloud Development" + ], + "enumDescriptions": [ + "Standard", + "ABAP for key user extensibility", + "ABAP cloud development" + ], + "default": "standard" + } + }, + "additionalProperties": false, + "required": [ + "description", + "originalLanguage" + ] + }, + "aifInterfaces": { + "title": "General", + "description": "AIF interfaces", + "type": "object", + "properties": { + "objectName": { + "title": "Interface Object Name", + "description": "Interface Object Name", + "type": "string", + "maxLength": 40 + }, + "namespace": { + "title": "Namespace", + "description": "Namespace", + "type": "string", + "maxLength": 6 + }, + "interfaceName": { + "title": "Interface Name", + "description": "Interface Name", + "type": "string", + "maxLength": 10 + }, + "interfaceVersion": { + "title": "Interface Version", + "description": "Interface Version", + "type": "string", + "maxLength": 5 + } + }, + "additionalProperties": false, + "required": [ + "objectName" + ] + } + }, + "additionalProperties": false, + "required": [ + "formatVersion", + "header", + "aifInterfaces" + ] +} diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap new file mode 100644 index 000000000..d4a24b00b --- /dev/null +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -0,0 +1,37 @@ +INTERFACE zif_aff_aifd_v1 + PUBLIC . + TYPES: + "!

AIF Interfaces

+ "! AIF interfaces + "! $required + BEGIN OF ty_aif_interfaces, + "!

Interface Object Name

+ "! Interface Object Name + "! $required + object_name TYPE c LENGTH 40, + "!

Namespace

+ "! Namespace + namespace TYPE c LENGTH 6, + "!

Interface Name

+ "! Interface Name + interface_name TYPE c LENGTH 10, + "!

Interface Version

+ "! Interface Version + interface_version TYPE c LENGTH 5, + END OF ty_aif_interfaces, + + "!

AIFD Object Type

+ "! Object type AIFD + BEGIN OF ty_main, + "! $required + format_version TYPE zif_aff_types_v1=>ty_format_version, + "!

Header

+ "! Header + "! $required + header TYPE zif_aff_types_v1=>ty_header_60_src, + "!

General

+ "! AIF interfaces + "! $required + aif_interfaces TYPE ty_aif_interfaces, + END OF ty_main. +ENDINTERFACE. diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.json b/file-formats/aifd/type/zif_aff_aifd_v1.intf.json new file mode 100644 index 000000000..8f6158533 --- /dev/null +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.json @@ -0,0 +1,7 @@ +{ + "formatVersion": "1", + "header": { + "description": "AFF type for AIFD (Deployment Scenario)", + "originalLanguage": "en" + } +} From 36dee3ee0a9e3f4483743dc73c8e284f182747ea Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Fri, 3 May 2024 12:02:47 +0200 Subject: [PATCH 02/17] React on abaplint for AIFD --- file-formats/aifd/type/zif_aff_aifd_v1.intf.abap | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index d4a24b00b..2696e8602 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -1,5 +1,5 @@ INTERFACE zif_aff_aifd_v1 - PUBLIC . + PUBLIC. TYPES: "!

AIF Interfaces

"! AIF interfaces @@ -8,16 +8,16 @@ INTERFACE zif_aff_aifd_v1 "!

Interface Object Name

"! Interface Object Name "! $required - object_name TYPE c LENGTH 40, + object_name TYPE c LENGTH 40, "!

Namespace

"! Namespace - namespace TYPE c LENGTH 6, + namespace TYPE c LENGTH 6, "!

Interface Name

"! Interface Name - interface_name TYPE c LENGTH 10, + interface_name TYPE c LENGTH 10, "!

Interface Version

"! Interface Version - interface_version TYPE c LENGTH 5, + interface_version TYPE c LENGTH 5, END OF ty_aif_interfaces, "!

AIFD Object Type

From 0c8fa5c672ad4c6b9adcf6304512d1bb4751eb37 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Fri, 3 May 2024 16:22:14 +0200 Subject: [PATCH 03/17] Changes to AFF for AIFD --- file-formats/aifd/aifd-v1.json | 68 ++++++++++--------- .../aifd/type/zif_aff_aifd_v1.intf.abap | 12 ++-- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json index 4cf19518e..0d002ca15 100644 --- a/file-formats/aifd/aifd-v1.json +++ b/file-formats/aifd/aifd-v1.json @@ -60,43 +60,49 @@ "aifInterfaces": { "title": "General", "description": "AIF interfaces", - "type": "object", - "properties": { - "objectName": { - "title": "Interface Object Name", - "description": "Interface Object Name", - "type": "string", - "maxLength": 40 - }, - "namespace": { - "title": "Namespace", - "description": "Namespace", - "type": "string", - "maxLength": 6 - }, - "interfaceName": { - "title": "Interface Name", - "description": "Interface Name", - "type": "string", - "maxLength": 10 + "type": "array", + "items": { + "title": "AIF Interface", + "description": "AIF interface", + "type": "object", + "properties": { + "objectName": { + "title": "Interface Object Name", + "description": "Interface Object Name", + "type": "string", + "maxLength": 40 + }, + "namespace": { + "title": "Namespace", + "description": "Namespace", + "type": "string", + "maxLength": 6 + }, + "interfaceName": { + "title": "Interface Name", + "description": "Interface Name", + "type": "string", + "maxLength": 10 + }, + "interfaceVersion": { + "title": "Interface Version", + "description": "Interface Version", + "type": "string", + "maxLength": 5 + } }, - "interfaceVersion": { - "title": "Interface Version", - "description": "Interface Version", - "type": "string", - "maxLength": 5 - } - }, - "additionalProperties": false, - "required": [ - "objectName" - ] + "additionalProperties": false, + "required": [ + "objectName" + ] + } } }, "additionalProperties": false, "required": [ "formatVersion", "header", - "aifInterfaces" + "aifInterfaces", + "tyAifInterface" ] } diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index 2696e8602..2a85f19ef 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -1,10 +1,10 @@ INTERFACE zif_aff_aifd_v1 PUBLIC. TYPES: - "!

AIF Interfaces

- "! AIF interfaces + "!

AIF Interface

+ "! AIF interface "! $required - BEGIN OF ty_aif_interfaces, + BEGIN OF ty_aif_interface, "!

Interface Object Name

"! Interface Object Name "! $required @@ -18,7 +18,11 @@ INTERFACE zif_aff_aifd_v1 "!

Interface Version

"! Interface Version interface_version TYPE c LENGTH 5, - END OF ty_aif_interfaces, + END OF ty_aif_interface, + + "!

AIF Interfaces

+ "! AIF Interfaces + ty_aif_interfaces TYPE STANDARD TABLE OF ty_aif_interface WITH DEFAULT KEY, "!

AIFD Object Type

"! Object type AIFD From bde5173d63ff9475b54b88bc922f91be2987207b Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Mon, 6 May 2024 16:09:28 +0200 Subject: [PATCH 04/17] AIFD: React and corrections on comments --- file-formats/aifd/aifd-v1.json | 7 ++----- file-formats/aifd/type/zif_aff_aifd_v1.intf.abap | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json index 0d002ca15..7a87882c2 100644 --- a/file-formats/aifd/aifd-v1.json +++ b/file-formats/aifd/aifd-v1.json @@ -2,7 +2,7 @@ "$comment": "This file is autogenerated, do not edit manually, see https://github.com/SAP/abap-file-formats for more information.", "$schema": "https://json-schema.org/draft/2020-12/schema", "$id": "https://github.com/SAP/abap-file-formats/blob/main/file-formats/aifd/aifd-v1.json", - "title": "AIFD Object Type", + "title": "Deployment Scenario", "description": "Object type AIFD", "type": "object", "properties": { @@ -35,17 +35,14 @@ "type": "string", "enum": [ "standard", - "keyUser", "cloudDevelopment" ], "enumTitles": [ "Standard", - "ABAP for Key Users", "ABAP Cloud Development" ], "enumDescriptions": [ "Standard", - "ABAP for key user extensibility", "ABAP cloud development" ], "default": "standard" @@ -58,7 +55,7 @@ ] }, "aifInterfaces": { - "title": "General", + "title": "AIF interfaces", "description": "AIF interfaces", "type": "array", "items": { diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index 2a85f19ef..3b36f4875 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -24,7 +24,7 @@ INTERFACE zif_aff_aifd_v1 "! AIF Interfaces ty_aif_interfaces TYPE STANDARD TABLE OF ty_aif_interface WITH DEFAULT KEY, - "!

AIFD Object Type

+ "!

Deployment Scenario

"! Object type AIFD BEGIN OF ty_main, "! $required @@ -32,8 +32,8 @@ INTERFACE zif_aff_aifd_v1 "!

Header

"! Header "! $required - header TYPE zif_aff_types_v1=>ty_header_60_src, - "!

General

+ header TYPE zif_aff_types_v1=>ty_header_60, + "!

AIF interfaces

"! AIF interfaces "! $required aif_interfaces TYPE ty_aif_interfaces, From 96dd1326dc0cc1ecfea93ca11e02f2c949fe51ae Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Mon, 6 May 2024 16:40:00 +0200 Subject: [PATCH 05/17] AIFD JSON --- file-formats/aifd/aifd-v1.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json index 7a87882c2..764868cb2 100644 --- a/file-formats/aifd/aifd-v1.json +++ b/file-formats/aifd/aifd-v1.json @@ -35,14 +35,17 @@ "type": "string", "enum": [ "standard", + "keyUser", "cloudDevelopment" ], "enumTitles": [ "Standard", + "ABAP for Key Users", "ABAP Cloud Development" ], "enumDescriptions": [ "Standard", + "ABAP for key user extensibility", "ABAP cloud development" ], "default": "standard" From 8eecd67f92aa385071e4f838079d168307ec76a5 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 7 May 2024 07:44:45 +0200 Subject: [PATCH 06/17] AIFD: EXAMPLE --- file-formats/aifd/README.md | 2 +- .../examples/z_aff_example_aifd.aifd.json | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 file-formats/aifd/examples/z_aff_example_aifd.aifd.json diff --git a/file-formats/aifd/README.md b/file-formats/aifd/README.md index 3fb0bf696..112129681 100644 --- a/file-formats/aifd/README.md +++ b/file-formats/aifd/README.md @@ -2,4 +2,4 @@ File | Cardinality | Definition | Schema | Example :--- | :--- | :--- | :--- | :--- -`.aifd.json` | 1 | [`zif_aff_aifd_v1.intf.abap`](./type/zif_aff_aifd_v1.intf.abap) | [`aifd-v1.json`](./aifd-v1.json) +`.aifd.json` | 1 | [`zif_aff_aifd_v1.intf.abap`](./type/zif_aff_aifd_v1.intf.abap) | [`aifd-v1.json`](./aifd-v1.json) | [`z_aff_example_aifd.aifd.json`](./examples/z_aff_example_aifd.aifd.json) diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json new file mode 100644 index 000000000..2f6ea1155 --- /dev/null +++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json @@ -0,0 +1,21 @@ +{ + "formatVersion": "1", + "header": { + "description": "Example AIFD for ABAP File Format", + "originalLanguage": "en" + }, + "aifInterfaces":[ + { + "objectName":"/AIFTCUST_WS_I00001", + "namespace":"/AIFT", + "interfaceName":"CUST_WS_I", + "interfaceVersion":"00001" + }, + { + "objectName":"/AIFTCUST_WS_O00001", + "namespace":"/AIFT", + "interfaceName":"CUST_WS_O", + "interfaceVersion":"00001" + } + ] +} \ No newline at end of file From 59271dc2d1d396a26dcf5d275d52a61cc9775fd2 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 7 May 2024 07:53:19 +0200 Subject: [PATCH 07/17] React to JSON Validation --- file-formats/aifd/aifd-v1.json | 3 +-- file-formats/aifd/examples/z_aff_example_aifd.aifd.json | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json index 764868cb2..2bfe6d2b8 100644 --- a/file-formats/aifd/aifd-v1.json +++ b/file-formats/aifd/aifd-v1.json @@ -102,7 +102,6 @@ "required": [ "formatVersion", "header", - "aifInterfaces", - "tyAifInterface" + "aifInterfaces" ] } diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json index 2f6ea1155..4e0a3f1a5 100644 --- a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json +++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json @@ -2,7 +2,8 @@ "formatVersion": "1", "header": { "description": "Example AIFD for ABAP File Format", - "originalLanguage": "en" + "originalLanguage": "en", + "abapLanguageVersion": "cloudDevelopment" }, "aifInterfaces":[ { From 419de1e50a2f81f4936938c829b8fd60b6ce9911 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 7 May 2024 07:58:34 +0200 Subject: [PATCH 08/17] React on SCHEMA checks --- file-formats/aifd/type/zif_aff_aifd_v1.intf.abap | 1 - 1 file changed, 1 deletion(-) diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index 3b36f4875..810dca17a 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -3,7 +3,6 @@ INTERFACE zif_aff_aifd_v1 TYPES: "!

AIF Interface

"! AIF interface - "! $required BEGIN OF ty_aif_interface, "!

Interface Object Name

"! Interface Object Name From 8416ca1da7d459f003082f893bb92012ef58e0cf Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 7 May 2024 08:10:29 +0200 Subject: [PATCH 09/17] React to checks --- .../examples/z_aff_example_aifd.aifd.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json index 4e0a3f1a5..b0154e634 100644 --- a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json +++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json @@ -1,22 +1,22 @@ { - "formatVersion": "1", - "header": { - "description": "Example AIFD for ABAP File Format", - "originalLanguage": "en", - "abapLanguageVersion": "cloudDevelopment" - }, + "formatVersion": "1", + "header": { + "description": "Example AIFD for ABAP File Format", + "originalLanguage": "en", + "abapLanguageVersion": "cloudDevelopment" + }, "aifInterfaces":[ { - "objectName":"/AIFTCUST_WS_I00001", - "namespace":"/AIFT", - "interfaceName":"CUST_WS_I", - "interfaceVersion":"00001" + "objectName":"/AIFTCUST_WS_I00001", + "namespace":"/AIFT", + "interfaceName":"CUST_WS_I", + "interfaceVersion":"00001" }, { - "objectName":"/AIFTCUST_WS_O00001", - "namespace":"/AIFT", - "interfaceName":"CUST_WS_O", - "interfaceVersion":"00001" + "objectName":"/AIFTCUST_WS_O00001", + "namespace":"/AIFT", + "interfaceName":"CUST_WS_O", + "interfaceVersion":"00001" } ] } \ No newline at end of file From 50929973097e64afa0ac8567910165ec9b373150 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 7 May 2024 08:13:32 +0200 Subject: [PATCH 10/17] AIFD: React on Editor Checks --- file-formats/aifd/examples/z_aff_example_aifd.aifd.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json index b0154e634..1b2db22a4 100644 --- a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json +++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json @@ -19,4 +19,4 @@ "interfaceVersion":"00001" } ] -} \ No newline at end of file +} From 9bdee7ccc292926aa7a5b74ed10ff9fa55621c44 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 7 May 2024 08:15:48 +0200 Subject: [PATCH 11/17] AIFD: React on Editor checks --- file-formats/aifd/examples/z_aff_example_aifd.aifd.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json index 1b2db22a4..1be4073e4 100644 --- a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json +++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json @@ -18,5 +18,5 @@ "interfaceName":"CUST_WS_O", "interfaceVersion":"00001" } - ] + ] } From ea097d7aa24129334bf5c48c08d4a919537c7fbf Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 7 May 2024 15:35:17 +0200 Subject: [PATCH 12/17] React on Comment --- file-formats/aifd/aifd-v1.json | 3 --- file-formats/aifd/type/zif_aff_aifd_v1.intf.abap | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json index 2bfe6d2b8..6a9bcbe39 100644 --- a/file-formats/aifd/aifd-v1.json +++ b/file-formats/aifd/aifd-v1.json @@ -35,17 +35,14 @@ "type": "string", "enum": [ "standard", - "keyUser", "cloudDevelopment" ], "enumTitles": [ "Standard", - "ABAP for Key Users", "ABAP Cloud Development" ], "enumDescriptions": [ "Standard", - "ABAP for key user extensibility", "ABAP cloud development" ], "default": "standard" diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index 810dca17a..973278159 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -31,7 +31,7 @@ INTERFACE zif_aff_aifd_v1 "!

Header

"! Header "! $required - header TYPE zif_aff_types_v1=>ty_header_60, + header TYPE zif_aff_types_v1=>ty_header_60_cloud, "!

AIF interfaces

"! AIF interfaces "! $required From 854cb70004648c2d797f5c2d9c235e8db960053f Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 14 May 2024 08:43:09 +0200 Subject: [PATCH 13/17] React on comment --- file-formats/aifd/aifd-v1.json | 12 ++++++------ .../aifd/examples/z_aff_example_aifd.aifd.json | 4 ++-- file-formats/aifd/type/zif_aff_aifd_v1.intf.abap | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json index 6a9bcbe39..fff68394f 100644 --- a/file-formats/aifd/aifd-v1.json +++ b/file-formats/aifd/aifd-v1.json @@ -3,7 +3,7 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "$id": "https://github.com/SAP/abap-file-formats/blob/main/file-formats/aifd/aifd-v1.json", "title": "Deployment Scenario", - "description": "Object type AIFD", + "description": "Deployment scenario", "type": "object", "properties": { "formatVersion": { @@ -63,9 +63,9 @@ "description": "AIF interface", "type": "object", "properties": { - "objectName": { + "interfaceObjectName": { "title": "Interface Object Name", - "description": "Interface Object Name", + "description": "Interface object name", "type": "string", "maxLength": 40 }, @@ -77,20 +77,20 @@ }, "interfaceName": { "title": "Interface Name", - "description": "Interface Name", + "description": "Interface name", "type": "string", "maxLength": 10 }, "interfaceVersion": { "title": "Interface Version", - "description": "Interface Version", + "description": "Interface version", "type": "string", "maxLength": 5 } }, "additionalProperties": false, "required": [ - "objectName" + "interfaceObjectName" ] } } diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json index 1be4073e4..4486640f4 100644 --- a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json +++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json @@ -7,13 +7,13 @@ }, "aifInterfaces":[ { - "objectName":"/AIFTCUST_WS_I00001", + "interfaceObjectName":"/AIFTCUST_WS_I00001", "namespace":"/AIFT", "interfaceName":"CUST_WS_I", "interfaceVersion":"00001" }, { - "objectName":"/AIFTCUST_WS_O00001", + "interfaceObjectName":"/AIFTCUST_WS_O00001", "namespace":"/AIFT", "interfaceName":"CUST_WS_O", "interfaceVersion":"00001" diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index 973278159..f9fbe9303 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -5,26 +5,26 @@ INTERFACE zif_aff_aifd_v1 "! AIF interface BEGIN OF ty_aif_interface, "!

Interface Object Name

- "! Interface Object Name + "! Interface object name "! $required - object_name TYPE c LENGTH 40, + interface_object_name TYPE c LENGTH 40, "!

Namespace

"! Namespace namespace TYPE c LENGTH 6, "!

Interface Name

- "! Interface Name + "! Interface name interface_name TYPE c LENGTH 10, "!

Interface Version

- "! Interface Version + "! Interface version interface_version TYPE c LENGTH 5, END OF ty_aif_interface, "!

AIF Interfaces

- "! AIF Interfaces + "! AIF interfaces ty_aif_interfaces TYPE STANDARD TABLE OF ty_aif_interface WITH DEFAULT KEY, "!

Deployment Scenario

- "! Object type AIFD + "! Deployment scenario BEGIN OF ty_main, "! $required format_version TYPE zif_aff_types_v1=>ty_format_version, From 9a15f9673451650a022943a1d07b61cf563d0bd4 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Thu, 16 May 2024 15:21:43 +0200 Subject: [PATCH 14/17] AIFD adjust example --- file-formats/aifd/examples/z_aff_example_aifd.aifd.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json index 4486640f4..8e3330e73 100644 --- a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json +++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json @@ -6,6 +6,12 @@ "abapLanguageVersion": "cloudDevelopment" }, "aifInterfaces":[ + { + "interfaceObjectName":"INT_OBJ_1", + "namespace":"/AIF", + "interfaceName":"BUPA_IN", + "interfaceVersion":"1" + }, { "interfaceObjectName":"/AIFTCUST_WS_I00001", "namespace":"/AIFT", From 73dc93cf72ba787e36844129fa18aff0cfb62bf8 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Fri, 17 May 2024 09:38:37 +0200 Subject: [PATCH 15/17] AIFD: remove NS/IFNAME/IFVERSION from AIF interfaces --- file-formats/aifd/aifd-v1.json | 18 ------------------ .../aifd/examples/z_aff_example_aifd.aifd.json | 15 +++------------ .../aifd/type/zif_aff_aifd_v1.intf.abap | 9 --------- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json index fff68394f..0cac95c91 100644 --- a/file-formats/aifd/aifd-v1.json +++ b/file-formats/aifd/aifd-v1.json @@ -68,24 +68,6 @@ "description": "Interface object name", "type": "string", "maxLength": 40 - }, - "namespace": { - "title": "Namespace", - "description": "Namespace", - "type": "string", - "maxLength": 6 - }, - "interfaceName": { - "title": "Interface Name", - "description": "Interface name", - "type": "string", - "maxLength": 10 - }, - "interfaceVersion": { - "title": "Interface Version", - "description": "Interface version", - "type": "string", - "maxLength": 5 } }, "additionalProperties": false, diff --git a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json index 8e3330e73..519255d51 100644 --- a/file-formats/aifd/examples/z_aff_example_aifd.aifd.json +++ b/file-formats/aifd/examples/z_aff_example_aifd.aifd.json @@ -7,22 +7,13 @@ }, "aifInterfaces":[ { - "interfaceObjectName":"INT_OBJ_1", - "namespace":"/AIF", - "interfaceName":"BUPA_IN", - "interfaceVersion":"1" + "interfaceObjectName":"INT_OBJ_1" }, { - "interfaceObjectName":"/AIFTCUST_WS_I00001", - "namespace":"/AIFT", - "interfaceName":"CUST_WS_I", - "interfaceVersion":"00001" + "interfaceObjectName":"/AIFTCUST_WS_I00001" }, { - "interfaceObjectName":"/AIFTCUST_WS_O00001", - "namespace":"/AIFT", - "interfaceName":"CUST_WS_O", - "interfaceVersion":"00001" + "interfaceObjectName":"/AIFTCUST_WS_O00001" } ] } diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index f9fbe9303..3d22cf68b 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -8,15 +8,6 @@ INTERFACE zif_aff_aifd_v1 "! Interface object name "! $required interface_object_name TYPE c LENGTH 40, - "!

Namespace

- "! Namespace - namespace TYPE c LENGTH 6, - "!

Interface Name

- "! Interface name - interface_name TYPE c LENGTH 10, - "!

Interface Version

- "! Interface version - interface_version TYPE c LENGTH 5, END OF ty_aif_interface, "!

AIF Interfaces

From 6d4245200c3f4e8cdcf740f90767f9e8e587f837 Mon Sep 17 00:00:00 2001 From: Nicole Goeddelmann Date: Tue, 28 May 2024 08:04:23 +0200 Subject: [PATCH 16/17] React on UX Review (Cross Check 1) for Object Type AIFD - adjust section tile --- file-formats/aifd/aifd-v1.json | 2 +- file-formats/aifd/type/zif_aff_aifd_v1.intf.abap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/file-formats/aifd/aifd-v1.json b/file-formats/aifd/aifd-v1.json index 0cac95c91..b40b1861f 100644 --- a/file-formats/aifd/aifd-v1.json +++ b/file-formats/aifd/aifd-v1.json @@ -55,7 +55,7 @@ ] }, "aifInterfaces": { - "title": "AIF interfaces", + "title": "AIF Interfaces", "description": "AIF interfaces", "type": "array", "items": { diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index 3d22cf68b..090004435 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -23,7 +23,7 @@ INTERFACE zif_aff_aifd_v1 "! Header "! $required header TYPE zif_aff_types_v1=>ty_header_60_cloud, - "!

AIF interfaces

+ "!

AIF Interfaces

"! AIF interfaces "! $required aif_interfaces TYPE ty_aif_interfaces, From d9e828d47c64c6a6bef5326790cfb6a28078eb63 Mon Sep 17 00:00:00 2001 From: Katharina Wurz Date: Mon, 1 Jul 2024 09:35:29 +0200 Subject: [PATCH 17/17] Update file-formats/aifd/type/zif_aff_aifd_v1.intf.abap Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> --- file-formats/aifd/type/zif_aff_aifd_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap index 090004435..06b45b2df 100644 --- a/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap +++ b/file-formats/aifd/type/zif_aff_aifd_v1.intf.abap @@ -7,7 +7,7 @@ INTERFACE zif_aff_aifd_v1 "!

Interface Object Name

"! Interface object name "! $required - interface_object_name TYPE c LENGTH 40, + interface_object_name TYPE c LENGTH 40, END OF ty_aif_interface, "!

AIF Interfaces