Dropped support of old-qualifier (#869)

scalecube · Dec 4, 2024 · d704ba4 · d704ba4
1 parent a85b474
commit d704ba4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 33 deletions.
diff --git a/services-api/src/main/java/io/scalecube/services/ServiceReference.java b/services-api/src/main/java/io/scalecube/services/ServiceReference.java
@@ -47,10 +47,6 @@ public String qualifier() {
     return qualifier;
   }
 
-  public String oldQualifier() {
-    return Qualifier.DELIMITER + qualifier();
-  }
-
   public String endpointId() {
     return endpointId;
   }

diff --git a/services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java b/services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java
@@ -70,10 +70,6 @@ public String qualifier() {
     return qualifier;
   }
 
-  public String oldQualifier() {
-    return Qualifier.DELIMITER + qualifier();
-  }
-
   public Type parameterizedReturnType() {
     return parameterizedReturnType;
   }

diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/SecuredService.java b/services-gateway/src/test/java/io/scalecube/services/gateway/SecuredService.java
@@ -19,13 +19,13 @@ public interface SecuredService {
   @RequestType(String.class)
   Mono<String> createSession(ServiceMessage request);
 
+  @Secured
   @ServiceMethod
   @RequestType(String.class)
-  @Secured
   Mono<String> requestOne(String req);
 
+  @Secured
   @ServiceMethod
   @RequestType(Integer.class)
-  @Secured
   Flux<String> requestN(Integer req);
 }
diff --git a/...teway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayAuthTest.java b/...teway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayAuthTest.java
@@ -175,7 +175,7 @@ void securedMethodAuthenticatedReqStream() {
 
   private static ServiceMessage createSessionRequest(String username) {
     return ServiceMessage.builder()
-        .qualifier("/" + SecuredService.NAMESPACE + "/createSession")
+        .qualifier(SecuredService.NAMESPACE + "/createSession")
         .data(username)
         .build();
   }

diff --git a/services/src/main/java/io/scalecube/services/registry/ServiceRegistryImpl.java b/services/src/main/java/io/scalecube/services/registry/ServiceRegistryImpl.java
@@ -72,13 +72,7 @@ public boolean registerService(ServiceEndpoint serviceEndpoint) {
     boolean success = serviceEndpoints.putIfAbsent(serviceEndpoint.id(), serviceEndpoint) == null;
     if (success) {
       LOGGER.log(Level.DEBUG, "ServiceEndpoint registered: {0}", serviceEndpoint);
-      serviceEndpoint
-          .serviceReferences()
-          .forEach(
-              sr -> {
-                populateServiceReferences(sr.qualifier(), sr);
-                populateServiceReferences(sr.oldQualifier(), sr);
-              });
+      serviceEndpoint.serviceReferences().forEach(this::populateServiceReferences);
     }
     return success;
   }
@@ -93,13 +87,9 @@ public ServiceEndpoint unregisterService(String endpointId) {
           serviceReferencesByQualifier.values().stream()
               .flatMap(Collection::stream)
               .filter(sr -> sr.endpointId().equals(endpointId))
-              .collect(Collectors.toList());
+              .toList();
 
-      serviceReferencesOfEndpoint.forEach(
-          sr -> {
-            computeServiceReferences(sr.qualifier(), sr);
-            computeServiceReferences(sr.oldQualifier(), sr);
-          });
+      serviceReferencesOfEndpoint.forEach(this::cleanServiceReferences);
     }
     return serviceEndpoint;
   }
@@ -158,13 +148,11 @@ public void registerService(ServiceInfo serviceInfo) {
                                   serviceInfo.level());
 
                           methodInvokers.put(methodInfo.qualifier(), methodInvoker);
-                          methodInvokers.put(methodInfo.oldQualifier(), methodInvoker);
                         }));
   }
 
   private void checkMethodInvokerDoesntExist(MethodInfo methodInfo) {
-    if (methodInvokers.containsKey(methodInfo.qualifier())
-        || methodInvokers.containsKey(methodInfo.oldQualifier())) {
+    if (methodInvokers.containsKey(methodInfo.qualifier())) {
       LOGGER.log(Level.ERROR, "MethodInvoker already exists, methodInfo: {0}", methodInfo);
       throw new IllegalStateException("MethodInvoker already exists");
     }
@@ -180,20 +168,20 @@ public List<ServiceInfo> listServices() {
     return serviceInfos;
   }
 
-  private void populateServiceReferences(String qualifier, ServiceReference serviceReference) {
+  private void populateServiceReferences(ServiceReference sr) {
     serviceReferencesByQualifier
-        .computeIfAbsent(qualifier, key -> new CopyOnWriteArrayList<>())
-        .add(serviceReference);
+        .computeIfAbsent(sr.qualifier(), key -> new CopyOnWriteArrayList<>())
+        .add(sr);
   }
 
-  private void computeServiceReferences(String qualifier, ServiceReference serviceReference) {
+  private void cleanServiceReferences(ServiceReference sr) {
     serviceReferencesByQualifier.compute(
-        qualifier,
+        sr.qualifier(),
         (key, list) -> {
           if (list == null || list.isEmpty()) {
             return null;
           }
-          list.remove(serviceReference);
+          list.remove(sr);
           return !list.isEmpty() ? list : null;
         });
   }