Merge branch 'master' of https://github.com/googleapis/toolkit into d…

…iscogapic
googleapis · May 27, 2017 · b153234 · b153234
2 parents a5014a4 + 4de4575
commit b153234
Show file tree

Hide file tree

Showing 156 changed files with 6,595 additions and 3,589 deletions.
diff --git a/src/main/java/com/google/api/codegen/CommentPatterns.java b/src/main/java/com/google/api/codegen/CommentPatterns.java
@@ -24,7 +24,7 @@ public final class CommentPatterns {
   public static final Pattern BACK_QUOTE_PATTERN = Pattern.compile("(?<!`)``?(?!`)");
   public static final Pattern ABSOLUTE_LINK_PATTERN =
       Pattern.compile("\\[([^\\]]+)\\]\\((\\p{Alpha}+:[^\\)]+)\\)");
-  public static final Pattern CLOUD_LINK_PATTERN =
+  public static final Pattern RELATIVE_LINK_PATTERN =
       Pattern.compile("\\[([^\\]]+)\\]\\(((?!\\p{Alpha}+:)[^\\)]+)\\)");
   public static final Pattern PROTO_LINK_PATTERN =
       Pattern.compile("\\[([^\\]]+)\\]\\[([A-Za-z_][A-Za-z_.0-9]*)?\\]");

diff --git a/.../com/google/api/codegen/discovery/transformer/py/PythonSampleMethodToViewTransformer.java b/.../com/google/api/codegen/discovery/transformer/py/PythonSampleMethodToViewTransformer.java
@@ -117,6 +117,7 @@ private SampleView createSampleView(SampleTransformerContext context) {
     discoveryBuildParams.add(String.format("'%s'", config.apiVersion()));
     switch (config.authType()) {
       case NONE:
+        discoveryBuildParams.add("http=httplib2.Http(timeout=60)");
         break;
       case API_KEY:
         discoveryBuildParams.add("developerKey=" + credentialsVarName);

diff --git a/src/main/java/com/google/api/codegen/gapic/MainGapicProviderFactory.java b/src/main/java/com/google/api/codegen/gapic/MainGapicProviderFactory.java
@@ -431,7 +431,7 @@ public static List<GapicProvider<? extends Object>> defaultCreate(
           providers.add(messageProvider);
         }
       }
-      if (generatorConfig.enableTestGenerator() && id.equals(RUBY)) {
+      if (generatorConfig.enableTestGenerator()) {
         GapicCodePathMapper rubyTestPathMapper =
             CommonGapicCodePathMapper.newBuilder()
                 .setPrefix("test")

diff --git a/.../java/com/google/api/codegen/grpcmetadatagen/java/JavaGrpcPackageMetadataTransformer.java b/.../java/com/google/api/codegen/grpcmetadatagen/java/JavaGrpcPackageMetadataTransformer.java
@@ -22,7 +22,7 @@ public class JavaGrpcPackageMetadataTransformer extends JavaPackageMetadataTrans
   private final Map<String, String> snippetsOutput =
       ImmutableMap.of(
           "LICENSE.snip", "LICENSE",
-          "metadatagen/java/grpc/package.snip", "build.gradle");
+          "metadatagen/java/grpc/build.gradle.snip", "build.gradle");
 
   @Override
   protected Map<String, String> getSnippetsOutput() {

diff --git a/...java/com/google/api/codegen/grpcmetadatagen/java/JavaProtoPackageMetadataTransformer.java b/...java/com/google/api/codegen/grpcmetadatagen/java/JavaProtoPackageMetadataTransformer.java
@@ -23,7 +23,7 @@ public class JavaProtoPackageMetadataTransformer extends JavaPackageMetadataTran
   private final Map<String, String> snippetsOutput =
       ImmutableMap.of(
           "LICENSE.snip", "LICENSE",
-          "metadatagen/java/grpc/package.snip", "build.gradle");
+          "metadatagen/java/grpc/build.gradle.snip", "build.gradle");
 
   @Override
   protected Map<String, String> getSnippetsOutput() {

diff --git a/src/main/java/com/google/api/codegen/metacode/FieldSetting.java b/src/main/java/com/google/api/codegen/metacode/FieldSetting.java
diff --git a/src/main/java/com/google/api/codegen/metacode/InitCode.java b/src/main/java/com/google/api/codegen/metacode/InitCode.java
diff --git a/src/main/java/com/google/api/codegen/metacode/InitCodeLine.java b/src/main/java/com/google/api/codegen/metacode/InitCodeLine.java
diff --git a/src/main/java/com/google/api/codegen/metacode/ListInitCodeLine.java b/src/main/java/com/google/api/codegen/metacode/ListInitCodeLine.java
diff --git a/src/main/java/com/google/api/codegen/metacode/MapInitCodeLine.java b/src/main/java/com/google/api/codegen/metacode/MapInitCodeLine.java
diff --git a/src/main/java/com/google/api/codegen/metacode/SimpleInitCodeLine.java b/src/main/java/com/google/api/codegen/metacode/SimpleInitCodeLine.java
diff --git a/src/main/java/com/google/api/codegen/metacode/StructureInitCodeLine.java b/src/main/java/com/google/api/codegen/metacode/StructureInitCodeLine.java
diff --git a/src/main/java/com/google/api/codegen/transformer/DynamicLangApiMethodTransformer.java b/src/main/java/com/google/api/codegen/transformer/DynamicLangApiMethodTransformer.java
@@ -63,6 +63,8 @@ public OptionalArrayMethodView generateMethod(GapicMethodContext context) {
       apiMethod.type(ClientMethodType.OptionalArrayMethod);
     }
     apiMethod.apiClassName(namer.getApiWrapperClassName(context.getInterfaceConfig()));
+    apiMethod.fullyQualifiedApiClassName(
+        namer.getFullyQualifiedApiWrapperClassName(context.getInterfaceConfig()));
     apiMethod.apiVariableName(namer.getApiWrapperVariableName(context.getInterfaceConfig()));
     apiMethod.apiModuleName(namer.getApiWrapperModuleName());
     InitCodeOutputType initCodeOutputType =

diff --git a/src/main/java/com/google/api/codegen/transformer/InitCodeTransformer.java b/src/main/java/com/google/api/codegen/transformer/InitCodeTransformer.java
@@ -273,6 +273,7 @@ private InitCodeLineView generateStructureInitCodeLine(
 
     String typeName = typeTable.getAndSaveNicknameFor(item.getType());
     surfaceLine.typeName(typeName);
+    surfaceLine.fullyQualifiedTypeName(typeTable.getFullNameFor(item.getType()));
     surfaceLine.typeConstructor(namer.getTypeConstructor(typeName));
 
     surfaceLine.fieldSettings(getFieldSettings(context, item.getChildren().values()));
@@ -391,6 +392,8 @@ private InitValueView getInitValue(GapicMethodContext context, InitCodeNode item
 
         initValue.apiWrapperName(
             context.getNamer().getApiWrapperClassName(context.getInterfaceConfig()));
+        initValue.fullyQualifiedApiWrapperName(
+            context.getNamer().getFullyQualifiedApiWrapperClassName(context.getInterfaceConfig()));
         initValue.formatFunctionName(
             context
                 .getNamer()