refactor(api-common): unify dot-segment validation message and remove hasPathWildcard

Author: blakeli0

sdk-platform-java/api-common-java/src/main/java/com/google/api/pathtemplate/PathTemplate.java

@@ -888,16 +888,14 @@ private String instantiate(Map<String, String> values, boolean allowPartial) {
                   || nextNext.kind() != SegmentKind.END_BINDING;
           restore(iterator, iterator.nextIndex() - 2);
           if (!pathEscape) {
-            validatePathSegment(var, value, value, false);
+            validatePathSegment(var, value);
             result.append(encodeUrl(value));
           } else {
-            boolean hasPathWildcard =
-                next.kind() == SegmentKind.PATH_WILDCARD || hasPathWildcard(iterator);
             // For a path wildcard or path of length greater 1, split the value and escape
             // every sub-segment.
             boolean first = true;
             for (String subSeg : SLASH_SPLITTER.split(value)) {
-              validatePathSegment(var, value, subSeg, hasPathWildcard);
+              validatePathSegment(var, subSeg);
               if (!first) {
                 result.append('/');
               }
@@ -1214,31 +1212,10 @@ private static List<Segment> parseComplexResourceId(String seg) {
 
   private static final PercentEscaper URL_ESCAPER = new PercentEscaper("-_.~", false);
 
-  private static boolean hasPathWildcard(ListIterator<Segment> iterator) {
-    int start = iterator.nextIndex();
-    boolean found = false;
-    while (iterator.hasNext()) {
-      Segment seg = iterator.next();
-      if (seg.kind() == SegmentKind.END_BINDING) {
-        break;
-      }
-      if (seg.kind() == SegmentKind.PATH_WILDCARD) {
-        found = true;
-        break;
-      }
-    }
-    restore(iterator, start);
-    return found;
-  }
-
-  private static void validatePathSegment(
-      String var, String fullValue, String segment, boolean hasPathWildcard) {
+  private static void validatePathSegment(String var, String segment) {
     if (".".equals(segment) || "..".equals(segment)) {
-      if (hasPathWildcard) {
-        throw new ValidationException(
-            "Value for %s must not contain segments that are exactly . or ..", var);
-      }
-      throw new ValidationException("Invalid value %s for %s.", fullValue, var);
+      throw new ValidationException(
+          "Value for %s must not contain segments that are exactly . or ..", var);
     }
   }
 

sdk-platform-java/api-common-java/src/test/java/com/google/api/pathtemplate/PathTemplateTest.java

@@ -650,7 +650,8 @@ void instantiateRejectsDotInSingleWildcard() {
         Assertions.assertThrows(
             ValidationException.class,
             () -> template.instantiate("project", "my-project", "region", "."));
-    Truth.assertThat(dotException.getMessage()).isEqualTo("Invalid value . for region.");
+    Truth.assertThat(dotException.getMessage())
+        .isEqualTo("Value for region must not contain segments that are exactly . or ..");
   }
 
   @Test
@@ -661,7 +662,8 @@ void instantiateRejectsDoubleDotInSingleWildcard() {
         Assertions.assertThrows(
             ValidationException.class,
             () -> template.instantiate("project", "my-project", "region", ".."));
-    Truth.assertThat(dotDotException.getMessage()).isEqualTo("Invalid value .. for region.");
+    Truth.assertThat(dotDotException.getMessage())
+        .isEqualTo("Value for region must not contain segments that are exactly . or ..");
   }
 
   @Test
@@ -673,7 +675,7 @@ void instantiateRejectsDotInMultiSegmentWildcard() {
             ValidationException.class,
             () -> template.instantiate("parent", "projects/my-project/locations/."));
     Truth.assertThat(dotException.getMessage())
-        .isEqualTo("Invalid value projects/my-project/locations/. for parent.");
+        .isEqualTo("Value for parent must not contain segments that are exactly . or ..");
   }
 
   @Test
@@ -685,7 +687,7 @@ void instantiateRejectsDoubleDotInMultiSegmentWildcard() {
             ValidationException.class,
             () -> template.instantiate("parent", "projects/my-project/locations/.."));
     Truth.assertThat(dotDotException.getMessage())
-        .isEqualTo("Invalid value projects/my-project/locations/.. for parent.");
+        .isEqualTo("Value for parent must not contain segments that are exactly . or ..");
   }
 
   @Test