Merge pull request #66 from difi/hotfix-4.1.1

Fix for Tomcat.
OxalisCommunity · Jan 29, 2020 · ad6d346 · ad6d346
2 parents 63b3888 + d9fa329
commit ad6d346
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>oxalis-as4</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
 
     <packaging>jar</packaging>
 

diff --git a/src/main/java/no/difi/oxalis/as4/common/As4CommonModule.java b/src/main/java/no/difi/oxalis/as4/common/As4CommonModule.java
@@ -31,8 +31,10 @@
 import no.difi.oxalis.as4.api.MessageIdGenerator;
 import no.difi.oxalis.as4.config.As4Conf;
 import no.difi.oxalis.as4.outbound.ActionProvider;
+import no.difi.oxalis.as4.outbound.DefaultActionProvider;
 import no.difi.oxalis.as4.util.As4MessageFactory;
 import no.difi.oxalis.as4.util.PolicyService;
+import no.difi.oxalis.as4.util.TransmissionRequestUtil;
 import no.difi.oxalis.commons.guice.ImplLoader;
 import no.difi.oxalis.commons.guice.OxalisModule;
 import no.difi.vefa.peppol.mode.Mode;
@@ -98,4 +100,31 @@ protected String getDefaultPolicy() {
 
         return new PolicyService(actionProvider);
     }
+
+    @Provides
+    @Singleton
+    public ActionProvider getActionProvider(Settings<As4Conf> settings) {
+        String type = settings.getString(As4Conf.TYPE);
+        if (CEF_CONNECTIVITY.equalsIgnoreCase(type)) {
+            return p -> {
+                String action = TransmissionRequestUtil.translateDocumentTypeToAction(p);
+
+                if (action.startsWith("connectivity::cef##connectivity::")) {
+                    return action.replaceFirst("connectivity::cef##connectivity::", "");
+                }
+
+                return action;
+            };
+        } else if (CEF_CONFORMANCE.equalsIgnoreCase(type)) {
+            return p -> {
+                if ("http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/test".equals(p.getIdentifier())) {
+                    return "http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/test";
+                }
+
+                return TransmissionRequestUtil.translateDocumentTypeToAction(p);
+            };
+        }
+
+        return new DefaultActionProvider();
+    }
 }
diff --git a/src/main/java/no/difi/oxalis/as4/outbound/As4OutboundModule.java b/src/main/java/no/difi/oxalis/as4/outbound/As4OutboundModule.java
@@ -9,7 +9,6 @@
 import no.difi.oxalis.as4.util.CompressionUtil;
 import no.difi.oxalis.as4.util.OxalisAlgorithmSuiteLoader;
 import no.difi.oxalis.as4.util.PeppolConfiguration;
-import no.difi.oxalis.as4.util.TransmissionRequestUtil;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -18,7 +17,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static no.difi.oxalis.as4.common.AS4Constants.CEF_CONFORMANCE;
 import static no.difi.oxalis.as4.common.AS4Constants.CEF_CONNECTIVITY;
 
 @Slf4j
@@ -75,31 +73,4 @@ public String getAgreementRef() {
 
         return new PeppolConfiguration();
     }
-
-    @Provides
-    @Singleton
-    public ActionProvider getActionProvider(Settings<As4Conf> settings) {
-        String type = settings.getString(As4Conf.TYPE);
-        if (CEF_CONNECTIVITY.equalsIgnoreCase(type)) {
-            return p -> {
-                String action = TransmissionRequestUtil.translateDocumentTypeToAction(p);
-
-                if (action.startsWith("connectivity::cef##connectivity::")) {
-                    return action.replaceFirst("connectivity::cef##connectivity::", "");
-                }
-
-                return action;
-            };
-        } else if (CEF_CONFORMANCE.equalsIgnoreCase(type)) {
-            return p -> {
-                if ("http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/test".equals(p.getIdentifier())) {
-                    return "http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/test";
-                }
-
-                return TransmissionRequestUtil.translateDocumentTypeToAction(p);
-            };
-        }
-
-        return new DefaultActionProvider();
-    }
 }