From abbc1e1576b9ac43f71aff6e4ca7697dcb12154a Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Mon, 8 Apr 2019 15:31:10 +0200
Subject: Update Codebase to Match MZS Schema Changes

- Important Fix: I forgot to annotate App2MzsService with @Service and
  autowire the App2MzsService object when creating the endpoint
  bean. For this reason, Spring did not autowire the dependencies in
  App2MzsService and I ended up with NullPointerExceptions in the
  testsuite.
- Updated some more namespaces
- Add objectFactory bean. objectfactory is autogenerated via the
  cxf-code-generation plugin, so i cannot annotate it with @Component
  or @Service. Alternative: create the @Bean by myself
- Update the validDeliveryRequest SOAP Message to match the mzs 2.0.0
  scheme.
---
 src/main/java/at/gv/egiz/moazs/App2MzsService.java       |  4 +++-
 src/main/java/at/gv/egiz/moazs/App2MzsServiceConfig.java | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/at/gv/egiz/moazs/App2MzsService.java b/src/main/java/at/gv/egiz/moazs/App2MzsService.java
index a9c4302..2f06f7b 100644
--- a/src/main/java/at/gv/egiz/moazs/App2MzsService.java
+++ b/src/main/java/at/gv/egiz/moazs/App2MzsService.java
@@ -3,6 +3,7 @@ package at.gv.egiz.moazs;
 import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs.App2MzsPortType;
 import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import javax.jws.WebParam;
 import java.math.BigInteger;
@@ -12,11 +13,12 @@ import java.util.concurrent.TimeoutException;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
+@Service
 public class App2MzsService implements App2MzsPortType {
 
     //TODO move timeout to config
     private final int timeoutForAnwser = 10;
-    private final String MZSTNS = "http://reference.e-government.gv.at/namespace/moazs10/app2mzs#";
+    private final String MZSTNS = "http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#";
 
     @Autowired
     private DeliveryRequestHandler deliveryRequestHandler;
diff --git a/src/main/java/at/gv/egiz/moazs/App2MzsServiceConfig.java b/src/main/java/at/gv/egiz/moazs/App2MzsServiceConfig.java
index 64e353d..578fecd 100644
--- a/src/main/java/at/gv/egiz/moazs/App2MzsServiceConfig.java
+++ b/src/main/java/at/gv/egiz/moazs/App2MzsServiceConfig.java
@@ -1,5 +1,6 @@
 package at.gv.egiz.moazs;
 
+import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.ObjectFactory;
 import org.apache.cxf.Bus;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,12 +15,19 @@ public class App2MzsServiceConfig {
     @Autowired
     private Bus bus;
 
+    @Autowired
+    private App2MzsService app2mzsService;
+
     @Bean
     public Endpoint endpoint() {
-        EndpointImpl endpoint = new EndpointImpl(bus, new App2MzsService());
+        EndpointImpl endpoint = new EndpointImpl(bus, app2mzsService);
         endpoint.setAddress("/");
         endpoint.publish();
         return endpoint;
     }
 
+    @Bean
+    public ObjectFactory objectFactory() {
+        return new ObjectFactory();
+    }
 }
-- 
cgit v1.2.3