1 files changed, 17 insertions, 14 deletions

diff --git a/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java b/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
index 2b758a9..bb9633e 100644
--- a/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
+++ b/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
@@ -1,10 +1,10 @@
 package at.gv.egiz.moazs;
 
-import at.gv.egiz.moazs.msg.MsgClientFactory;
-import at.gv.egiz.moazs.msg.StoreSOAPBodyBinaryInRepositoryInterceptor;
+import at.gv.egiz.moazs.msg.ClientFactory;
 import at.gv.egiz.moazs.scheme.Marshaller;
 import at.gv.zustellung.app2mzs.xsd.ClientType;
 import at.gv.zustellung.app2mzs.xsd.KeyStoreType;
+import at.gv.zustellung.msg.xsd.App2ZusePort;
 import at.gv.zustellung.msg.xsd.DeliveryRequestType;
 import at.gv.zustellung.msg.xsd.ObjectFactory;
 import org.junit.Test;
@@ -36,7 +36,7 @@ public class ITMsgClientTest {
     private Marshaller msgMarshaller;
 
     @Autowired
-    private MsgClientFactory factory;
+    private ClientFactory factory;
 
     private static final ObjectFactory OF = new ObjectFactory();
 
@@ -54,13 +54,16 @@ public class ITMsgClientTest {
                 .withReceiveTimeout(BigInteger.ZERO)
                 .build();
 
-        var client = factory.create(clientParams);
-
-        var status = client.delivery(request);
+        App2ZusePort port = createPort(clientParams);
+        var status = port.delivery(request);
         assertThat(status.getPartialSuccess().getAppDeliveryID()).isEqualTo(VALID_MZS_REQUEST_ID);
 
     }
 
+    private App2ZusePort createPort(ClientType params) {
+        return factory.create(params, App2ZusePort.class);
+    }
+
     // Requirements:
     // - run zusemsg service under httpsServiceURL
     // - server trusts client cert (by trusting CA bundle in ssl/trusted-cas-bundle.pem)
@@ -73,9 +76,9 @@ public class ITMsgClientTest {
         var httpsServiceURL = "https://localhost/zusemsg/services/DeliveryRequest";
 
         var clientParams = generateSSLClientParams(httpsServiceURL, false, false);
-        var client = factory.create(clientParams);
+        App2ZusePort port = createPort(clientParams);
 
-        var status = client.delivery(request);
+        var status = port.delivery(request);
         assertThat(status.getPartialSuccess().getAppDeliveryID()).isEqualTo(VALID_MZS_REQUEST_ID);
     }
 
@@ -91,9 +94,9 @@ public class ITMsgClientTest {
         var httpsServiceURL = "https://localhost/zusemsg/services/DeliveryRequest";
 
         var clientParams = generateSSLClientParams(httpsServiceURL, true, false);
-        var client = factory.create(clientParams);
+        App2ZusePort port = createPort(clientParams);
 
-        var status = client.delivery(request);
+        var status = port.delivery(request);
         assertThat(status.getPartialSuccess().getAppDeliveryID()).isEqualTo(VALID_MZS_REQUEST_ID);
     }
 
@@ -109,9 +112,9 @@ public class ITMsgClientTest {
         var httpsServiceURL = "https://notlocalhost/zusemsg/services/DeliveryRequest";
 
         var clientParams = generateSSLClientParams(httpsServiceURL, false, true);
-        var client = factory.create(clientParams);
+        App2ZusePort port = createPort(clientParams);
 
-        var status = client.delivery(request);
+        var status = port.delivery(request);
         assertThat(status.getPartialSuccess().getAppDeliveryID()).isEqualTo(VALID_MZS_REQUEST_ID);
     }
 
@@ -127,9 +130,9 @@ public class ITMsgClientTest {
         var httpsServiceURL = "https://notlocalhost/zusemsg/services/DeliveryRequest";
 
         var clientParams = generateSSLClientParams(httpsServiceURL, false, false);
-        var client = factory.create(clientParams);
+        App2ZusePort port = createPort(clientParams);
 
-        client.delivery(request);
+        port.delivery(request);
     }
 
     private ClientType generateSSLClientParams(String httpsServiceURL, boolean trustAll, boolean laxHostNameVerification) {