aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pom.xml26
-rw-r--r--src/main/java/at/gv/egiz/moazs/App2MzsService.java15
-rw-r--r--src/main/java/at/gv/egiz/moazs/DeliveryPreprocessor.java8
-rw-r--r--src/main/java/at/gv/egiz/moazs/Mzs2AppClient.java2
-rw-r--r--src/main/java/at/gv/egiz/moazs/TnvzClient.java3
-rw-r--r--src/main/java/at/gv/egiz/moazs/config/MarshallerConfig.java10
-rw-r--r--src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java2
-rw-r--r--src/main/java/at/gv/egiz/moazs/repository/DeliveryRepository.java4
-rw-r--r--src/main/java/at/gv/egiz/moazs/repository/InMemoryDeliveryRepository.java5
-rw-r--r--src/main/java/at/gv/egiz/moazs/repository/RedisDeliveryRepository.java6
-rw-r--r--src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java7
11 files changed, 52 insertions, 36 deletions
diff --git a/pom.xml b/pom.xml
index 4a8a1cf..fc3bded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,19 @@
<extraarg>-xjc-immutable</extraarg>
<extraarg>-xjc-imm-builder</extraarg>
<extraarg>-xjc-imm-cc</extraarg>
- </extraargs>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/mzs/persondata#=at.gv.zustellung.app2mzs.xsd.persondata</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#=at.gv.zustellung.app2mzs.xsd</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs.wsdl=at.gv.zustellung.app2mzs.xsd</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#=at.gv.zustellung.msg.xsd</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#=at.gv.zustellung.msg.xsd.persondata</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/app2zuse/phase2/20181206#=at.gv.zustellung.msg.xsd</extraarg>
+ </extraargs>
</wsdlOption>
<wsdlOption>
<wsdl>${project.basedir}/src/main/resources/zusemsg/app2zuse_p2.wsdl</wsdl>
@@ -127,6 +139,18 @@
<extraarg>-xjc-immutable</extraarg>
<extraarg>-xjc-imm-builder</extraarg>
<extraarg>-xjc-imm-cc</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/mzs/persondata#=at.gv.zustellung.app2mzs.xsd.persondata</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#=at.gv.zustellung.app2mzs.xsd</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs.wsdl=at.gv.zustellung.app2mzs.xsd</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#=at.gv.zustellung.msg.xsd</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#=at.gv.zustellung.msg.xsd.persondata</extraarg>
+ <extraarg>-p</extraarg>
+ <extraarg>http://reference.e-government.gv.at/namespace/zustellung/app2zuse/phase2/20181206#=at.gv.zustellung.msg.xsd</extraarg>
</extraargs>
</wsdlOption>
</wsdlOptions>
diff --git a/src/main/java/at/gv/egiz/moazs/App2MzsService.java b/src/main/java/at/gv/egiz/moazs/App2MzsService.java
index c89083f..d61bafd 100644
--- a/src/main/java/at/gv/egiz/moazs/App2MzsService.java
+++ b/src/main/java/at/gv/egiz/moazs/App2MzsService.java
@@ -1,22 +1,19 @@
package at.gv.egiz.moazs;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryAnswerType.DeliveryAnswerTypeBuilder;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType.DeliveryRequestStatusTypeBuilder;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType.Error.ErrorBuilder;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.ErrorInfoType.ErrorInfoTypeBuilder;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs.App2MzsPortType;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType;
import at.gv.egiz.moazs.pipeline.DeliveryPipeline;
import at.gv.egiz.moazs.repository.DeliveryRepository;
-import org.apache.cxf.binding.soap.SoapFault;
+import at.gv.zustellung.app2mzs.xsd.App2MzsPortType;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
+import at.gv.zustellung.msg.xsd.DeliveryAnswerType;
+import at.gv.zustellung.msg.xsd.DeliveryAnswerType.DeliveryAnswerTypeBuilder;
+import at.gv.zustellung.msg.xsd.DeliveryRequestStatusType;
+import at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.DeliveryRequestStatusTypeBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.jws.WebParam;
-import javax.xml.XMLConstants;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
diff --git a/src/main/java/at/gv/egiz/moazs/DeliveryPreprocessor.java b/src/main/java/at/gv/egiz/moazs/DeliveryPreprocessor.java
index 2bb621d..18642e7 100644
--- a/src/main/java/at/gv/egiz/moazs/DeliveryPreprocessor.java
+++ b/src/main/java/at/gv/egiz/moazs/DeliveryPreprocessor.java
@@ -1,9 +1,9 @@
package at.gv.egiz.moazs;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.ConfigType;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.ConfigType.ConfigTypeBuilder;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType.DeliveryRequestTypeBuilder;
+import at.gv.zustellung.app2mzs.xsd.ConfigType;
+import at.gv.zustellung.app2mzs.xsd.ConfigType.ConfigTypeBuilder;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.DeliveryRequestTypeBuilder;
import org.springframework.stereotype.Component;
import static at.gv.egiz.moazs.util.NullCoalesce.coalesce;
diff --git a/src/main/java/at/gv/egiz/moazs/Mzs2AppClient.java b/src/main/java/at/gv/egiz/moazs/Mzs2AppClient.java
index d0d7936..60bd193 100644
--- a/src/main/java/at/gv/egiz/moazs/Mzs2AppClient.java
+++ b/src/main/java/at/gv/egiz/moazs/Mzs2AppClient.java
@@ -1,6 +1,6 @@
package at.gv.egiz.moazs;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType;
+import at.gv.zustellung.msg.xsd.DeliveryRequestStatusType;
import org.springframework.stereotype.Component;
@Component
diff --git a/src/main/java/at/gv/egiz/moazs/TnvzClient.java b/src/main/java/at/gv/egiz/moazs/TnvzClient.java
index 28bcb66..e892033 100644
--- a/src/main/java/at/gv/egiz/moazs/TnvzClient.java
+++ b/src/main/java/at/gv/egiz/moazs/TnvzClient.java
@@ -1,9 +1,8 @@
package at.gv.egiz.moazs;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.Receiver;
import org.springframework.stereotype.Component;
-import static at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType.*;
-
@Component
public class TnvzClient {
diff --git a/src/main/java/at/gv/egiz/moazs/config/MarshallerConfig.java b/src/main/java/at/gv/egiz/moazs/config/MarshallerConfig.java
index f00a2b5..e6e3cc1 100644
--- a/src/main/java/at/gv/egiz/moazs/config/MarshallerConfig.java
+++ b/src/main/java/at/gv/egiz/moazs/config/MarshallerConfig.java
@@ -4,8 +4,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.oxm.jaxb.Jaxb2Marshaller;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
import java.util.HashMap;
@Configuration
@@ -15,10 +13,10 @@ public class MarshallerConfig {
public Jaxb2Marshaller jaxb2Marshaller() {
Jaxb2Marshaller marshaller = new Jaxb2Marshaller();
marshaller.setClassesToBeBound(
- at.gv.e_government.reference.namespace.zustellung.mzs.persondata_.ObjectFactory.class,
- at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.ObjectFactory.class,
- at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.ObjectFactory.class,
- at.gv.e_government.reference.namespace.persondata.phase2._20181206_.ObjectFactory.class);
+ at.gv.zustellung.msg.xsd.ObjectFactory.class,
+ at.gv.zustellung.msg.xsd.persondata.ObjectFactory.class,
+ at.gv.zustellung.app2mzs.xsd.ObjectFactory.class,
+ at.gv.zustellung.app2mzs.xsd.persondata.ObjectFactory.class);
marshaller.setMarshallerProperties(new HashMap<String, Object>() {{
put(javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, true);
diff --git a/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java b/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java
index 5a8e377..ef591ea 100644
--- a/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java
+++ b/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java
@@ -1,9 +1,9 @@
package at.gv.egiz.moazs.pipeline;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType;
import at.gv.egiz.moazs.TnvzClient;
import at.gv.egiz.moazs.repository.DeliveryRepository;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/at/gv/egiz/moazs/repository/DeliveryRepository.java b/src/main/java/at/gv/egiz/moazs/repository/DeliveryRepository.java
index f736160..228d55e 100644
--- a/src/main/java/at/gv/egiz/moazs/repository/DeliveryRepository.java
+++ b/src/main/java/at/gv/egiz/moazs/repository/DeliveryRepository.java
@@ -1,7 +1,7 @@
package at.gv.egiz.moazs.repository;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
+import at.gv.zustellung.msg.xsd.DeliveryRequestStatusType;
import org.springframework.stereotype.Repository;
import java.util.Optional;
diff --git a/src/main/java/at/gv/egiz/moazs/repository/InMemoryDeliveryRepository.java b/src/main/java/at/gv/egiz/moazs/repository/InMemoryDeliveryRepository.java
index 5712c2d..570296f 100644
--- a/src/main/java/at/gv/egiz/moazs/repository/InMemoryDeliveryRepository.java
+++ b/src/main/java/at/gv/egiz/moazs/repository/InMemoryDeliveryRepository.java
@@ -1,7 +1,8 @@
package at.gv.egiz.moazs.repository;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType;
+
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
+import at.gv.zustellung.msg.xsd.DeliveryRequestStatusType;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import org.slf4j.Logger;
diff --git a/src/main/java/at/gv/egiz/moazs/repository/RedisDeliveryRepository.java b/src/main/java/at/gv/egiz/moazs/repository/RedisDeliveryRepository.java
index cd02dac..7384b12 100644
--- a/src/main/java/at/gv/egiz/moazs/repository/RedisDeliveryRepository.java
+++ b/src/main/java/at/gv/egiz/moazs/repository/RedisDeliveryRepository.java
@@ -1,9 +1,9 @@
package at.gv.egiz.moazs.repository;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType;
-import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.ObjectFactory;
import at.gv.egiz.moazs.Marshaller;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
+import at.gv.zustellung.msg.xsd.DeliveryRequestStatusType;
+import at.gv.zustellung.app2mzs.xsd.ObjectFactory;
import org.apache.tools.ant.filters.StringInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java b/src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java
index bdf00d5..8d7ee6f 100644
--- a/src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java
+++ b/src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java
@@ -1,12 +1,9 @@
package at.gv.egiz.moazs;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType.DeliveryRequestStatusTypeBuilder;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.DeliveryRequestStatusType.Success.SuccessBuilder;
-import at.gv.e_government.reference.namespace.zustellung.msg.phase2._20181206_.ObjectFactory;
import at.gv.egiz.moazs.pipeline.DeliveryPipeline;
import at.gv.egiz.moazs.repository.DeliveryRepository;
-import org.hamcrest.Matchers;
+import at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.DeliveryRequestStatusTypeBuilder;
+import at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.Success.SuccessBuilder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;