address PR feedback

vam-google · vam-google · commit 3f692cb850f7 · 2022-01-21T12:26:06.000-08:00
diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java
@@ -470,16 +470,16 @@ private MethodDefinition createRpcTestMethod(
               .setValueExpr(valExpr)
               .build());
     } else {
+      Map<String, String> valuePatterns = Collections.emptyMap();
+      if (getTransportContext().useValuePatterns() && method.hasHttpBindings()) {
+        valuePatterns = method.httpBindings().getPathParametersValuePatterns();
+      }
       for (MethodArgument methodArg : methodSignature) {
         String methodArgName = JavaStyle.toLowerCamelCase(methodArg.name());
         VariableExpr varExpr =
             VariableExpr.withVariable(
                 Variable.builder().setType(methodArg.type()).setName(methodArgName).build());
         argExprs.add(varExpr);
-        Map<String, String> valuePatterns = Collections.emptyMap();
-        if (getTransportContext().useValuePatterns() && method.hasHttpBindings()) {
-          valuePatterns = method.httpBindings().getPathParametersValuePatterns();
-        }
         Expr valExpr =
             DefaultValueComposer.createMethodArgValue(
                 methodArg, resourceNames, messageTypes, valuePatterns);
@@ -777,17 +777,16 @@ protected List<Statement> createRpcExceptionTestStatements(
               .setValueExpr(valExpr)
               .build());
     } else {
+      Map<String, String> valuePatterns = Collections.emptyMap();
+      if (getTransportContext().useValuePatterns() && method.hasHttpBindings()) {
+        valuePatterns = method.httpBindings().getPathParametersValuePatterns();
+      }
       for (MethodArgument methodArg : methodSignature) {
         String methodArgName = JavaStyle.toLowerCamelCase(methodArg.name());
         VariableExpr varExpr =
             VariableExpr.withVariable(
                 Variable.builder().setType(methodArg.type()).setName(methodArgName).build());
         argVarExprs.add(varExpr);
-        Map<String, String> valuePatterns = Collections.emptyMap();
-        if (getTransportContext().useValuePatterns() && method.hasHttpBindings()) {
-          valuePatterns = method.httpBindings().getPathParametersValuePatterns();
-        }
-
         Expr valExpr =
             DefaultValueComposer.createMethodArgValue(
                 methodArg, resourceNames, messageTypes, valuePatterns);
diff --git a/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java b/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java
@@ -600,16 +600,14 @@ private static String constructValueMatchingPattern(String fieldName, String pat
 
     final String suffix = "-" + (Math.abs((fieldName + pattern).hashCode()) % 10000);
 
-    String value = pattern;
-    value = value.replace("**", "*");
+    String value = pattern.replace("**", "*");
 
     String prevTempl = null;
     while (!value.equals(prevTempl)) {
       prevTempl = value;
       value = REPLACER_PATTERN.matcher(value).replaceFirst("$1$2$1" + suffix);
     }
 
-    value = value.replace("*", fieldName + suffix);
-    return value;
+    return value.replace("*", fieldName + suffix);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -600,16 +600,14 @@ private static String constructValueMatchingPattern(String fieldName, String pat`
`600`	`600`
`601`	`601`	`final String suffix = "-" + (Math.abs((fieldName + pattern).hashCode()) % 10000);`
`602`	`602`
`603`		`- String value = pattern;`
`604`		`- value = value.replace("*", "");`
	`603`	`+ String value = pattern.replace("*", "");`
`605`	`604`
`606`	`605`	`String prevTempl = null;`
`607`	`606`	`while (!value.equals(prevTempl)) {`
`608`	`607`	`prevTempl = value;`
`609`	`608`	`value = REPLACER_PATTERN.matcher(value).replaceFirst("$1$2$1" + suffix);`
`610`	`609`	`}`
`611`	`610`
`612`		`- value = value.replace("*", fieldName + suffix);`
`613`		`- return value;`
	`611`	`+ return value.replace("*", fieldName + suffix);`
`614`	`612`	`}`
`615`	`613`	`}`