From 81a336271e7b486832944c2d28c471f387b09495 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Mon, 30 Nov 2020 13:33:02 -0800 Subject: [PATCH] chore: migrate java-retail to the Java microgenerator Committer: @miraleung PiperOrigin-RevId: 344877885 --- google/cloud/retail/v2/BUILD.bazel | 10 ++++------ google/cloud/retail/v2/import_config.proto | 5 ----- google/cloud/retail/v2/retail_gapic.yaml | 2 -- google/cloud/retail/v2alpha/BUILD.bazel | 10 ++++------ google/cloud/retail/v2alpha/import_config.proto | 5 ----- google/cloud/retail/v2alpha/retail_gapic.yaml | 2 -- google/cloud/retail/v2beta/BUILD.bazel | 10 ++++------ google/cloud/retail/v2beta/import_config.proto | 5 ----- google/cloud/retail/v2beta/retail_gapic.yaml | 2 -- 9 files changed, 12 insertions(+), 39 deletions(-) diff --git a/google/cloud/retail/v2/BUILD.bazel b/google/cloud/retail/v2/BUILD.bazel index b638da7d..6a265ced 100644 --- a/google/cloud/retail/v2/BUILD.bazel +++ b/google/cloud/retail/v2/BUILD.bazel @@ -23,9 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", - "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", "moved_proto_library", @@ -101,11 +101,9 @@ java_grpc_library( java_gapic_library( name = "retail_java_gapic", - src = ":retail_proto_with_info", - gapic_yaml = "retail_gapic.yaml", + srcs = [":retail_proto_with_info"], grpc_service_config = "retail_grpc_service_config.json", package = "google.cloud.retail.v2", - service_yaml = "retail_v2.yaml", test_deps = [ ":retail_java_grpc", ], diff --git a/google/cloud/retail/v2/import_config.proto b/google/cloud/retail/v2/import_config.proto index 835ef687..fd5e31df 100644 --- a/google/cloud/retail/v2/import_config.proto +++ b/google/cloud/retail/v2/import_config.proto @@ -199,11 +199,6 @@ message UserEventInputConfig { // Metadata related to the progress of the Import operation. This will be // returned by the google.longrunning.Operation.metadata field. message ImportMetadata { - option (google.api.resource) = { - type: "retail.googleapis.com/Operation" - pattern: "operations/{operation}" - }; - // Operation create time. google.protobuf.Timestamp create_time = 1; diff --git a/google/cloud/retail/v2/retail_gapic.yaml b/google/cloud/retail/v2/retail_gapic.yaml index e7f27446..8cbed69c 100644 --- a/google/cloud/retail/v2/retail_gapic.yaml +++ b/google/cloud/retail/v2/retail_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.retail.v2 python: package_name: google.cloud.retail_v2.gapic go: diff --git a/google/cloud/retail/v2alpha/BUILD.bazel b/google/cloud/retail/v2alpha/BUILD.bazel index a7cafa6f..3f490d12 100644 --- a/google/cloud/retail/v2alpha/BUILD.bazel +++ b/google/cloud/retail/v2alpha/BUILD.bazel @@ -23,9 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", - "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", "moved_proto_library", @@ -101,11 +101,9 @@ java_grpc_library( java_gapic_library( name = "retail_java_gapic", - src = ":retail_proto_with_info", - gapic_yaml = "retail_gapic.yaml", + srcs = [":retail_proto_with_info"], grpc_service_config = "retail_grpc_service_config.json", package = "google.cloud.retail.v2alpha", - service_yaml = "retail_v2alpha.yaml", test_deps = [ ":retail_java_grpc", ], diff --git a/google/cloud/retail/v2alpha/import_config.proto b/google/cloud/retail/v2alpha/import_config.proto index 63a8c6ae..0b8be8b5 100644 --- a/google/cloud/retail/v2alpha/import_config.proto +++ b/google/cloud/retail/v2alpha/import_config.proto @@ -199,11 +199,6 @@ message UserEventInputConfig { // Metadata related to the progress of the Import operation. This will be // returned by the google.longrunning.Operation.metadata field. message ImportMetadata { - option (google.api.resource) = { - type: "retail.googleapis.com/Operation" - pattern: "operations/{operation}" - }; - // Operation create time. google.protobuf.Timestamp create_time = 1; diff --git a/google/cloud/retail/v2alpha/retail_gapic.yaml b/google/cloud/retail/v2alpha/retail_gapic.yaml index 8ac01056..1156cce0 100644 --- a/google/cloud/retail/v2alpha/retail_gapic.yaml +++ b/google/cloud/retail/v2alpha/retail_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.retail.v2alpha python: package_name: google.cloud.retail_v2alpha.gapic go: diff --git a/google/cloud/retail/v2beta/BUILD.bazel b/google/cloud/retail/v2beta/BUILD.bazel index 22006f74..794dfcb7 100644 --- a/google/cloud/retail/v2beta/BUILD.bazel +++ b/google/cloud/retail/v2beta/BUILD.bazel @@ -23,9 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", - "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", "moved_proto_library", @@ -101,11 +101,9 @@ java_grpc_library( java_gapic_library( name = "retail_java_gapic", - src = ":retail_proto_with_info", - gapic_yaml = "retail_gapic.yaml", + srcs = [":retail_proto_with_info"], grpc_service_config = "retail_grpc_service_config.json", package = "google.cloud.retail.v2beta", - service_yaml = "retail_v2beta.yaml", test_deps = [ ":retail_java_grpc", ], diff --git a/google/cloud/retail/v2beta/import_config.proto b/google/cloud/retail/v2beta/import_config.proto index d30e3482..5de09262 100644 --- a/google/cloud/retail/v2beta/import_config.proto +++ b/google/cloud/retail/v2beta/import_config.proto @@ -199,11 +199,6 @@ message UserEventInputConfig { // Metadata related to the progress of the Import operation. This will be // returned by the google.longrunning.Operation.metadata field. message ImportMetadata { - option (google.api.resource) = { - type: "retail.googleapis.com/Operation" - pattern: "operations/{operation}" - }; - // Operation create time. google.protobuf.Timestamp create_time = 1; diff --git a/google/cloud/retail/v2beta/retail_gapic.yaml b/google/cloud/retail/v2beta/retail_gapic.yaml index c683e849..688ca522 100644 --- a/google/cloud/retail/v2beta/retail_gapic.yaml +++ b/google/cloud/retail/v2beta/retail_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.retail.v2beta python: package_name: google.cloud.retail_v2beta.gapic go: