Refactor gapic method config (googleapis#2715)

* Refactor GapicMethodConfig to add builder and break apart * Refactor for separate methods to create GapicMethodConfig * Rename common gapic creation method
busunkim96 · Nov 7, 2019 · 35b2686 · 35b2686
1 parent 8a418cc
commit 35b2686
Show file tree

Hide file tree

Showing 4 changed files with 252 additions and 158 deletions.
diff --git a/src/main/java/com/google/api/codegen/config/GapicInterfaceConfig.java b/src/main/java/com/google/api/codegen/config/GapicInterfaceConfig.java
@@ -231,18 +231,33 @@ private static ImmutableMap<String, GapicMethodConfig> createMethodConfigMap(
     for (Entry<Method, MethodConfigProto> methodEntry : methodsToGenerate.entrySet()) {
       MethodConfigProto methodConfigProto = methodEntry.getValue();
       Method method = methodEntry.getKey();
-      GapicMethodConfig methodConfig =
-          GapicMethodConfig.createMethodConfig(
-              diagCollector,
-              language,
-              defaultPackageName,
-              methodConfigProto,
-              method,
-              messageConfigs,
-              resourceNameConfigs,
-              retryCodesConfig,
-              retryParamsConfigNames,
-              protoParser);
+      GapicMethodConfig methodConfig;
+      if (protoParser.isProtoAnnotationsEnabled()) {
+        methodConfig =
+            GapicMethodConfig.createGapicMethodConfigFromProto(
+                diagCollector,
+                language,
+                defaultPackageName,
+                methodConfigProto,
+                method,
+                messageConfigs,
+                resourceNameConfigs,
+                retryCodesConfig,
+                retryParamsConfigNames,
+                protoParser);
+      } else {
+        methodConfig =
+            GapicMethodConfig.createGapicMethodConfigFromGapicYaml(
+                diagCollector,
+                language,
+                defaultPackageName,
+                methodConfigProto,
+                method,
+                messageConfigs,
+                resourceNameConfigs,
+                retryCodesConfig,
+                retryParamsConfigNames);
+      }
       if (methodConfig == null) {
         continue;
       }