From 004936d1c93a6ec980058950387ddf21a8aeceb7 Mon Sep 17 00:00:00 2001
From: Joerg Bolay <joerg.bolay@dataport.de>
Date: Fri, 25 Oct 2024 07:21:28 +0200
Subject: [PATCH] KOP-2774 changed package for xta-service classes

---
 pom.xml                                       | 18 ++++++------
 .../xta/client/core/WrappedXtaService.java    | 18 ++++++------
 .../xta/client/core/XtaClientService.java     | 14 +++++-----
 .../xta/client/core/XtaExceptionHandler.java  |  4 +--
 .../xta/client/core/XtaPortTriple.java        |  6 ++--
 .../xta/client/core/XtaPortTripleFactory.java |  2 +-
 .../xta/client/mapper/RequestMapper.java      | 24 ++++++++--------
 .../xta/client/mapper/ResponseMapper.java     | 24 ++++++++--------
 .../client/core/WrappedXtaServiceTest.java    | 28 +++++++++----------
 .../xta/client/core/XtaClientServiceTest.java |  4 +--
 .../client/core/XtaExceptionHandlerTest.java  |  4 +--
 .../client/core/XtaPortTripleFactoryTest.java | 11 ++++----
 .../XtaServerSetupExtensionTestUtil.java      | 10 +++----
 .../ClientRuntimeExceptionTestFactory.java    |  6 ++--
 .../factory/ContentTypeTestFactory.java       |  2 +-
 .../GenericContentContainerTestFactory.java   |  2 +-
 .../LookupServiceResponseTestFactory.java     |  6 ++--
 .../factory/MessageMetaDataTestFactory.java   |  4 +--
 .../MsgBoxResponseTypeTestFactory.java        |  2 +-
 .../factory/MsgStatusListTypeTestFactory.java |  4 +--
 .../factory/TransportReportTestFactory.java   |  4 +--
 .../xta/client/mapper/RequestMapperTest.java  |  8 +++---
 .../xta/client/mapper/ResponseMapperTest.java | 12 ++++----
 23 files changed, 108 insertions(+), 109 deletions(-)

diff --git a/pom.xml b/pom.xml
index aec1225..bd1e1dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
 		<version>4.3.0</version>
-		<relativePath />
+		<relativePath/>
 	</parent>
 	<groupId>de.ozgcloud.xta</groupId>
 	<artifactId>xta-client-lib</artifactId>
@@ -237,27 +237,27 @@
 								<!--- Map XTA namespaces to their respective package in java -->
 								<extraarg>-p</extraarg>
 								<extraarg>
-									http://www.w3.org/2004/06/xmlmime=genv3.org.w3.x2004.x06.xmlmime
+									http://www.w3.org/2004/06/xmlmime=de.ozgcloud.xta.client.gen.v3.org.w3.x2004.x06.xmlmime
 								</extraarg>
 								<extraarg>-p</extraarg>
 								<extraarg>
-									http://xoev.de/transport/xta/211=genv3.de.xoev.transport.xta.x211
+									http://xoev.de/transport/xta/211=de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211
 								</extraarg>
 								<extraarg>-p</extraarg>
 								<extraarg>
-									http://xoev.de/schemata/basisdatentypen/1_1=genv3.de.xoev.schemata.basisdatentypen.x11
+									http://xoev.de/schemata/basisdatentypen/1_1=de.ozgcloud.xta.client.gen.v3.de.xoev.schemata.basisdatentypen.x11
 								</extraarg>
 								<extraarg>-p</extraarg>
 								<extraarg>
-									http://www.osci.eu/ws/2008/05/transport=genv3.eu.osci.ws.x2008.x05.transport
+									http://www.osci.eu/ws/2008/05/transport=de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport
 								</extraarg>
 								<extraarg>-p</extraarg>
 								<extraarg>
-									http://www.osci.eu/ws/2014/10/transport=genv3.eu.osci.ws.x2014.x10.transport
+									http://www.osci.eu/ws/2014/10/transport=de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport
 								</extraarg>
 								<extraarg>-p</extraarg>
 								<extraarg>
-									http://www.w3.org/2003/05/soap-envelope=genv3.org.w3.x2003.x05.soapEnvelope
+									http://www.w3.org/2003/05/soap-envelope=de.ozgcloud.xta.client.gen.v3.org.w3.x2003.x05.soapEnvelope
 								</extraarg>
 
 								<!-- exclude not needed schemas to generate -->
