From d1bb7bdbb5a2a8a4c27cda9007781ff378e0ee7e Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Thu, 11 Nov 2021 17:31:34 -0500
Subject: [PATCH] chore: simplify logic (#870)

Co-authored-by: Mike Eltsufin <meltsufin@google.com>
---
 .../defaultvalue/DefaultValueComposer.java    | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

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
index 12ab7e4187..957a5ca4d3 100644
--- 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
@@ -218,25 +218,20 @@ static Expr createDefaultValueResourceHelper(
       resourceName = findParentResource(resourceName, resnames).orElse(resourceName);
     }
 
-    boolean hasOnePattern = resourceName.patterns().size() == 1;
     if (resourceName.isOnlyWildcard()) {
       List<ResourceName> unexaminedResnames = new ArrayList<>(resnames);
       for (ResourceName resname : resnames) {
-        if (resname.isOnlyWildcard()) {
-          unexaminedResnames.remove(resname);
-          continue;
-        }
         unexaminedResnames.remove(resname);
-        return createDefaultValue(resname, false, unexaminedResnames, fieldOrMessageName);
+        if (!resname.isOnlyWildcard()) {
+          return createDefaultValue(resname, false, unexaminedResnames, fieldOrMessageName);
+        }
       }
 
-      if (unexaminedResnames.isEmpty()) {
-        return allowAnonResourceNameClass
-            ? createAnonymousResourceNameClass(fieldOrMessageName)
-            : ValueExpr.withValue(
-                StringObjectValue.withValue(
-                    String.format("%s%s", fieldOrMessageName, fieldOrMessageName.hashCode())));
-      }
+      return allowAnonResourceNameClass
+          ? createAnonymousResourceNameClass(fieldOrMessageName)
+          : ValueExpr.withValue(
+              StringObjectValue.withValue(
+                  String.format("%s%s", fieldOrMessageName, fieldOrMessageName.hashCode())));
     }
 
     // The cost tradeoffs of new ctors versus distinct() don't really matter here, since this list
@@ -261,6 +256,7 @@ static Expr createDefaultValueResourceHelper(
       }
     }
 
+    boolean hasOnePattern = resourceName.patterns().size() == 1;
     if (!hasOnePattern) {
       ofMethodName =
           String.format(