From 037014915b833992ca2e50dbfacbc3b7cf44909d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Mon, 25 Jul 2022 14:57:06 +0200 Subject: [PATCH 01/41] Update gsmp-v1.json --- file-formats/gsmp/gsmp-v1.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/file-formats/gsmp/gsmp-v1.json b/file-formats/gsmp/gsmp-v1.json index 6ea2f3b37..19826d7c5 100644 --- a/file-formats/gsmp/gsmp-v1.json +++ b/file-formats/gsmp/gsmp-v1.json @@ -102,19 +102,22 @@ "system", "instance", "application", - "none" + "none", + "job" ], "enumTitles": [ "System", "Instance", "Application", - "None" + "None", + "Job" ], "enumDescriptions": [ "System", "Instance", "Application", - "No execution. Only model. Data from external." + "No execution. Only model. Data from external.", + "Job." ] }, "priority": { From 74d07312b7326be0da9abe8f9b4c29eda3c2496c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Mon, 25 Jul 2022 15:00:15 +0200 Subject: [PATCH 02/41] Update zif_aff_gsmp_v1.intf.abap --- file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap b/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap index eec70b10c..b2e8ddd5b 100644 --- a/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap +++ b/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap @@ -101,6 +101,10 @@ INTERFACE zif_aff_gsmp_v1 "! No execution. Only model. Data from external. none TYPE ty_execution_mode VALUE 'N', + "!

Job

+ "! Job. + job TYPE ty_execution_mode VALUE 'J', + END OF co_execution_mode, "!

Provider Priority

From e9c6fd4f1f359d150506871462adbe58f15c8008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:35:22 +0200 Subject: [PATCH 03/41] Update gsmp-v1.json --- file-formats/gsmp/gsmp-v1.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file-formats/gsmp/gsmp-v1.json b/file-formats/gsmp/gsmp-v1.json index 19826d7c5..9182752ee 100644 --- a/file-formats/gsmp/gsmp-v1.json +++ b/file-formats/gsmp/gsmp-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/gsmp/gsmp-v1.json", "title": "Metric Provider", - "description": "Metric Provider (GSMP) v1", + "description": "Metric Provider (GSMP)", "type": "object", "properties": { "formatVersion": { @@ -117,7 +117,7 @@ "Instance", "Application", "No execution. Only model. Data from external.", - "Job." + "Job" ] }, "priority": { From aa1a67506e3a95d10838590b1c436f0a8bf88c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:37:22 +0200 Subject: [PATCH 04/41] Update zif_aff_gsmp_v1.intf.abap --- file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap b/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap index b2e8ddd5b..8df981416 100644 --- a/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap +++ b/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap @@ -102,7 +102,7 @@ INTERFACE zif_aff_gsmp_v1 none TYPE ty_execution_mode VALUE 'N', "!

Job

- "! Job. + "! Job job TYPE ty_execution_mode VALUE 'J', END OF co_execution_mode, @@ -132,7 +132,7 @@ INTERFACE zif_aff_gsmp_v1 TYPES: "!

Metric Provider

- "! Metric Provider (GSMP) v1 + "! Metric Provider (GSMP) BEGIN OF ty_main, "! $required From 2375a380f3188187320b0e4c7d0ee1d0c2aae960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 26 Jul 2022 10:07:28 +0200 Subject: [PATCH 05/41] Update gsmp-v1.json --- file-formats/gsmp/gsmp-v1.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/file-formats/gsmp/gsmp-v1.json b/file-formats/gsmp/gsmp-v1.json index 9182752ee..b78579a8f 100644 --- a/file-formats/gsmp/gsmp-v1.json +++ b/file-formats/gsmp/gsmp-v1.json @@ -102,22 +102,22 @@ "system", "instance", "application", - "none", - "job" + "job", + "none" ], "enumTitles": [ "System", "Instance", "Application", - "None", - "Job" + "Job", + "None" ], "enumDescriptions": [ "System", "Instance", "Application", - "No execution. Only model. Data from external.", - "Job" + "Job", + "No execution. Only model. Data from external." ] }, "priority": { From 588a57f15538382c3ebd23f3fd64ed87851429b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 26 Jul 2022 10:08:07 +0200 Subject: [PATCH 06/41] Update zif_aff_gsmp_v1.intf.abap --- file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap b/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap index 8df981416..1199857c7 100644 --- a/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap +++ b/file-formats/gsmp/type/zif_aff_gsmp_v1.intf.abap @@ -97,14 +97,14 @@ INTERFACE zif_aff_gsmp_v1 "! Application application TYPE ty_execution_mode VALUE 'A', - "!

None

- "! No execution. Only model. Data from external. - none TYPE ty_execution_mode VALUE 'N', - "!

Job

"! Job job TYPE ty_execution_mode VALUE 'J', + "!

None

+ "! No execution. Only model. Data from external. + none TYPE ty_execution_mode VALUE 'N', + END OF co_execution_mode, "!

Provider Priority

From 370a0e320d0664adf3db92c0a75cf9ee8681f3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Fri, 15 Mar 2024 09:57:51 +0100 Subject: [PATCH 07/41] Add files for GSMG --- file-formats/gsmg/README.md | 5 + .../examples/z_aff_example_gsmg.gsmg.json | 12 ++ file-formats/gsmg/gsmg-v1.json | 117 ++++++++++++++++++ .../gsmg/type/zif_aff_gsmg_v1.intf.abap | 99 +++++++++++++++ .../gsmg/type/zif_aff_gsmg_v1.intf.json | 7 ++ 5 files changed, 240 insertions(+) create mode 100644 file-formats/gsmg/README.md create mode 100644 file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json create mode 100644 file-formats/gsmg/gsmg-v1.json create mode 100644 file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap create mode 100644 file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json diff --git a/file-formats/gsmg/README.md b/file-formats/gsmg/README.md new file mode 100644 index 000000000..f0610448b --- /dev/null +++ b/file-formats/gsmg/README.md @@ -0,0 +1,5 @@ +# GSMG File Format + +File | Cardinality | Definition | Schema | Example +:--- | :--- | :--- | :--- | :--- +`.gsmg.json` | 1 | [`zif_aff_gsmg_v1.intf.abap`](./type/zif_aff_gsmg_v1.intf.abap) | [`gsmg-v1.json`](./gsmg-v1.json) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json new file mode 100644 index 000000000..f9d0f0f8c --- /dev/null +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -0,0 +1,12 @@ +{ + "formatVersion": "1", + "header": { + "description": "For testing", + "originalLanguage": "en", + "abapLanguageVersion": "standard" + }, + "generalInformation": { + "type": "USAGE", + "detailedDescription": "This Metric Group is for testing" + } +} \ No newline at end of file diff --git a/file-formats/gsmg/gsmg-v1.json b/file-formats/gsmg/gsmg-v1.json new file mode 100644 index 000000000..4e29c8769 --- /dev/null +++ b/file-formats/gsmg/gsmg-v1.json @@ -0,0 +1,117 @@ +{ + "$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/gsmg/gsmg-v1.json", + "title": "Metric Group", + "description": "Metric Group (GSMG)", + "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, + "maxLength": 2, + "pattern": "^[a-z]+$" + }, + "abapLanguageVersion": { + "title": "ABAP Language Version", + "description": "ABAP language version", + "type": "string", + "enum": [ + "standard", + "cloudDevelopment" + ], + "enumTitles": [ + "Standard", + "ABAP Cloud Development" + ], + "enumDescriptions": [ + "Standard", + "ABAP cloud development" + ], + "default": "standard" + } + }, + "additionalProperties": false, + "required": [ + "description", + "originalLanguage" + ] + }, + "generalInformation": { + "title": "General information", + "description": "General information", + "type": "object", + "properties": { + "type": { + "title": "Category", + "description": "Category", + "type": "string", + "enum": [ + "AVAIL", + "PERFORM", + "EXCEPTION", + "CONFIGURE", + "USAGE", + "SELFMON", + "METERING" + ], + "enumTitles": [ + "Availability", + "Performance", + "Exceptions", + "Configuration", + "Usage", + "Self Monitoring", + "Metering" + ], + "enumDescriptions": [ + "Availability", + "Performance", + "Exceptions", + "Configuration", + "Usage", + "Self Monitoring", + "Metering" + ], + "default": "USAGE" + }, + "detailedDescription": { + "title": "Detailed description", + "description": "Detailed description", + "type": "string", + "maxLength": 255 + } + }, + "additionalProperties": false, + "required": [ + "type", + "detailedDescription" + ] + } + }, + "additionalProperties": false, + "required": [ + "formatVersion", + "header", + "generalInformation" + ] +} diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap new file mode 100644 index 000000000..0da9c6012 --- /dev/null +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -0,0 +1,99 @@ +INTERFACE zif_aff_gsmg_v1 + PUBLIC. + + TYPES: + + "!

Category

+ "! Category + "! $values {@link zif_aff_gsmg_v1.data:co_category} + "! $default {@link zif_aff_gsmg_v1.data:co_category.usage} + ty_category TYPE c LENGTH 10, + + "!

Detailed description

+ "! Detailed description + ty_detailed_description TYPE c LENGTH 255, + + + "!

General information

+ "! General information + BEGIN OF ty_general_information, + "!

Category

+ "! Category + "! $required + type TYPE ty_category, + + "!

Detailed description

+ "! Detailed description + "! $required + detailed_description TYPE ty_detailed_description, + + END OF ty_general_information. + + + CONSTANTS: + + "!

Category

+ "! Category + BEGIN OF co_category, + + "!

Availability

+ "! Availability + "! $enumValue 'AVAIL' + availability TYPE ty_category VALUE 'AVAIL', + + "!

Performance

+ "! Performance + "! $enumValue 'PERFORM' + performance TYPE ty_category VALUE 'PERFORM', + + "!

Exceptions

+ "! Exceptions + "! $enumValue 'EXCEPTION' + exceptions TYPE ty_category VALUE 'EXCEPTION', + + "!

Configuration

+ "! Configuration + "! $enumValue 'CONFIGURE' + configuration TYPE ty_category VALUE 'CONFIGURE', + + "!

Usage

+ "! Usage + "! $enumValue 'USAGE' + usage TYPE ty_category VALUE 'USAGE', + + "!

Self Monitoring

+ "! Self Monitoring + "! $enumValue 'SELFMON' + self_monitoring TYPE ty_category VALUE 'SELFMON', + + "!

Metering

+ "! Metering + "! $enumValue 'METERING' + metering TYPE ty_category VALUE 'METERING', + + END OF co_category. + + + + TYPES: + + "!

Metric Group

+ "! Metric Group (GSMG) + 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_cloud, + + "!

General information

+ "! General information + "! $required + general_information TYPE ty_general_information, + + END OF ty_main. + +ENDINTERFACE. diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json new file mode 100644 index 000000000..77ace97e4 --- /dev/null +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json @@ -0,0 +1,7 @@ +{ + "formatVersion": "1", + "header": { + "description": "GSMP AFF Type (Generic Simple Metric Collector)", + "originalLanguage": "en" + } +} From a777188f3619e0bbe45cf66bc198c26f90547d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:18:07 +0100 Subject: [PATCH 08/41] Update file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json Co-authored-by: Albert Mink --- file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index f9d0f0f8c..999404201 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -9,4 +9,4 @@ "type": "USAGE", "detailedDescription": "This Metric Group is for testing" } -} \ No newline at end of file +} From 2898e057d48f03ae172d045c0989eccd5fc08363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:21:26 +0100 Subject: [PATCH 09/41] Update file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap Co-authored-by: Katharina Wurz --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 0da9c6012..90a2b7a3f 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -9,7 +9,7 @@ INTERFACE zif_aff_gsmg_v1 "! $default {@link zif_aff_gsmg_v1.data:co_category.usage} ty_category TYPE c LENGTH 10, - "!

