From 9556dc6bd7e327dfbfc3c2d5228ad920ad7b9f8e Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Thu, 27 Jun 2019 14:41:51 +0200
Subject: Inject Configurable HTTP Policies to MsgClient

- Refactor: Get rid of MsgClient, because MsgClientFactory can do all the work.
- Add Connection Timeout and Request Timeout (Policies of HTTP Client)
  to mzs:DeliveryRequest/Config and application.yaml.
- Update readme: Add JDK 12 Requirement
---
 .../java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java')

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 20320c4..2e0433f 100644
--- a/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java
+++ b/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java
@@ -4,7 +4,6 @@ package at.gv.egiz.moazs.pipeline;
 import at.gv.egiz.moazs.MoaZSException;
 import at.gv.egiz.moazs.msg.MsgClientFactory;
 import at.gv.egiz.moazs.verify.SignatureVerifier;
-import at.gv.egiz.moazs.msg.StoreSOAPBodyBinaryInRepositoryInterceptor;
 import at.gv.egiz.moazs.repository.DeliveryRepository;
 import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
 import at.gv.egiz.moazs.scheme.NameSpace;
@@ -38,14 +37,12 @@ public class SameThreadDeliveryPipeline implements DeliveryPipeline {
     private final Mzs2MsgConverter converter;
     private final MsgClientFactory msgClientFactory;
     private final SignatureVerifier verifier;
-    private final StoreSOAPBodyBinaryInRepositoryInterceptor interceptor;
 
     @Autowired
     public SameThreadDeliveryPipeline(DeliveryRepository repository,
                                       TnvzClient tnvzClient,
                                       TnvzResultVerifier tnvzVerifier,
                                       Mzs2MsgConverter converter,
-                                      StoreSOAPBodyBinaryInRepositoryInterceptor interceptor,
                                       MsgClientFactory msgClientFactory,
                                       SignatureVerifier verifier
     ) {
@@ -55,7 +52,6 @@ public class SameThreadDeliveryPipeline implements DeliveryPipeline {
         this.converter = converter;
         this.msgClientFactory = msgClientFactory;
         this.verifier = verifier;
-        this.interceptor = interceptor;
     }
 
     @Override
@@ -77,10 +73,9 @@ public class SameThreadDeliveryPipeline implements DeliveryPipeline {
             } else {
                 msgRequest = converter.convert(mzsRequest);
             }
-
             exceptionBuilder.withMsgRequest(msgRequest);
 
-            var status = msgClientFactory.create(mzsRequest.getConfig().getMSGClient()).send(msgRequest);
+            var status = msgClientFactory.create(mzsRequest.getConfig().getMSGClient()).delivery(msgRequest);
             exceptionBuilder.withMsgResult(status);
 
             verifySignedStatus(appDeliveryId, exceptionBuilder);
-- 
cgit v1.2.3