MOSIP-32461 code changes

Signed-off-by: Sowmya Ujjappa Banakar <[email protected]>
mosip · May 27, 2024 · 8e6e649 · 8e6e649
1 parent 82f190a
commit 8e6e649
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 24 deletions.
diff --git a/registration-processor/init/registration-processor-registration-status-service/pom.xml b/registration-processor/init/registration-processor-registration-status-service/pom.xml
@@ -42,12 +42,6 @@
 					<groupId>io.springfox</groupId>
 					<artifactId>springfox-swagger2</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>
-						spring-boot-starter-activemq
-					</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

diff --git a/...ain/java/io/mosip/registration/processor/status/api/RegistrationStatusApiApplication.java b/...ain/java/io/mosip/registration/processor/status/api/RegistrationStatusApiApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.FilterType;
@@ -24,7 +26,7 @@
  * @author Pranav Kumar
  *
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = { JmsAutoConfiguration.class, ActiveMQAutoConfiguration.class })
 @ComponentScan(basePackages = { "io.mosip.registration.processor.status.*",
 		"io.mosip.registration.processor.rest.client.*", "io.mosip.registration.processor.core.token.*",
 		"io.mosip.registration.processor.core.config",
@@ -33,7 +35,7 @@
 		excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = { RegistrationStatusServiceBeanConfig.class,
 				RestConfigBean.class, KafkaMosipEventBus.class, VertxMosipEventBus.class, StageHealthCheckHandler.class,
 				MosipVerticleManager.class, MosipVerticleAPIManager.class, MosipEventBus.class,
-				PropertyLoaderConfig.class, ActivemqConfigBean.class }))
+				PropertyLoaderConfig.class }))
 public class RegistrationStatusApiApplication
 {
     public static void main( String[] args )

diff --git a/...-processor/post-processor/registration-processor-registration-transaction-service/pom.xml b/...-processor/post-processor/registration-processor-registration-transaction-service/pom.xml
@@ -50,12 +50,6 @@
 					<groupId>io.springfox</groupId>
 					<artifactId>springfox-swagger2</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>
-						spring-boot-starter-activemq
-					</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

diff --git a/...sip/registration/processor/transaction/api/RegistrationTransactionServiceApplication.java b/...sip/registration/processor/transaction/api/RegistrationTransactionServiceApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.FilterType;
@@ -11,13 +13,13 @@
 import io.mosip.registration.processor.rest.client.config.RestConfigBean;
 import io.mosip.registration.processor.status.config.RegistrationStatusBeanConfig;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { JmsAutoConfiguration.class, ActiveMQAutoConfiguration.class })
 @ComponentScan(basePackages= {"io.mosip.registration.processor.status.*","io.mosip.registration.processor.rest.client.*",
 		"io.mosip.registration.processor.core.token.*", "io.mosip.registration.processor.core.config",
 		"io.mosip.registration.processor.transaction.*", "${mosip.auth.adapter.impl.basepackage}",
 		"io.mosip.registration.processor.core.kernel.beans" },
 		excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = { RestConfigBean.class,
-				PropertyLoaderConfig.class, ActivemqConfigBean.class }))
+				PropertyLoaderConfig.class }))
 public class RegistrationTransactionServiceApplication {
 
 	public static void main(String[] args) {

diff --git a/...ain/java/io/mosip/registration/processor/RegistrationProcessorLandingZoneApplication.java b/...ain/java/io/mosip/registration/processor/RegistrationProcessorLandingZoneApplication.java
@@ -2,15 +2,16 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.ComponentScan.Filter;
 
-import io.mosip.kernel.dataaccess.hibernate.config.HibernateDaoConfig;
 import io.mosip.registration.processor.core.config.configserverloader.PropertyLoaderConfig;
 import io.mosip.registration.processor.rest.client.config.RestConfigBean;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { JmsAutoConfiguration.class, ActiveMQAutoConfiguration.class })
 @ComponentScan( basePackages = { "io.mosip.registration.processor.status.*",
 		"io.mosip.registration.processor.rest.client.*", "io.mosip.registration.processor.util",
 		"io.mosip.registration.processor.core.config",

diff --git a/...ion-processor/registration-processor-landing-zone/src/main/resources/bootstrap.properties b/...ion-processor/registration-processor-landing-zone/src/main/resources/bootstrap.properties
@@ -12,7 +12,7 @@ health.config.enabled=false
 
 server.port=8098
 server.servlet.path=/registrationprocessor/v1/landingzone
-
+spring.mvc.servlet.path=${server.servlet.path}
 
 #management.endpoint.health.show-details=always
 #management.endpoints.web.exposure.include=info,health,refresh
diff --git a/...e/src/main/java/io/mosip/registration/processor/notification/NotificationApplication.java b/...e/src/main/java/io/mosip/registration/processor/notification/NotificationApplication.java
@@ -1,13 +1,17 @@
 package io.mosip.registration.processor.notification;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import io.mosip.registration.processor.core.config.configserverloader.PropertyLoaderConfig;
+
 import io.mosip.registration.processor.rest.client.config.RestConfigBean;
 /**
  * Init class for Notification service.
@@ -16,7 +20,7 @@
  * @since 1.0.0
  *
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = { JmsAutoConfiguration.class, ActiveMQAutoConfiguration.class })
 @ComponentScan( basePackages = { "io.mosip.registration.processor.notification.*",
 		"io.mosip.kernel.websub.api.*","${mosip.auth.adapter.impl.basepackage}", "io.mosip.registration.processor.message.sender.config",
 		"io.mosip.registration.processor.rest.client.*", "io.mosip.registration.processor.packet.storage.config",

diff --git a/...essor/registration-processor-notification-service/src/main/resources/bootstrap.properties b/...essor/registration-processor-notification-service/src/main/resources/bootstrap.properties
@@ -11,4 +11,4 @@ server.port=8088
 health.config.enabled=false
 management.endpoints.web.exposure.include=refresh
 server.servlet.path=/registrationprocessor/v1/notification
-
+spring.mvc.servlet.path=${server.servlet.path}
diff --git a/...main/java/io/mosip/registration/processor/workflowmanager/WorkflowManagerApplication.java b/...main/java/io/mosip/registration/processor/workflowmanager/WorkflowManagerApplication.java
@@ -1,8 +1,11 @@
 package io.mosip.registration.processor.workflowmanager;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.jms.JmsHealthIndicator;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -16,16 +19,18 @@
 import io.mosip.registration.processor.workflowmanager.verticle.WorkflowInternalActionVerticle;
 
 @Configuration
-@EnableAutoConfiguration
+@EnableAutoConfiguration(exclude = { JmsAutoConfiguration.class, ActiveMQAutoConfiguration.class })
 @SpringBootApplication
 @ComponentScan(basePackages = { "io.mosip.registration.processor.core.config",
 		"${mosip.auth.adapter.impl.basepackage}",
 		"io.mosip.registration.processor.workflowmanager.config",
 		"io.mosip.registration.processor.status.config",
 		"io.mosip.registration.processor.core.kernel.beans",
 		"io.mosip.registration.processor.packet.storage.config",
-		"io.mosip.kernel.websub.api.config.publisher" }, excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
-				HibernateDaoConfig.class, PropertyLoaderConfig.class }))
+		"io.mosip.kernel.websub.api.config.publisher",
+		"io.mosip.registration.processor.packet.storage.utils.ActiveMqConnectionUtility" }, excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
+				HibernateDaoConfig.class, PropertyLoaderConfig.class
+}))
 public class WorkflowManagerApplication 
 {
 	public static void main(String[] args) {

diff --git a/...e/registration-processor-workflow-manager-service/src/main/resources/bootstrap.properties b/...e/registration-processor-workflow-manager-service/src/main/resources/bootstrap.properties
@@ -13,6 +13,7 @@ health.config.enabled=false
 eventbus.port=5754
 server.port=8026
 server.servlet.path=/registrationprocessor/v1/workflowmanager
+spring.mvc.servlet.path=${server.servlet.path}
 mosip.regproc.workflow-manager.internal.action.server.port=8024
 mosip.regproc.workflow-manager.internal.action.eventbus.port=5751
 mosip.regproc.workflow-manager.workflowaction.server.port=8023