From 65b88e2d87cf442b263a0bee331168db58c9ee56 Mon Sep 17 00:00:00 2001 From: vam-google Date: Mon, 14 Jun 2021 16:34:06 -0700 Subject: [PATCH] remove the https://github.com/googleapis/gapic-generator-java/pull/765 parts --- BUILD.bazel | 28 -------- rules_java_gapic/java_gapic.bzl | 67 ++++--------------- .../java/com/google/api/generator/Main.java | 6 +- .../google/api/generator/debug/BUILD.bazel | 27 -------- .../debug/CodeGeneratorRequestDumper.java | 37 ---------- .../api/generator/debug/MainFromFile.java | 43 ------------ 6 files changed, 17 insertions(+), 191 deletions(-) delete mode 100644 src/main/java/com/google/api/generator/debug/BUILD.bazel delete mode 100644 src/main/java/com/google/api/generator/debug/CodeGeneratorRequestDumper.java delete mode 100644 src/main/java/com/google/api/generator/debug/MainFromFile.java diff --git a/BUILD.bazel b/BUILD.bazel index 6564c7e849..8823250fca 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -45,34 +45,6 @@ java_binary( ], ) -java_binary( - name = "protoc-gen-code_generator_request_dumper", - main_class = "com.google.api.generator.debug.CodeGeneratorRequestDumper", - runtime_deps = [ - "//src/main/java/com/google/api/generator", - "//src/main/java/com/google/api/generator/debug", - "//src/main/java/com/google/api/generator/gapic", - "@com_google_googleapis//google/api:api_java_proto", - "@com_google_googleapis//google/longrunning:longrunning_java_proto", - "@com_google_guava_guava", - "@com_google_protobuf//:protobuf_java", - ], -) - -java_binary( - name = "protoc-gen-java_gapic_from_file", - main_class = "com.google.api.generator.debug.MainFromFile", - runtime_deps = [ - "//src/main/java/com/google/api/generator", - "//src/main/java/com/google/api/generator/debug", - "//src/main/java/com/google/api/generator/gapic", - "@com_google_googleapis//google/api:api_java_proto", - "@com_google_googleapis//google/longrunning:longrunning_java_proto", - "@com_google_guava_guava", - "@com_google_protobuf//:protobuf_java", - ], -) - # google-java-format java_binary( name = "google_java_format_binary", diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl index 57b4c6e47d..505fbfdbc3 100644 --- a/rules_java_gapic/java_gapic.bzl +++ b/rules_java_gapic/java_gapic.bzl @@ -119,18 +119,19 @@ def _append_dep_without_duplicates(dest_deps, new_deps): dest_deps.append(new_deps[i]) return dest_deps -def _java_gapic_srcjar( +def java_gapic_library( name, srcs, - grpc_service_config, - gapic_yaml, - service_yaml, + grpc_service_config = None, + gapic_yaml = None, + service_yaml = None, + deps = [], + test_deps = [], # possible values are: "grpc", "rest", "grpc+rest" - transport, + transport = None, # Can be used to provide a java_library with a customized generator, # like the one which dumps descriptor to a file for future debugging. - java_generator_name = "java_gapic", - output_suffix = ".srcjar", + _java_generator_name = "java_gapic", **kwargs): file_args_dict = {} @@ -158,6 +159,8 @@ def _java_gapic_srcjar( else: fail("Service.yaml is no longer supported in the Java microgenerator") + srcjar_name = name + "_srcjar" + raw_srcjar_name = srcjar_name + "_raw" output_suffix = ".srcjar" opt_args = [] @@ -169,43 +172,18 @@ def _java_gapic_srcjar( plugin_args = ["metadata"] proto_custom_library( - name = name, + name = raw_srcjar_name, deps = srcs, - plugin = Label("@gapic_generator_java//:protoc-gen-%s" % java_generator_name), + plugin = Label("@gapic_generator_java//:protoc-gen-%s" % _java_generator_name), plugin_args = plugin_args, plugin_file_args = {}, opt_file_args = file_args_dict, - output_type = java_generator_name, + output_type = _java_generator_name, output_suffix = output_suffix, opt_args = opt_args, **kwargs ) -def java_gapic_library( - name, - srcs, - grpc_service_config = None, - gapic_yaml = None, - service_yaml = None, - deps = [], - test_deps = [], - # possible values are: "grpc", "rest", "grpc+rest" - transport = None, - **kwargs): - srcjar_name = name + "_srcjar" - raw_srcjar_name = srcjar_name + "_raw" - - _java_gapic_srcjar( - name = raw_srcjar_name, - srcs = srcs, - grpc_service_config = grpc_service_config, - gapic_yaml = gapic_yaml, - service_yaml = service_yaml, - transport = transport, - java_generator_name = "java_gapic", - **kwargs - ) - _java_gapic_postprocess_srcjar( name = srcjar_name, gapic_srcjar = "%s.srcjar" % raw_srcjar_name, @@ -304,22 +282,3 @@ def java_gapic_test(name, runtime_deps, test_classes, **kwargs): tests = test_classes, **kwargs ) - -def java_generator_request_dump( - name, - srcs, - grpc_service_config = None, - gapic_yaml = None, - service_yaml = None, - transport = None, - **kwargs): - _java_gapic_srcjar( - name = name, - srcs = srcs, - grpc_service_config = grpc_service_config, - gapic_yaml = gapic_yaml, - service_yaml = service_yaml, - transport = transport, - java_generator_name = "code_generator_request_dumper", - **kwargs - ) diff --git a/src/main/java/com/google/api/generator/Main.java b/src/main/java/com/google/api/generator/Main.java index a9dd5f842e..0e1e985e2f 100644 --- a/src/main/java/com/google/api/generator/Main.java +++ b/src/main/java/com/google/api/generator/Main.java @@ -20,13 +20,15 @@ import com.google.api.ResourceProto; import com.google.api.generator.gapic.Generator; import com.google.longrunning.OperationsProto; +import com.google.protobuf.Descriptors.DescriptorValidationException; import com.google.protobuf.ExtensionRegistry; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import java.io.IOException; public class Main { - public static void main(String[] args) throws IOException { + public static void main(String[] args) + throws IOException, InterruptedException, DescriptorValidationException { ExtensionRegistry registry = ExtensionRegistry.newInstance(); registerAllExtensions(registry); CodeGeneratorRequest request = CodeGeneratorRequest.parseFrom(System.in, registry); @@ -35,7 +37,7 @@ public static void main(String[] args) throws IOException { } /** Register all extensions needed to process API protofiles. */ - public static void registerAllExtensions(ExtensionRegistry extensionRegistry) { + private static void registerAllExtensions(ExtensionRegistry extensionRegistry) { OperationsProto.registerAllExtensions(extensionRegistry); AnnotationsProto.registerAllExtensions(extensionRegistry); ClientProto.registerAllExtensions(extensionRegistry); diff --git a/src/main/java/com/google/api/generator/debug/BUILD.bazel b/src/main/java/com/google/api/generator/debug/BUILD.bazel deleted file mode 100644 index fbc34298ad..0000000000 --- a/src/main/java/com/google/api/generator/debug/BUILD.bazel +++ /dev/null @@ -1,27 +0,0 @@ -load("@rules_java//java:defs.bzl", "java_library", "java_plugin") - -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "debug_files", - srcs = glob(["*.java"]), -) - -java_library( - name = "debug", - srcs = [ - ":debug_files", - ], - deps = [ - "//src/main/java/com/google/api/generator", - "//src/main/java/com/google/api/generator/engine", - "//src/main/java/com/google/api/generator/engine/ast", - "//src/main/java/com/google/api/generator/gapic", - "//src/main/java/com/google/api/generator/gapic/model", - "//src/main/java/com/google/api/generator/util", - "@com_google_googleapis//google/api:api_java_proto", - "@com_google_googleapis//google/longrunning:longrunning_java_proto", - "@com_google_guava_guava//jar", - "@com_google_protobuf//:protobuf_java", - ], -) diff --git a/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestDumper.java b/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestDumper.java deleted file mode 100644 index 0855522f3a..0000000000 --- a/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestDumper.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.api.generator.debug; - -import com.google.api.generator.Main; -import com.google.protobuf.ExtensionRegistry; -import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; -import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; -import java.io.IOException; - -public class CodeGeneratorRequestDumper { - public static void main(String[] args) throws IOException { - ExtensionRegistry registry = ExtensionRegistry.newInstance(); - Main.registerAllExtensions(registry); - CodeGeneratorRequest request = CodeGeneratorRequest.parseFrom(System.in, registry); - - CodeGeneratorResponse.Builder response = CodeGeneratorResponse.newBuilder(); - response - .setSupportedFeatures(CodeGeneratorResponse.Feature.FEATURE_PROTO3_OPTIONAL_VALUE) - .addFileBuilder() - .setName("desc-dump.bin") - .setContentBytes(request.toByteString()); - response.build().writeTo(System.out); - } -} diff --git a/src/main/java/com/google/api/generator/debug/MainFromFile.java b/src/main/java/com/google/api/generator/debug/MainFromFile.java deleted file mode 100644 index d6b9d3e0ea..0000000000 --- a/src/main/java/com/google/api/generator/debug/MainFromFile.java +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.api.generator.debug; - -import com.google.api.generator.Main; -import com.google.api.generator.gapic.Generator; -import com.google.protobuf.ExtensionRegistry; -import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; -import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -public class MainFromFile { - public static void main(String[] args) throws IOException { - ExtensionRegistry registry = ExtensionRegistry.newInstance(); - Main.registerAllExtensions(registry); - - String inputFile = args[0]; - String outputFile = args[1]; - - try (InputStream inputStream = new FileInputStream(inputFile); - OutputStream outputStream = new FileOutputStream(outputFile)) { - CodeGeneratorRequest request = CodeGeneratorRequest.parseFrom(inputStream, registry); - CodeGeneratorResponse response = Generator.generateGapic(request); - response.writeTo(outputStream); - } - } -}