From 565b9a5f01d7154825c657bca5ee244e86aad918 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Mon, 7 Dec 2020 11:04:45 -0800 Subject: [PATCH] chore: migrate java-dataproc to the Java microgenerator Committer: @miraleung PiperOrigin-RevId: 346132878 --- google/cloud/dataproc/v1/BUILD.bazel | 10 +++++----- google/cloud/dataproc/v1/dataproc_gapic.yaml | 2 -- google/cloud/dataproc/v1beta2/BUILD.bazel | 10 +++++----- google/cloud/dataproc/v1beta2/dataproc_gapic.yaml | 2 -- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/google/cloud/dataproc/v1/BUILD.bazel b/google/cloud/dataproc/v1/BUILD.bazel index dfcfa487..e7812c57 100644 --- a/google/cloud/dataproc/v1/BUILD.bazel +++ b/google/cloud/dataproc/v1/BUILD.bazel @@ -42,12 +42,13 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", + java_gapic_library = "java_gapic_library2", + java_gapic_test = "java_gapic_test2", "java_grpc_library", "java_proto_library", ) @@ -65,11 +66,10 @@ java_grpc_library( java_gapic_library( name = "dataproc_java_gapic", - src = ":dataproc_proto_with_info", + srcs = [":dataproc_proto_with_info"], gapic_yaml = "dataproc_gapic.yaml", grpc_service_config = "dataproc_grpc_service_config.json", package = "google.cloud.dataproc.v1", - service_yaml = "dataproc_v1.yaml", test_deps = [ ":dataproc_java_grpc", ], diff --git a/google/cloud/dataproc/v1/dataproc_gapic.yaml b/google/cloud/dataproc/v1/dataproc_gapic.yaml index 4c4d2c8b..d38c96c3 100644 --- a/google/cloud/dataproc/v1/dataproc_gapic.yaml +++ b/google/cloud/dataproc/v1/dataproc_gapic.yaml @@ -1,8 +1,6 @@ type: com.google.api.codegen.ConfigProto config_schema_version: 2.0.0 language_settings: - java: - package_name: com.google.cloud.dataproc.v1 python: package_name: google.cloud.dataproc_v1.gapic go: diff --git a/google/cloud/dataproc/v1beta2/BUILD.bazel b/google/cloud/dataproc/v1beta2/BUILD.bazel index 182bd8da..b0b1f62a 100644 --- a/google/cloud/dataproc/v1beta2/BUILD.bazel +++ b/google/cloud/dataproc/v1beta2/BUILD.bazel @@ -42,12 +42,13 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", + java_gapic_library = "java_gapic_library2", + java_gapic_test = "java_gapic_test2", "java_grpc_library", "java_proto_library", ) @@ -65,11 +66,10 @@ java_grpc_library( java_gapic_library( name = "dataproc_java_gapic", - src = ":dataproc_proto_with_info", + srcs = [":dataproc_proto_with_info"], gapic_yaml = "dataproc_gapic.yaml", grpc_service_config = "dataproc_grpc_service_config.json", package = "google.cloud.dataproc.v1beta2", - service_yaml = "dataproc_v1beta2.yaml", test_deps = [ ":dataproc_java_grpc", ], diff --git a/google/cloud/dataproc/v1beta2/dataproc_gapic.yaml b/google/cloud/dataproc/v1beta2/dataproc_gapic.yaml index 3e4d4b49..efddce37 100644 --- a/google/cloud/dataproc/v1beta2/dataproc_gapic.yaml +++ b/google/cloud/dataproc/v1beta2/dataproc_gapic.yaml @@ -1,8 +1,6 @@ type: com.google.api.codegen.ConfigProto config_schema_version: 2.0.0 language_settings: - java: - package_name: com.google.cloud.dataproc.v1beta2 python: package_name: google.cloud.dataproc_v1beta2.gapic go: