From 8b599fbd184ed33b66cd6a21ec353f82888909d3 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Mon, 26 Aug 2024 11:09:57 +0200 Subject: [PATCH] Moved classes to incoming.spi --- .../src/main/java/com/helger/phase4/dump/AS4DumpReader.java | 6 +++--- .../incoming/mgr/AS4IncomingMessageProcessorManager.java | 2 +- .../mgr/AS4IncomingPullRequestProcessorManager.java | 2 +- .../SOAPHeaderElementProcessorExtractEbms3Messaging.java | 2 +- .../spi/AS4MessageProcessorResult.java | 2 +- .../spi/AS4SignalMessageProcessorResult.java | 2 +- .../spi/IAS4ServletMessageProcessorSPI.java | 2 +- .../spi/IAS4ServletPullRequestProcessorSPI.java | 2 +- .../java/com/helger/phase4/servlet/AS4RequestHandler.java | 6 +++--- .../server/spi/StoringServletMessageProcessorSPI.java | 6 +++--- .../servlet/Phase4PeppolServletMessageProcessorSPI.java | 6 +++--- .../server/spi/ExampleReceiveMessageProcessorSPI.java | 6 +++--- .../server/spi/MockMessageProcessorCheckingStreamsSPI.java | 6 +++--- .../helger/phase4/server/spi/MockMessageProcessorSPI.java | 6 +++--- .../phase4/server/spi/MockPullRequestProcessorSPI.java | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) rename phase4-lib/src/main/java/com/helger/phase4/{servlet => incoming}/spi/AS4MessageProcessorResult.java (99%) rename phase4-lib/src/main/java/com/helger/phase4/{servlet => incoming}/spi/AS4SignalMessageProcessorResult.java (98%) rename phase4-lib/src/main/java/com/helger/phase4/{servlet => incoming}/spi/IAS4ServletMessageProcessorSPI.java (99%) rename phase4-lib/src/main/java/com/helger/phase4/{servlet => incoming}/spi/IAS4ServletPullRequestProcessorSPI.java (97%) 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 index f85babe40..5e8b987ab 100644 --- 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,6 +48,9 @@ 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; @@ -55,9 +58,6 @@ 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/phase4-lib/src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingMessageProcessorManager.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingMessageProcessorManager.java index d4c351fe6..c1e97c1bd 100644 --- a/phase4-lib/src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingMessageProcessorManager.java +++ b/phase4-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/phase4-lib/src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingPullRequestProcessorManager.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingPullRequestProcessorManager.java index 31614689a..cbcb58934 100644 --- a/phase4-lib/src/main/java/com/helger/phase4/incoming/mgr/AS4IncomingPullRequestProcessorManager.java +++ b/phase4-lib/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/phase4-lib/src/main/java/com/helger/phase4/incoming/soap/SOAPHeaderElementProcessorExtractEbms3Messaging.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/soap/SOAPHeaderElementProcessorExtractEbms3Messaging.java index 3caa75061..78e82c5f7 100644 --- a/phase4-lib/src/main/java/com/helger/phase4/incoming/soap/SOAPHeaderElementProcessorExtractEbms3Messaging.java +++ b/phase4-lib/src/main/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/phase4-lib/src/main/java/com/helger/phase4/servlet/spi/AS4MessageProcessorResult.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/spi/AS4MessageProcessorResult.java similarity index 99% rename from phase4-lib/src/main/java/com/helger/phase4/servlet/spi/AS4MessageProcessorResult.java rename to phase4-lib/src/main/java/com/helger/phase4/incoming/spi/AS4MessageProcessorResult.java index 9ab5ffc68..52a364aea 100644 --- a/phase4-lib/src/main/java/com/helger/phase4/servlet/spi/AS4MessageProcessorResult.java +++ b/phase4-lib/src/main/java/com/helger/phase4/incoming/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/phase4-lib/src/main/java/com/helger/phase4/servlet/spi/AS4SignalMessageProcessorResult.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/spi/AS4SignalMessageProcessorResult.java similarity index 98% rename from phase4-lib/src/main/java/com/helger/phase4/servlet/spi/AS4SignalMessageProcessorResult.java rename to phase4-lib/src/main/java/com/helger/phase4/incoming/spi/AS4SignalMessageProcessorResult.java index 821452d2e..3c5e8a86e 100644 --- a/phase4-lib/src/main/java/com/helger/phase4/servlet/spi/AS4SignalMessageProcessorResult.java +++ b/phase4-lib/src/main/java/com/helger/phase4/incoming/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/phase4-lib/src/main/java/com/helger/phase4/servlet/spi/IAS4ServletMessageProcessorSPI.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/spi/IAS4ServletMessageProcessorSPI.java similarity index 99% rename from phase4-lib/src/main/java/com/helger/phase4/servlet/spi/IAS4ServletMessageProcessorSPI.java rename to phase4-lib/src/main/java/com/helger/phase4/incoming/spi/IAS4ServletMessageProcessorSPI.java index c17c0afdd..28bed7c32 100644 --- a/phase4-lib/src/main/java/com/helger/phase4/servlet/spi/IAS4ServletMessageProcessorSPI.java +++ b/phase4-lib/src/main/java/com/helger/phase4/incoming/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/phase4-lib/src/main/java/com/helger/phase4/servlet/spi/IAS4ServletPullRequestProcessorSPI.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/spi/IAS4ServletPullRequestProcessorSPI.java similarity index 97% rename from phase4-lib/src/main/java/com/helger/phase4/servlet/spi/IAS4ServletPullRequestProcessorSPI.java rename to phase4-lib/src/main/java/com/helger/phase4/incoming/spi/IAS4ServletPullRequestProcessorSPI.java index 6af4f0953..c9255ee04 100644 --- a/phase4-lib/src/main/java/com/helger/phase4/servlet/spi/IAS4ServletPullRequestProcessorSPI.java +++ b/phase4-lib/src/main/java/com/helger/phase4/incoming/spi/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 index a4950f89a..3a197c447 100644 --- 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/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java index 9f4d3f188..54b2c8987 100644 --- a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java +++ b/phase4-peppol-server-webapp/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/phase4-peppol-servlet/src/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java b/phase4-peppol-servlet/src/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java index 047642d38..bd241851f 100644 --- a/phase4-peppol-servlet/src/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java +++ b/phase4-peppol-servlet/src/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/phase4-server-webapp/src/main/java/com/helger/phase4/server/spi/ExampleReceiveMessageProcessorSPI.java b/phase4-server-webapp/src/main/java/com/helger/phase4/server/spi/ExampleReceiveMessageProcessorSPI.java index 15a9c64c6..a58ce17f3 100644 --- a/phase4-server-webapp/src/main/java/com/helger/phase4/server/spi/ExampleReceiveMessageProcessorSPI.java +++ b/phase4-server-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/phase4-test/src/test/java/com/helger/phase4/server/spi/MockMessageProcessorCheckingStreamsSPI.java b/phase4-test/src/test/java/com/helger/phase4/server/spi/MockMessageProcessorCheckingStreamsSPI.java index 3454951e0..f90d64f5d 100644 --- a/phase4-test/src/test/java/com/helger/phase4/server/spi/MockMessageProcessorCheckingStreamsSPI.java +++ b/phase4-test/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 index c06cbd547..4c54a98bb 100644 --- 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 index 7601f6153..09797125d 100644 --- 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