diff --git a/core/src/main/java/ru/finex/core/cluster/ClusterService.java b/core/src/main/java/ru/finex/core/cluster/ClusterService.java index d83b338..bc66410 100644 --- a/core/src/main/java/ru/finex/core/cluster/ClusterService.java +++ b/core/src/main/java/ru/finex/core/cluster/ClusterService.java @@ -41,7 +41,7 @@ public interface ClusterService { * @param name name of object * @return name of distributed object with role */ - String getName(String name); + String getAddress(String name); /** * Return name of object with role generated by the caller canonical name. @@ -55,7 +55,7 @@ public interface ClusterService { * @param caller the caller * @return name of distributed object */ - String getName(Class caller); + String getAddress(Class caller); /** * Return name of object with role and the field, generated by the caller canonical name. @@ -77,7 +77,7 @@ public interface ClusterService { * @param field the field * @return name of distributed object */ - String getName(Class caller, String field); + String getAddress(Class caller, String field); /** * Return name of object with role, the method name and the method parameter name. @@ -99,7 +99,7 @@ public interface ClusterService { * @param parameter the method parameter name * @return name of distributed object */ - String getName(Class caller, String method, String parameter); + String getAddress(Class caller, String method, String parameter); /** * Return count of this server instances (by role) in cluster. diff --git a/core/src/main/java/ru/finex/core/cluster/impl/ClusterServiceImpl.java b/core/src/main/java/ru/finex/core/cluster/impl/ClusterServiceImpl.java index 6a42720..73b8b8f 100644 --- a/core/src/main/java/ru/finex/core/cluster/impl/ClusterServiceImpl.java +++ b/core/src/main/java/ru/finex/core/cluster/impl/ClusterServiceImpl.java @@ -30,27 +30,27 @@ public class ClusterServiceImpl implements ClusterService { @Inject public ClusterServiceImpl(RedissonClient client, ClusterConfig config) { this.client = client; - role = config.getRole(); - instances = client.getAtomicLong(getName(getClass(), "instances")); + this.role = config.getRole(); + this.instances = client.getAtomicLong(getAddress(getClass(), "instances")); } @Override - public String getName(String name) { + public String getAddress(String name) { return role + "@" + name; } @Override - public String getName(Class caller) { + public String getAddress(Class caller) { return role + "@" + caller.getCanonicalName(); } @Override - public String getName(Class caller, String field) { - return getName(caller) + "#" + field; + public String getAddress(Class caller, String field) { + return getAddress(caller) + "#" + field; } @Override - public String getName(Class caller, String method, String parameter) { + public String getAddress(Class caller, String method, String parameter) { return role + "@" + caller.getCanonicalName() + "::" + method + "#" + parameter; } diff --git a/core/src/main/java/ru/finex/core/cluster/impl/Clustered.java b/core/src/main/java/ru/finex/core/cluster/impl/Clustered.java index d2675bc..727e7f5 100644 --- a/core/src/main/java/ru/finex/core/cluster/impl/Clustered.java +++ b/core/src/main/java/ru/finex/core/cluster/impl/Clustered.java @@ -28,8 +28,8 @@ *

* Supports expressions. * @return name of object - * @see ru.finex.core.cluster.ClusterService#getName(Class, String) - * @see ru.finex.core.cluster.ClusterService#getName(Class, String, String) + * @see ru.finex.core.cluster.ClusterService#getAddress(Class, String) + * @see ru.finex.core.cluster.ClusterService#getAddress(Class, String, String) * @see ru.finex.core.placeholder.PlaceholderService */ String value() default ""; diff --git a/core/src/main/java/ru/finex/core/cluster/impl/ClusteredListener.java b/core/src/main/java/ru/finex/core/cluster/impl/ClusteredListener.java index 7e7f0a5..7d02cbc 100644 --- a/core/src/main/java/ru/finex/core/cluster/impl/ClusteredListener.java +++ b/core/src/main/java/ru/finex/core/cluster/impl/ClusteredListener.java @@ -98,7 +98,7 @@ private void injectMethod(Provider clientProvider, TypeEncounter } else { String methodName = method.getName(); String parameterName = parameter.getName(); - String name = getName(clazz, methodName, parameterName, clustered); + String name = getAddress(clazz, methodName, parameterName, clustered); value = provideObject(clientProvider, clazz, type, methodName, parameter, name); if (clustered.autoManagement() && value instanceof RObject resource) { @@ -123,7 +123,7 @@ private Pair getAnnotationInfo(Class type, Field field) { Clustered clustered = field.getAnnotation(Clustered.class); String name = clustered.value(); if (StringUtils.isBlank(name)) { - name = clusterService.getName(type, field.getName()); + name = clusterService.getAddress(type, field.getName()); } else { name = placeholderServiceProvider.get().evaluate(name, String.class); } @@ -131,11 +131,11 @@ private Pair getAnnotationInfo(Class type, Field field) { return Pair.of(name, clustered.autoManagement()); } - private String getName(Class type, String methodName, String parameterName, Clustered clustered) { + private String getAddress(Class type, String methodName, String parameterName, Clustered clustered) { ClusterService clusterService = clusterServiceProvider.get(); String name = clustered.value(); if (StringUtils.isBlank(name)) { - name = clusterService.getName(type, methodName, parameterName); + name = clusterService.getAddress(type, methodName, parameterName); } else { name = placeholderServiceProvider.get().evaluate(name, String.class); }