Refactors the ips package to interactionpatterns

esa · Oct 13, 2023 · ed0bdfd · ed0bdfd
1 parent 5d42e42
commit ed0bdfd
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 34 deletions.
diff --git a/mal-impl/src/main/java/esa/mo/mal/impl/InteractionConsumerMap.java b/mal-impl/src/main/java/esa/mo/mal/impl/InteractionConsumerMap.java
@@ -20,13 +20,13 @@
  */
 package esa.mo.mal.impl;
 
-import esa.mo.mal.impl.ips.IPConsumerHandler;
-import esa.mo.mal.impl.ips.RequestIPConsumerHandler;
-import esa.mo.mal.impl.ips.InvokeIPConsumerHandler;
-import esa.mo.mal.impl.ips.OperationResponseHolder;
-import esa.mo.mal.impl.ips.SubmitIPConsumerHandler;
-import esa.mo.mal.impl.ips.PubSubIPConsumerHandler;
-import esa.mo.mal.impl.ips.ProgressIPConsumerHandler;
+import esa.mo.mal.impl.interactionpatterns.IPConsumerHandler;
+import esa.mo.mal.impl.interactionpatterns.RequestIPConsumerHandler;
+import esa.mo.mal.impl.interactionpatterns.InvokeIPConsumerHandler;
+import esa.mo.mal.impl.interactionpatterns.OperationResponseHolder;
+import esa.mo.mal.impl.interactionpatterns.SubmitIPConsumerHandler;
+import esa.mo.mal.impl.interactionpatterns.PubSubIPConsumerHandler;
+import esa.mo.mal.impl.interactionpatterns.ProgressIPConsumerHandler;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;

diff --git a/mal-impl/src/main/java/esa/mo/mal/impl/InteractionTimeout.java b/mal-impl/src/main/java/esa/mo/mal/impl/InteractionTimeout.java
@@ -20,7 +20,7 @@
  */
 package esa.mo.mal.impl;
 
