chore: Merge multitransport client and fixes (#836)

* feat: enable self signed jwt for gapic clients (#794)

* feat: enable self signed jwt for gapic clients

* resolve comments

* update gax version

* update goldens

* update golden files

* chore: release 2.1.0 (#827)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

* feat: REGAPIC initial implementation (#824)

This includes:
1) Proper GRPC transcoding
2) Mimimal REST Operations (go make it compilable)
3) Rely on resource names for tests values generation (to not fail http url path validation)
4) Empty Server Streaming method implementation

* feat: REGAPIC Multitransport implementation (grpc+rest) (#833)

1) Fully backward compatible with grpc-only GAPIC
2) Strictly speaking not fully backward compatible with rest-only REGAPIC (but is compatible for practical cases). See below for details.
3) Introduces the concept of default transport (is necessary to preserve backward-compabitility). The default behavior assumes grpc transport.

Needed to unblock DIREGAPIC LRO. To be reviewed after submission

* chore: merge DIREGAPIC LRO with multitransport changes from master

* fix: fix Stub.longRunningClient() issues for DIREGAPIC LRO

* fix: [bazel] fix rest transport handling in assembly rule (#835)

Co-authored-by: arithmetic1728 <[email protected]>
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

Author: 3 people

WORKSPACE

@@ -33,7 +33,7 @@ jvm_maven_import_external(
 # which in its turn, prioritizes actual generated clients runtime dependencies
 # over the generator dependencies.
 
-_gax_java_version = "2.3.0"
+_gax_java_version = "2.4.0"
 
 http_archive(
     name = "com_google_api_gax_java",

repositories.bzl

@@ -70,9 +70,9 @@ def gapic_generator_java_repositories():
     _maybe(
         http_archive,
         name = "com_google_googleapis_discovery",
-        strip_prefix = "googleapis-discovery-2872d382ff767518e63d59ececf5d6f9224b21b4",
+        strip_prefix = "googleapis-discovery-bb8a053b93ef8698297c41634aa9201f7e075277",
         urls = [
-            "https://github.com/vam-google/googleapis-discovery/archive/2872d382ff767518e63d59ececf5d6f9224b21b4.zip",
+            "https://github.com/vam-google/googleapis-discovery/archive/bb8a053b93ef8698297c41634aa9201f7e075277.zip",
         ],
     )
 

rules_java_gapic/java_gapic.bzl

@@ -135,7 +135,7 @@ def _java_gapic_srcjar(
 
     if grpc_service_config:
         file_args_dict[grpc_service_config] = "grpc-service-config"
-    elif transport != "rest":
+    elif not transport or transport == "grpc":
         for keyword in NO_GRPC_CONFIG_ALLOWLIST:
             if keyword not in name:
                 fail("Missing a gRPC service config file")
@@ -230,16 +230,25 @@ def java_gapic_library(
         "@javax_annotation_javax_annotation_api//jar",
     ]
 
-    if transport == "rest":
+    if not transport or transport == "grpc":
+        actual_deps += [
+            "@com_google_api_gax_java//gax-grpc:gax_grpc",
+            "@io_grpc_grpc_java//core:core",
+            "@io_grpc_grpc_java//protobuf:protobuf",
+        ]
+    elif transport == "rest":
         actual_deps += [
             "@com_google_api_gax_java//gax-httpjson:gax_httpjson",
         ]
-    else:
+    elif transport == "grpc+rest":
         actual_deps += [
             "@com_google_api_gax_java//gax-grpc:gax_grpc",
             "@io_grpc_grpc_java//core:core",
             "@io_grpc_grpc_java//protobuf:protobuf",
+            "@com_google_api_gax_java//gax-httpjson:gax_httpjson",
         ]
+    else:
+        fail("Unknown transport: %s" % transport)
 
     native.java_library(
         name = name,
@@ -256,18 +265,29 @@ def java_gapic_library(
         "@junit_junit//jar",
     ]
 
-    if transport == "rest":
+    if not transport or transport == "grpc":
+        actual_test_deps += [
+            "@com_google_api_gax_java//gax-grpc:gax_grpc_testlib",
+            "@io_grpc_grpc_java//auth:auth",
+            "@io_grpc_grpc_netty_shaded//jar",
+            "@io_grpc_grpc_java//stub:stub",
+            "@io_opencensus_opencensus_contrib_grpc_metrics//jar",
+        ]
+    elif transport == "rest":
         actual_test_deps += [
             "@com_google_api_gax_java//gax-httpjson:gax_httpjson_testlib",
         ]
-    else:
+    elif transport == "grpc+rest":
         actual_test_deps += [
             "@com_google_api_gax_java//gax-grpc:gax_grpc_testlib",
             "@io_grpc_grpc_java//auth:auth",
             "@io_grpc_grpc_netty_shaded//jar",
             "@io_grpc_grpc_java//stub:stub",
             "@io_opencensus_opencensus_contrib_grpc_metrics//jar",
+            "@com_google_api_gax_java//gax-httpjson:gax_httpjson_testlib",
         ]
+    else:
+        fail("Unknown transport: %s" % transport)
 
     _append_dep_without_duplicates(actual_test_deps, test_deps)
     _append_dep_without_duplicates(actual_test_deps, actual_deps)

rules_java_gapic/java_gapic_pkg.bzl

@@ -351,10 +351,12 @@ def java_gapic_assembly_gradle_pkg(
         grpc_target_dep = ["%s" % grpc_target]
 
     if client_deps:
-        if transport == "rest":
-            template_label = Label("//rules_java_gapic:resources/gradle/client_rest.gradle.tmpl")
-        else:
+        if not transport or transport == "grpc":
             template_label = Label("//rules_java_gapic:resources/gradle/client_grpc.gradle.tmpl")
+        elif transport == "rest":
+            template_label = Label("//rules_java_gapic:resources/gradle/client_rest.gradle.tmpl")
+        elif transport == "grpc+rest":
+            template_label = Label("//rules_java_gapic:resources/gradle/client_grpcrest.gradle.tmpl")
 
         _java_gapic_gradle_pkg(
             name = client_target,

rules_java_gapic/resources/gradle/assembly.gradle.tmpl

@@ -12,8 +12,8 @@ subprojects {
   apply plugin: 'java'
   apply plugin: 'maven'
 
-  sourceCompatibility = 1.7
-  targetCompatibility = 1.7
+  sourceCompatibility = 1.8
+  targetCompatibility = 1.8
 
   test {
     testLogging {

rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl

@@ -9,8 +9,8 @@ apply plugin: 'java'
 description = 'GAPIC library for {{name}}'
 group = 'com.google.cloud'
 version = (findProperty('version') == 'unspecified') ? '0.0.0-SNAPSHOT' : version
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 repositories {
   mavenCentral()

rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl

@@ -0,0 +1,63 @@
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+}
+
+apply plugin: 'java'
+
+description = 'GAPIC library for {{name}}'
+group = 'com.google.cloud'
+version = (findProperty('version') == 'unspecified') ? '0.0.0-SNAPSHOT' : version
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+  mavenCentral()
+  mavenLocal()
+}
+
+compileJava.options.encoding = 'UTF-8'
+javadoc.options.encoding = 'UTF-8'
+
+dependencies {
+  compile 'com.google.api:gax:{{version.gax}}'
+  testCompile 'com.google.api:gax:{{version.gax}}:testlib'
+  compile 'com.google.api:gax-grpc:{{version.gax_grpc}}'
+  testCompile 'com.google.api:gax-grpc:{{version.gax_grpc}}:testlib'
+  compile 'com.google.api:gax-httpjson:{{version.gax_httpjson}}'
+  testCompile 'com.google.api:gax-httpjson:{{version.gax_httpjson}}:testlib'
+  testCompile 'io.grpc:grpc-netty-shaded:{{version.io_grpc}}'
+  testCompile '{{maven.junit_junit}}'
+  {{extra_deps}}
+}
+
+task smokeTest(type: Test) {
+  filter {
+    includeTestsMatching "*SmokeTest"
+    setFailOnNoMatchingTests false
+  }
+}
+
+test {
+  exclude "**/*SmokeTest*"
+}
+
+sourceSets {
+  main {
+    java {
+      srcDir 'src/main/java'
+    }
+  }
+}
+
+clean {
+  delete 'all-jars'
+}
+
+task allJars(type: Copy) {
+  dependsOn test, jar
+  into 'all-jars'
+  // Replace with `from configurations.testRuntime, jar` to include test dependencies
+  from configurations.runtime, jar
+}

rules_java_gapic/resources/gradle/client_rest.gradle.tmpl

@@ -9,8 +9,8 @@ apply plugin: 'java'
 description = 'GAPIC library for {{name}}'
 group = 'com.google.cloud'
 version = (findProperty('version') == 'unspecified') ? '0.0.0-SNAPSHOT' : version
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 repositories {
   mavenCentral()

rules_java_gapic/resources/gradle/grpc.gradle.tmpl

@@ -9,8 +9,8 @@ apply plugin: 'java'
 description = 'GRPC library for {{name}}'
 group = 'com.google.api.grpc'
 version = (findProperty('version') == 'unspecified') ? '0.0.0-SNAPSHOT' : version
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 repositories {
   mavenCentral()

rules_java_gapic/resources/gradle/proto.gradle.tmpl

@@ -9,8 +9,8 @@ apply plugin: 'java'
 description = 'PROTO library for {{name}}'
 group = 'com.google.api.grpc'
 version = (findProperty('version') == 'unspecified') ? '0.0.0-SNAPSHOT' : version
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 repositories {
   mavenCentral()

src/main/java/com/google/api/generator/gapic/BUILD.bazel

@@ -9,6 +9,7 @@ filegroup(
         "//src/main/java/com/google/api/generator/gapic/composer/comment:comment_files",
         "//src/main/java/com/google/api/generator/gapic/composer/defaultvalue:defaultvalue_files",
         "//src/main/java/com/google/api/generator/gapic/composer/grpc:grpc_files",
+        "//src/main/java/com/google/api/generator/gapic/composer/grpcrest:grpcrest_files",
         "//src/main/java/com/google/api/generator/gapic/composer/resourcename:resourcename_files",
         "//src/main/java/com/google/api/generator/gapic/composer/rest:rest_files",
         "//src/main/java/com/google/api/generator/gapic/composer/samplecode:samplecode_files",

src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel

@@ -21,6 +21,7 @@ java_library(
         "//src/main/java/com/google/api/generator/gapic/composer/common",
         "//src/main/java/com/google/api/generator/gapic/composer/defaultvalue",
         "//src/main/java/com/google/api/generator/gapic/composer/grpc",
+        "//src/main/java/com/google/api/generator/gapic/composer/grpcrest",
         "//src/main/java/com/google/api/generator/gapic/composer/resourcename",
         "//src/main/java/com/google/api/generator/gapic/composer/rest",
         "//src/main/java/com/google/api/generator/gapic/composer/samplecode",