WIP

Author: artem-v

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

@@ -14,6 +14,7 @@ public final class DynamicQualifier {
   private final String qualifier;
   private final Pattern pattern;
   private final List<String> pathVariables;
+  private final int size;
 
   public DynamicQualifier(String qualifier) {
     if (!qualifier.contains(":")) {
@@ -34,9 +35,10 @@ public DynamicQualifier(String qualifier) {
     }
     sb.setLength(sb.length() - 1);
 
-    this.pattern = Pattern.compile(sb.toString());
     this.qualifier = qualifier;
+    this.pattern = Pattern.compile(sb.toString());
     this.pathVariables = Collections.unmodifiableList(pathVariables);
+    this.size = sizeOf(qualifier);
   }
 
   public String qualifier() {
@@ -51,7 +53,15 @@ public List<String> pathVariables() {
     return pathVariables;
   }
 
+  public int size() {
+    return size;
+  }
+
   public Map<String, String> matchQualifier(String input) {
+    if (size != sizeOf(input)) {
+      return null;
+    }
+
     final var matcher = pattern.matcher(input);
     if (!matcher.matches()) {
       return null;
@@ -68,6 +78,16 @@ public Map<String, String> matchQualifier(String input) {
     return map;
   }
 
+  private static int sizeOf(String value) {
+    int count = 0;
+    for (int i = 0, length = value.length(); i < length; i++) {
+      if (value.charAt(i) == '/') {
+        count++;
+      }
+    }
+    return count;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -90,6 +110,7 @@ public String toString() {
         .add("qualifier='" + qualifier + "'")
         .add("pattern=" + pattern)
         .add("pathVariables=" + pathVariables)
+        .add("size=" + size)
         .toString();
   }
 }

services-api/src/test/java/io/scalecube/services/api/DynamicQualifierTest.java

@@ -1,48 +1,58 @@
 package io.scalecube.services.api;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.UUID;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 class DynamicQualifierTest {
 
+  @Test
+  void testIllegalArgument() {
+    assertThrows(IllegalArgumentException.class, () -> new DynamicQualifier("v1/foo/bar"));
+  }
+
   @Test
   void testNoMatches() {
     final var qualifier = new DynamicQualifier("v1/foo/:foo/bar/:bar");
-    Assertions.assertNull(qualifier.matchQualifier("v1/foo/bar"));
+    assertNull(qualifier.matchQualifier("v1/foo/bar"));
   }
 
   @Test
-  void testIllegalArgument() {
-    Assertions.assertThrows(
-        IllegalArgumentException.class, () -> new DynamicQualifier("v1/foo/bar"));
+  void testStrictMatching() {
+    final var qualifier = new DynamicQualifier("v1/foo/:foo");
+    assertNotNull(qualifier.matchQualifier("v1/foo/123"));
+    assertNull(qualifier.matchQualifier("v1/foo/123/bar/456/baz/678"));
   }
 
   @Test
-  void testQualifierEquality() {
+  void testEquality() {
     final var qualifier1 = new DynamicQualifier("v1/foo/:foo/bar/:bar");
     final var qualifier2 = new DynamicQualifier("v1/foo/:foo/bar/:bar");
-    Assertions.assertEquals(qualifier1, qualifier2);
+    assertEquals(qualifier1, qualifier2);
   }
 
   @Test
-  void testMatchQualifierSinglePathVariable() {
+  void testMatchSinglePathVariable() {
     final var userName = UUID.randomUUID().toString();
     final var qualifier = new DynamicQualifier("v1/foo/bar/:userName");
     final var map = qualifier.matchQualifier("v1/foo/bar/" + userName);
-    Assertions.assertNotNull(map);
-    Assertions.assertEquals(1, map.size());
-    Assertions.assertEquals(userName, map.get("userName"));
+    assertNotNull(map);
+    assertEquals(1, map.size());
+    assertEquals(userName, map.get("userName"));
   }
 
   @Test
-  void testMatchQualifierMultiplePathVariables() {
+  void testMatchMultiplePathVariables() {
     final var qualifier = new DynamicQualifier("v1/foo/:foo/bar/:bar/baz/:baz");
     final var map = qualifier.matchQualifier("v1/foo/123/bar/456/baz/678");
-    Assertions.assertNotNull(map);
-    Assertions.assertEquals(3, map.size());
-    Assertions.assertEquals("123", map.get("foo"));
-    Assertions.assertEquals("456", map.get("bar"));
-    Assertions.assertEquals("678", map.get("baz"));
+    assertNotNull(map);
+    assertEquals(3, map.size());
+    assertEquals("123", map.get("foo"));
+    assertEquals("456", map.get("bar"));
+    assertEquals("678", map.get("baz"));
   }
 }