-import esa.mo.mal.impl.ips.IPConsumerHandler;
+import esa.mo.mal.impl.interactionpatterns.IPConsumerHandler;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Level;
@@ -135,12 +135,9 @@ private Thread createTimeoutCheckingThread() {
                                 + "set to: " + timeout + " ms";
 
                         try {
-                            handler.handleError(
-                                    null,
-                                    new MOErrorException(
-                                            MALHelper.DELIVERY_TIMEDOUT_ERROR_NUMBER,
-                                            msg),
-                                    null);
+                            MOErrorException error
+                                    = new MOErrorException(MALHelper.DELIVERY_TIMEDOUT_ERROR_NUMBER, msg);
+                            handler.handleError(null, error, null);
                         } catch (Exception ex) {
                             // Do not allow to kill the thread
                             Logger.getLogger(InteractionTimeout.class.getName()).log(

diff --git a/mal-impl/src/main/java/esa/mo/mal/impl/MALReceiver.java b/mal-impl/src/main/java/esa/mo/mal/impl/MALReceiver.java
@@ -21,12 +21,12 @@
 package esa.mo.mal.impl;
 
 import esa.mo.mal.impl.broker.MALBrokerBindingImpl;
-import esa.mo.mal.impl.ips.InvokeIPProviderHandler;
-import esa.mo.mal.impl.ips.ProgressIPProviderHandler;
-import esa.mo.mal.impl.ips.PubSubIPProviderHandler;
-import esa.mo.mal.impl.ips.RequestIPProviderHandler;
-import esa.mo.mal.impl.ips.SendIPProviderHandler;
-import esa.mo.mal.impl.ips.SubmitIPProviderHandler;
+import esa.mo.mal.impl.interactionpatterns.InvokeIPProviderHandler;
+import esa.mo.mal.impl.interactionpatterns.ProgressIPProviderHandler;
+import esa.mo.mal.impl.interactionpatterns.PubSubIPProviderHandler;
+import esa.mo.mal.impl.interactionpatterns.RequestIPProviderHandler;
+import esa.mo.mal.impl.interactionpatterns.SendIPProviderHandler;
+import esa.mo.mal.impl.interactionpatterns.SubmitIPProviderHandler;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;

diff --git a/...sa/mo/mal/impl/ips/IPConsumerHandler.java → ...nteractionpatterns/IPConsumerHandler.java b/...sa/mo/mal/impl/ips/IPConsumerHandler.java → ...nteractionpatterns/IPConsumerHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.MALContextFactoryImpl;
 import java.util.Map;

diff --git a/...sa/mo/mal/impl/ips/IPProviderHandler.java → ...nteractionpatterns/IPProviderHandler.java b/...sa/mo/mal/impl/ips/IPProviderHandler.java → ...nteractionpatterns/IPProviderHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.Address;
 import esa.mo.mal.impl.MALSender;

diff --git a/...mal/impl/ips/InvokeIPConsumerHandler.java → ...tionpatterns/InvokeIPConsumerHandler.java b/...mal/impl/ips/InvokeIPConsumerHandler.java → ...tionpatterns/InvokeIPConsumerHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.MALContextFactoryImpl;
 import java.util.Map;

diff --git a/...mal/impl/ips/InvokeIPProviderHandler.java → ...tionpatterns/InvokeIPProviderHandler.java b/...mal/impl/ips/InvokeIPProviderHandler.java → ...tionpatterns/InvokeIPProviderHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.Address;
 import esa.mo.mal.impl.MALSender;

diff --git a/...mal/impl/ips/OperationResponseHolder.java → ...tionpatterns/OperationResponseHolder.java b/...mal/impl/ips/OperationResponseHolder.java → ...tionpatterns/OperationResponseHolder.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.MALContextFactoryImpl;
 import java.util.Map;

diff --git a/...l/impl/ips/ProgressIPConsumerHandler.java → ...onpatterns/ProgressIPConsumerHandler.java b/...l/impl/ips/ProgressIPConsumerHandler.java → ...onpatterns/ProgressIPConsumerHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.MALContextFactoryImpl;
 import java.util.Map;

diff --git a/...l/impl/ips/ProgressIPProviderHandler.java → ...onpatterns/ProgressIPProviderHandler.java b/...l/impl/ips/ProgressIPProviderHandler.java → ...onpatterns/ProgressIPProviderHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.Address;
 import esa.mo.mal.impl.MALSender;

diff --git a/...mal/impl/ips/PubSubIPConsumerHandler.java → ...tionpatterns/PubSubIPConsumerHandler.java b/...mal/impl/ips/PubSubIPConsumerHandler.java → ...tionpatterns/PubSubIPConsumerHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import org.ccsds.moims.mo.mal.MALException;
 import org.ccsds.moims.mo.mal.MALPubSubOperation;

diff --git a/...mal/impl/ips/PubSubIPProviderHandler.java → ...tionpatterns/PubSubIPProviderHandler.java b/...mal/impl/ips/PubSubIPProviderHandler.java → ...tionpatterns/PubSubIPProviderHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.Address;
 import esa.mo.mal.impl.MALSender;

diff --git a/...al/impl/ips/RequestIPConsumerHandler.java → ...ionpatterns/RequestIPConsumerHandler.java b/...al/impl/ips/RequestIPConsumerHandler.java → ...ionpatterns/RequestIPConsumerHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import org.ccsds.moims.mo.mal.MALException;
 import org.ccsds.moims.mo.mal.MALRequestOperation;

diff --git a/...al/impl/ips/RequestIPProviderHandler.java → ...ionpatterns/RequestIPProviderHandler.java b/...al/impl/ips/RequestIPProviderHandler.java → ...ionpatterns/RequestIPProviderHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.Address;
 import esa.mo.mal.impl.MALSender;

diff --git a/...o/mal/impl/ips/SendIPProviderHandler.java → ...actionpatterns/SendIPProviderHandler.java b/...o/mal/impl/ips/SendIPProviderHandler.java → ...actionpatterns/SendIPProviderHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.MALSender;
 import org.ccsds.moims.mo.mal.MALInteractionException;

diff --git a/...mal/impl/ips/SubmitIPConsumerHandler.java → ...tionpatterns/SubmitIPConsumerHandler.java b/...mal/impl/ips/SubmitIPConsumerHandler.java → ...tionpatterns/SubmitIPConsumerHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.MALContextFactoryImpl;
 import java.util.Map;

diff --git a/...mal/impl/ips/SubmitIPProviderHandler.java → ...tionpatterns/SubmitIPProviderHandler.java b/...mal/impl/ips/SubmitIPProviderHandler.java → ...tionpatterns/SubmitIPProviderHandler.java
@@ -18,7 +18,7 @@
  * limitations under the License. 
  * ----------------------------------------------------------------------------
  */
-package esa.mo.mal.impl.ips;
+package esa.mo.mal.impl.interactionpatterns;
 
 import esa.mo.mal.impl.Address;
 import esa.mo.mal.impl.MALSender;