diff --git a/registration-processor/core-processor/registration-processor-abis-handler-stage/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java b/registration-processor/core-processor/registration-processor-abis-handler-stage/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java index 4507ed810dc..31590cd7727 100644 --- a/registration-processor/core-processor/registration-processor-abis-handler-stage/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java +++ b/registration-processor/core-processor/registration-processor-abis-handler-stage/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java @@ -220,9 +220,10 @@ public void deployVerticle() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.ABIS_HANDLER_BUS_IN, - MessageBusAddress.ABIS_HANDLER_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.ABIS_HANDLER_BUS_IN, + MessageBusAddress.ABIS_HANDLER_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override diff --git a/registration-processor/core-processor/registration-processor-abis-middleware-stage/src/main/java/io/mosip/registartion/processor/abis/middleware/stage/AbisMiddleWareStage.java b/registration-processor/core-processor/registration-processor-abis-middleware-stage/src/main/java/io/mosip/registartion/processor/abis/middleware/stage/AbisMiddleWareStage.java index 00363dc7e9f..d576212b703 100644 --- a/registration-processor/core-processor/registration-processor-abis-middleware-stage/src/main/java/io/mosip/registartion/processor/abis/middleware/stage/AbisMiddleWareStage.java +++ b/registration-processor/core-processor/registration-processor-abis-middleware-stage/src/main/java/io/mosip/registartion/processor/abis/middleware/stage/AbisMiddleWareStage.java @@ -220,9 +220,10 @@ public void setListener(Message message) { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.ABIS_MIDDLEWARE_BUS_IN, - MessageBusAddress.ABIS_MIDDLEWARE_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.ABIS_MIDDLEWARE_BUS_IN, + MessageBusAddress.ABIS_MIDDLEWARE_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } diff --git a/registration-processor/core-processor/registration-processor-bio-dedupe-stage/src/main/java/io/mosip/registration/processor/biodedupe/stage/BioDedupeStage.java b/registration-processor/core-processor/registration-processor-bio-dedupe-stage/src/main/java/io/mosip/registration/processor/biodedupe/stage/BioDedupeStage.java index ea1b41f7e15..1c75b3f36c2 100644 --- a/registration-processor/core-processor/registration-processor-bio-dedupe-stage/src/main/java/io/mosip/registration/processor/biodedupe/stage/BioDedupeStage.java +++ b/registration-processor/core-processor/registration-processor-bio-dedupe-stage/src/main/java/io/mosip/registration/processor/biodedupe/stage/BioDedupeStage.java @@ -65,8 +65,9 @@ public void deployVerticle() { @Override public void start(){ - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.BIO_DEDUPE_BUS_IN, MessageBusAddress.BIO_DEDUPE_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.BIO_DEDUPE_BUS_IN, MessageBusAddress.BIO_DEDUPE_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override diff --git a/registration-processor/core-processor/registration-processor-biometric-authentication-stage/src/main/java/io/mosip/registration/processor/biometric/authentication/stage/BiometricAuthenticationStage.java b/registration-processor/core-processor/registration-processor-biometric-authentication-stage/src/main/java/io/mosip/registration/processor/biometric/authentication/stage/BiometricAuthenticationStage.java index 5c3d6b43bfe..17d763c82eb 100644 --- a/registration-processor/core-processor/registration-processor-biometric-authentication-stage/src/main/java/io/mosip/registration/processor/biometric/authentication/stage/BiometricAuthenticationStage.java +++ b/registration-processor/core-processor/registration-processor-biometric-authentication-stage/src/main/java/io/mosip/registration/processor/biometric/authentication/stage/BiometricAuthenticationStage.java @@ -120,9 +120,10 @@ public void deployVerticle() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.BIOMETRIC_AUTHENTICATION_BUS_IN, - MessageBusAddress.BIOMETRIC_AUTHENTICATION_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.BIOMETRIC_AUTHENTICATION_BUS_IN, + MessageBusAddress.BIOMETRIC_AUTHENTICATION_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override diff --git a/registration-processor/core-processor/registration-processor-biometric-extraction-stage/src/main/java/io/mosip/registration/processor/stages/biometric/extraction/stage/BiometricExtractionStage.java b/registration-processor/core-processor/registration-processor-biometric-extraction-stage/src/main/java/io/mosip/registration/processor/stages/biometric/extraction/stage/BiometricExtractionStage.java index ea65e0cbf44..e2ac4bce0c0 100644 --- a/registration-processor/core-processor/registration-processor-biometric-extraction-stage/src/main/java/io/mosip/registration/processor/stages/biometric/extraction/stage/BiometricExtractionStage.java +++ b/registration-processor/core-processor/registration-processor-biometric-extraction-stage/src/main/java/io/mosip/registration/processor/stages/biometric/extraction/stage/BiometricExtractionStage.java @@ -138,9 +138,10 @@ public void deployVerticle() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.BIOMETRIC_EXTRACTION_BUS_IN, - MessageBusAddress.BIOMETRIC_EXTRACTION_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.BIOMETRIC_EXTRACTION_BUS_IN, + MessageBusAddress.BIOMETRIC_EXTRACTION_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } /* diff --git a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupeStage.java b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupeStage.java index 22bdd5f484a..10eb0b7732a 100644 --- a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupeStage.java +++ b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupeStage.java @@ -61,8 +61,9 @@ public void deployVerticle() { @Override public void start(){ - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.DEMO_DEDUPE_BUS_IN, MessageBusAddress.DEMO_DEDUPE_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.DEMO_DEDUPE_BUS_IN, MessageBusAddress.DEMO_DEDUPE_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override diff --git a/registration-processor/core-processor/registration-processor-finalization-stage/src/main/java/io/mosip/registration/processor/stages/finalization/stage/FinalizationStage.java b/registration-processor/core-processor/registration-processor-finalization-stage/src/main/java/io/mosip/registration/processor/stages/finalization/stage/FinalizationStage.java index efcdd01d7f8..803fd68e3b2 100644 --- a/registration-processor/core-processor/registration-processor-finalization-stage/src/main/java/io/mosip/registration/processor/stages/finalization/stage/FinalizationStage.java +++ b/registration-processor/core-processor/registration-processor-finalization-stage/src/main/java/io/mosip/registration/processor/stages/finalization/stage/FinalizationStage.java @@ -110,9 +110,10 @@ public void deployVerticle() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.FINALIZATION_BUS_IN, - MessageBusAddress.FINALIZATION_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.FINALIZATION_BUS_IN, + MessageBusAddress.FINALIZATION_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } /* diff --git a/registration-processor/core-processor/registration-processor-manual-adjudication-stage/src/main/java/io/mosip/registration/processor/adjudication/stage/ManualAdjudicationStage.java b/registration-processor/core-processor/registration-processor-manual-adjudication-stage/src/main/java/io/mosip/registration/processor/adjudication/stage/ManualAdjudicationStage.java index ec8622d298b..d619716c0b6 100644 --- a/registration-processor/core-processor/registration-processor-manual-adjudication-stage/src/main/java/io/mosip/registration/processor/adjudication/stage/ManualAdjudicationStage.java +++ b/registration-processor/core-processor/registration-processor-manual-adjudication-stage/src/main/java/io/mosip/registration/processor/adjudication/stage/ManualAdjudicationStage.java @@ -175,8 +175,9 @@ public void setListener(Message message) { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.MANUAL_ADJUDICATION_BUS_IN, MessageBusAddress.MANUAL_ADJUDICATION_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.MANUAL_ADJUDICATION_BUS_IN, MessageBusAddress.MANUAL_ADJUDICATION_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override diff --git a/registration-processor/core-processor/registration-processor-uin-generator-stage/src/main/java/io/mosip/registration/processor/stages/uingenerator/stage/UinGeneratorStage.java b/registration-processor/core-processor/registration-processor-uin-generator-stage/src/main/java/io/mosip/registration/processor/stages/uingenerator/stage/UinGeneratorStage.java index d28465ff294..3ade33ac7e2 100644 --- a/registration-processor/core-processor/registration-processor-uin-generator-stage/src/main/java/io/mosip/registration/processor/stages/uingenerator/stage/UinGeneratorStage.java +++ b/registration-processor/core-processor/registration-processor-uin-generator-stage/src/main/java/io/mosip/registration/processor/stages/uingenerator/stage/UinGeneratorStage.java @@ -1100,9 +1100,10 @@ public void deployVerticle() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.UIN_GENERATION_BUS_IN, - MessageBusAddress.UIN_GENERATION_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.UIN_GENERATION_BUS_IN, + MessageBusAddress.UIN_GENERATION_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } diff --git a/registration-processor/core-processor/registration-processor-verification-stage/src/main/java/io/mosip/registration/processor/verification/stage/VerificationStage.java b/registration-processor/core-processor/registration-processor-verification-stage/src/main/java/io/mosip/registration/processor/verification/stage/VerificationStage.java index 6f49bfe7845..f2424766bb9 100644 --- a/registration-processor/core-processor/registration-processor-verification-stage/src/main/java/io/mosip/registration/processor/verification/stage/VerificationStage.java +++ b/registration-processor/core-processor/registration-processor-verification-stage/src/main/java/io/mosip/registration/processor/verification/stage/VerificationStage.java @@ -9,7 +9,6 @@ import org.apache.activemq.command.ActiveMQTextMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; @@ -48,7 +47,6 @@ * @author Pranav Kumar * @since 0.0.1 */ -@RefreshScope @Service @Configuration @ComponentScan(basePackages = { "${mosip.auth.adapter.impl.basepackage}", @@ -176,8 +174,9 @@ public void setListener(Message message) { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.MANUAL_ADJUDICATION_BUS_IN, MessageBusAddress.MANUAL_ADJUDICATION_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.MANUAL_ADJUDICATION_BUS_IN, MessageBusAddress.MANUAL_ADJUDICATION_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override diff --git a/registration-processor/init/registration-processor-packet-receiver-stage/src/main/java/io/mosip/registration/processor/packet/receiver/stage/PacketReceiverStage.java b/registration-processor/init/registration-processor-packet-receiver-stage/src/main/java/io/mosip/registration/processor/packet/receiver/stage/PacketReceiverStage.java index 7c0974b5f91..97374355bdf 100644 --- a/registration-processor/init/registration-processor-packet-receiver-stage/src/main/java/io/mosip/registration/processor/packet/receiver/stage/PacketReceiverStage.java +++ b/registration-processor/init/registration-processor-packet-receiver-stage/src/main/java/io/mosip/registration/processor/packet/receiver/stage/PacketReceiverStage.java @@ -12,7 +12,6 @@ import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; @@ -42,7 +41,6 @@ * The Class PacketReceiverStage. */ -@RefreshScope @Service @Configuration @ComponentScan(basePackages = { "${mosip.auth.adapter.impl.basepackage}", @@ -112,9 +110,10 @@ public void deployVerticle() { */ @Override public void start() { - router.setRoute(this.postUrl(vertx, null, MessageBusAddress.PACKET_RECEIVER_OUT)); + io.vertx.ext.web.Router vertxRouter = this.postUrl(vertx, null, MessageBusAddress.PACKET_RECEIVER_OUT); + router.setRoute(vertxRouter); this.routes(router); - this.createServer(router.getRouter(), getPort()); + this.createServer(vertxRouter, getPort()); } /** @@ -124,10 +123,9 @@ public void start() { * the router */ private void routes(MosipRouter router) { - router.post(getServletPath() + "/registrationpackets"); router.handler(this::processURL, this::processPacket, this::failure); - }; + } /** * This is for failure handler. diff --git a/registration-processor/post-processor/registration-processor-credential-requestor-stage/src/main/java/io/mosip/registration/processor/credentialrequestor/stage/CredentialRequestorStage.java b/registration-processor/post-processor/registration-processor-credential-requestor-stage/src/main/java/io/mosip/registration/processor/credentialrequestor/stage/CredentialRequestorStage.java index 7bd27746ccf..e18af8a8b4d 100644 --- a/registration-processor/post-processor/registration-processor-credential-requestor-stage/src/main/java/io/mosip/registration/processor/credentialrequestor/stage/CredentialRequestorStage.java +++ b/registration-processor/post-processor/registration-processor-credential-requestor-stage/src/main/java/io/mosip/registration/processor/credentialrequestor/stage/CredentialRequestorStage.java @@ -397,9 +397,10 @@ private void getAdditionalCredentialFields(String regId, String process, */ @Override public void start() { - router.setRoute(this.postUrl(getVertx(), - MessageBusAddress.CREDENTIAL_REQUESTOR_BUS_IN, MessageBusAddress.CREDENTIAL_REQUESTOR_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), + MessageBusAddress.CREDENTIAL_REQUESTOR_BUS_IN, MessageBusAddress.CREDENTIAL_REQUESTOR_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } public String generatePin() { diff --git a/registration-processor/post-processor/registration-processor-message-sender-stage/src/main/java/io/mosip/registration/processor/message/sender/stage/MessageSenderStage.java b/registration-processor/post-processor/registration-processor-message-sender-stage/src/main/java/io/mosip/registration/processor/message/sender/stage/MessageSenderStage.java index e22c6f69fbb..b4c897e1efb 100644 --- a/registration-processor/post-processor/registration-processor-message-sender-stage/src/main/java/io/mosip/registration/processor/message/sender/stage/MessageSenderStage.java +++ b/registration-processor/post-processor/registration-processor-message-sender-stage/src/main/java/io/mosip/registration/processor/message/sender/stage/MessageSenderStage.java @@ -11,7 +11,6 @@ import org.json.simple.parser.ParseException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; @@ -84,8 +83,6 @@ * @author M1048358 Alok * @since 1.0.0 */ -@RefreshScope - @Service @Configuration @ComponentScan(basePackages = { "${mosip.auth.adapter.impl.basepackage}", @@ -187,8 +184,9 @@ public void deployVerticle() { */ @Override public void start() { - router.setRoute(this.postUrl(vertx, MessageBusAddress.MESSAGE_SENDER_BUS, null)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(vertx, MessageBusAddress.MESSAGE_SENDER_BUS, null); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } /* diff --git a/registration-processor/pre-processor/registration-processor-cmd-validator-stage/src/main/java/io/mosip/registration/processor/stages/app/CMDValidatorStage.java b/registration-processor/pre-processor/registration-processor-cmd-validator-stage/src/main/java/io/mosip/registration/processor/stages/app/CMDValidatorStage.java index 0288cc59a5f..423117f8934 100644 --- a/registration-processor/pre-processor/registration-processor-cmd-validator-stage/src/main/java/io/mosip/registration/processor/stages/app/CMDValidatorStage.java +++ b/registration-processor/pre-processor/registration-processor-cmd-validator-stage/src/main/java/io/mosip/registration/processor/stages/app/CMDValidatorStage.java @@ -50,9 +50,10 @@ public void deployVerticle() { @Override public void start(){ - router.setRoute(this.postUrl(getVertx(), - MessageBusAddress.CMD_VALIDATOR_BUS_IN, MessageBusAddress.CMD_VALIDATOR_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), + MessageBusAddress.CMD_VALIDATOR_BUS_IN, MessageBusAddress.CMD_VALIDATOR_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } diff --git a/registration-processor/pre-processor/registration-processor-introducer-validator-stage/src/main/java/io/mosip/registration/processor/stages/introducervalidator/IntroducerValidatorStage.java b/registration-processor/pre-processor/registration-processor-introducer-validator-stage/src/main/java/io/mosip/registration/processor/stages/introducervalidator/IntroducerValidatorStage.java index 3b2f0733297..4c843e7ef7f 100644 --- a/registration-processor/pre-processor/registration-processor-introducer-validator-stage/src/main/java/io/mosip/registration/processor/stages/introducervalidator/IntroducerValidatorStage.java +++ b/registration-processor/pre-processor/registration-processor-introducer-validator-stage/src/main/java/io/mosip/registration/processor/stages/introducervalidator/IntroducerValidatorStage.java @@ -56,9 +56,10 @@ public void deployVerticle() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.INTRODUCER_VALIDATOR_BUS_IN, - MessageBusAddress.INTRODUCER_VALIDATOR_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.INTRODUCER_VALIDATOR_BUS_IN, + MessageBusAddress.INTRODUCER_VALIDATOR_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override diff --git a/registration-processor/pre-processor/registration-processor-operator-validator-stage/src/main/java/io/mosip/registration/processor/stages/operatorvalidator/OperatorValidatorStage.java b/registration-processor/pre-processor/registration-processor-operator-validator-stage/src/main/java/io/mosip/registration/processor/stages/operatorvalidator/OperatorValidatorStage.java index 8d11369e599..ea73b3db10f 100644 --- a/registration-processor/pre-processor/registration-processor-operator-validator-stage/src/main/java/io/mosip/registration/processor/stages/operatorvalidator/OperatorValidatorStage.java +++ b/registration-processor/pre-processor/registration-processor-operator-validator-stage/src/main/java/io/mosip/registration/processor/stages/operatorvalidator/OperatorValidatorStage.java @@ -55,9 +55,10 @@ public void deployVerticle() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.OPERATOR_VALIDATOR_BUS_IN, - MessageBusAddress.OPERATOR_VALIDATOR_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.OPERATOR_VALIDATOR_BUS_IN, + MessageBusAddress.OPERATOR_VALIDATOR_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override diff --git a/registration-processor/pre-processor/registration-processor-packet-classifier-stage/src/main/java/io/mosip/registration/processor/stages/config/PacketClassifierConfig.java b/registration-processor/pre-processor/registration-processor-packet-classifier-stage/src/main/java/io/mosip/registration/processor/stages/config/PacketClassifierConfig.java index df392ba9b7e..e445ea5d7f3 100644 --- a/registration-processor/pre-processor/registration-processor-packet-classifier-stage/src/main/java/io/mosip/registration/processor/stages/config/PacketClassifierConfig.java +++ b/registration-processor/pre-processor/registration-processor-packet-classifier-stage/src/main/java/io/mosip/registration/processor/stages/config/PacketClassifierConfig.java @@ -1,6 +1,5 @@ package io.mosip.registration.processor.stages.config; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -14,7 +13,6 @@ * The beans belonging to other libraries has their own config class to declare the required beans */ @Configuration -@RefreshScope public class PacketClassifierConfig { @Bean diff --git a/registration-processor/pre-processor/registration-processor-packet-classifier-stage/src/main/java/io/mosip/registration/processor/stages/packetclassifier/PacketClassifierStage.java b/registration-processor/pre-processor/registration-processor-packet-classifier-stage/src/main/java/io/mosip/registration/processor/stages/packetclassifier/PacketClassifierStage.java index 62ffc7eacfa..a2d7675cd75 100644 --- a/registration-processor/pre-processor/registration-processor-packet-classifier-stage/src/main/java/io/mosip/registration/processor/stages/packetclassifier/PacketClassifierStage.java +++ b/registration-processor/pre-processor/registration-processor-packet-classifier-stage/src/main/java/io/mosip/registration/processor/stages/packetclassifier/PacketClassifierStage.java @@ -2,7 +2,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Service; @@ -19,7 +18,6 @@ * * @author Vishwanath V */ -@RefreshScope @Service @Configuration @ComponentScan(basePackages = { "${mosip.auth.adapter.impl.basepackage}", @@ -69,9 +67,10 @@ public void deployVerticle() { @Override public void start(){ - router.setRoute(this.postUrl(getVertx(), - MessageBusAddress.PACKET_CLASSIFIER_BUS_IN, MessageBusAddress.PACKET_CLASSIFIER_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), + MessageBusAddress.PACKET_CLASSIFIER_BUS_IN, MessageBusAddress.PACKET_CLASSIFIER_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } /* diff --git a/registration-processor/pre-processor/registration-processor-packet-uploader-stage/src/main/java/io/mosip/registration/processor/packet/uploader/stage/PacketUploaderStage.java b/registration-processor/pre-processor/registration-processor-packet-uploader-stage/src/main/java/io/mosip/registration/processor/packet/uploader/stage/PacketUploaderStage.java index 4661b67a884..d56f835262a 100644 --- a/registration-processor/pre-processor/registration-processor-packet-uploader-stage/src/main/java/io/mosip/registration/processor/packet/uploader/stage/PacketUploaderStage.java +++ b/registration-processor/pre-processor/registration-processor-packet-uploader-stage/src/main/java/io/mosip/registration/processor/packet/uploader/stage/PacketUploaderStage.java @@ -79,9 +79,10 @@ public void deployVerticle() { @Override public void start(){ - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.PACKET_UPLOADER_IN, - MessageBusAddress.PACKET_UPLOADER_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.PACKET_UPLOADER_IN, + MessageBusAddress.PACKET_UPLOADER_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } /* diff --git a/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/packet/validator/PacketValidatorStage.java b/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/packet/validator/PacketValidatorStage.java index 73dcdbc903d..39e42073e11 100644 --- a/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/packet/validator/PacketValidatorStage.java +++ b/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/packet/validator/PacketValidatorStage.java @@ -69,9 +69,10 @@ public void deployVerticle() { @Override public void start(){ - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.PACKET_VALIDATOR_BUS_IN, - MessageBusAddress.PACKET_VALIDATOR_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.PACKET_VALIDATOR_BUS_IN, + MessageBusAddress.PACKET_VALIDATOR_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } /* * (non-Javadoc) diff --git a/registration-processor/pre-processor/registration-processor-quality-classifier-stage/src/main/java/io/mosip/registration/processor/quality/classifier/stage/QualityClassifierStage.java b/registration-processor/pre-processor/registration-processor-quality-classifier-stage/src/main/java/io/mosip/registration/processor/quality/classifier/stage/QualityClassifierStage.java index 4a2dba73f42..5ebebdf5f5b 100644 --- a/registration-processor/pre-processor/registration-processor-quality-classifier-stage/src/main/java/io/mosip/registration/processor/quality/classifier/stage/QualityClassifierStage.java +++ b/registration-processor/pre-processor/registration-processor-quality-classifier-stage/src/main/java/io/mosip/registration/processor/quality/classifier/stage/QualityClassifierStage.java @@ -208,9 +208,10 @@ protected String getPropertyPrefix() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.QUALITY_CLASSIFIER_BUS_IN, - MessageBusAddress.QUALITY_CLASSIFIER_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.QUALITY_CLASSIFIER_BUS_IN, + MessageBusAddress.QUALITY_CLASSIFIER_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } /* diff --git a/registration-processor/pre-processor/registration-processor-securezone-notification-stage/src/main/java/io/mosip/registration/processor/securezone/notification/stage/SecurezoneNotificationStage.java b/registration-processor/pre-processor/registration-processor-securezone-notification-stage/src/main/java/io/mosip/registration/processor/securezone/notification/stage/SecurezoneNotificationStage.java index 5672a5b4c34..6bb2aa8eeb7 100644 --- a/registration-processor/pre-processor/registration-processor-securezone-notification-stage/src/main/java/io/mosip/registration/processor/securezone/notification/stage/SecurezoneNotificationStage.java +++ b/registration-processor/pre-processor/registration-processor-securezone-notification-stage/src/main/java/io/mosip/registration/processor/securezone/notification/stage/SecurezoneNotificationStage.java @@ -126,10 +126,11 @@ protected String getPropertyPrefix() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.SECUREZONE_NOTIFICATION_IN, - MessageBusAddress.SECUREZONE_NOTIFICATION_OUT)); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.SECUREZONE_NOTIFICATION_IN, + MessageBusAddress.SECUREZONE_NOTIFICATION_OUT); + router.setRoute(vertxRouter); this.routes(router); - this.createServer(router.getRouter(), getPort()); + this.createServer(vertxRouter, getPort()); } /** diff --git a/registration-processor/pre-processor/registration-processor-supervisor-validator-stage/src/main/java/io/mosip/registration/processor/stages/supervisorvalidator/SupervisorValidatorStage.java b/registration-processor/pre-processor/registration-processor-supervisor-validator-stage/src/main/java/io/mosip/registration/processor/stages/supervisorvalidator/SupervisorValidatorStage.java index 34cb6df0e39..74fa7ce41d6 100644 --- a/registration-processor/pre-processor/registration-processor-supervisor-validator-stage/src/main/java/io/mosip/registration/processor/stages/supervisorvalidator/SupervisorValidatorStage.java +++ b/registration-processor/pre-processor/registration-processor-supervisor-validator-stage/src/main/java/io/mosip/registration/processor/stages/supervisorvalidator/SupervisorValidatorStage.java @@ -55,9 +55,10 @@ public void deployVerticle() { @Override public void start() { - router.setRoute(this.postUrl(getVertx(), MessageBusAddress.SUPERVISOR_VALIDATOR_BUS_IN, - MessageBusAddress.SUPERVISOR_VALIDATOR_BUS_OUT)); - this.createServer(router.getRouter(), getPort()); + io.vertx.ext.web.Router vertxRouter = this.postUrl(getVertx(), MessageBusAddress.SUPERVISOR_VALIDATOR_BUS_IN, + MessageBusAddress.SUPERVISOR_VALIDATOR_BUS_OUT); + router.setRoute(vertxRouter); + this.createServer(vertxRouter, getPort()); } @Override