Merge pull request #760 from scalecube/remove-unused-qualifier-methods

Remove redundant methods from `Qualifier`

Author: dmytro-lazebnyi

services-api/src/main/java/io/scalecube/services/api/Qualifier.java

@@ -15,35 +15,4 @@ public final class Qualifier {
   public static String asString(String namespace, String action) {
     return namespace + DELIMITER + action;
   }
-
-  /**
-   * Extracts qualifier namespace part from given qualifier string.
-   *
-   * @param qualifierAsString qualifier string.
-   * @return qualifier namespace.
-   */
-  public static String getQualifierNamespace(String qualifierAsString) {
-    // If qualifier starts with DELIMITER it's old format, if not then it's new format without
-    // DELIMITER in the beginning
-    int namespacePos = qualifierAsString.startsWith(DELIMITER) ? 1 : 0;
-    int pos = qualifierAsString.indexOf(DELIMITER, namespacePos);
-    if (pos == -1) {
-      throw new IllegalArgumentException("Wrong qualifier: '" + qualifierAsString + "'");
-    }
-    return qualifierAsString.substring(namespacePos, pos);
-  }
-
-  /**
-   * Extracts qualifier action part from given qualifier string.
-   *
-   * @param qualifierAsString qualifier string.
-   * @return qualifier action.
-   */
-  public static String getQualifierAction(String qualifierAsString) {
-    int pos = qualifierAsString.lastIndexOf(DELIMITER);
-    if (pos == -1) {
-      throw new IllegalArgumentException("Wrong qualifier format: '" + qualifierAsString + "'");
-    }
-    return qualifierAsString.substring(pos + 1);
-  }
 }

services/src/test/java/io/scalecube/services/ServiceLocalTest.java

@@ -213,7 +213,7 @@ void test_local_greeting_message() {
 
     StepVerifier.create(
             serviceCall.requestOne(
-                ServiceMessage.from(request).qualifier("/greetings/greetingMessage").build(),
+                ServiceMessage.from(request).qualifier("v1/greetings/greetingMessage").build(),
                 GreetingResponse.class))
         .assertNext(
             message -> {
@@ -229,7 +229,7 @@ void test_local_greeting_message() {
 
     StepVerifier.create(
             serviceCall.requestOne(
-                ServiceMessage.from(request).qualifier("/greetings/greetingMessage2").build(),
+                ServiceMessage.from(request).qualifier("v1/greetings/greetingMessage2").build(),
                 GreetingResponse.class))
         .assertNext(
             message -> {

services/src/test/java/io/scalecube/services/ServiceRemoteTest.java

@@ -229,7 +229,7 @@ void test_remote_greeting_message() {
 
     StepVerifier.create(
             serviceCall.requestOne(
-                ServiceMessage.from(request).qualifier("/greetings/greetingMessage").build(),
+                ServiceMessage.from(request).qualifier("v1/greetings/greetingMessage").build(),
                 GreetingResponse.class))
         .assertNext(
             message -> {
@@ -245,7 +245,7 @@ void test_remote_greeting_message() {
 
     StepVerifier.create(
             serviceCall.requestOne(
-                ServiceMessage.from(request).qualifier("/greetings/greetingMessage2").build(),
+                ServiceMessage.from(request).qualifier("v1/greetings/greetingMessage2").build(),
                 GreetingResponse.class))
         .assertNext(
             message -> {

services/src/test/java/io/scalecube/services/TestRequests.java

@@ -7,7 +7,7 @@
 
 public interface TestRequests {
 
-  String SERVICE_NAME = "greetings";
+  String SERVICE_NAME = "v1/greetings";
 
   ServiceMessage GREETING_VOID_REQ =
       ServiceMessage.builder()

services/src/test/java/io/scalecube/services/sut/GreetingService.java

@@ -12,7 +12,7 @@
 @Service(GreetingService.SERVICE_NAME)
 public interface GreetingService {
 
-  String SERVICE_NAME = "greetings";
+  String SERVICE_NAME = "v1/greetings";
 
   @ServiceMethod
   void notifyGreeting();