Detailed description

+ "!

Detailed Description

"! Detailed description ty_detailed_description TYPE c LENGTH 255, From e0b5e183693abb7b7bc896010473bb15e93b1749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:21:36 +0100 Subject: [PATCH 10/41] Update file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap Co-authored-by: Katharina Wurz --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 90a2b7a3f..3dd3a5676 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -14,7 +14,7 @@ INTERFACE zif_aff_gsmg_v1 ty_detailed_description TYPE c LENGTH 255, - "!

General information

+ "!

General Information

"! General information BEGIN OF ty_general_information, "!

Category

From 5bbb486b32b866e3ab737f300da76302bd734f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:21:43 +0100 Subject: [PATCH 11/41] Update file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap Co-authored-by: Katharina Wurz --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 3dd3a5676..3976e61a5 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -22,7 +22,7 @@ INTERFACE zif_aff_gsmg_v1 "! $required type TYPE ty_category, - "!

Detailed description

+ "!

Detailed Description

"! Detailed description "! $required detailed_description TYPE ty_detailed_description, From b7a4c18bdada33af73324d8970ef560c81bde41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:21:54 +0100 Subject: [PATCH 12/41] Update file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap Co-authored-by: Katharina Wurz --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 3976e61a5..995b6324f 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -62,7 +62,7 @@ INTERFACE zif_aff_gsmg_v1 usage TYPE ty_category VALUE 'USAGE', "!

Self Monitoring

- "! Self Monitoring + "! Self monitoring "! $enumValue 'SELFMON' self_monitoring TYPE ty_category VALUE 'SELFMON', From 1fe7cad29d1321c4eb4f72f33d4c9bd45d348dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:22:02 +0100 Subject: [PATCH 13/41] Update file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap Co-authored-by: Katharina Wurz --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 995b6324f..e3b494393 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -89,7 +89,7 @@ INTERFACE zif_aff_gsmg_v1 "! $required header TYPE zif_aff_types_v1=>ty_header_60_cloud, - "!

General information

+ "!

General Information

"! General information "! $required general_information TYPE ty_general_information, From a13a41b81a0f661ac48a35e6fba25d2fff13d1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:22:49 +0100 Subject: [PATCH 14/41] Update file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap Co-authored-by: Katharina Wurz --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index e3b494393..667a1205c 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -17,8 +17,8 @@ INTERFACE zif_aff_gsmg_v1 "!

General Information

"! General information BEGIN OF ty_general_information, - "!

Category

- "! Category + "!

Type

+ "! Type "! $required type TYPE ty_category, From 13820b5ac44b70001805ce7be48ab951aa8b4c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:30:04 +0100 Subject: [PATCH 15/41] Update file-formats/gsmg/README.md Co-authored-by: Katharina Wurz --- file-formats/gsmg/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/README.md b/file-formats/gsmg/README.md index f0610448b..cb9c1fdbe 100644 --- a/file-formats/gsmg/README.md +++ b/file-formats/gsmg/README.md @@ -2,4 +2,4 @@ File | Cardinality | Definition | Schema | Example :--- | :--- | :--- | :--- | :--- -`.gsmg.json` | 1 | [`zif_aff_gsmg_v1.intf.abap`](./type/zif_aff_gsmg_v1.intf.abap) | [`gsmg-v1.json`](./gsmg-v1.json) +`.gsmg.json` | 1 | [`zif_aff_gsmg_v1.intf.abap`](./type/zif_aff_gsmg_v1.intf.abap) | [`gsmg-v1.json`](./gsmg-v1.json) | | [z_aff_example_gsmg.gsmg.json](./examples/z_aff_example_gsmg.gsmg.json) From 4b2edface891b8e7eb3a0ff573902fd9401272f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:52:37 +0100 Subject: [PATCH 16/41] Update zif_aff_gsmg_v1.intf.abap Switched type to category --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 667a1205c..7a15d91fc 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -1,12 +1,12 @@ -INTERFACE zif_aff_gsmg_v1 +INTERFACE if_aff_gsmg_v1 PUBLIC. TYPES: "!

Category

"! Category - "! $values {@link zif_aff_gsmg_v1.data:co_category} - "! $default {@link zif_aff_gsmg_v1.data:co_category.usage} + "! $values {@link if_aff_gsmg_v1.data:co_category} + "! $default {@link if_aff_gsmg_v1.data:co_category.usage} ty_category TYPE c LENGTH 10, "!

Detailed Description

@@ -17,10 +17,10 @@ INTERFACE zif_aff_gsmg_v1 "!

General Information

"! General information BEGIN OF ty_general_information, - "!

Type

- "! Type + "!

Category

+ "! Category "! $required - type TYPE ty_category, + category TYPE ty_category, "!

Detailed Description

"! Detailed description @@ -82,12 +82,12 @@ INTERFACE zif_aff_gsmg_v1 BEGIN OF ty_main, "! $required - format_version TYPE zif_aff_types_v1=>ty_format_version, + format_version TYPE if_aff_types_v1=>ty_format_version, "!

Header

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

General Information

"! General information From 071a0fe1881efc9955bf21053ef6cfd23198b3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:53:28 +0100 Subject: [PATCH 17/41] Update zif_aff_gsmg_v1.intf.json Typo --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json index 77ace97e4..a9790e334 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.json @@ -1,7 +1,7 @@ { "formatVersion": "1", "header": { - "description": "GSMP AFF Type (Generic Simple Metric Collector)", + "description": "GSMG AFF Type (Metric Group)", "originalLanguage": "en" } } From ca1ca167c24f684a8615358c9d8ba729d24e54be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:54:47 +0100 Subject: [PATCH 18/41] Update gsmg-v1.json --- file-formats/gsmg/gsmg-v1.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/file-formats/gsmg/gsmg-v1.json b/file-formats/gsmg/gsmg-v1.json index 4e29c8769..762cee18a 100644 --- a/file-formats/gsmg/gsmg-v1.json +++ b/file-formats/gsmg/gsmg-v1.json @@ -57,11 +57,11 @@ ] }, "generalInformation": { - "title": "General information", + "title": "General Information", "description": "General information", "type": "object", "properties": { - "type": { + "category": { "title": "Category", "description": "Category", "type": "string", @@ -89,13 +89,13 @@ "Exceptions", "Configuration", "Usage", - "Self Monitoring", + "Self monitoring", "Metering" ], "default": "USAGE" }, "detailedDescription": { - "title": "Detailed description", + "title": "Detailed Description", "description": "Detailed description", "type": "string", "maxLength": 255 @@ -103,7 +103,7 @@ }, "additionalProperties": false, "required": [ - "type", + "category", "detailedDescription" ] } From ec6075d4f9fef661b8947ce18c55330e8a77c9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:55:36 +0100 Subject: [PATCH 19/41] Update z_aff_example_gsmg.gsmg.json --- file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index 999404201..043bead40 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -6,7 +6,7 @@ "abapLanguageVersion": "standard" }, "generalInformation": { - "type": "USAGE", + "category": "USAGE", "detailedDescription": "This Metric Group is for testing" } } From ce1b698b034d9682ef6b1843ccc55a33adfe4f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:57:17 +0100 Subject: [PATCH 20/41] Update zif_aff_gsmg_v1.intf.abap --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 7a15d91fc..ecfe323f8 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -1,12 +1,12 @@ -INTERFACE if_aff_gsmg_v1 +INTERFACE zif_aff_gsmg_v1 PUBLIC. TYPES: "!

Category

"! Category - "! $values {@link if_aff_gsmg_v1.data:co_category} - "! $default {@link if_aff_gsmg_v1.data:co_category.usage} + "! $values {@link zif_aff_gsmg_v1.data:co_category} + "! $default {@link zif_aff_gsmg_v1.data:co_category.usage} ty_category TYPE c LENGTH 10, "!

Detailed Description

@@ -82,12 +82,12 @@ INTERFACE if_aff_gsmg_v1 BEGIN OF ty_main, "! $required - format_version TYPE if_aff_types_v1=>ty_format_version, + format_version TYPE zif_aff_types_v1=>ty_format_version, "!

Header

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

General Information

"! General information From 222c9c8ca4ff71aeea28faa122e40e935ace465e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:26:06 +0100 Subject: [PATCH 21/41] EOL Unix style (LF) --- file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index 043bead40..6850e4c8c 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -10,3 +10,4 @@ "detailedDescription": "This Metric Group is for testing" } } + From 752ac827526bc5306ae08792f29fd8c2103a814f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:44:49 +0100 Subject: [PATCH 22/41] Get rid of enums --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 7 ------- 1 file changed, 7 deletions(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index ecfe323f8..68714093a 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -38,37 +38,30 @@ INTERFACE zif_aff_gsmg_v1 "!

Availability

"! Availability - "! $enumValue 'AVAIL' availability TYPE ty_category VALUE 'AVAIL', "!

Performance

"! Performance - "! $enumValue 'PERFORM' performance TYPE ty_category VALUE 'PERFORM', "!

Exceptions

"! Exceptions - "! $enumValue 'EXCEPTION' exceptions TYPE ty_category VALUE 'EXCEPTION', "!

Configuration

"! Configuration - "! $enumValue 'CONFIGURE' configuration TYPE ty_category VALUE 'CONFIGURE', "!

Usage

"! Usage - "! $enumValue 'USAGE' usage TYPE ty_category VALUE 'USAGE', "!

Self Monitoring

"! Self monitoring - "! $enumValue 'SELFMON' self_monitoring TYPE ty_category VALUE 'SELFMON', "!

Metering

"! Metering - "! $enumValue 'METERING' metering TYPE ty_category VALUE 'METERING', END OF co_category. From 7c34be4e0728597971993bf3597b014fd5d95c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:46:30 +0100 Subject: [PATCH 23/41] Auto enums --- file-formats/gsmg/gsmg-v1.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/file-formats/gsmg/gsmg-v1.json b/file-formats/gsmg/gsmg-v1.json index 762cee18a..d65564080 100644 --- a/file-formats/gsmg/gsmg-v1.json +++ b/file-formats/gsmg/gsmg-v1.json @@ -1,3 +1,4 @@ + { "$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", @@ -66,13 +67,13 @@ "description": "Category", "type": "string", "enum": [ - "AVAIL", - "PERFORM", - "EXCEPTION", - "CONFIGURE", - "USAGE", - "SELFMON", - "METERING" + "availability", + "performance", + "exceptions", + "configuration", + "usage", + "selfMonitoring", + "metering" ], "enumTitles": [ "Availability", @@ -92,7 +93,7 @@ "Self monitoring", "Metering" ], - "default": "USAGE" + "default": "usage" }, "detailedDescription": { "title": "Detailed Description", From 697550152b2789960955c272a26abc02aaaaffa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:49:37 +0100 Subject: [PATCH 24/41] fixed enum --- file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index 6850e4c8c..1aeac9f6d 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -6,7 +6,7 @@ "abapLanguageVersion": "standard" }, "generalInformation": { - "category": "USAGE", + "category": "usage", "detailedDescription": "This Metric Group is for testing" } } From 65de592f76f54ffaef8c65dd32d334ed892b6ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:09:03 +0100 Subject: [PATCH 25/41] Update zif_aff_gsmg_v1.intf.abap From 4fda52541e9f786960a9a408cd5ed6be9195dbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:09:52 +0100 Subject: [PATCH 26/41] Update gsmg-v1.json --- file-formats/gsmg/gsmg-v1.json | 1 - 1 file changed, 1 deletion(-) diff --git a/file-formats/gsmg/gsmg-v1.json b/file-formats/gsmg/gsmg-v1.json index d65564080..9419693ec 100644 --- a/file-formats/gsmg/gsmg-v1.json +++ b/file-formats/gsmg/gsmg-v1.json @@ -1,4 +1,3 @@ - { "$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", From acbd246f75af58ca85fdb051ea7aacfac33455db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:15:00 +0100 Subject: [PATCH 27/41] Update z_aff_example_gsmg.gsmg.json --- file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index 1aeac9f6d..d8c4eddfb 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -10,4 +10,3 @@ "detailedDescription": "This Metric Group is for testing" } } - From 5676338b657a937b912a3e86a284b49b272f15f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:34:21 +0100 Subject: [PATCH 28/41] Update z_aff_example_gsmg.gsmg.json From 332849bbdf9baab8e1ace7dcb2e62acc9a12d425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:37:15 +0100 Subject: [PATCH 29/41] Update z_aff_example_gsmg.gsmg.json --- .../gsmg/examples/z_aff_example_gsmg.gsmg.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index d8c4eddfb..035f7a691 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -1,12 +1,12 @@ { "formatVersion": "1", "header": { - "description": "For testing", - "originalLanguage": "en", - "abapLanguageVersion": "standard" + "description": "Example CSN model for ABAP file formats", + "originalLanguage": "en" }, - "generalInformation": { - "category": "usage", - "detailedDescription": "This Metric Group is for testing" - } + "csnFiles": [ + { + "file": "model_inferred.csn" + } + ] } From db43d0ce75b9c8ac06c6bd45f6be5c2ebea0eef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:42:07 +0100 Subject: [PATCH 30/41] Update z_aff_example_gsmg.gsmg.json From 6f9caecb738f5c00ee7d088eb03fd367554f0ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:04:20 +0100 Subject: [PATCH 31/41] LF as EOL --- .../gsmg/examples/z_aff_example_gsmg.gsmg.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index 035f7a691..d8c4eddfb 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -1,12 +1,12 @@ { "formatVersion": "1", "header": { - "description": "Example CSN model for ABAP file formats", - "originalLanguage": "en" + "description": "For testing", + "originalLanguage": "en", + "abapLanguageVersion": "standard" }, - "csnFiles": [ - { - "file": "model_inferred.csn" - } - ] + "generalInformation": { + "category": "usage", + "detailedDescription": "This Metric Group is for testing" + } } From cb3be75f3c50d6f72a3a9e65aae28a4752ebd255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:26:10 +0100 Subject: [PATCH 32/41] LF as EOL --- .vscode/settings.json | 3 +++ file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..c24779377 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "files.eol": "auto" +} \ No newline at end of file diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index d8c4eddfb..ed868957c 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -1,12 +1,12 @@ { "formatVersion": "1", "header": { - "description": "For testing", + "description": "For testing.", "originalLanguage": "en", "abapLanguageVersion": "standard" }, "generalInformation": { "category": "usage", - "detailedDescription": "This Metric Group is for testing" + "detailedDescription": "This Metric Group is for testing." } } From a54a74300c14bc4f7a97b8285ac2483adec811a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 20 Mar 2024 13:28:39 +0100 Subject: [PATCH 33/41] LF as EOL Part 3 --- .../examples/z_aff_example_gsmg.gsmg.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index ed868957c..5ce37eee7 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -1,12 +1,12 @@ -{ - "formatVersion": "1", - "header": { - "description": "For testing.", - "originalLanguage": "en", - "abapLanguageVersion": "standard" - }, - "generalInformation": { - "category": "usage", - "detailedDescription": "This Metric Group is for testing." - } -} +{ + "formatVersion": "1", + "header": { + "description": "For testing.", + "originalLanguage": "en", + "abapLanguageVersion": "standard" + }, + "generalInformation": { + "category": "usage", + "detailedDescription": "This Metric Group is for testing." + } +} From cfc32c5ee6880b1a8576d190be1086449af0ff73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:46:55 +0100 Subject: [PATCH 34/41] Delete .vscode/settings.json --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c24779377..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files.eol": "auto" -} \ No newline at end of file From 880cba2d62d346201d134646f6e8ae0f289059b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:41:36 +0100 Subject: [PATCH 35/41] Update file-formats/gsmg/README.md Co-authored-by: Michael Schneider --- file-formats/gsmg/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/README.md b/file-formats/gsmg/README.md index cb9c1fdbe..a1189df84 100644 --- a/file-formats/gsmg/README.md +++ b/file-formats/gsmg/README.md @@ -2,4 +2,4 @@ File | Cardinality | Definition | Schema | Example :--- | :--- | :--- | :--- | :--- -`.gsmg.json` | 1 | [`zif_aff_gsmg_v1.intf.abap`](./type/zif_aff_gsmg_v1.intf.abap) | [`gsmg-v1.json`](./gsmg-v1.json) | | [z_aff_example_gsmg.gsmg.json](./examples/z_aff_example_gsmg.gsmg.json) +`.gsmg.json` | 1 | [`zif_aff_gsmg_v1.intf.abap`](./type/zif_aff_gsmg_v1.intf.abap) | [`gsmg-v1.json`](./gsmg-v1.json) | | [`z_aff_example_gsmg.gsmg.json`](./examples/z_aff_example_gsmg.gsmg.json) From 7d6f46dfc7fdf89eb3c8e4c00c0bb869c04fd7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:42:32 +0100 Subject: [PATCH 36/41] Update file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json Co-authored-by: Michael Schneider --- file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index 5ce37eee7..79bdcbf03 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -2,8 +2,7 @@ "formatVersion": "1", "header": { "description": "For testing.", - "originalLanguage": "en", - "abapLanguageVersion": "standard" + "originalLanguage": "en" }, "generalInformation": { "category": "usage", From e8a7d73bd047dc39a104f3cc767508cc58049fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:59:05 +0100 Subject: [PATCH 37/41] exceptions -> exception --- file-formats/gsmg/gsmg-v1.json | 6 +++--- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/file-formats/gsmg/gsmg-v1.json b/file-formats/gsmg/gsmg-v1.json index 9419693ec..acd61103e 100644 --- a/file-formats/gsmg/gsmg-v1.json +++ b/file-formats/gsmg/gsmg-v1.json @@ -68,7 +68,7 @@ "enum": [ "availability", "performance", - "exceptions", + "exception", "configuration", "usage", "selfMonitoring", @@ -77,7 +77,7 @@ "enumTitles": [ "Availability", "Performance", - "Exceptions", + "Exception", "Configuration", "Usage", "Self Monitoring", @@ -86,7 +86,7 @@ "enumDescriptions": [ "Availability", "Performance", - "Exceptions", + "Exception", "Configuration", "Usage", "Self monitoring", diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 68714093a..71f9e7d5d 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -44,9 +44,9 @@ INTERFACE zif_aff_gsmg_v1 "! Performance performance TYPE ty_category VALUE 'PERFORM', - "!

Exceptions

- "! Exceptions - exceptions TYPE ty_category VALUE 'EXCEPTION', + "!

Exception

+ "! Exception + exception TYPE ty_category VALUE 'EXCEPTION', "!

Configuration

"! Configuration From 328b92bd78ef92797764b56ecc865eb70e3a0405 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Wed, 10 Apr 2024 17:24:44 +0200 Subject: [PATCH 38/41] Fix schema due to changes in issue #582 --- file-formats/gsmg/gsmg-v1.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/file-formats/gsmg/gsmg-v1.json b/file-formats/gsmg/gsmg-v1.json index acd61103e..c8b90f283 100644 --- a/file-formats/gsmg/gsmg-v1.json +++ b/file-formats/gsmg/gsmg-v1.json @@ -27,9 +27,7 @@ "title": "Original Language", "description": "Original language of the ABAP object", "type": "string", - "minLength": 2, - "maxLength": 2, - "pattern": "^[a-z]+$" + "minLength": 2 }, "abapLanguageVersion": { "title": "ABAP Language Version", From 25b0135df550461c3ef4018fee59f02bd1eb51b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Eichelsd=C3=B6rfer?= <108392784+mseich@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:14:46 +0200 Subject: [PATCH 39/41] remove long description --- .../gsmg/examples/z_aff_example_gsmg.gsmg.json | 3 +-- file-formats/gsmg/gsmg-v1.json | 13 ++++--------- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 9 --------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json index 79bdcbf03..f4f9f2c9f 100644 --- a/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json +++ b/file-formats/gsmg/examples/z_aff_example_gsmg.gsmg.json @@ -5,7 +5,6 @@ "originalLanguage": "en" }, "generalInformation": { - "category": "usage", - "detailedDescription": "This Metric Group is for testing." + "category": "usage" } } diff --git a/file-formats/gsmg/gsmg-v1.json b/file-formats/gsmg/gsmg-v1.json index c8b90f283..0e387d9a4 100644 --- a/file-formats/gsmg/gsmg-v1.json +++ b/file-formats/gsmg/gsmg-v1.json @@ -27,7 +27,9 @@ "title": "Original Language", "description": "Original language of the ABAP object", "type": "string", - "minLength": 2 + "minLength": 2, + "maxLength": 2, + "pattern": "^[a-z]+$" }, "abapLanguageVersion": { "title": "ABAP Language Version", @@ -91,18 +93,11 @@ "Metering" ], "default": "usage" - }, - "detailedDescription": { - "title": "Detailed Description", - "description": "Detailed description", - "type": "string", - "maxLength": 255 } }, "additionalProperties": false, "required": [ - "category", - "detailedDescription" + "category" ] } }, diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 71f9e7d5d..94ea482a4 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -9,10 +9,6 @@ INTERFACE zif_aff_gsmg_v1 "! $default {@link zif_aff_gsmg_v1.data:co_category.usage} ty_category TYPE c LENGTH 10, - "!

Detailed Description

- "! Detailed description - ty_detailed_description TYPE c LENGTH 255, - "!

General Information

"! General information @@ -22,11 +18,6 @@ INTERFACE zif_aff_gsmg_v1 "! $required category TYPE ty_category, - "!

Detailed Description

- "! Detailed description - "! $required - detailed_description TYPE ty_detailed_description, - END OF ty_general_information. From 7e7859cbe5a1b012bf21bfe9218dfcc677624264 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Wed, 17 Apr 2024 12:27:28 +0200 Subject: [PATCH 40/41] Fix language field according to BCP47 --- file-formats/gsmg/gsmg-v1.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/file-formats/gsmg/gsmg-v1.json b/file-formats/gsmg/gsmg-v1.json index 0e387d9a4..39357bf52 100644 --- a/file-formats/gsmg/gsmg-v1.json +++ b/file-formats/gsmg/gsmg-v1.json @@ -27,9 +27,7 @@ "title": "Original Language", "description": "Original language of the ABAP object", "type": "string", - "minLength": 2, - "maxLength": 2, - "pattern": "^[a-z]+$" + "minLength": 2 }, "abapLanguageVersion": { "title": "ABAP Language Version", From ae2976c5d65f18b6e02073bd19dbbb319ed1b687 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Tue, 8 Oct 2024 16:00:40 +0200 Subject: [PATCH 41/41] Fix abaplint issue Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> --- file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap index 94ea482a4..2405550b0 100644 --- a/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap +++ b/file-formats/gsmg/type/zif_aff_gsmg_v1.intf.abap @@ -16,7 +16,7 @@ INTERFACE zif_aff_gsmg_v1 "!

Category

"! Category "! $required - category TYPE ty_category, + category TYPE ty_category, END OF ty_general_information.