diff --git a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/config/HazelcastServiceTestConfiguration.java b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/config/HazelcastServiceTestConfiguration.java index 7ee4bc8fa..323c2e34e 100644 --- a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/config/HazelcastServiceTestConfiguration.java +++ b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/config/HazelcastServiceTestConfiguration.java @@ -43,7 +43,7 @@ public class HazelcastServiceTestConfiguration { networkConfig.setJoin(joinConfig); cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/HazelcastServiceTestConfiguration.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/HazelcastServiceTestConfiguration.java index 21f476282..f6414f2a1 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/HazelcastServiceTestConfiguration.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/HazelcastServiceTestConfiguration.java @@ -41,7 +41,7 @@ public class HazelcastServiceTestConfiguration { networkConfig.setJoin(joinConfig); cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.newHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/ImdgTestConfig.java b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/ImdgTestConfig.java index c629b65d7..b1eaa9bc0 100644 --- a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/ImdgTestConfig.java +++ b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/ImdgTestConfig.java @@ -58,7 +58,7 @@ public class ImdgTestConfig { networkConfig.setJoin(joinConfig); cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/config/HazelcastServiceTestConfiguration.java b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/config/HazelcastServiceTestConfiguration.java index 6fa6dea43..6611b764d 100644 --- a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/config/HazelcastServiceTestConfiguration.java +++ b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/config/HazelcastServiceTestConfiguration.java @@ -44,7 +44,7 @@ public class HazelcastServiceTestConfiguration { networkConfig.setJoin(joinConfig); cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/config/HazelcastServiceTestConfiguration.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/config/HazelcastServiceTestConfiguration.java index fbff8eb0c..5605eaff9 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/config/HazelcastServiceTestConfiguration.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/config/HazelcastServiceTestConfiguration.java @@ -44,7 +44,7 @@ public class HazelcastServiceTestConfiguration { networkConfig.setJoin(joinConfig); cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractHazelcastLifecycleSupport.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractHazelcastLifecycleSupport.java index 8b26a9649..b715b032e 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractHazelcastLifecycleSupport.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractHazelcastLifecycleSupport.java @@ -115,7 +115,7 @@ public abstract class AbstractHazelcastLifecycleSupport implements InitializingB throw new RuntimeException("MapStore multithreaded not complete.", e); } - HazelcastHelper.otcSystem_setStorageState(true, hazelcastServerInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastServerInstance); loadTime = System.currentTimeMillis() - loadTime; log.info("All map load time {} ms", loadTime); diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/config/HazelcastServiceTestConfiguration.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/config/HazelcastServiceTestConfiguration.java index a517c8d42..ef4458f82 100644 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/config/HazelcastServiceTestConfiguration.java +++ b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/config/HazelcastServiceTestConfiguration.java @@ -44,7 +44,7 @@ public class HazelcastServiceTestConfiguration { networkConfig.setJoin(joinConfig); cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/config/HazelcastServiceTestConfiguration.java b/clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/config/HazelcastServiceTestConfiguration.java index 48b9644d4..ed08bbbb9 100644 --- a/clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/config/HazelcastServiceTestConfiguration.java +++ b/clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/config/HazelcastServiceTestConfiguration.java @@ -43,7 +43,7 @@ public class HazelcastServiceTestConfiguration { networkConfig.setJoin(joinConfig); cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.newHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/config/ImdgTestConfig.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/config/ImdgTestConfig.java index 839542afd..9fa010b83 100644 --- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/config/ImdgTestConfig.java +++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/config/ImdgTestConfig.java @@ -60,7 +60,7 @@ public class ImdgTestConfig { networkConfig.setJoin(joinConfig); cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/utility-service/src/test/java/ru/spcex/clearing/utility/config/HazelcastServiceTestConfiguration.java b/clearing-parent/utility-service/src/test/java/ru/spcex/clearing/utility/config/HazelcastServiceTestConfiguration.java index d1cfc84d0..6ec937bd0 100644 --- a/clearing-parent/utility-service/src/test/java/ru/spcex/clearing/utility/config/HazelcastServiceTestConfiguration.java +++ b/clearing-parent/utility-service/src/test/java/ru/spcex/clearing/utility/config/HazelcastServiceTestConfiguration.java @@ -44,7 +44,7 @@ public class HazelcastServiceTestConfiguration { cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.newHazelcastInstance(cfg); - HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); + HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/util/HazelcastHelper.java b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/util/HazelcastHelper.java index 5898d2a40..605849f15 100644 --- a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/util/HazelcastHelper.java +++ b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/util/HazelcastHelper.java @@ -123,7 +123,7 @@ public final class HazelcastHelper { return Boolean.valueOf(systemMap.get(STATE_OF_IMDG_SERVER)); } - public static void otcSystem_setStorageState(boolean val, HazelcastInstance hazelcast) { + public static void imdgSystem_setStorageState(boolean val, HazelcastInstance hazelcast) { IMap systemMap = hazelcast.getMap(CLEARING_SYSTEM_MAP); systemMap.set(STATE_OF_IMDG_SERVER, Boolean.toString(val)); }