diff --git a/src/main/java/de/ozgcloud/xta/client/core/WrappedXtaService.java b/src/main/java/de/ozgcloud/xta/client/core/WrappedXtaService.java
index e64a923..bd9f198 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/WrappedXtaService.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/WrappedXtaService.java
@@ -2,21 +2,21 @@ package de.ozgcloud.xta.client.core;
 
 import jakarta.xml.ws.Holder;
 
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.InvalidMessageIDException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MessageVirusDetectionException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ParameterIsNotValidException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.PermissionDeniedException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.SyncAsyncException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
 import de.ozgcloud.xta.client.mapper.RequestMapper;
 import de.ozgcloud.xta.client.mapper.ResponseMapper;
 import de.ozgcloud.xta.client.model.XtaIdentifier;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
 import de.ozgcloud.xta.client.model.XtaTransportReport;
-import genv3.de.xoev.transport.xta.x211.InvalidMessageIDException;
-import genv3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
-import genv3.de.xoev.transport.xta.x211.MessageVirusDetectionException;
-import genv3.de.xoev.transport.xta.x211.ParameterIsNotValidException;
-import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
-import genv3.de.xoev.transport.xta.x211.SyncAsyncException;
-import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
-import genv3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java b/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
index d610289..536ff5a 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
@@ -4,18 +4,18 @@ import java.util.Optional;
 
 import de.ozgcloud.xta.client.config.XtaClientConfig;
 import de.ozgcloud.xta.client.exception.XtaClientRuntimeException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.InvalidMessageIDException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MessageVirusDetectionException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ParameterIsNotValidException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.PermissionDeniedException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.SyncAsyncException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
 import de.ozgcloud.xta.client.model.XtaIdentifier;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaData;
 import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
 import de.ozgcloud.xta.client.model.XtaTransportReport;
-import genv3.de.xoev.transport.xta.x211.InvalidMessageIDException;
-import genv3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
-import genv3.de.xoev.transport.xta.x211.MessageVirusDetectionException;
-import genv3.de.xoev.transport.xta.x211.ParameterIsNotValidException;
-import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
-import genv3.de.xoev.transport.xta.x211.SyncAsyncException;
-import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/de/ozgcloud/xta/client/core/XtaExceptionHandler.java b/src/main/java/de/ozgcloud/xta/client/core/XtaExceptionHandler.java
index a31641c..f7c31bf 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/XtaExceptionHandler.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/XtaExceptionHandler.java
@@ -4,9 +4,9 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import de.ozgcloud.xta.client.exception.XtaClientRuntimeException;
 import de.ozgcloud.xta.client.exception.XtaClientException;
-import genv3.de.xoev.transport.xta.x211.ExceptionType;
+import de.ozgcloud.xta.client.exception.XtaClientRuntimeException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ExceptionType;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;
 
diff --git a/src/main/java/de/ozgcloud/xta/client/core/XtaPortTriple.java b/src/main/java/de/ozgcloud/xta/client/core/XtaPortTriple.java
index 2beac48..bf7c10f 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/XtaPortTriple.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/XtaPortTriple.java
@@ -1,8 +1,8 @@
 package de.ozgcloud.xta.client.core;
 
-import genv3.de.xoev.transport.xta.x211.ManagementPortType;
-import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
-import genv3.de.xoev.transport.xta.x211.SendPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ManagementPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MsgBoxPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.SendPortType;
 
 public record XtaPortTriple(
 		ManagementPortType managementPort,
diff --git a/src/main/java/de/ozgcloud/xta/client/core/XtaPortTripleFactory.java b/src/main/java/de/ozgcloud/xta/client/core/XtaPortTripleFactory.java
index 908dc1e..1831b14 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/XtaPortTripleFactory.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/XtaPortTripleFactory.java
@@ -15,7 +15,7 @@ import org.apache.cxf.transport.http.HTTPConduit;
 
 import de.ozgcloud.xta.client.config.XtaClientConfig;
 import de.ozgcloud.xta.client.exception.XtaClientInitializationException;
-import genv3.de.xoev.transport.xta.x211.XTAService;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.XTAService;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/de/ozgcloud/xta/client/mapper/RequestMapper.java b/src/main/java/de/ozgcloud/xta/client/mapper/RequestMapper.java
index f2fbed4..9ca46b9 100644
--- a/src/main/java/de/ozgcloud/xta/client/mapper/RequestMapper.java
+++ b/src/main/java/de/ozgcloud/xta/client/mapper/RequestMapper.java
@@ -6,22 +6,22 @@ import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.ReportingPolicy;
 
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ContentType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.GenericContentContainer;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceRequest;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxCloseRequestType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxFetchRequest;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxStatusListRequestType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.KeyCodeType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.PartyIdentifierType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.PartyType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.QualifierType;
 import de.ozgcloud.xta.client.model.XtaFile;
 import de.ozgcloud.xta.client.model.XtaIdentifier;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaData;
-import genv3.de.xoev.transport.xta.x211.ContentType;
-import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
-import genv3.de.xoev.transport.xta.x211.LookupServiceRequest;
-import genv3.de.xoev.transport.xta.x211.LookupServiceType;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxCloseRequestType;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxFetchRequest;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxStatusListRequestType;
-import genv3.eu.osci.ws.x2014.x10.transport.KeyCodeType;
-import genv3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
-import genv3.eu.osci.ws.x2014.x10.transport.PartyIdentifierType;
-import genv3.eu.osci.ws.x2014.x10.transport.PartyType;
-import genv3.eu.osci.ws.x2014.x10.transport.QualifierType;
 
 @Mapper(
 		unmappedTargetPolicy = ReportingPolicy.ERROR
diff --git a/src/main/java/de/ozgcloud/xta/client/mapper/ResponseMapper.java b/src/main/java/de/ozgcloud/xta/client/mapper/ResponseMapper.java
index eac4acd..215fdbf 100644
--- a/src/main/java/de/ozgcloud/xta/client/mapper/ResponseMapper.java
+++ b/src/main/java/de/ozgcloud/xta/client/mapper/ResponseMapper.java
@@ -10,6 +10,18 @@ import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.ReportingPolicy;
 
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ContentType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.GenericContentContainer;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.IsServiceAvailableValueType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceResponse;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceResultType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MessageStatusType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.TransportReport;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.PartyIdentifierType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.QualifierType;
 import de.ozgcloud.xta.client.model.XtaFile;
 import de.ozgcloud.xta.client.model.XtaIdentifier;
 import de.ozgcloud.xta.client.model.XtaMessage;
@@ -17,18 +29,6 @@ import de.ozgcloud.xta.client.model.XtaMessageMetaData;
 import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
 import de.ozgcloud.xta.client.model.XtaMessageStatus;
 import de.ozgcloud.xta.client.model.XtaTransportReport;
-import genv3.de.xoev.transport.xta.x211.ContentType;
-import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
-import genv3.de.xoev.transport.xta.x211.IsServiceAvailableValueType;
-import genv3.de.xoev.transport.xta.x211.LookupServiceResponse;
-import genv3.de.xoev.transport.xta.x211.LookupServiceResultType;
-import genv3.de.xoev.transport.xta.x211.MessageStatusType;
-import genv3.de.xoev.transport.xta.x211.TransportReport;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
-import genv3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
-import genv3.eu.osci.ws.x2014.x10.transport.PartyIdentifierType;
-import genv3.eu.osci.ws.x2014.x10.transport.QualifierType;
 
 @Mapper(
 		unmappedTargetPolicy = ReportingPolicy.ERROR
diff --git a/src/test/java/de/ozgcloud/xta/client/core/WrappedXtaServiceTest.java b/src/test/java/de/ozgcloud/xta/client/core/WrappedXtaServiceTest.java
index 48bdd44..38ecce8 100644
--- a/src/test/java/de/ozgcloud/xta/client/core/WrappedXtaServiceTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/core/WrappedXtaServiceTest.java
@@ -18,25 +18,25 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
 import de.ozgcloud.xta.client.factory.XtaMessageTestFactory;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.GenericContentContainer;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceRequest;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceResponse;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ManagementPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MsgBoxPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.SendPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.TransportReport;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxCloseRequestType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxFetchRequest;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxStatusListRequestType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.PartyType;
 import de.ozgcloud.xta.client.mapper.RequestMapper;
 import de.ozgcloud.xta.client.mapper.ResponseMapper;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
 import de.ozgcloud.xta.client.model.XtaTransportReport;
-import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
-import genv3.de.xoev.transport.xta.x211.LookupServiceRequest;
-import genv3.de.xoev.transport.xta.x211.LookupServiceResponse;
-import genv3.de.xoev.transport.xta.x211.ManagementPortType;
-import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
-import genv3.de.xoev.transport.xta.x211.SendPortType;
-import genv3.de.xoev.transport.xta.x211.TransportReport;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxCloseRequestType;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxFetchRequest;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxStatusListRequestType;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
-import genv3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
-import genv3.eu.osci.ws.x2014.x10.transport.PartyType;
 import lombok.SneakyThrows;
 
 class WrappedXtaServiceTest {
diff --git a/src/test/java/de/ozgcloud/xta/client/core/XtaClientServiceTest.java b/src/test/java/de/ozgcloud/xta/client/core/XtaClientServiceTest.java
index 44f5255..0da91f0 100644
--- a/src/test/java/de/ozgcloud/xta/client/core/XtaClientServiceTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/core/XtaClientServiceTest.java
@@ -24,12 +24,12 @@ import de.ozgcloud.xta.client.factory.XtaMessageMetaDataListingTestFactory;
 import de.ozgcloud.xta.client.factory.XtaMessageMetaDataTestFactory;
 import de.ozgcloud.xta.client.factory.XtaMessageTestFactory;
 import de.ozgcloud.xta.client.factory.XtaTransportReportTestFactory;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.PermissionDeniedException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaData;
 import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
 import de.ozgcloud.xta.client.model.XtaTransportReport;
-import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
-import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
 import lombok.SneakyThrows;
 
 class XtaClientServiceTest {
diff --git a/src/test/java/de/ozgcloud/xta/client/core/XtaExceptionHandlerTest.java b/src/test/java/de/ozgcloud/xta/client/core/XtaExceptionHandlerTest.java
index be02999..c9e0f6e 100644
--- a/src/test/java/de/ozgcloud/xta/client/core/XtaExceptionHandlerTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/core/XtaExceptionHandlerTest.java
@@ -15,10 +15,10 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.xta.client.exception.XtaClientRuntimeException;
 import de.ozgcloud.xta.client.exception.XtaClientException;
+import de.ozgcloud.xta.client.exception.XtaClientRuntimeException;
 import de.ozgcloud.xta.client.factory.ClientRuntimeExceptionTestFactory;
-import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.PermissionDeniedException;
 
 class XtaExceptionHandlerTest {
 
diff --git a/src/test/java/de/ozgcloud/xta/client/core/XtaPortTripleFactoryTest.java b/src/test/java/de/ozgcloud/xta/client/core/XtaPortTripleFactoryTest.java
index 39dd609..b13cb8e 100644
--- a/src/test/java/de/ozgcloud/xta/client/core/XtaPortTripleFactoryTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/core/XtaPortTripleFactoryTest.java
@@ -28,12 +28,12 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.xta.client.factory.XtaClientConfigTestFactory;
 import de.ozgcloud.xta.client.config.XtaClientConfig;
-import genv3.de.xoev.transport.xta.x211.ManagementPortType;
-import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
-import genv3.de.xoev.transport.xta.x211.SendPortType;
-import genv3.de.xoev.transport.xta.x211.XTAService;
+import de.ozgcloud.xta.client.factory.XtaClientConfigTestFactory;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ManagementPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MsgBoxPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.SendPortType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.XTAService;
 import lombok.SneakyThrows;
 
 class XtaPortTripleFactoryTest {
@@ -65,7 +65,6 @@ class XtaPortTripleFactoryTest {
 		@Mock(extraInterfaces = BindingProvider.class)
 		private MsgBoxPortType msgBoxPort;
 
-
 		@BeforeEach
 		@SneakyThrows
 		void mock() {
diff --git a/src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java b/src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java
index cdd531f..6d2731a 100644
--- a/src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java
+++ b/src/test/java/de/ozgcloud/xta/client/extension/XtaServerSetupExtensionTestUtil.java
@@ -15,17 +15,17 @@ import de.ozgcloud.xta.client.config.XtaClientConfig;
 import de.ozgcloud.xta.client.core.WrappedXtaService;
 import de.ozgcloud.xta.client.core.WrappedXtaServiceFactory;
 import de.ozgcloud.xta.client.exception.XtaClientRuntimeException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.CodeFehlernummer;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ParameterIsNotValidException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.PermissionDeniedException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
 import de.ozgcloud.xta.client.model.XtaFile;
 import de.ozgcloud.xta.client.model.XtaIdentifier;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaData;
 import de.ozgcloud.xta.client.model.XtaMessageStatus;
 import de.ozgcloud.xta.client.model.XtaTransportReport;
-import genv3.de.xoev.transport.xta.x211.CodeFehlernummer;
-import genv3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
-import genv3.de.xoev.transport.xta.x211.ParameterIsNotValidException;
-import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
-import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
 
diff --git a/src/test/java/de/ozgcloud/xta/client/factory/ClientRuntimeExceptionTestFactory.java b/src/test/java/de/ozgcloud/xta/client/factory/ClientRuntimeExceptionTestFactory.java
index 7b2d14b..11202cf 100644
--- a/src/test/java/de/ozgcloud/xta/client/factory/ClientRuntimeExceptionTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/client/factory/ClientRuntimeExceptionTestFactory.java
@@ -1,9 +1,9 @@
 package de.ozgcloud.xta.client.factory;
 
 import de.ozgcloud.xta.client.exception.XtaClientRuntimeException;
-import genv3.de.xoev.transport.xta.x211.CodeFehlernummer;
-import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
-import genv3.de.xoev.transport.xta.x211.PermissionDeniedExceptionType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.CodeFehlernummer;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.PermissionDeniedException;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.PermissionDeniedExceptionType;
 
 public class ClientRuntimeExceptionTestFactory {
 
diff --git a/src/test/java/de/ozgcloud/xta/client/factory/ContentTypeTestFactory.java b/src/test/java/de/ozgcloud/xta/client/factory/ContentTypeTestFactory.java
index 98060f7..994573e 100644
--- a/src/test/java/de/ozgcloud/xta/client/factory/ContentTypeTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/client/factory/ContentTypeTestFactory.java
@@ -5,7 +5,7 @@ import static de.ozgcloud.xta.client.factory.XtaFileTestFactory.*;
 import jakarta.activation.DataHandler;
 import jakarta.mail.util.ByteArrayDataSource;
 
-import genv3.de.xoev.transport.xta.x211.ContentType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ContentType;
 
 public class ContentTypeTestFactory {
 
diff --git a/src/test/java/de/ozgcloud/xta/client/factory/GenericContentContainerTestFactory.java b/src/test/java/de/ozgcloud/xta/client/factory/GenericContentContainerTestFactory.java
index 7f4dba1..b358a1e 100644
--- a/src/test/java/de/ozgcloud/xta/client/factory/GenericContentContainerTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/client/factory/GenericContentContainerTestFactory.java
@@ -4,7 +4,7 @@ import static de.ozgcloud.xta.client.factory.XtaFileTestFactory.*;
 
 import java.util.List;
 
-import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.GenericContentContainer;
 
 public class GenericContentContainerTestFactory {
 	public static GenericContentContainer create() {
diff --git a/src/test/java/de/ozgcloud/xta/client/factory/LookupServiceResponseTestFactory.java b/src/test/java/de/ozgcloud/xta/client/factory/LookupServiceResponseTestFactory.java
index 4798fc3..c2da451 100644
--- a/src/test/java/de/ozgcloud/xta/client/factory/LookupServiceResponseTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/client/factory/LookupServiceResponseTestFactory.java
@@ -1,8 +1,8 @@
 package de.ozgcloud.xta.client.factory;
 
-import genv3.de.xoev.transport.xta.x211.IsServiceAvailableValueType;
-import genv3.de.xoev.transport.xta.x211.LookupServiceResponse;
-import genv3.de.xoev.transport.xta.x211.LookupServiceResultType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.IsServiceAvailableValueType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceResponse;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceResultType;
 import lombok.Builder;
 
 public class LookupServiceResponseTestFactory {
diff --git a/src/test/java/de/ozgcloud/xta/client/factory/MessageMetaDataTestFactory.java b/src/test/java/de/ozgcloud/xta/client/factory/MessageMetaDataTestFactory.java
index 3d66c9a..b3c069d 100644
--- a/src/test/java/de/ozgcloud/xta/client/factory/MessageMetaDataTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/client/factory/MessageMetaDataTestFactory.java
@@ -4,9 +4,9 @@ import static de.ozgcloud.xta.client.mapper.RequestMapper.*;
 
 import java.math.BigInteger;
 
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.PartyIdentifierType;
 import de.ozgcloud.xta.client.model.XtaIdentifier;
-import genv3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
-import genv3.eu.osci.ws.x2014.x10.transport.PartyIdentifierType;
 
 public class MessageMetaDataTestFactory {
 
diff --git a/src/test/java/de/ozgcloud/xta/client/factory/MsgBoxResponseTypeTestFactory.java b/src/test/java/de/ozgcloud/xta/client/factory/MsgBoxResponseTypeTestFactory.java
index 1846eda..27bc173 100644
--- a/src/test/java/de/ozgcloud/xta/client/factory/MsgBoxResponseTypeTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/client/factory/MsgBoxResponseTypeTestFactory.java
@@ -2,7 +2,7 @@ package de.ozgcloud.xta.client.factory;
 
 import java.math.BigInteger;
 
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
 
 public class MsgBoxResponseTypeTestFactory {
 	public static final String MSG_BOX_REQUEST_ID = "msgBoxRequestId1";
diff --git a/src/test/java/de/ozgcloud/xta/client/factory/MsgStatusListTypeTestFactory.java b/src/test/java/de/ozgcloud/xta/client/factory/MsgStatusListTypeTestFactory.java
index 1f9abd8..8428b54 100644
--- a/src/test/java/de/ozgcloud/xta/client/factory/MsgStatusListTypeTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/client/factory/MsgStatusListTypeTestFactory.java
@@ -4,8 +4,8 @@ import static de.ozgcloud.xta.client.factory.MessageMetaDataTestFactory.*;
 
 import java.util.List;
 
-import genv3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
-import genv3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
 
 public class MsgStatusListTypeTestFactory {
 
diff --git a/src/test/java/de/ozgcloud/xta/client/factory/TransportReportTestFactory.java b/src/test/java/de/ozgcloud/xta/client/factory/TransportReportTestFactory.java
index 6c898db..dc85c73 100644
--- a/src/test/java/de/ozgcloud/xta/client/factory/TransportReportTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/client/factory/TransportReportTestFactory.java
@@ -7,9 +7,9 @@ import java.util.GregorianCalendar;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.MessageStatusType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.TransportReport;
 import de.ozgcloud.xta.client.model.XtaMessageStatus;
-import genv3.de.xoev.transport.xta.x211.MessageStatusType;
-import genv3.de.xoev.transport.xta.x211.TransportReport;
 
 public class TransportReportTestFactory {
 
diff --git a/src/test/java/de/ozgcloud/xta/client/mapper/RequestMapperTest.java b/src/test/java/de/ozgcloud/xta/client/mapper/RequestMapperTest.java
index 08bbd72..2a99793 100644
--- a/src/test/java/de/ozgcloud/xta/client/mapper/RequestMapperTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/mapper/RequestMapperTest.java
@@ -16,12 +16,12 @@ import org.mapstruct.factory.Mappers;
 import de.ozgcloud.xta.client.factory.XtaFileTestFactory;
 import de.ozgcloud.xta.client.factory.XtaMessageMetaDataTestFactory;
 import de.ozgcloud.xta.client.factory.XtaMessageTestFactory;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ContentType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.LookupServiceType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.PartyIdentifierType;
 import de.ozgcloud.xta.client.model.XtaFile;
 import de.ozgcloud.xta.client.model.XtaMessage;
-import genv3.de.xoev.transport.xta.x211.ContentType;
-import genv3.de.xoev.transport.xta.x211.LookupServiceType;
-import genv3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
-import genv3.eu.osci.ws.x2014.x10.transport.PartyIdentifierType;
 import lombok.SneakyThrows;
 
 class RequestMapperTest {
diff --git a/src/test/java/de/ozgcloud/xta/client/mapper/ResponseMapperTest.java b/src/test/java/de/ozgcloud/xta/client/mapper/ResponseMapperTest.java
index 9714507..9659845 100644
--- a/src/test/java/de/ozgcloud/xta/client/mapper/ResponseMapperTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/mapper/ResponseMapperTest.java
@@ -26,17 +26,17 @@ import de.ozgcloud.xta.client.factory.MessageMetaDataTestFactory;
 import de.ozgcloud.xta.client.factory.MsgBoxResponseTypeTestFactory;
 import de.ozgcloud.xta.client.factory.MsgStatusListTypeTestFactory;
 import de.ozgcloud.xta.client.factory.TransportReportTestFactory;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.ContentType;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.GenericContentContainer;
+import de.ozgcloud.xta.client.gen.v3.de.xoev.transport.xta.x211.TransportReport;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
+import de.ozgcloud.xta.client.gen.v3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
 import de.ozgcloud.xta.client.model.XtaFile;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaData;
 import de.ozgcloud.xta.client.model.XtaMessageStatus;
 import de.ozgcloud.xta.client.model.XtaTransportReport;
-import genv3.de.xoev.transport.xta.x211.ContentType;
-import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
-import genv3.de.xoev.transport.xta.x211.TransportReport;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
-import genv3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
-import genv3.eu.osci.ws.x2014.x10.transport.MessageMetaData;
 import lombok.SneakyThrows;
 
 class ResponseMapperTest {
-- 
GitLab