This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch refactor/phase1-leaf-modules in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 26df7c6ebe9bb987297a4892e4804b5a76636cf9 Author: yasithdev <[email protected]> AuthorDate: Thu Mar 26 19:41:15 2026 -0500 refactor: reorganize o.a.a.messaging into service/handler/util layers Consolidate messaging infrastructure from messaging/core/, messaging/client/, service/messaging/, db/event/manager/, and common/utils/ into a layered messaging/ package structure: - messaging/service/ — core interfaces (Publisher, Subscriber, MessageHandler, MessageContext, MessagingFactory, Type), implementations (RabbitMQPublisher, RabbitMQSubscriber), and event publishers (EventPublisher, LocalEventPublisher) - messaging/handler/ — consumers (MessageConsumer, ExperimentConsumer, ProcessConsumer, StatusConsumer), listeners (RabbitMQListener, TestReader), and DB event managers (DBEventManagerRunner, DBEventManagerMessagingFactory, DBEventMessageHandler) - messaging/util/ — properties (RabbitMQProperties), constants (MessagingConstants, DBEventConstants, DBEventManagerConstants), stats (StatCounter, LatencyWriterTask, CountWriterTask), and utilities (DBEventPublisherUtils, DbEventManagerZkUtils, DBEventService, DBEventManagerException) Rename db.event.manager.utils.Constants → DBEventConstants to avoid collision. Delete empty source directories. --- .../org/apache/airavata/helix/impl/task/AiravataTask.java | 10 +++++----- .../org/apache/airavata/helix/impl/task/TaskContext.java | 2 +- .../airavata/helix/impl/workflow/PostWorkflowManager.java | 2 +- .../airavata/helix/impl/workflow/PreWorkflowManager.java | 10 +++++----- .../airavata/helix/impl/workflow/WorkflowManager.java | 8 ++++---- .../handler}/DBEventManagerMessagingFactory.java | 12 ++++++------ .../handler}/DBEventManagerRunner.java | 4 ++-- .../impl => messaging/handler}/DBEventMessageHandler.java | 14 +++++++------- .../{core/impl => handler}/ExperimentConsumer.java | 6 +++--- .../messaging/{core/impl => handler}/MessageConsumer.java | 6 +++--- .../messaging/{core/impl => handler}/ProcessConsumer.java | 6 +++--- .../messaging/{client => handler}/RabbitMQListener.java | 10 +++++----- .../messaging/{core/impl => handler}/StatusConsumer.java | 6 +++--- .../airavata/messaging/{core => handler}/TestClient.java | 5 ++++- .../airavata/messaging/{client => handler}/TestReader.java | 2 +- .../messaging => messaging/service}/EventPublisher.java | 6 +++--- .../utils => messaging/service}/LocalEventPublisher.java | 2 +- .../messaging/{core => service}/MessageContext.java | 2 +- .../messaging/{core => service}/MessageHandler.java | 2 +- .../messaging/{core => service}/MessagingFactory.java | 10 +++++++--- .../airavata/messaging/{core => service}/Publisher.java | 2 +- .../{core/impl => service}/RabbitMQPublisher.java | 8 ++++---- .../{core/impl => service}/RabbitMQSubscriber.java | 6 +++--- .../airavata/messaging/{core => service}/Subscriber.java | 2 +- .../apache/airavata/messaging/{core => service}/Type.java | 2 +- .../messaging/{core/stats => util}/CountWriterTask.java | 2 +- .../util/DBEventConstants.java} | 4 ++-- .../utils => messaging/util}/DBEventManagerConstants.java | 2 +- .../util}/DBEventManagerException.java | 2 +- .../messaging/{core => }/util/DBEventPublisherUtils.java | 12 ++++++------ .../{common/utils => messaging/util}/DBEventService.java | 2 +- .../utils => messaging/util}/DbEventManagerZkUtils.java | 6 +++--- .../messaging/{core/stats => util}/LatencyWriterTask.java | 2 +- .../messaging/{core => util}/MessagingConstants.java | 2 +- .../messaging/{core => util}/RabbitMQProperties.java | 2 +- .../messaging/{core/stats => util}/StatCounter.java | 2 +- .../apache/airavata/metascheduler/core/utils/Utils.java | 8 ++++---- .../orchestrator/core/context/OrchestratorContext.java | 2 +- .../orchestrator/core/impl/GFACPassiveJobSubmitter.java | 8 ++++---- .../airavata/orchestrator/util/OrchestratorUtils.java | 4 ++-- .../service/messaging/RegistryServiceDBEventHandler.java | 8 ++++---- .../messaging/RegistryServiceDBEventMessagingFactory.java | 12 ++++++------ .../airavata/registry/api/service/util/Constants.java | 2 +- .../airavata/service/experiment/ExperimentService.java | 2 +- .../registry/messaging/SharingServiceDBEventHandler.java | 4 ++-- .../messaging/SharingServiceDBEventMessagingFactory.java | 12 ++++++------ .../apache/airavata/sharing/registry/utils/Constants.java | 2 +- .../airavata/service/experiment/ExperimentServiceTest.java | 2 +- .../org/apache/airavata/api/server/AiravataServer.java | 2 +- .../airavata/api/server/handler/AiravataServerHandler.java | 8 ++++---- .../orchestrator/server/OrchestratorServerHandler.java | 3 ++- .../service/profile/handlers/IamAdminServicesHandler.java | 4 ++-- .../profile/handlers/TenantProfileServiceHandler.java | 4 ++-- .../profile/handlers/UserProfileServiceHandler.java | 4 ++-- 54 files changed, 141 insertions(+), 133 deletions(-) diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java index b59b980f6f..e56b130951 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java @@ -34,11 +34,11 @@ import org.apache.airavata.helix.core.AbstractTask; import org.apache.airavata.helix.core.util.MonitoringUtil; import org.apache.airavata.helix.task.api.TaskHelper; import org.apache.airavata.helix.task.api.annotation.TaskParam; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.Type; -import org.apache.airavata.messaging.core.impl.RabbitMQPublisher; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.service.Type; +import org.apache.airavata.messaging.service.RabbitMQPublisher; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; import org.apache.airavata.model.application.io.OutputDataObjectType; import org.apache.airavata.model.commons.ErrorModel; diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java index 46a46f5513..9ad7f888ef 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Optional; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.Publisher; +import org.apache.airavata.messaging.service.Publisher; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription; import org.apache.airavata.model.appcatalog.computeresource.BatchQueue; diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java index f976334303..95bd5681b5 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java @@ -30,7 +30,7 @@ import org.apache.airavata.helix.core.OutPort; import org.apache.airavata.helix.impl.task.AiravataTask; import org.apache.airavata.helix.impl.task.HelixTaskFactory; import org.apache.airavata.helix.impl.task.TaskFactory; -import org.apache.airavata.messaging.core.MessageContext; +import org.apache.airavata.messaging.service.MessageContext; import org.apache.airavata.model.appcatalog.groupresourceprofile.ResourceType; import org.apache.airavata.model.experiment.ExperimentModel; import org.apache.airavata.model.job.JobModel; diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java index 3f54d35a9e..d87a697c5b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java @@ -39,11 +39,11 @@ import org.apache.airavata.helix.impl.task.cancel.CancelCompletingTask; import org.apache.airavata.helix.impl.task.cancel.RemoteJobCancellationTask; import org.apache.airavata.helix.impl.task.cancel.WorkflowCancellationTask; import org.apache.airavata.helix.impl.task.completing.CompletingTask; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessageHandler; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Subscriber; -import org.apache.airavata.messaging.core.Type; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessageHandler; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Subscriber; +import org.apache.airavata.messaging.service.Type; import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference; import org.apache.airavata.model.appcatalog.groupresourceprofile.ResourceType; import org.apache.airavata.model.experiment.ExperimentModel; diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/WorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/WorkflowManager.java index 50c33e3e62..276f997463 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/WorkflowManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/WorkflowManager.java @@ -29,10 +29,10 @@ import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftClientPool; import org.apache.airavata.helix.workflow.WorkflowOperator; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.Type; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.service.Type; import org.apache.airavata.model.messaging.event.MessageType; import org.apache.airavata.model.messaging.event.ProcessIdentifier; import org.apache.airavata.model.messaging.event.ProcessStatusChangeEvent; diff --git a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerMessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerMessagingFactory.java similarity index 88% rename from airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerMessagingFactory.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerMessagingFactory.java index 4ae09faadd..54f8d99837 100644 --- a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerMessagingFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerMessagingFactory.java @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.db.event.manager.messaging; +package org.apache.airavata.messaging.handler; import org.apache.airavata.common.exception.AiravataException; -import org.apache.airavata.common.utils.DBEventService; -import org.apache.airavata.db.event.manager.messaging.impl.DBEventMessageHandler; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.Subscriber; +import org.apache.airavata.messaging.util.DBEventService; +import org.apache.airavata.messaging.handler.DBEventMessageHandler; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.service.Subscriber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerRunner.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerRunner.java index 2b6310d299..126275e3f5 100644 --- a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventManagerRunner.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.db.event.manager; +package org.apache.airavata.messaging.handler; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.server.IServer; -import org.apache.airavata.db.event.manager.messaging.DBEventManagerMessagingFactory; +import org.apache.airavata.messaging.handler.DBEventManagerMessagingFactory; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/impl/DBEventMessageHandler.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventMessageHandler.java similarity index 90% rename from airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/impl/DBEventMessageHandler.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventMessageHandler.java index be97ecc9c5..e676f01f63 100644 --- a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/impl/DBEventMessageHandler.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/DBEventMessageHandler.java @@ -17,19 +17,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.db.event.manager.messaging.impl; +package org.apache.airavata.messaging.handler; import java.util.Collections; import java.util.List; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.util.AiravataUtils; -import org.apache.airavata.common.utils.DBEventManagerConstants; +import org.apache.airavata.messaging.util.DBEventManagerConstants; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.db.event.manager.messaging.DBEventManagerException; -import org.apache.airavata.db.event.manager.messaging.DBEventManagerMessagingFactory; -import org.apache.airavata.db.event.manager.utils.DbEventManagerZkUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessageHandler; +import org.apache.airavata.messaging.util.DBEventManagerException; +import org.apache.airavata.messaging.handler.DBEventManagerMessagingFactory; +import org.apache.airavata.messaging.util.DbEventManagerZkUtils; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessageHandler; import org.apache.airavata.model.dbevent.DBEventMessage; import org.apache.airavata.model.dbevent.DBEventMessageContext; import org.apache.airavata.model.messaging.event.MessageType; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ExperimentConsumer.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/ExperimentConsumer.java index b14f83689f..54e6ac769c 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ExperimentConsumer.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.impl; +package org.apache.airavata.messaging.handler; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; @@ -28,8 +28,8 @@ import java.io.IOException; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessageHandler; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessageHandler; import org.apache.airavata.model.messaging.event.*; import org.apache.thrift.TBase; import org.apache.thrift.TException; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/MessageConsumer.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/MessageConsumer.java index 56aae88a2d..58602c7140 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/MessageConsumer.java @@ -17,13 +17,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.impl; +package org.apache.airavata.messaging.handler; import com.rabbitmq.client.*; import java.io.IOException; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessageHandler; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessageHandler; import org.apache.airavata.model.dbevent.DBEventMessage; import org.apache.airavata.model.messaging.event.Message; import org.apache.log4j.LogManager; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ProcessConsumer.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/ProcessConsumer.java index 520a465177..90e1ae39a9 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/ProcessConsumer.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.impl; +package org.apache.airavata.messaging.handler; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; @@ -28,8 +28,8 @@ import java.io.IOException; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessageHandler; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessageHandler; import org.apache.airavata.model.messaging.event.Message; import org.apache.airavata.model.messaging.event.MessageType; import org.apache.airavata.model.messaging.event.ProcessSubmitEvent; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/RabbitMQListener.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/RabbitMQListener.java index 7fd8cfcd76..594744563e 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/RabbitMQListener.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.client; +package org.apache.airavata.messaging.handler; import java.io.BufferedWriter; import java.io.File; @@ -29,10 +29,10 @@ import java.util.List; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageHandler; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Subscriber; -import org.apache.airavata.messaging.core.Type; +import org.apache.airavata.messaging.service.MessageHandler; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Subscriber; +import org.apache.airavata.messaging.service.Type; import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent; import org.apache.airavata.model.messaging.event.JobStatusChangeEvent; import org.apache.airavata.model.messaging.event.MessageType; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/StatusConsumer.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/StatusConsumer.java index 12c93f7349..239b0cc797 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/StatusConsumer.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.impl; +package org.apache.airavata.messaging.handler; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; @@ -27,8 +27,8 @@ import com.rabbitmq.client.Envelope; import java.io.IOException; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessageHandler; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessageHandler; import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent; import org.apache.airavata.model.messaging.event.JobStatusChangeEvent; import org.apache.airavata.model.messaging.event.Message; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/TestClient.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/TestClient.java similarity index 93% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/TestClient.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/TestClient.java index 681ca53eb0..f149dda629 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/TestClient.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/TestClient.java @@ -17,12 +17,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.handler; import java.util.ArrayList; import java.util.List; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.util.ThriftUtils; +import org.apache.airavata.messaging.service.MessageHandler; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Type; import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent; import org.apache.airavata.model.messaging.event.MessageType; import org.apache.thrift.TBase; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/client/TestReader.java b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/TestReader.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/messaging/client/TestReader.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/handler/TestReader.java index 97ee3e040a..359b7c46e6 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/client/TestReader.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/handler/TestReader.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.client; +package org.apache.airavata.messaging.handler; import java.io.*; // import java.util.stream.Stream; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/messaging/EventPublisher.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/EventPublisher.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/service/messaging/EventPublisher.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/EventPublisher.java index 67b955b7ca..c1afce6b10 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/messaging/EventPublisher.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/EventPublisher.java @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.messaging; +package org.apache.airavata.messaging.service; import java.util.List; import java.util.UUID; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.util.AiravataUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.Publisher; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.Publisher; import org.apache.airavata.model.messaging.event.ExperimentIntermediateOutputsEvent; import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent; import org.apache.airavata.model.messaging.event.ExperimentSubmitEvent; diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/LocalEventPublisher.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/LocalEventPublisher.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/common/utils/LocalEventPublisher.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/LocalEventPublisher.java index 0316c4d8f2..4e93838a31 100644 --- a/airavata-api/src/main/java/org/apache/airavata/common/utils/LocalEventPublisher.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/LocalEventPublisher.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.common.utils; +package org.apache.airavata.messaging.service; import com.google.common.eventbus.EventBus; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessageContext.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/MessageContext.java index ad2009c99a..a7ccc1bc1f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessageContext.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.service; import java.sql.Timestamp; import org.apache.airavata.model.messaging.event.MessageType; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageHandler.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessageHandler.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageHandler.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/MessageHandler.java index 085c1c224f..bf4d29b29f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageHandler.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessageHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.service; @FunctionalInterface public interface MessageHandler { diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessagingFactory.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/MessagingFactory.java index 17a6d29836..c56a7e0bf9 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/MessagingFactory.java @@ -17,14 +17,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.service; import java.util.ArrayList; import java.util.List; import org.apache.airavata.common.exception.AiravataException; -import org.apache.airavata.common.utils.DBEventManagerConstants; +import org.apache.airavata.messaging.util.DBEventManagerConstants; +import org.apache.airavata.messaging.util.RabbitMQProperties; +import org.apache.airavata.messaging.handler.ExperimentConsumer; +import org.apache.airavata.messaging.handler.MessageConsumer; +import org.apache.airavata.messaging.handler.ProcessConsumer; +import org.apache.airavata.messaging.handler.StatusConsumer; import org.apache.airavata.common.config.ServerSettings; -import org.apache.airavata.messaging.core.impl.*; import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent; import org.apache.airavata.model.messaging.event.JobIdentifier; import org.apache.airavata.model.messaging.event.JobStatusChangeEvent; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/Publisher.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/Publisher.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/Publisher.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/Publisher.java index 12f3ac1f02..83ef623caf 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/Publisher.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/Publisher.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.service; import org.apache.airavata.common.exception.AiravataException; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQPublisher.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQPublisher.java index 6a7a16422b..23d53ff3d7 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQPublisher.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.impl; +package org.apache.airavata.messaging.service; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; @@ -29,9 +29,9 @@ import java.io.IOException; import java.util.function.Function; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.RabbitMQProperties; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.util.RabbitMQProperties; import org.apache.airavata.model.messaging.event.Message; import org.apache.thrift.TException; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQSubscriber.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQSubscriber.java index b8b49136a8..edb643a74e 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/RabbitMQSubscriber.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.impl; +package org.apache.airavata.messaging.service; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; @@ -31,8 +31,8 @@ import java.util.List; import java.util.Map; import java.util.function.BiFunction; import org.apache.airavata.common.exception.AiravataException; -import org.apache.airavata.messaging.core.RabbitMQProperties; -import org.apache.airavata.messaging.core.Subscriber; +import org.apache.airavata.messaging.util.RabbitMQProperties; +import org.apache.airavata.messaging.service.Subscriber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/Subscriber.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/Subscriber.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/Subscriber.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/Subscriber.java index 00d35284a2..0447783165 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/Subscriber.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/Subscriber.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.service; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/Type.java b/airavata-api/src/main/java/org/apache/airavata/messaging/service/Type.java similarity index 94% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/Type.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/service/Type.java index facc47aa8c..0d527df05e 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/Type.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/service/Type.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.service; public enum Type { EXPERIMENT_LAUNCH, diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/CountWriterTask.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/CountWriterTask.java index 7933b7b78d..c47233ffcf 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/CountWriterTask.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.stats; +package org.apache.airavata.messaging.util; import java.io.*; import java.util.List; diff --git a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventConstants.java similarity index 92% rename from airavata-api/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventConstants.java index bf6a7717ac..85555b3ee4 100644 --- a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventConstants.java @@ -17,12 +17,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.db.event.manager.utils; +package org.apache.airavata.messaging.util; /** * Created by Ajinkya on 3/1/17. */ -public class Constants { +public class DBEventConstants { public static final String DB_EVENT_MGR_ZK_PATH = "db-event-mgr"; } diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/DBEventManagerConstants.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventManagerConstants.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/common/utils/DBEventManagerConstants.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventManagerConstants.java index 52600b04db..eb4547f6ab 100644 --- a/airavata-api/src/main/java/org/apache/airavata/common/utils/DBEventManagerConstants.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventManagerConstants.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.common.utils; +package org.apache.airavata.messaging.util; /** * Created by Ajinkya on 3/22/17. diff --git a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerException.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventManagerException.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerException.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventManagerException.java index ed14b11dc0..5ea658122a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerException.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventManagerException.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.db.event.manager.messaging; +package org.apache.airavata.messaging.util; /** * Created by Ajinkya on 3/14/17. diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventPublisherUtils.java similarity index 92% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventPublisherUtils.java index 5705f0e5b1..6e49b89770 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventPublisherUtils.java @@ -17,15 +17,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.util; +package org.apache.airavata.messaging.util; import org.apache.airavata.common.exception.AiravataException; -import org.apache.airavata.common.utils.DBEventManagerConstants; -import org.apache.airavata.common.utils.DBEventService; +import org.apache.airavata.messaging.util.DBEventManagerConstants; +import org.apache.airavata.messaging.util.DBEventService; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; import org.apache.airavata.model.dbevent.CrudType; import org.apache.airavata.model.dbevent.DBEventMessage; import org.apache.airavata.model.dbevent.DBEventMessageContext; diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/DBEventService.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventService.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/common/utils/DBEventService.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventService.java index ef406057d7..9ba8789623 100644 --- a/airavata-api/src/main/java/org/apache/airavata/common/utils/DBEventService.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DBEventService.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.common.utils; +package org.apache.airavata.messaging.util; /** * Created by Ajinkya on 3/28/17. diff --git a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/utils/DbEventManagerZkUtils.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DbEventManagerZkUtils.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/db/event/manager/utils/DbEventManagerZkUtils.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/DbEventManagerZkUtils.java index 52410dd307..5da7189a1b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/db/event/manager/utils/DbEventManagerZkUtils.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/DbEventManagerZkUtils.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.db.event.manager.utils; +package org.apache.airavata.messaging.util; import java.util.List; import org.apache.airavata.common.exception.ApplicationSettingsException; @@ -69,7 +69,7 @@ public class DbEventManagerZkUtils { // get pub,sub queue names // construct ZK paths for pub,sub - String publisherZkPath = ZKPaths.makePath(Constants.DB_EVENT_MGR_ZK_PATH, publisherNode); + String publisherZkPath = ZKPaths.makePath(DBEventConstants.DB_EVENT_MGR_ZK_PATH, publisherNode); String subscriberZkPath = ZKPaths.makePath(publisherZkPath, subscriberNode); // construct byte-data(s) for pub, sub @@ -96,7 +96,7 @@ public class DbEventManagerZkUtils { throws Exception { // construct ZK path for pub - String publisherZkPath = ZKPaths.makePath(Constants.DB_EVENT_MGR_ZK_PATH, publisherNode); + String publisherZkPath = ZKPaths.makePath(DBEventConstants.DB_EVENT_MGR_ZK_PATH, publisherNode); // get children-list for pub List<String> subscriberList = curatorClient.getChildren().forPath(publisherZkPath); diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/LatencyWriterTask.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/LatencyWriterTask.java index 6405ea7d80..49c05fa625 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/LatencyWriterTask.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.stats; +package org.apache.airavata.messaging.util; import java.io.*; import java.util.Map; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingConstants.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/MessagingConstants.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingConstants.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/MessagingConstants.java index 08dca111e6..3653aacf25 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingConstants.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/MessagingConstants.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.util; @Deprecated public abstract class MessagingConstants { diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/RabbitMQProperties.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/RabbitMQProperties.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/RabbitMQProperties.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/RabbitMQProperties.java index b8e953385a..ab8a002ae5 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/RabbitMQProperties.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/RabbitMQProperties.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core; +package org.apache.airavata.messaging.util; public class RabbitMQProperties { private String brokerUrl; diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java b/airavata-api/src/main/java/org/apache/airavata/messaging/util/StatCounter.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java rename to airavata-api/src/main/java/org/apache/airavata/messaging/util/StatCounter.java index ada5224e3f..9e8ae68bcf 100644 --- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java +++ b/airavata-api/src/main/java/org/apache/airavata/messaging/util/StatCounter.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.messaging.core.stats; +package org.apache.airavata.messaging.util; import java.io.*; import java.util.*; diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java b/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java index 445e057a23..5b5ab16678 100644 --- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java +++ b/airavata-api/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java @@ -23,10 +23,10 @@ import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftClientPool; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.Type; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.service.Type; import org.apache.airavata.model.messaging.event.MessageType; import org.apache.airavata.model.messaging.event.ProcessIdentifier; import org.apache.airavata.model.messaging.event.ProcessStatusChangeEvent; diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/context/OrchestratorContext.java b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/context/OrchestratorContext.java index 8ea522e7d0..a19e690a52 100644 --- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/context/OrchestratorContext.java +++ b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/context/OrchestratorContext.java @@ -19,7 +19,7 @@ */ package org.apache.airavata.orchestrator.core.context; -import org.apache.airavata.messaging.core.Publisher; +import org.apache.airavata.messaging.service.Publisher; import org.apache.airavata.orchestrator.core.OrchestratorConfiguration; /** diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACPassiveJobSubmitter.java b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACPassiveJobSubmitter.java index 426d900682..ac25a7390f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACPassiveJobSubmitter.java +++ b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/impl/GFACPassiveJobSubmitter.java @@ -24,10 +24,10 @@ import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.credential.store.store.CredentialReader; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.Type; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.service.Type; import org.apache.airavata.model.messaging.event.MessageType; import org.apache.airavata.model.messaging.event.ProcessSubmitEvent; import org.apache.airavata.model.messaging.event.ProcessTerminateEvent; diff --git a/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java b/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java index 18a740ec74..65db439651 100644 --- a/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java +++ b/airavata-api/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorUtils.java @@ -24,8 +24,8 @@ import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.Publisher; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.Publisher; import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent; import org.apache.airavata.model.messaging.event.MessageType; import org.apache.airavata.model.process.ProcessModel; diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java b/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java index 2f889f4b34..d69c3bc2c7 100644 --- a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java +++ b/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java @@ -23,13 +23,13 @@ import java.time.Duration; import java.util.List; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.common.utils.DBEventService; +import org.apache.airavata.messaging.util.DBEventService; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftClientPool; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessageHandler; -import org.apache.airavata.messaging.core.util.DBEventPublisherUtils; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessageHandler; +import org.apache.airavata.messaging.util.DBEventPublisherUtils; import org.apache.airavata.model.dbevent.CrudType; import org.apache.airavata.model.dbevent.DBEventMessage; import org.apache.airavata.model.dbevent.DBEventPublisherContext; diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventMessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventMessagingFactory.java index 038244c635..d77a450a41 100644 --- a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventMessagingFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventMessagingFactory.java @@ -21,12 +21,12 @@ package org.apache.airavata.registry.api.service.messaging; import java.util.List; import org.apache.airavata.common.exception.AiravataException; -import org.apache.airavata.common.utils.DBEventManagerConstants; -import org.apache.airavata.common.utils.DBEventService; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.Subscriber; +import org.apache.airavata.messaging.util.DBEventManagerConstants; +import org.apache.airavata.messaging.util.DBEventService; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.service.Subscriber; import org.apache.airavata.model.dbevent.DBEventMessage; import org.apache.airavata.model.dbevent.DBEventMessageContext; import org.apache.airavata.model.dbevent.DBEventSubscriber; diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java b/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java index fa9510f845..b927e592e9 100644 --- a/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java +++ b/airavata-api/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java @@ -21,7 +21,7 @@ package org.apache.airavata.registry.api.service.util; import java.util.ArrayList; import java.util.List; -import org.apache.airavata.common.utils.DBEventService; +import org.apache.airavata.messaging.util.DBEventService; public class Constants { public static final String REGISTRY_SERVER_PORT = "regserver.server.port"; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java b/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java index 1c4ede8cad..347b009579 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java @@ -50,7 +50,7 @@ import org.apache.airavata.service.exception.ServiceAuthorizationException; import org.apache.airavata.service.exception.ServiceException; import org.apache.airavata.service.exception.ServiceNotFoundException; import org.apache.airavata.service.groupprofile.GroupResourceProfileService; -import org.apache.airavata.service.messaging.EventPublisher; +import org.apache.airavata.messaging.service.EventPublisher; import org.apache.airavata.service.sharing.SharingHelper; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.EntitySearchField; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java index fc67b8f279..e6a36d67fa 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java @@ -23,8 +23,8 @@ import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftUtils; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessageHandler; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessageHandler; import org.apache.airavata.model.dbevent.DBEventMessage; import org.apache.airavata.model.dbevent.DBEventMessageContext; import org.apache.airavata.model.error.DuplicateEntryException; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventMessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventMessagingFactory.java index 9257a582e9..e7f1c100e2 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventMessagingFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventMessagingFactory.java @@ -21,12 +21,12 @@ package org.apache.airavata.sharing.registry.messaging; import java.util.List; import org.apache.airavata.common.exception.AiravataException; -import org.apache.airavata.common.utils.DBEventManagerConstants; -import org.apache.airavata.common.utils.DBEventService; -import org.apache.airavata.messaging.core.MessageContext; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.Subscriber; +import org.apache.airavata.messaging.util.DBEventManagerConstants; +import org.apache.airavata.messaging.util.DBEventService; +import org.apache.airavata.messaging.service.MessageContext; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.service.Subscriber; import org.apache.airavata.model.dbevent.DBEventMessage; import org.apache.airavata.model.dbevent.DBEventMessageContext; import org.apache.airavata.model.dbevent.DBEventSubscriber; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/Constants.java b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/Constants.java index ce32ad3cf5..6aa37d7c58 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/Constants.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/Constants.java @@ -21,7 +21,7 @@ package org.apache.airavata.sharing.registry.utils; import java.util.ArrayList; import java.util.List; -import org.apache.airavata.common.utils.DBEventService; +import org.apache.airavata.messaging.util.DBEventService; /** * Created by Ajinkya on 3/28/17. diff --git a/airavata-api/src/test/java/org/apache/airavata/service/experiment/ExperimentServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/service/experiment/ExperimentServiceTest.java index 306adc5ef6..ea498d77f4 100644 --- a/airavata-api/src/test/java/org/apache/airavata/service/experiment/ExperimentServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/service/experiment/ExperimentServiceTest.java @@ -42,7 +42,7 @@ import org.apache.airavata.registry.api.service.handler.RegistryServerHandler; import org.apache.airavata.service.context.RequestContext; import org.apache.airavata.service.exception.ServiceAuthorizationException; import org.apache.airavata.service.exception.ServiceException; -import org.apache.airavata.service.messaging.EventPublisher; +import org.apache.airavata.messaging.service.EventPublisher; import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java index a1042a37f7..6c110f38e4 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java @@ -36,7 +36,7 @@ import org.apache.airavata.compute.resource.monitoring.ComputationalResourceMoni import org.apache.airavata.credential.store.cpi.CredentialStoreService; import org.apache.airavata.credential.store.server.CredentialStoreServerHandler; import org.apache.airavata.credential.store.store.impl.util.CredentialStoreDBInitConfig; -import org.apache.airavata.db.event.manager.DBEventManagerRunner; +import org.apache.airavata.messaging.handler.DBEventManagerRunner; import org.apache.airavata.helix.core.AbstractTask; import org.apache.airavata.helix.impl.controller.HelixController; import org.apache.airavata.helix.impl.participant.GlobalParticipant; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 477e101c40..57cdb26ede 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -27,9 +27,9 @@ import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.credential.store.server.CredentialStoreServerHandler; -import org.apache.airavata.messaging.core.MessagingFactory; -import org.apache.airavata.messaging.core.Publisher; -import org.apache.airavata.messaging.core.Type; +import org.apache.airavata.messaging.service.MessagingFactory; +import org.apache.airavata.messaging.service.Publisher; +import org.apache.airavata.messaging.service.Type; import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule; @@ -79,7 +79,7 @@ import org.apache.airavata.service.dataproduct.DataProductService; import org.apache.airavata.service.experiment.ExperimentService; import org.apache.airavata.service.gateway.GatewayService; import org.apache.airavata.service.groupprofile.GroupResourceProfileService; -import org.apache.airavata.service.messaging.EventPublisher; +import org.apache.airavata.messaging.service.EventPublisher; import org.apache.airavata.service.notification.NotificationService; import org.apache.airavata.service.parser.ParserService; import org.apache.airavata.service.project.ProjectService; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java index 83156917cf..d4e351f8a7 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java @@ -29,7 +29,8 @@ import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.common.util.ThriftUtils; import org.apache.airavata.common.config.ZkConstants; -import org.apache.airavata.messaging.core.*; +import org.apache.airavata.messaging.service.*; +import org.apache.airavata.messaging.util.*; import org.apache.airavata.metascheduler.core.api.ProcessScheduler; import org.apache.airavata.metascheduler.process.scheduling.api.ProcessSchedulerImpl; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java index cf6e9b988e..04c37a550f 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java @@ -24,12 +24,12 @@ import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.Constants; -import org.apache.airavata.common.utils.DBEventService; +import org.apache.airavata.messaging.util.DBEventService; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.credential.store.client.CredentialStoreClientFactory; import org.apache.airavata.credential.store.cpi.CredentialStoreService; import org.apache.airavata.credential.store.exception.CredentialStoreException; -import org.apache.airavata.messaging.core.util.DBEventPublisherUtils; +import org.apache.airavata.messaging.util.DBEventPublisherUtils; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; import org.apache.airavata.model.credential.store.PasswordCredential; import org.apache.airavata.model.dbevent.CrudType; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java index f3e5b946aa..7fcf67e762 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java @@ -23,12 +23,12 @@ import java.util.List; import java.util.UUID; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.config.Constants; -import org.apache.airavata.common.utils.DBEventService; +import org.apache.airavata.messaging.util.DBEventService; import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.credential.store.client.CredentialStoreClientFactory; import org.apache.airavata.credential.store.cpi.CredentialStoreService; import org.apache.airavata.credential.store.exception.CredentialStoreException; -import org.apache.airavata.messaging.core.util.DBEventPublisherUtils; +import org.apache.airavata.messaging.util.DBEventPublisherUtils; import org.apache.airavata.model.credential.store.PasswordCredential; import org.apache.airavata.model.dbevent.CrudType; import org.apache.airavata.model.dbevent.EntityType; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java index 245964f3c8..c7239a332e 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java @@ -23,9 +23,9 @@ import java.util.List; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.util.AiravataUtils; import org.apache.airavata.common.config.Constants; -import org.apache.airavata.common.utils.DBEventService; +import org.apache.airavata.messaging.util.DBEventService; import org.apache.airavata.common.config.ServerSettings; -import org.apache.airavata.messaging.core.util.DBEventPublisherUtils; +import org.apache.airavata.messaging.util.DBEventPublisherUtils; import org.apache.airavata.model.dbevent.CrudType; import org.apache.airavata.model.dbevent.EntityType; import org.apache.airavata.model.error.AuthorizationException;
