Moved classes to incoming.spi

phax · Aug 26, 2024 · 8b599fb · 8b599fb
1 parent b6fd2b0
commit 8b599fb
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 29 deletions.
diff --git a/phase4-lib/src/main/java/com/helger/phase4/dump/AS4DumpReader.java b/phase4-lib/src/main/java/com/helger/phase4/dump/AS4DumpReader.java
@@ -48,16 +48,16 @@
 import com.helger.phase4.ebms3header.Ebms3SignalMessage;
 import com.helger.phase4.ebms3header.Ebms3UserMessage;
 import com.helger.phase4.incoming.crypto.AS4IncomingSecurityConfiguration;
+import com.helger.phase4.incoming.spi.AS4MessageProcessorResult;
+import com.helger.phase4.incoming.spi.AS4SignalMessageProcessorResult;
+import com.helger.phase4.incoming.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.model.pmode.IPMode;
 import com.helger.phase4.model.pmode.resolve.DefaultPModeResolver;
 import com.helger.phase4.servlet.AS4IncomingMessageMetadata;
 import com.helger.phase4.servlet.AS4RequestHandler;
 import com.helger.phase4.servlet.IAS4MessageState;
 import com.helger.phase4.servlet.IAS4ResponseAbstraction;
-import com.helger.phase4.servlet.spi.AS4MessageProcessorResult;
-import com.helger.phase4.servlet.spi.AS4SignalMessageProcessorResult;
-import com.helger.phase4.servlet.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.util.Phase4Exception;
 import com.helger.servlet.mock.MockServletContext;
 import com.helger.web.scope.mgr.WebScopeManager;

diff --git a/...-lib/src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingMessageProcessorManager.java b/...-lib/src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingMessageProcessorManager.java
@@ -28,7 +28,7 @@
 import com.helger.commons.collection.impl.ICommonsList;
 import com.helger.commons.concurrent.SimpleReadWriteLock;
 import com.helger.commons.lang.ServiceLoaderHelper;
