From ed0bdfd1497c2eff8b0fd354ae2fe96132b03bbf Mon Sep 17 00:00:00 2001 From: CesarCoelho Date: Fri, 13 Oct 2023 10:36:46 +0200 Subject: [PATCH] Refactors the ips package to interactionpatterns --- .../esa/mo/mal/impl/InteractionConsumerMap.java | 14 +++++++------- .../java/esa/mo/mal/impl/InteractionTimeout.java | 11 ++++------- .../src/main/java/esa/mo/mal/impl/MALReceiver.java | 12 ++++++------ .../IPConsumerHandler.java | 2 +- .../IPProviderHandler.java | 2 +- .../InvokeIPConsumerHandler.java | 2 +- .../InvokeIPProviderHandler.java | 2 +- .../OperationResponseHolder.java | 2 +- .../ProgressIPConsumerHandler.java | 2 +- .../ProgressIPProviderHandler.java | 2 +- .../PubSubIPConsumerHandler.java | 2 +- .../PubSubIPProviderHandler.java | 2 +- .../RequestIPConsumerHandler.java | 2 +- .../RequestIPProviderHandler.java | 2 +- .../SendIPProviderHandler.java | 2 +- .../SubmitIPConsumerHandler.java | 2 +- .../SubmitIPProviderHandler.java | 2 +- 17 files changed, 31 insertions(+), 34 deletions(-) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/IPConsumerHandler.java (98%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/IPProviderHandler.java (98%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/InvokeIPConsumerHandler.java (99%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/InvokeIPProviderHandler.java (98%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/OperationResponseHolder.java (99%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/ProgressIPConsumerHandler.java (99%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/ProgressIPProviderHandler.java (98%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/PubSubIPConsumerHandler.java (98%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/PubSubIPProviderHandler.java (97%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/RequestIPConsumerHandler.java (98%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/RequestIPProviderHandler.java (98%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/SendIPProviderHandler.java (97%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/SubmitIPConsumerHandler.java (99%) rename mal-impl/src/main/java/esa/mo/mal/impl/{ips => interactionpatterns}/SubmitIPProviderHandler.java (98%) 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 index 022fee337..1ddc9e2dc 100644 --- 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 index d75f5f0e2..f1bfe2af6 100644 --- 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 index 7044666d9..5a5a0f489 100644 --- 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/mal-impl/src/main/java/esa/mo/mal/impl/ips/IPConsumerHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/IPConsumerHandler.java similarity index 98% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/IPConsumerHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/IPConsumerHandler.java index 2c8e0de60..b04f063f5 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/IPConsumerHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/mal-impl/src/main/java/esa/mo/mal/impl/ips/IPProviderHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/IPProviderHandler.java similarity index 98% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/IPProviderHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/IPProviderHandler.java index b64f8794f..190cfad72 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/IPProviderHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/src/main/java/esa/mo/mal/impl/ips/InvokeIPConsumerHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/InvokeIPConsumerHandler.java similarity index 99% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/InvokeIPConsumerHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/InvokeIPConsumerHandler.java index 382d6fcd6..b4a87731f 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/InvokeIPConsumerHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/src/main/java/esa/mo/mal/impl/ips/InvokeIPProviderHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/InvokeIPProviderHandler.java similarity index 98% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/InvokeIPProviderHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/InvokeIPProviderHandler.java index 480010439..8fd8085bc 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/InvokeIPProviderHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/src/main/java/esa/mo/mal/impl/ips/OperationResponseHolder.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/OperationResponseHolder.java similarity index 99% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/OperationResponseHolder.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/OperationResponseHolder.java index 4de865adf..01b60b9ad 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/OperationResponseHolder.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/mal-impl/src/main/java/esa/mo/mal/impl/ips/ProgressIPConsumerHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/ProgressIPConsumerHandler.java similarity index 99% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/ProgressIPConsumerHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/ProgressIPConsumerHandler.java index e2ffcf67e..8e38f665b 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/ProgressIPConsumerHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/mal-impl/src/main/java/esa/mo/mal/impl/ips/ProgressIPProviderHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/ProgressIPProviderHandler.java similarity index 98% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/ProgressIPProviderHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/ProgressIPProviderHandler.java index 3d8f04287..4165e08aa 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/ProgressIPProviderHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/src/main/java/esa/mo/mal/impl/ips/PubSubIPConsumerHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/PubSubIPConsumerHandler.java similarity index 98% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/PubSubIPConsumerHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/PubSubIPConsumerHandler.java index 556fe9527..70d5ee19c 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/PubSubIPConsumerHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/src/main/java/esa/mo/mal/impl/ips/PubSubIPProviderHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/PubSubIPProviderHandler.java similarity index 97% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/PubSubIPProviderHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/PubSubIPProviderHandler.java index cc9d16a5a..fe321b1ab 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/PubSubIPProviderHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/mal-impl/src/main/java/esa/mo/mal/impl/ips/RequestIPConsumerHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/RequestIPConsumerHandler.java similarity index 98% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/RequestIPConsumerHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/RequestIPConsumerHandler.java index f900ecf0c..6b5371e2c 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/RequestIPConsumerHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/mal-impl/src/main/java/esa/mo/mal/impl/ips/RequestIPProviderHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/RequestIPProviderHandler.java similarity index 98% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/RequestIPProviderHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/RequestIPProviderHandler.java index 3cfa69dba..fd9c6c55c 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/RequestIPProviderHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/mal-impl/src/main/java/esa/mo/mal/impl/ips/SendIPProviderHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/SendIPProviderHandler.java similarity index 97% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/SendIPProviderHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/SendIPProviderHandler.java index 6aedbd929..e17335722 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/SendIPProviderHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/src/main/java/esa/mo/mal/impl/ips/SubmitIPConsumerHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/SubmitIPConsumerHandler.java similarity index 99% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/SubmitIPConsumerHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/SubmitIPConsumerHandler.java index 52bbff98c..c4106b053 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/SubmitIPConsumerHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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/src/main/java/esa/mo/mal/impl/ips/SubmitIPProviderHandler.java b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/SubmitIPProviderHandler.java similarity index 98% rename from mal-impl/src/main/java/esa/mo/mal/impl/ips/SubmitIPProviderHandler.java rename to mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/SubmitIPProviderHandler.java index c13136e69..c64412a1d 100644 --- a/mal-impl/src/main/java/esa/mo/mal/impl/ips/SubmitIPProviderHandler.java +++ b/mal-impl/src/main/java/esa/mo/mal/impl/interactionpatterns/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;