Organizational change - GroupID and Package refactoring

src/main/java/no/difi/oxalis/as4/api/MessageIdGenerator.java → src/main/java/network/oxalis/as4/api/MessageIdGenerator.java

@@ -20,7 +20,7 @@
  * permissions and limitations under the Licence.
  */
 
-package no.difi.oxalis.as4.api;
+package network.oxalis.as4.api;
 
 public interface MessageIdGenerator {
 

src/main/java/no/difi/oxalis/as4/common/AS4Constants.java → src/main/java/network/oxalis/as4/common/AS4Constants.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.common;
+package network.oxalis.as4.common;
 
 import lombok.experimental.UtilityClass;
 

src/main/java/no/difi/oxalis/as4/common/As4CommonModule.java → src/main/java/network/oxalis/as4/common/As4CommonModule.java

@@ -20,22 +20,22 @@
  * permissions and limitations under the Licence.
  */
 
-package no.difi.oxalis.as4.common;
+package network.oxalis.as4.common;
 
 import com.google.inject.Injector;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
+import network.oxalis.as4.api.MessageIdGenerator;
+import network.oxalis.as4.outbound.DefaultActionProvider;
+import network.oxalis.as4.util.OxalisAlgorithmSuiteLoader;
+import network.oxalis.as4.util.PolicyService;
+import network.oxalis.as4.util.TransmissionRequestUtil;
 import no.difi.oxalis.api.header.HeaderParser;
 import no.difi.oxalis.api.settings.Settings;
-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.OxalisAlgorithmSuiteLoader;
-import no.difi.oxalis.as4.util.PolicyService;
-import no.difi.oxalis.as4.util.TransmissionRequestUtil;
+import network.oxalis.as4.config.As4Conf;
+import network.oxalis.as4.outbound.ActionProvider;
+import network.oxalis.as4.util.As4MessageFactory;
 import no.difi.oxalis.commons.guice.ImplLoader;
 import no.difi.oxalis.commons.guice.OxalisModule;
 import no.difi.vefa.peppol.mode.Mode;
@@ -45,7 +45,7 @@
 
 import java.security.Security;
 
-import static no.difi.oxalis.as4.common.AS4Constants.*;
+import static network.oxalis.as4.common.AS4Constants.*;
 
 @Slf4j
 public class As4CommonModule extends OxalisModule {

src/main/java/no/difi/oxalis/as4/common/As4MessageProperties.java → src/main/java/network/oxalis/as4/common/As4MessageProperties.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.common;
+package network.oxalis.as4.common;
 
 import java.util.ArrayList;
 

src/main/java/no/difi/oxalis/as4/common/As4MessageProperty.java → src/main/java/network/oxalis/as4/common/As4MessageProperty.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.common;
+package network.oxalis.as4.common;
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;

src/main/java/no/difi/oxalis/as4/common/DefaultMessageIdGenerator.java → src/main/java/network/oxalis/as4/common/DefaultMessageIdGenerator.java

@@ -20,15 +20,15 @@
  * permissions and limitations under the Licence.
  */
 
-package no.difi.oxalis.as4.common;
+package network.oxalis.as4.common;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import lombok.SneakyThrows;
+import network.oxalis.as4.api.MessageIdGenerator;
 import no.difi.oxalis.api.settings.Settings;
 import no.difi.oxalis.api.util.Type;
-import no.difi.oxalis.as4.api.MessageIdGenerator;
-import no.difi.oxalis.as4.config.As4Conf;
+import network.oxalis.as4.config.As4Conf;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

src/main/java/no/difi/oxalis/as4/common/DummyHeaderParser.java → src/main/java/network/oxalis/as4/common/DummyHeaderParser.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.common;
+package network.oxalis.as4.common;
 
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;

src/main/java/no/difi/oxalis/as4/common/MerlinProvider.java → src/main/java/network/oxalis/as4/common/MerlinProvider.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.common;
+package network.oxalis.as4.common;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;

src/main/java/no/difi/oxalis/as4/config/As4Conf.java → src/main/java/network/oxalis/as4/config/As4Conf.java

@@ -20,7 +20,7 @@
  * permissions and limitations under the Licence.
  */
 
-package no.difi.oxalis.as4.config;
+package network.oxalis.as4.config;
 
 import no.difi.oxalis.api.settings.DefaultValue;
 import no.difi.oxalis.api.settings.Path;

src/main/java/no/difi/oxalis/as4/inbound/AS4MessageContextKey.java → src/main/java/network/oxalis/as4/inbound/AS4MessageContextKey.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import lombok.experimental.UtilityClass;
 

src/main/java/no/difi/oxalis/as4/inbound/AS4StatusServlet.java → src/main/java/network/oxalis/as4/inbound/AS4StatusServlet.java

@@ -20,7 +20,7 @@
  * permissions and limitations under the Licence.
  */
 
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;

src/main/java/no/difi/oxalis/as4/inbound/AbstractSetPolicyInterceptor.java → src/main/java/network/oxalis/as4/inbound/AbstractSetPolicyInterceptor.java

@@ -1,9 +1,9 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import lombok.extern.slf4j.Slf4j;
-import no.difi.oxalis.as4.util.Constants;
-import no.difi.oxalis.as4.util.Marshalling;
-import no.difi.oxalis.as4.util.PolicyService;
+import network.oxalis.as4.util.Constants;
+import network.oxalis.as4.util.Marshalling;
+import network.oxalis.as4.util.PolicyService;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
 import org.apache.cxf.headers.Header;

src/main/java/no/difi/oxalis/as4/inbound/As4EndpointSelector.java → src/main/java/network/oxalis/as4/inbound/As4EndpointSelector.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
 import org.apache.cxf.endpoint.Endpoint;

src/main/java/no/difi/oxalis/as4/inbound/As4EndpointsPublisher.java → src/main/java/network/oxalis/as4/inbound/As4EndpointsPublisher.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.jaxws.EndpointImpl;

src/main/java/no/difi/oxalis/as4/inbound/As4EndpointsPublisherImpl.java → src/main/java/network/oxalis/as4/inbound/As4EndpointsPublisherImpl.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import com.google.inject.Inject;
 import org.apache.cxf.attachment.As4AttachmentInInterceptor;

src/main/java/no/difi/oxalis/as4/inbound/As4EnvelopeHeader.java → src/main/java/network/oxalis/as4/inbound/As4EnvelopeHeader.java

@@ -1,7 +1,7 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import lombok.Data;
-import no.difi.oxalis.as4.common.As4MessageProperties;
+import network.oxalis.as4.common.As4MessageProperties;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/no/difi/oxalis/as4/inbound/As4FaultInHandler.java → src/main/java/network/oxalis/as4/inbound/As4FaultInHandler.java

@@ -1,15 +1,15 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
+import network.oxalis.as4.lang.AS4Error;
+import network.oxalis.as4.lang.OxalisAs4Exception;
+import network.oxalis.as4.util.AS4ErrorCode;
+import network.oxalis.as4.util.As4MessageFactory;
+import network.oxalis.as4.util.MessageId;
 import no.difi.oxalis.api.model.TransmissionIdentifier;
 import no.difi.oxalis.api.persist.PersisterHandler;
-import no.difi.oxalis.as4.lang.AS4Error;
-import no.difi.oxalis.as4.lang.OxalisAs4Exception;
-import no.difi.oxalis.as4.util.AS4ErrorCode;
-import no.difi.oxalis.as4.util.As4MessageFactory;
-import no.difi.oxalis.as4.util.MessageId;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;

src/main/java/no/difi/oxalis/as4/inbound/As4InboundHandler.java → src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java

@@ -1,9 +1,12 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import com.google.common.io.ByteStreams;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
+import network.oxalis.as4.lang.OxalisAs4Exception;
+import network.oxalis.as4.lang.OxalisAs4TransmissionException;
+import network.oxalis.as4.util.*;
 import no.difi.oxalis.api.header.HeaderParser;
 import no.difi.oxalis.api.inbound.InboundService;
 import no.difi.oxalis.api.lang.TimestampException;
@@ -14,11 +17,8 @@
 import no.difi.oxalis.api.timestamp.Timestamp;
 import no.difi.oxalis.api.timestamp.TimestampProvider;
 import no.difi.oxalis.api.transmission.TransmissionVerifier;
-import no.difi.oxalis.as4.lang.OxalisAs4Exception;
-import no.difi.oxalis.as4.lang.OxalisAs4TransmissionException;
-import no.difi.oxalis.as4.common.As4MessageProperties;
-import no.difi.oxalis.as4.common.As4MessageProperty;
-import no.difi.oxalis.as4.util.*;
+import network.oxalis.as4.common.As4MessageProperties;
+import network.oxalis.as4.common.As4MessageProperty;
 import no.difi.oxalis.commons.header.SbdhHeaderParser;
 import no.difi.oxalis.commons.io.UnclosableInputStream;
 import no.difi.vefa.peppol.common.code.DigestMethod;

src/main/java/no/difi/oxalis/as4/inbound/As4InboundMetadata.java → src/main/java/network/oxalis/as4/inbound/As4InboundMetadata.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import no.difi.oxalis.api.inbound.InboundMetadata;
 import no.difi.oxalis.api.model.TransmissionIdentifier;

src/main/java/no/difi/oxalis/as4/inbound/As4InboundModule.java → src/main/java/network/oxalis/as4/inbound/As4InboundModule.java

@@ -1,10 +1,9 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import com.google.inject.Key;
 import com.google.inject.name.Names;
 import com.google.inject.servlet.ServletModule;
 import lombok.extern.slf4j.Slf4j;
-import no.difi.oxalis.as4.common.MerlinProvider;
 import org.apache.cxf.wsdl.interceptors.AbstractEndpointSelectionInterceptor;
 
 import javax.servlet.http.HttpServlet;

src/main/java/no/difi/oxalis/as4/inbound/As4Interceptor.java → src/main/java/network/oxalis/as4/inbound/As4Interceptor.java

@@ -1,21 +1,20 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import no.difi.oxalis.as4.lang.OxalisAs4Exception;
-import no.difi.oxalis.as4.util.Constants;
-import no.difi.oxalis.as4.util.Marshalling;
-import no.difi.oxalis.as4.util.MessageId;
-import no.difi.oxalis.as4.util.PolicyService;
+import network.oxalis.as4.lang.OxalisAs4Exception;
+import network.oxalis.as4.util.Constants;
+import network.oxalis.as4.util.Marshalling;
+import network.oxalis.as4.util.MessageId;
+import network.oxalis.as4.util.PolicyService;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
 import org.apache.cxf.headers.Header;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.ws.policy.AssertionInfoMap;
-import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor;
 import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JStaxInInterceptor;
 import org.apache.neethi.Policy;
 import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.CollaborationInfo;

src/main/java/no/difi/oxalis/as4/inbound/As4PayloadHeader.java → src/main/java/network/oxalis/as4/inbound/As4PayloadHeader.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import lombok.Getter;
 import lombok.ToString;

src/main/java/no/difi/oxalis/as4/inbound/As4Provider.java → src/main/java/network/oxalis/as4/inbound/As4Provider.java

@@ -1,40 +1,40 @@
-package no.difi.oxalis.as4.inbound;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import no.difi.oxalis.as4.lang.OxalisAs4Exception;
-import org.apache.cxf.transport.http.AbstractHTTPDestination;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.*;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.soap.SOAPBinding;
-
-@WebServiceProvider
-@ServiceMode(value = Service.Mode.MESSAGE)
-@BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
-@Singleton
-public class As4Provider implements Provider<SOAPMessage> {
-
-    @Resource
-    private WebServiceContext context;
-
-    @Inject
-    private As4InboundHandler handler;
-
-    @Override
-    public SOAPMessage invoke(SOAPMessage request) {
-        MessageContext messageContext = context.getMessageContext();
-        HttpServletResponse httpRes = (HttpServletResponse) messageContext.get(AbstractHTTPDestination.HTTP_RESPONSE);
-        httpRes.setStatus(HttpServletResponse.SC_OK);
-
-        try {
-            return handler.handle(request, messageContext);
-        } catch (OxalisAs4Exception e) {
-            httpRes.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-            throw new WebServiceException(e);
-        }
-    }
-}
+package network.oxalis.as4.inbound;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import network.oxalis.as4.lang.OxalisAs4Exception;
+import org.apache.cxf.transport.http.AbstractHTTPDestination;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.*;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.soap.SOAPBinding;
+
+@WebServiceProvider
+@ServiceMode(value = Service.Mode.MESSAGE)
+@BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
+@Singleton
+public class As4Provider implements Provider<SOAPMessage> {
+
+    @Resource
+    private WebServiceContext context;
+
+    @Inject
+    private As4InboundHandler handler;
+
+    @Override
+    public SOAPMessage invoke(SOAPMessage request) {
+        MessageContext messageContext = context.getMessageContext();
+        HttpServletResponse httpRes = (HttpServletResponse) messageContext.get(AbstractHTTPDestination.HTTP_RESPONSE);
+        httpRes.setStatus(HttpServletResponse.SC_OK);
+
+        try {
+            return handler.handle(request, messageContext);
+        } catch (OxalisAs4Exception e) {
+            httpRes.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+            throw new WebServiceException(e);
+        }
+    }
+}

src/main/java/no/difi/oxalis/as4/inbound/As4Servlet.java → src/main/java/network/oxalis/as4/inbound/As4Servlet.java

@@ -1,13 +1,11 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
+import network.oxalis.as4.common.MerlinProvider;
 import no.difi.oxalis.api.settings.Settings;
-import no.difi.oxalis.as4.common.MerlinProvider;
-import no.difi.oxalis.as4.util.OxalisAlgorithmSuiteLoader;
 import no.difi.oxalis.commons.security.KeyStoreConf;
-import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.ext.logging.LoggingFeature;
 import org.apache.cxf.jaxws.EndpointImpl;

src/main/java/no/difi/oxalis/as4/inbound/AttachmentCleanupInterceptor.java → src/main/java/network/oxalis/as4/inbound/AttachmentCleanupInterceptor.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import lombok.SneakyThrows;
 import org.apache.cxf.attachment.As4AttachmentDataSource;

src/main/java/no/difi/oxalis/as4/inbound/MessagingHandler.java → src/main/java/network/oxalis/as4/inbound/MessagingHandler.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.handler.MessageContext;

src/main/java/no/difi/oxalis/as4/inbound/OxalisAS4Version.java → src/main/java/network/oxalis/as4/inbound/OxalisAS4Version.java

@@ -20,7 +20,7 @@
  * permissions and limitations under the Licence.
  */
 
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import no.difi.oxalis.api.lang.OxalisLoadingException;
 

src/main/java/no/difi/oxalis/as4/inbound/ProsessingContext.java → src/main/java/network/oxalis/as4/inbound/ProsessingContext.java

@@ -1,4 +1,4 @@
-package no.difi.oxalis.as4.inbound;
+package network.oxalis.as4.inbound;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;