-import com.helger.phase4.servlet.spi.IAS4ServletMessageProcessorSPI;
+import com.helger.phase4.incoming.spi.IAS4ServletMessageProcessorSPI;
 
 /**
  * This class manages all the {@link IAS4ServletMessageProcessorSPI} SPI

diff --git a/.../src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingPullRequestProcessorManager.java b/.../src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingPullRequestProcessorManager.java
@@ -28,7 +28,7 @@
 import com.helger.commons.collection.impl.ICommonsList;
 import com.helger.commons.concurrent.SimpleReadWriteLock;
 import com.helger.commons.lang.ServiceLoaderHelper;
-import com.helger.phase4.servlet.spi.IAS4ServletPullRequestProcessorSPI;
+import com.helger.phase4.incoming.spi.IAS4ServletPullRequestProcessorSPI;
 
 /**
  * This class manages all the {@link IAS4ServletPullRequestProcessorSPI} SPI

diff --git a/...java/com/helger/phase4/incoming/soap/SOAPHeaderElementProcessorExtractEbms3Messaging.java b/...java/com/helger/phase4/incoming/soap/SOAPHeaderElementProcessorExtractEbms3Messaging.java
@@ -58,6 +58,7 @@
 import com.helger.phase4.ebms3header.Ebms3UserMessage;
 import com.helger.phase4.error.EEbmsError;
 import com.helger.phase4.incoming.mgr.AS4IncomingPullRequestProcessorManager;
+import com.helger.phase4.incoming.spi.IAS4ServletPullRequestProcessorSPI;
 import com.helger.phase4.marshaller.Ebms3MessagingMarshaller;
 import com.helger.phase4.messaging.domain.MessageHelperMethods;
 import com.helger.phase4.mgr.MetaAS4Manager;
@@ -67,7 +68,6 @@
 import com.helger.phase4.model.pmode.leg.PModeLeg;
 import com.helger.phase4.model.pmode.resolve.IPModeResolver;
 import com.helger.phase4.servlet.AS4MessageState;
-import com.helger.phase4.servlet.spi.IAS4ServletPullRequestProcessorSPI;
 import com.helger.xml.XMLHelper;
 
 /**

diff --git a/...ervlet/spi/AS4MessageProcessorResult.java → ...coming/spi/AS4MessageProcessorResult.java b/...ervlet/spi/AS4MessageProcessorResult.java → ...coming/spi/AS4MessageProcessorResult.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.helger.phase4.servlet.spi;
+package com.helger.phase4.incoming.spi;
 
 import java.util.Collection;
 

diff --git a/.../spi/AS4SignalMessageProcessorResult.java → .../spi/AS4SignalMessageProcessorResult.java b/.../spi/AS4SignalMessageProcessorResult.java → .../spi/AS4SignalMessageProcessorResult.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.helger.phase4.servlet.spi;
+package com.helger.phase4.incoming.spi;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/...t/spi/IAS4ServletMessageProcessorSPI.java → ...g/spi/IAS4ServletMessageProcessorSPI.java b/...t/spi/IAS4ServletMessageProcessorSPI.java → ...g/spi/IAS4ServletMessageProcessorSPI.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.helger.phase4.servlet.spi;
+package com.helger.phase4.incoming.spi;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/...i/IAS4ServletPullRequestProcessorSPI.java → ...i/IAS4ServletPullRequestProcessorSPI.java b/...i/IAS4ServletPullRequestProcessorSPI.java → ...i/IAS4ServletPullRequestProcessorSPI.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.helger.phase4.servlet.spi;
+package com.helger.phase4.incoming.spi;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/phase4-lib/src/main/java/com/helger/phase4/servlet/AS4RequestHandler.java b/phase4-lib/src/main/java/com/helger/phase4/servlet/AS4RequestHandler.java
@@ -81,6 +81,9 @@
 import com.helger.phase4.incoming.crypto.IAS4IncomingSecurityConfiguration;
 import com.helger.phase4.incoming.mgr.AS4IncomingMessageProcessorManager;
 import com.helger.phase4.incoming.soap.SOAPHeaderElementProcessorRegistry;
+import com.helger.phase4.incoming.spi.AS4MessageProcessorResult;
+import com.helger.phase4.incoming.spi.AS4SignalMessageProcessorResult;
+import com.helger.phase4.incoming.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.messaging.EAS4MessageMode;
 import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.messaging.crypto.AS4Encryptor;
@@ -102,9 +105,6 @@
 import com.helger.phase4.model.pmode.resolve.IPModeResolver;
 import com.helger.phase4.profile.IAS4Profile;
 import com.helger.phase4.servlet.AS4IncomingHandler.IAS4ParsedMessageCallback;
-import com.helger.phase4.servlet.spi.AS4MessageProcessorResult;
-import com.helger.phase4.servlet.spi.AS4SignalMessageProcessorResult;
-import com.helger.phase4.servlet.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.soap.ESoapVersion;
 import com.helger.phase4.util.AS4ResourceHelper;
 import com.helger.phase4.util.AS4XMLHelper;

diff --git a/.../src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java b/.../src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java
@@ -40,14 +40,14 @@
 import com.helger.phase4.ebms3header.Ebms3Error;
 import com.helger.phase4.ebms3header.Ebms3SignalMessage;
 import com.helger.phase4.ebms3header.Ebms3UserMessage;
+import com.helger.phase4.incoming.spi.AS4MessageProcessorResult;
+import com.helger.phase4.incoming.spi.AS4SignalMessageProcessorResult;
+import com.helger.phase4.incoming.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.marshaller.Ebms3NamespaceHandler;
 import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.model.pmode.IPMode;
 import com.helger.phase4.peppol.server.storage.StorageHelper;
 import com.helger.phase4.servlet.IAS4MessageState;
-import com.helger.phase4.servlet.spi.AS4MessageProcessorResult;
-import com.helger.phase4.servlet.spi.AS4SignalMessageProcessorResult;
-import com.helger.phase4.servlet.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.security.certificate.CertificateHelper;
 import com.helger.xml.serialize.write.EXMLSerializeIndent;
 import com.helger.xml.serialize.write.XMLWriter;

diff --git a/...rc/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java b/...rc/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java
@@ -76,13 +76,13 @@
 import com.helger.phase4.ebms3header.Ebms3SignalMessage;
 import com.helger.phase4.ebms3header.Ebms3UserMessage;
 import com.helger.phase4.error.EEbmsError;
+import com.helger.phase4.incoming.spi.AS4MessageProcessorResult;
+import com.helger.phase4.incoming.spi.AS4SignalMessageProcessorResult;
+import com.helger.phase4.incoming.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.mgr.MetaAS4Manager;
 import com.helger.phase4.model.pmode.IPMode;
 import com.helger.phase4.servlet.IAS4MessageState;
-import com.helger.phase4.servlet.spi.AS4MessageProcessorResult;
-import com.helger.phase4.servlet.spi.AS4SignalMessageProcessorResult;
-import com.helger.phase4.servlet.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.util.Phase4Exception;
 import com.helger.sbdh.SBDMarshaller;
 import com.helger.security.certificate.CertificateHelper;

diff --git a/...-webapp/src/main/java/com/helger/phase4/server/spi/ExampleReceiveMessageProcessorSPI.java b/...-webapp/src/main/java/com/helger/phase4/server/spi/ExampleReceiveMessageProcessorSPI.java
@@ -38,14 +38,14 @@
 import com.helger.phase4.ebms3header.Ebms3Error;
 import com.helger.phase4.ebms3header.Ebms3SignalMessage;
 import com.helger.phase4.ebms3header.Ebms3UserMessage;
+import com.helger.phase4.incoming.spi.AS4MessageProcessorResult;
+import com.helger.phase4.incoming.spi.AS4SignalMessageProcessorResult;
+import com.helger.phase4.incoming.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.marshaller.Ebms3NamespaceHandler;
 import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.model.pmode.IPMode;
 import com.helger.phase4.server.storage.StorageHelper;
 import com.helger.phase4.servlet.IAS4MessageState;
-import com.helger.phase4.servlet.spi.AS4MessageProcessorResult;
-import com.helger.phase4.servlet.spi.AS4SignalMessageProcessorResult;
-import com.helger.phase4.servlet.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.security.certificate.CertificateHelper;
 import com.helger.xml.serialize.write.EXMLSerializeIndent;
 import com.helger.xml.serialize.write.XMLWriter;

diff --git a/...st/src/test/java/com/helger/phase4/server/spi/MockMessageProcessorCheckingStreamsSPI.java b/...st/src/test/java/com/helger/phase4/server/spi/MockMessageProcessorCheckingStreamsSPI.java
@@ -45,14 +45,14 @@
 import com.helger.phase4.ebms3header.Ebms3SignalMessage;
 import com.helger.phase4.ebms3header.Ebms3UserMessage;
 import com.helger.phase4.error.EEbmsError;
+import com.helger.phase4.incoming.spi.AS4MessageProcessorResult;
+import com.helger.phase4.incoming.spi.AS4SignalMessageProcessorResult;
+import com.helger.phase4.incoming.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.messaging.domain.MessageHelperMethods;
 import com.helger.phase4.model.pmode.IPMode;
 import com.helger.phase4.server.MockPModeGenerator;
 import com.helger.phase4.servlet.IAS4MessageState;
-import com.helger.phase4.servlet.spi.AS4MessageProcessorResult;
-import com.helger.phase4.servlet.spi.AS4SignalMessageProcessorResult;
-import com.helger.phase4.servlet.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.xml.serialize.read.DOMReader;
 import com.helger.xml.serialize.write.XMLWriter;
 

diff --git a/phase4-test/src/test/java/com/helger/phase4/server/spi/MockMessageProcessorSPI.java b/phase4-test/src/test/java/com/helger/phase4/server/spi/MockMessageProcessorSPI.java
@@ -39,15 +39,15 @@
 import com.helger.phase4.ebms3header.Ebms3SignalMessage;
 import com.helger.phase4.ebms3header.Ebms3UserMessage;
 import com.helger.phase4.error.EEbmsError;
+import com.helger.phase4.incoming.spi.AS4MessageProcessorResult;
+import com.helger.phase4.incoming.spi.AS4SignalMessageProcessorResult;
+import com.helger.phase4.incoming.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.messaging.domain.MessageHelperMethods;
 import com.helger.phase4.model.EMEPBinding;
 import com.helger.phase4.model.pmode.IPMode;
 import com.helger.phase4.server.MockPModeGenerator;
 import com.helger.phase4.servlet.IAS4MessageState;
-import com.helger.phase4.servlet.spi.AS4MessageProcessorResult;
-import com.helger.phase4.servlet.spi.AS4SignalMessageProcessorResult;
-import com.helger.phase4.servlet.spi.IAS4ServletMessageProcessorSPI;
 import com.helger.xml.serialize.read.DOMReader;
 
 /**

diff --git a/phase4-test/src/test/java/com/helger/phase4/server/spi/MockPullRequestProcessorSPI.java b/phase4-test/src/test/java/com/helger/phase4/server/spi/MockPullRequestProcessorSPI.java
@@ -22,10 +22,10 @@
 
 import com.helger.commons.annotation.IsSPIImplementation;
 import com.helger.phase4.ebms3header.Ebms3SignalMessage;
+import com.helger.phase4.incoming.spi.IAS4ServletPullRequestProcessorSPI;
 import com.helger.phase4.model.EMEPBinding;
 import com.helger.phase4.model.pmode.IPMode;
 import com.helger.phase4.model.pmode.PMode;
-import com.helger.phase4.servlet.spi.IAS4ServletPullRequestProcessorSPI;
 import com.helger.phase4.test.profile.TestPMode;
 
 @IsSPIImplementation