chore: DIREGAPIC #2 refactoring of the rest Composer Classes (#730)

googleapis · May 24, 2021 · ae17e7e · ae17e7e
1 parent 5d182dd
commit ae17e7e
Show file tree

Hide file tree

Showing 96 changed files with 2,504 additions and 2,379 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -46,7 +46,7 @@ jobs:
           echo "The old one will disappear after 7 days."
 
       - name: Unit Tests
-        run: bazel --batch test $(bazel query "//src/test/..." | grep "Test$") --noshow_progress
+        run: bazel --batch test $(bazel query "//src/test/..." | grep "Test$") --noshow_progress --test_output=errors
 
       - name: Integration Tests
         run: bazel --batch test //test/integration:asset //test/integration:credentials //test/integration:iam //test/integration:kms //test/integration:logging //test/integration:redis //test/integration:library --noshow_progress

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.0.6](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.5...v1.0.6) (2021-05-19)
+
+
+### Bug Fixes
+
+* **mixins:** Gate mixin RPC on HTTP rules, add yaml doc/http overrides ([#727](https://www.github.com/googleapis/gapic-generator-java/issues/727)) ([229da5d](https://www.github.com/googleapis/gapic-generator-java/commit/229da5d94cf7db060abf3ea006a20d1ade804597))
+
 ### [1.0.5](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.4...v1.0.5) (2021-05-17)
 
 

diff --git a/dependencies.properties b/dependencies.properties
@@ -11,12 +11,11 @@ version.com_google_protobuf=3.13.0
 # Version of google-java-format is downgraded from 1.8 to 1.7, because 1.8 supports java 11 minimum, while our JRE is java 8.
 version.google_java_format=1.7
 version.com_google_api_common_java=1.9.3
-# TODO(miraleung): Update this.
 version.com_google_gax_java=1.62.0
 version.io_grpc_java=1.30.2
 
 # Common deps.
-maven.com_google_guava_guava=com.google.guava:guava:26.0-jre
+maven.com_google_guava_guava=com.google.guava:guava:30.1-android
 maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.0
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.7.2
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.2

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java
@@ -17,7 +17,15 @@
 import com.google.api.generator.engine.ast.ClassDefinition;
 import com.google.api.generator.engine.ast.ScopeNode;
 import com.google.api.generator.gapic.composer.comment.CommentComposer;
+import com.google.api.generator.gapic.composer.common.ServiceClientClassComposer;
+import com.google.api.generator.gapic.composer.common.ServiceStubClassComposer;
+import com.google.api.generator.gapic.composer.grpc.GrpcServiceCallableFactoryClassComposer;
+import com.google.api.generator.gapic.composer.grpc.GrpcServiceStubClassComposer;
+import com.google.api.generator.gapic.composer.grpc.MockServiceClassComposer;
+import com.google.api.generator.gapic.composer.grpc.MockServiceImplClassComposer;
+import com.google.api.generator.gapic.composer.grpc.ServiceClientTestClassComposer;
 import com.google.api.generator.gapic.composer.grpc.ServiceSettingsClassComposer;
+import com.google.api.generator.gapic.composer.grpc.ServiceStubSettingsClassComposer;
 import com.google.api.generator.gapic.composer.resourcename.ResourceNameHelperClassComposer;
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.GapicClass.Kind;

diff --git a/src/main/java/com/google/api/generator/gapic/composer/comment/StubCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/comment/StubCommentComposer.java
@@ -31,21 +31,12 @@ public class StubCommentComposer {
   private static final String ADVANCED_USAGE_API_REFLECTION_DESCRIPTION =
       "This class is for advanced usage and reflects the underlying API directly.";
 
-  // TODO: remove after Pre-DIREGAPIC refactoring is fully merged
-  private static final StubCommentComposer GRPC_INSTANCE = new StubCommentComposer("gRPC");
-
   private final String transportPrefix;
 
   public StubCommentComposer(String transportPrefix) {
     this.transportPrefix = transportPrefix;
   }
 
-  // TODO: remove after Pre-DIREGAPIC refactoring is fully merged
-  public static List<CommentStatement> createGrpcServiceStubClassHeaderComments(
-      String serviceName, boolean isDeprecated) {
-    return GRPC_INSTANCE.createTransportServiceStubClassHeaderComments(serviceName, isDeprecated);
-  }
-
   public List<CommentStatement> createTransportServiceStubClassHeaderComments(
       String serviceName, boolean isDeprecated) {
     JavaDocComment.Builder javaDocBuilder = JavaDocComment.builder();
@@ -63,13 +54,6 @@ public List<CommentStatement> createTransportServiceStubClassHeaderComments(
                 .build()));
   }
 
-  // TODO: remove after Pre-DIREGAPIC refactoring is fully merged
-  public static List<CommentStatement> createGrpcServiceCallableFactoryClassHeaderComments(
-      String serviceName, boolean isDeprecated) {
-    return GRPC_INSTANCE.createTransportServiceCallableFactoryClassHeaderComments(
-        serviceName, isDeprecated);
-  }
-
   public List<CommentStatement> createTransportServiceCallableFactoryClassHeaderComments(
       String serviceName, boolean isDeprecated) {
     JavaDocComment.Builder javaDocBuilder = JavaDocComment.builder();