From eb64c26473f18aa84bd1802681d66cc45b4a2d19 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 3 Apr 2025 16:58:47 +0200
Subject: [PATCH 1/3] KOP-3126 xta: Remove NCName restriction for fileIds
---
src/main/resources/wsdl/XTA-Webservice-Datentypen.xsd | 2 +-
.../ozgcloud/xta/client/extension/XtaMessageExampleLoader.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/resources/wsdl/XTA-Webservice-Datentypen.xsd b/src/main/resources/wsdl/XTA-Webservice-Datentypen.xsd
index 8accdad..fbb8121 100644
--- a/src/main/resources/wsdl/XTA-Webservice-Datentypen.xsd
+++ b/src/main/resources/wsdl/XTA-Webservice-Datentypen.xsd
@@ -366,7 +366,7 @@ Die Belegung der Attribute ist für verschiedene Fachlichkeiten unterschiedlich
<xs:documentation>Der Dateiname der Datenquelle, falls der Inhalt einer Datei entnommen worden ist. Bsp.: Für die Übermittlung von xdomea-Nachrichten ist dieses Attribut Pflicht.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="id" type="xs:ID" use="optional">
+ <xs:attribute name="id" type="oscimeta:NonEmptyStringType" use="optional">
<xs:annotation>
<xs:documentation>Bietet die Möglichkeit, den Inhalt über z.B. eine laufende Nummer zu referenzieren.</xs:documentation>
</xs:annotation>
diff --git a/src/test/java/de/ozgcloud/xta/client/extension/XtaMessageExampleLoader.java b/src/test/java/de/ozgcloud/xta/client/extension/XtaMessageExampleLoader.java
index 8fa45ec..740edbd 100644
--- a/src/test/java/de/ozgcloud/xta/client/extension/XtaMessageExampleLoader.java
+++ b/src/test/java/de/ozgcloud/xta/client/extension/XtaMessageExampleLoader.java
@@ -126,6 +126,7 @@ public class XtaMessageExampleLoader {
.name(name)
.contentType(getString.apply("contentType"))
.content(createContentDataHandler(data))
+ .id(MapUtils.getString(messageFile, "id"))
.build();
}
--
GitLab
From 92a19cb6a3a8d788465fc17e0c9dada407b0833f Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Fri, 4 Apr 2025 13:22:07 +0200
Subject: [PATCH 2/3] KOP-3126 itcase: Use xta-test-server w/o NCName
restriction
---
.../xta/client/extension/XtaTestServerSetupExtension.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java b/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
index ca8e5d8..50fc489 100644
--- a/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
+++ b/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
public class XtaTestServerSetupExtension implements BeforeAllCallback, AfterAllCallback {
private static final DockerImageName XTA_TEST_SERVER_IMAGE = DockerImageName.parse("docker.ozg-sh.de/xta-test-server")
- .withTag("latest");
+ .withTag("1.9.0-MR-6");
private static final String XTA_TEST_CLIENT_KEYSTORE_PATH = "store/xta-test-client-john-smith_keystore.p12";
private static final String XTA_TEST_CLIENT_KEYSTORE_PASSWORD = "password";
--
GitLab
From 9192e9660b88f1a0bb126315b427f3d0079d0fa4 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Fri, 4 Apr 2025 13:32:28 +0200
Subject: [PATCH 3/3] KOP-3126 itcase: Use xta-test-server of main branch
---
.../xta/client/extension/XtaTestServerSetupExtension.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java b/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
index 50fc489..3b13758 100644
--- a/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
+++ b/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
public class XtaTestServerSetupExtension implements BeforeAllCallback, AfterAllCallback {
private static final DockerImageName XTA_TEST_SERVER_IMAGE = DockerImageName.parse("docker.ozg-sh.de/xta-test-server")
- .withTag("1.9.0-MR-6");
+ .withTag("1.9.0-main");
private static final String XTA_TEST_CLIENT_KEYSTORE_PATH = "store/xta-test-client-john-smith_keystore.p12";
private static final String XTA_TEST_CLIENT_KEYSTORE_PASSWORD = "password";
--
GitLab