From 55a135bd47be0a323d6ed8ad7efea3512a5c6c7d Mon Sep 17 00:00:00 2001
From: "Zickermann, Jan" <jan.zickermann@dataport.de>
Date: Fri, 28 Jun 2024 12:36:31 +0200
Subject: [PATCH] OZG-6054 xta: Avoid accidental use of wildcard identifier
---
.../eingang/xta/WsHeaderAddingInterceptor.java | 15 ++++++++++-----
.../eingang/xta/XtaCurrentIdentifierService.java | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/WsHeaderAddingInterceptor.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/WsHeaderAddingInterceptor.java
index 3833376fc..f0ae4deba 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/WsHeaderAddingInterceptor.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/WsHeaderAddingInterceptor.java
@@ -1,5 +1,11 @@
package de.ozgcloud.eingang.xta;
+import java.util.Objects;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.ws.client.WebServiceClientException;
@@ -12,10 +18,6 @@ import eu.osci.ws._2014._10.transport.OriginatorsType;
import eu.osci.ws._2014._10.transport.PartyIdentifierType;
import eu.osci.ws._2014._10.transport.PartyType;
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.JAXBException;
-
@Component
class WsHeaderAddingInterceptor implements ClientInterceptor {
@@ -43,7 +45,10 @@ class WsHeaderAddingInterceptor implements ClientInterceptor {
PartyType partyType = new PartyType();
PartyIdentifierType identifier = new PartyIdentifierType();
- identifier.setValue(xtaCurrentIdentifierService.getCurrentIdentifier());
+ identifier.setValue(Objects.requireNonNull(
+ xtaCurrentIdentifierService.getCurrentIdentifier(),
+ "Expect current identifier to be set!")
+ );
partyType.setIdentifier(identifier);
var origin = new OriginatorsType();
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaCurrentIdentifierService.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaCurrentIdentifierService.java
index 0024ec287..a4d501aad 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaCurrentIdentifierService.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaCurrentIdentifierService.java
@@ -15,7 +15,7 @@ public class XtaCurrentIdentifierService {
@Setter
@Getter
- private String currentIdentifier = "*";
+ private String currentIdentifier;
@Autowired
@Valid
--
GitLab