chore: migrate java-billingbudgets to the Java microgenerator

Committer: @miraleung PiperOrigin-RevId: 346132901
googleapis · Dec 7, 2020 · 61771ac · 61771ac
1 parent bd42e00
commit 61771ac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/google/cloud/billing/budgets/v1/BUILD.bazel b/google/cloud/billing/budgets/v1/BUILD.bazel
@@ -46,12 +46,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",
 )
@@ -69,11 +70,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "budgets_java_gapic",
-    src = ":budgets_proto_with_info",
-    gapic_yaml = "billingbudget_gapic.yaml",
+    srcs = [":budgets_proto_with_info"],
     grpc_service_config = "billingbudgets_grpc_service_config.json",
     package = "google.cloud.billing.budgets.v1",
-    service_yaml = "billingbudgets.yaml",
     test_deps = [
         ":budgets_java_grpc",
     ],

diff --git a/google/cloud/billing/budgets/v1/billingbudget_gapic.yaml b/google/cloud/billing/budgets/v1/billingbudget_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.billing.budgets.v1
   python:
     package_name: google.cloud.billing_budgets_v1.gapic
   go:

diff --git a/google/cloud/billing/budgets/v1beta1/BUILD.bazel b/google/cloud/billing/budgets/v1beta1/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",
@@ -88,11 +88,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "budgets_java_gapic",
-    src = ":budgets_proto_with_info",
-    gapic_yaml = "billingbudgets_gapic.yaml",
+    srcs = [":budgets_proto_with_info"],
     grpc_service_config = "billingbudgets_grpc_service_config.json",
     package = "google.cloud.billing.budgets.v1beta1",
-    service_yaml = "billingbudgets.yaml",
     test_deps = [
         ":budgets_java_grpc",
     ],

diff --git a/google/cloud/billing/budgets/v1beta1/billingbudgets_gapic.yaml b/google/cloud/billing/budgets/v1beta1/billingbudgets_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.billing.budgets.v1beta1
   python:
     package_name: google.cloud.billing_budgets_v1beta1.gapic
   go: