diff --git a/file-formats/rvbc/rvbc-v1.json b/file-formats/rvbc/rvbc-v1.json index 802fd45da..0084f0e96 100644 --- a/file-formats/rvbc/rvbc-v1.json +++ b/file-formats/rvbc/rvbc-v1.json @@ -156,66 +156,14 @@ "predefinedIna1Service": { "title": "Predefined InA Service", "description": "Predefined InA service", - "type": "object", - "properties": { - "ina1ServiceId": { - "title": "Service ID", - "description": "Service ID", - "type": "string", - "maxLength": 30 - }, - "ina1Service": { - "title": "Service Name", - "description": "Service name", - "type": "string", - "maxLength": 40 - }, - "serviceType": { - "title": "Service Type", - "description": "Service type", - "type": "string", - "maxLength": 2, - "pattern": "^[0-9]+$" - } - }, - "additionalProperties": false, - "required": [ - "ina1ServiceId", - "ina1Service", - "serviceType" - ] + "type": "string", + "maxLength": 40 }, "customIna1Service": { "title": "Custom InA Service", "description": "Custom InA service", - "type": "object", - "properties": { - "ina1ServiceId": { - "title": "Service ID", - "description": "Service ID", - "type": "string", - "maxLength": 30 - }, - "ina1Service": { - "title": "Service Name", - "description": "Service name", - "type": "string", - "maxLength": 40 - }, - "serviceType": { - "title": "Service Type", - "description": "Service type", - "type": "string", - "maxLength": 2, - "pattern": "^[0-9]+$" - } - }, - "additionalProperties": false, - "required": [ - "ina1ServiceId", - "ina1Service", - "serviceType" - ] + "type": "string", + "maxLength": 40 } }, "additionalProperties": false, diff --git a/file-formats/rvbc/type/zif_aff_rvbc_v1.intf.abap b/file-formats/rvbc/type/zif_aff_rvbc_v1.intf.abap index 2e37243c7..2359009be 100644 --- a/file-formats/rvbc/type/zif_aff_rvbc_v1.intf.abap +++ b/file-formats/rvbc/type/zif_aff_rvbc_v1.intf.abap @@ -3,9 +3,7 @@ INTERFACE zif_aff_rvbc_v1 PUBLIC. TYPES ty_app_id TYPE c LENGTH 70. - TYPES ty_ina1_service_id TYPE c LENGTH 30. TYPES ty_ina1_service_name TYPE c LENGTH 40. - TYPES ty_ina1_service_type TYPE n LENGTH 2. "! $values { @link zif_aff_rvbc_v1.data:co_extensibility_mode } "! $default { @link zif_aff_rvbc_v1.data:co_extensibility_mode.not_supported } @@ -88,23 +86,6 @@ INTERFACE zif_aff_rvbc_v1 extensibility_mode TYPE ty_extensibility_mode, END OF ty_booklet_definition. - TYPES: - "!

InA Service

- "! InA Service - BEGIN OF ty_ina1_service, - "!

Service ID

- "! Service ID - "! $required - ina1_service_id TYPE ty_ina1_service_id, - "!

Service Name

- "! Service name - "! $required - ina1_service TYPE ty_ina1_service_name, - "!

Service Type

- "! Service type - "! $required - service_type TYPE ty_ina1_service_type, - END OF ty_ina1_service. TYPES: "!

Object Type RVBC

@@ -123,10 +104,10 @@ INTERFACE zif_aff_rvbc_v1 booklet_definition TYPE ty_booklet_definition, "!

Predefined InA Service

"! Predefined InA service - predefined_ina1_service TYPE ty_ina1_service, + predefined_ina1_service TYPE ty_ina1_service_name, "!

Custom InA Service

"! Custom InA service - custom_ina1_service TYPE ty_ina1_service, + custom_ina1_service TYPE ty_ina1_service_name, END OF ty_main. ENDINTERFACE.