From 88ad4d34ce272c1af42611ae6dd4477e996213e0 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Mon, 30 Nov 2020 10:20:34 -0800
Subject: [PATCH] chore: migrate notebooks to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 344838119
---
 google/cloud/notebooks/v1beta1/BUILD.bazel          | 11 +++++------
 google/cloud/notebooks/v1beta1/notebooks_gapic.yaml |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/google/cloud/notebooks/v1beta1/BUILD.bazel b/google/cloud/notebooks/v1beta1/BUILD.bazel
index cbbacfba..47204562 100644
--- a/google/cloud/notebooks/v1beta1/BUILD.bazel
+++ b/google/cloud/notebooks/v1beta1/BUILD.bazel
@@ -45,12 +45,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",
 )
@@ -68,11 +69,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "notebooks_java_gapic",
-    src = ":notebooks_proto_with_info",
-    gapic_yaml = "notebooks_gapic.yaml",
+    srcs = [":notebooks_proto_with_info"],
     grpc_service_config = "notebooks_grpc_service_config.json",
     package = "google.cloud.notebooks.v1beta1",
-    service_yaml = "notebooks_v1beta1.yaml",
     test_deps = [
         ":notebooks_java_grpc",
     ],
diff --git a/google/cloud/notebooks/v1beta1/notebooks_gapic.yaml b/google/cloud/notebooks/v1beta1/notebooks_gapic.yaml
index 5d8eab1b..b98aa012 100644
--- a/google/cloud/notebooks/v1beta1/notebooks_gapic.yaml
+++ b/google/cloud/notebooks/v1beta1/notebooks_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.notebooks.v1beta1
   python:
     package_name: google.cloud.notebooks_v1beta1.gapic
   nodejs: