From a4d732fdc4905a35391ad235a74180ba26d57b0d Mon Sep 17 00:00:00 2001 From: Google APIs Date: Thu, 3 Dec 2020 11:29:40 -0800 Subject: [PATCH] chore: migrate websecurityscanner to the Java microgenerator Committer: @miraleung PiperOrigin-RevId: 345496255 --- google/cloud/websecurityscanner/v1/BUILD.bazel | 11 +++++------ .../v1/websecurityscanner_gapic.yaml | 2 -- google/cloud/websecurityscanner/v1alpha/BUILD.bazel | 11 +++++------ .../v1alpha/websecurityscanner_gapic.yaml | 2 -- google/cloud/websecurityscanner/v1beta/BUILD.bazel | 11 +++++------ .../v1beta/websecurityscanner_gapic.yaml | 2 -- 6 files changed, 15 insertions(+), 24 deletions(-) diff --git a/google/cloud/websecurityscanner/v1/BUILD.bazel b/google/cloud/websecurityscanner/v1/BUILD.bazel index 12226117..e46b226a 100644 --- a/google/cloud/websecurityscanner/v1/BUILD.bazel +++ b/google/cloud/websecurityscanner/v1/BUILD.bazel @@ -44,12 +44,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", ) @@ -67,11 +68,9 @@ java_grpc_library( java_gapic_library( name = "websecurityscanner_java_gapic", - src = ":websecurityscanner_proto_with_info", - gapic_yaml = "websecurityscanner_gapic.yaml", + srcs = [":websecurityscanner_proto_with_info"], grpc_service_config = "websecurityscanner_grpc_service_config.json", package = "google.cloud.websecurityscanner.v1", - service_yaml = "websecurityscanner_v1.yaml", test_deps = [ ":websecurityscanner_java_grpc", ], diff --git a/google/cloud/websecurityscanner/v1/websecurityscanner_gapic.yaml b/google/cloud/websecurityscanner/v1/websecurityscanner_gapic.yaml index 6c634317..f171653e 100644 --- a/google/cloud/websecurityscanner/v1/websecurityscanner_gapic.yaml +++ b/google/cloud/websecurityscanner/v1/websecurityscanner_gapic.yaml @@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto config_schema_version: 2.0.0 # The settings of generated code in a specific language. language_settings: - java: - package_name: com.google.cloud.websecurityscanner.v1 python: package_name: google.cloud.websecurityscanner_v1.gapic go: diff --git a/google/cloud/websecurityscanner/v1alpha/BUILD.bazel b/google/cloud/websecurityscanner/v1alpha/BUILD.bazel index 003029f2..55fe9898 100644 --- a/google/cloud/websecurityscanner/v1alpha/BUILD.bazel +++ b/google/cloud/websecurityscanner/v1alpha/BUILD.bazel @@ -41,12 +41,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", ) @@ -64,11 +65,9 @@ java_grpc_library( java_gapic_library( name = "websecurityscanner_java_gapic", - src = ":websecurityscanner_proto_with_info", - gapic_yaml = "websecurityscanner_gapic.yaml", + srcs = [":websecurityscanner_proto_with_info"], grpc_service_config = "websecurityscanner_grpc_service_config.json", package = "google.cloud.websecurityscanner.v1alpha", - service_yaml = "websecurityscanner_v1alpha.yaml", test_deps = [ ":websecurityscanner_java_grpc", ], diff --git a/google/cloud/websecurityscanner/v1alpha/websecurityscanner_gapic.yaml b/google/cloud/websecurityscanner/v1alpha/websecurityscanner_gapic.yaml index d1225e7a..960f4ea3 100644 --- a/google/cloud/websecurityscanner/v1alpha/websecurityscanner_gapic.yaml +++ b/google/cloud/websecurityscanner/v1alpha/websecurityscanner_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.websecurityscanner.v1alpha python: package_name: google.cloud.websecurityscanner_v1alpha.gapic go: diff --git a/google/cloud/websecurityscanner/v1beta/BUILD.bazel b/google/cloud/websecurityscanner/v1beta/BUILD.bazel index 72f35c99..1719bea6 100644 --- a/google/cloud/websecurityscanner/v1beta/BUILD.bazel +++ b/google/cloud/websecurityscanner/v1beta/BUILD.bazel @@ -44,12 +44,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", ) @@ -67,11 +68,9 @@ java_grpc_library( java_gapic_library( name = "websecurityscanner_java_gapic", - src = ":websecurityscanner_proto_with_info", - gapic_yaml = "websecurityscanner_gapic.yaml", + srcs = [":websecurityscanner_proto_with_info"], grpc_service_config = "websecurityscanner_grpc_service_config.json", package = "google.cloud.websecurityscanner.v1beta", - service_yaml = "websecurityscanner_v1beta.yaml", test_deps = [ ":websecurityscanner_java_grpc", ], diff --git a/google/cloud/websecurityscanner/v1beta/websecurityscanner_gapic.yaml b/google/cloud/websecurityscanner/v1beta/websecurityscanner_gapic.yaml index 62625171..1e77ae7c 100644 --- a/google/cloud/websecurityscanner/v1beta/websecurityscanner_gapic.yaml +++ b/google/cloud/websecurityscanner/v1beta/websecurityscanner_gapic.yaml @@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto config_schema_version: 2.0.0 # The settings of generated code in a specific language. language_settings: - java: - package_name: com.google.cloud.websecurityscanner.v1beta python: package_name: google.cloud.websecurityscanner_v1beta.gapic go: