Merge branch 'main' into main

SAP · Nov 10, 2023 · a168708 · a168708
2 parents 614108a + 89a1440
commit a168708
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 12 deletions.
diff --git a/file-formats/sprv/README.md b/file-formats/sprv/README.md
@@ -1,5 +1,5 @@
 # SPRV File Format
 
 File | Cardinality | Definition | Schema | Example
-:--- | :---  | :--- | :--- | :---
-`<name>.sprv.json` | 1 | [`zif_aff_sprv_v1.intf.abap`](./type/zif_aff_sprv_v1.intf.abap) | [`sprv-v1.json`](./sprv-v1.json) |
+:--- | :--- | :--- | :--- | :---
+`<name>.sprv.json` | 1 |  [`zif_aff_sprv_v1.intf.abap`](./type/zif_aff_sprv_v1.intf.abap)  | [`sprv-v1.json`](./sprv-v1.json) | [srt_test_sprv.sprv.json](./examples/srt_test_sprv.sprv.json)
diff --git a/file-formats/sprv/examples/srt_test_sprv.sprv.json b/file-formats/sprv/examples/srt_test_sprv.sprv.json
@@ -0,0 +1,12 @@
+{
+  "formatVersion": "1",
+  "header": {
+    "description": "SPRV-Objekt für SOAP-Laufzeit testen",
+    "originalLanguage": "en"
+  },
+  "serviceProvider": {
+    "providerName": "IIW_SRT_TEST_SPRV_PROVIDER",
+    "namespace": "urn:sap-com:sprx:ep:sap:test",
+    "prefix": ""
+  }
+}
diff --git a/file-formats/sprv/sprv-v1.json b/file-formats/sprv/sprv-v1.json
@@ -61,22 +61,29 @@
       "description": "Service provider details",
       "type": "object",
       "properties": {
-        "name": {
-          "title": "Name",
+        "providerName": {
+          "title": "Provider Name",
           "description": "Name of the service provider",
           "type": "string",
           "maxLength": 30
         },
+        "namespace": {
+          "title": "Namespace",
+          "description": "Namespace of the service provider",
+          "type": "string",
+          "maxLength": 30
+        },
         "prefix": {
-          "title": "Prefix",
+          "title": "Object Name Prefix",
           "description": "Prefix for all generated objects",
           "type": "string",
           "maxLength": 10
         }
       },
       "additionalProperties": false,
       "required": [
-        "name"
+        "providerName",
+        "namespace"
       ]
     }
   },

diff --git a/file-formats/sprv/type/zif_aff_sprv_v1.intf.abap b/file-formats/sprv/type/zif_aff_sprv_v1.intf.abap
@@ -6,25 +6,29 @@ INTERFACE zif_aff_sprv_v1
     "! <p class="shorttext">Service Provider</p>
     "! Service provider details
     BEGIN OF ty_servprovider,
-      "! <p class="shorttext">Name</p>
+      "! <p class="shorttext">Provider Name</p>
       "! Name of the service provider
       "! $required
-      name   TYPE c LENGTH 30,
-      "! <p class="shorttext">Prefix</p>
+      provider_name TYPE c LENGTH 30,
+      "! <p class="shorttext">Namespace</p>
+      "! Namespace of the service provider
+      "! $required
+      namespace TYPE c LENGTH 30,
+      "! <p class="shorttext">Object Name Prefix</p>
       "! Prefix for all generated objects
       "! $showAlways
-      prefix TYPE c LENGTH 10,
+      prefix  TYPE c LENGTH 10,
     END OF ty_servprovider.
   TYPES:
     "! <p class="shorttext">SOAP Web Service Provider Model</p>
     "! SOAP web service provider model
     BEGIN OF ty_main,
       "! $required
-      format_version   TYPE zif_aff_types_v1=>ty_format_version,
+      format_version TYPE zif_aff_types_v1=>ty_format_version,
       "! <p class="shorttext">Header</p>
       "! Header data
       "! $required
-      header           TYPE zif_aff_types_v1=>ty_header_60_cloud,
+      header TYPE zif_aff_types_v1=>ty_header_60_cloud,
       "! <p class="shorttext">Service Provider</p>
       "! Service provider details
       "! $required