diff --git a/caf-boot-autoconfigure/pom.xml b/caf-boot-autoconfigure/pom.xml index 7882dfdfcafd95d6584b30afeacf389935fd339c..b63a842c4a55060a76eb67e10882be0a73997167 100644 --- a/caf-boot-autoconfigure/pom.xml +++ b/caf-boot-autoconfigure/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-autoconfigure diff --git a/caf-boot-config-client/pom.xml b/caf-boot-config-client/pom.xml index 572a1086cfb1352818275082b7f5b5553dfb1f97..9e0c08f72dc652e3b79ebbd67c8008a454420554 100644 --- a/caf-boot-config-client/pom.xml +++ b/caf-boot-config-client/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-config-client diff --git a/caf-boot-deprecated/pom.xml b/caf-boot-deprecated/pom.xml index d46cc0b0569a441f712e017791cac535d05f2507..c0f04091e0b0ba11b0ad8f63e18e540687ae598f 100644 --- a/caf-boot-deprecated/pom.xml +++ b/caf-boot-deprecated/pom.xml @@ -20,7 +20,7 @@ caf-boot io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-parent/pom.xml b/caf-boot-parent/pom.xml index fb9e2c2a19bef0f135d8dd697a4a1c72002e3c69..e50f792452372d861a483b6c8cd792f87e571ae9 100644 --- a/caf-boot-parent/pom.xml +++ b/caf-boot-parent/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-parent diff --git a/caf-boot-starters/caf-boot-starter-base/pom.xml b/caf-boot-starters/caf-boot-starter-base/pom.xml index c26039d64beea0c05fac760d124782490f1b3d0d..29e9a11374ba09d517e7ea10cd2ac5a874fe2f2a 100644 --- a/caf-boot-starters/caf-boot-starter-base/pom.xml +++ b/caf-boot-starters/caf-boot-starter-base/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-caching/pom.xml b/caf-boot-starters/caf-boot-starter-caching/pom.xml index 8178cc175a8acf1deb1e592754561cd4bbbb5e6b..279c09def9b058d9cc61cdbd26b0fc6d607a69b9 100644 --- a/caf-boot-starters/caf-boot-starter-caching/pom.xml +++ b/caf-boot-starters/caf-boot-starter-caching/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-context/pom.xml b/caf-boot-starters/caf-boot-starter-context/pom.xml index b42d6e0b6be6aba3813ce5c665d0fc884180d247..f50c608d102fd8a9b78b1e2dbe7b6f5b4e802608 100644 --- a/caf-boot-starters/caf-boot-starter-context/pom.xml +++ b/caf-boot-starters/caf-boot-starter-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot-starters - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-starter-context diff --git a/caf-boot-starters/caf-boot-starter-data/pom.xml b/caf-boot-starters/caf-boot-starter-data/pom.xml index a1943d008a1b0f3ee255ffc1ca0e47ac6a7c5807..fdcc5307d94f083500023e3b3021971189199367 100644 --- a/caf-boot-starters/caf-boot-starter-data/pom.xml +++ b/caf-boot-starters/caf-boot-starter-data/pom.xml @@ -22,7 +22,7 @@ io.iec.edp caf-boot-starters - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-starter-data diff --git a/caf-boot-starters/caf-boot-starter-event/pom.xml b/caf-boot-starters/caf-boot-starter-event/pom.xml index 066f46e889d6c96058822320af5e5e184a300ea3..5cfb9ba2d8812e63f5baa9f330100942d04d2d57 100644 --- a/caf-boot-starters/caf-boot-starter-event/pom.xml +++ b/caf-boot-starters/caf-boot-starter-event/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-i18n/pom.xml b/caf-boot-starters/caf-boot-starter-i18n/pom.xml index 11efdeea6bcef9a181c88200542dff01fadf445c..f09e38d46fc120844bbd1904b4e86ce15c1678f4 100644 --- a/caf-boot-starters/caf-boot-starter-i18n/pom.xml +++ b/caf-boot-starters/caf-boot-starter-i18n/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-lock/pom.xml b/caf-boot-starters/caf-boot-starter-lock/pom.xml index daf1ee2ed9537ab3355721cd1cdcf94245ae9623..5195f2b676e4354286b8c23c81aae678c24138fd 100644 --- a/caf-boot-starters/caf-boot-starter-lock/pom.xml +++ b/caf-boot-starters/caf-boot-starter-lock/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-logging/pom.xml b/caf-boot-starters/caf-boot-starter-logging/pom.xml index 0cd7e1f261a6d4a7ddb61f08c7cbe996bc3c5fb9..87f6013b4a446c56bfab3fb65da3057f1cc4877e 100644 --- a/caf-boot-starters/caf-boot-starter-logging/pom.xml +++ b/caf-boot-starters/caf-boot-starter-logging/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-msu/pom.xml b/caf-boot-starters/caf-boot-starter-msu/pom.xml index 38ba662140650cfee7de3d3dd7349b1a887444aa..e94958f28e334c772779fb16262ac6eeb6b01c8a 100644 --- a/caf-boot-starters/caf-boot-starter-msu/pom.xml +++ b/caf-boot-starters/caf-boot-starter-msu/pom.xml @@ -22,7 +22,7 @@ io.iec.edp caf-boot-starters - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-starter-msu diff --git a/caf-boot-starters/caf-boot-starter-provider/pom.xml b/caf-boot-starters/caf-boot-starter-provider/pom.xml index c05da201efa9bb0a5d1ccf4095a9585541a28d6a..998035c13c586cc1d19f4bb6167a54723d55d042 100644 --- a/caf-boot-starters/caf-boot-starter-provider/pom.xml +++ b/caf-boot-starters/caf-boot-starter-provider/pom.xml @@ -3,7 +3,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-rest/pom.xml b/caf-boot-starters/caf-boot-starter-rest/pom.xml index 93c7041b4dd3b3740573032d2f3c3bbb18eb6079..0f6df8f58acddace3a7586e68429325d548998d5 100644 --- a/caf-boot-starters/caf-boot-starter-rest/pom.xml +++ b/caf-boot-starters/caf-boot-starter-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot-starters - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-starter-rest diff --git a/caf-boot-starters/caf-boot-starter-rpc/pom.xml b/caf-boot-starters/caf-boot-starter-rpc/pom.xml index 56cdbc52f234ecc02d1e33b2fb3cfb66107b2e05..7b68236049470cafa85e63ea3b856ffe911590df 100644 --- a/caf-boot-starters/caf-boot-starter-rpc/pom.xml +++ b/caf-boot-starters/caf-boot-starter-rpc/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-rpc/src/main/java/io/iec/edp/caf/rpc/config/RpcClientAutoConfiguration.java b/caf-boot-starters/caf-boot-starter-rpc/src/main/java/io/iec/edp/caf/rpc/config/RpcClientAutoConfiguration.java index 3432a52f07337dc5d8985c29fb0c0e322b3dfbfb..c2de1f1bcfbcfa5c91f1c0cff03a775dc50e4282 100644 --- a/caf-boot-starters/caf-boot-starter-rpc/src/main/java/io/iec/edp/caf/rpc/config/RpcClientAutoConfiguration.java +++ b/caf-boot-starters/caf-boot-starter-rpc/src/main/java/io/iec/edp/caf/rpc/config/RpcClientAutoConfiguration.java @@ -26,6 +26,7 @@ import io.iec.edp.caf.rpc.api.event.RpcClientEventBroker; import io.iec.edp.caf.rpc.api.event.RpcClientEventManager; import io.iec.edp.caf.rpc.api.event.RpcServerEventBroker; import io.iec.edp.caf.rpc.api.local.InternalServiceManageServiceImpl; +import io.iec.edp.caf.rpc.api.properties.RPCConfigurationProperties; import io.iec.edp.caf.rpc.api.service.InternalServiceManageService; import io.iec.edp.caf.rpc.api.service.RpcClient; import io.iec.edp.caf.rpc.client.RpcClassHolder; @@ -38,6 +39,7 @@ import io.iec.edp.caf.rpc.server.invoker.RpcRemoteInvoker; import io.iec.edp.caf.tenancy.api.ITenantRouteService; import io.iec.edp.caf.tenancy.api.ITenantService; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -49,6 +51,9 @@ import java.util.ArrayList; import java.util.List; @Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties({ + RPCConfigurationProperties.class +}) public class RpcClientAutoConfiguration { @Value("${msu.enable:false}") @@ -102,8 +107,11 @@ public class RpcClientAutoConfiguration { @Bean - public RpcLocalInvoker rpcLocalInvoker(RpcClientEventBroker clientEventBroker, RpcServerEventBroker serverEventBroker, ICAFContextService cafContextService) { - return new RpcLocalInvokerImpl(clientEventBroker,serverEventBroker,cafContextService); + public RpcLocalInvoker rpcLocalInvoker(RpcClientEventBroker clientEventBroker, + RpcServerEventBroker serverEventBroker, + ICAFContextService cafContextService, + RPCConfigurationProperties properties) { + return new RpcLocalInvokerImpl(clientEventBroker,serverEventBroker,cafContextService,properties); } @Bean diff --git a/caf-boot-starters/caf-boot-starter-security/pom.xml b/caf-boot-starters/caf-boot-starter-security/pom.xml index 288e568b930cfa7bd811b35b133c34676a805675..89e311d373124867a2799f267a4a6a15a48087a0 100644 --- a/caf-boot-starters/caf-boot-starter-security/pom.xml +++ b/caf-boot-starters/caf-boot-starter-security/pom.xml @@ -22,7 +22,7 @@ io.iec.edp caf-boot-starters - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-starter-security diff --git a/caf-boot-starters/caf-boot-starter-session/pom.xml b/caf-boot-starters/caf-boot-starter-session/pom.xml index 3511b8ce4f6b37500566e8e3aa6f8d4983beee4a..2143e8514e91c75bcf3ee38c21acc372f194b050 100644 --- a/caf-boot-starters/caf-boot-starter-session/pom.xml +++ b/caf-boot-starters/caf-boot-starter-session/pom.xml @@ -22,7 +22,7 @@ io.iec.edp caf-boot-starters - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-starter-session diff --git a/caf-boot-starters/caf-boot-starter-tenancy/pom.xml b/caf-boot-starters/caf-boot-starter-tenancy/pom.xml index ccfb82b7b89e337d389c8fe127bfa0228c42d89d..9b12c56eaab8c498336b8dd14b78b4c67e53203e 100644 --- a/caf-boot-starters/caf-boot-starter-tenancy/pom.xml +++ b/caf-boot-starters/caf-boot-starter-tenancy/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/caf-boot-starter-web/pom.xml b/caf-boot-starters/caf-boot-starter-web/pom.xml index 2c2ba44a9c9df6612ebcfd48acd057f922912290..c408171b693b23ffb14104916300e70e1a01d2ff 100644 --- a/caf-boot-starters/caf-boot-starter-web/pom.xml +++ b/caf-boot-starters/caf-boot-starter-web/pom.xml @@ -20,7 +20,7 @@ caf-boot-starters io.iec.edp - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 diff --git a/caf-boot-starters/pom.xml b/caf-boot-starters/pom.xml index 39fdc4ae1ba072aec2e4b91218da7679cd9e2a5b..8b4bc73f75444990fb683a673bfac18781d2af61 100644 --- a/caf-boot-starters/pom.xml +++ b/caf-boot-starters/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-boot-starters diff --git a/caf-bootstrap/pom.xml b/caf-bootstrap/pom.xml index 9282d0ae273610ddd05909ce5878a3ea22d8370b..e68bc2b4b8cf39ef0d5e2d35a9e8a3605e70de98 100644 --- a/caf-bootstrap/pom.xml +++ b/caf-bootstrap/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT caf-bootstrap diff --git a/pom.xml b/pom.xml index a75d1100da69dd611c03f5d05d6f7fc768ddbfd5..a04e905ed72874f3fa50bef7967826d2effdd4ca 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom caf-boot @@ -38,7 +38,7 @@ 5.3.26 - 1.3.1 + 1.3.3-SNAPSHOT https://git.iec.io/caf/caf-boot @@ -102,7 +102,7 @@ io.iec.edp caf-boot-autoconfigure - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT