-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* chore: Pre-DIREGAPIC Refactoring #1 This is as minimal of a PR that I could make stuch that: 1) It compiles and tests run single composer plus minimal 2) All the key changes are present (abstract/grpc class, comment composer, class names, golden files move) I had to add a few quite ugly and artificial constructs: fake `ClassComposer` under `composer` package which simply extends `composer.common.Composer` to void changing the rest of the classes put back static methods in `ClassNames` and `StubCommentComposer` and `TestProtoLoaderUtil` (for the same reasons as above). All of those chagnes are marked with `// TODO: remove after Pre-DIREGAPIC refactoring is fully merged` statement.
- Loading branch information
1 parent
83e2e3b
commit 5d182dd
Showing
29 changed files
with
920 additions
and
267 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
src/main/java/com/google/api/generator/gapic/composer/common/BUILD.bazel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| load("@rules_java//java:defs.bzl", "java_library") | ||
|
|
||
| package(default_visibility = ["//visibility:public"]) | ||
|
|
||
| filegroup( | ||
| name = "common_files", | ||
| srcs = glob(["*.java"]), | ||
| ) | ||
|
|
||
| java_library( | ||
| name = "common", | ||
| srcs = [ | ||
| ":common_files", | ||
| ], | ||
| deps = [ | ||
| "//:service_config_java_proto", | ||
| "//src/main/java/com/google/api/generator/engine/ast", | ||
| "//src/main/java/com/google/api/generator/engine/writer", | ||
| "//src/main/java/com/google/api/generator/gapic:status_java_proto", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/comment", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/defaultvalue", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/resourcename", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/samplecode", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/store", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/utils", | ||
| "//src/main/java/com/google/api/generator/gapic/model", | ||
| "//src/main/java/com/google/api/generator/gapic/utils", | ||
| "//src/main/java/com/google/api/generator/util", | ||
| "@com_google_api_api_common//jar", | ||
| "@com_google_api_gax_java//gax:gax", | ||
| "@com_google_api_gax_java//gax:gax_testlib", | ||
| "@com_google_api_gax_java//gax-grpc:gax_grpc", | ||
| "@com_google_api_gax_java//gax-grpc:gax_grpc_testlib", | ||
| "@com_google_code_findbugs_jsr305//jar", | ||
| "@com_google_googleapis//gapic/metadata:metadata_java_proto", | ||
| "@com_google_googleapis//google/api:api_java_proto", | ||
| "@com_google_googleapis//google/longrunning:longrunning_java_proto", | ||
| "@com_google_googleapis//google/rpc:rpc_java_proto", | ||
| "@com_google_guava_guava//jar", | ||
| "@com_google_protobuf//:protobuf_java", | ||
| "@com_google_protobuf//:protobuf_java_util", | ||
| "@com_google_protobuf//java/core", | ||
| "@io_grpc_grpc_java//api", | ||
| "@io_grpc_grpc_java//protobuf", | ||
| "@io_grpc_grpc_java//stub", | ||
| "@javax_annotation_javax_annotation_api//jar", | ||
| "@junit_junit//jar", | ||
| "@org_threeten_threetenbp//jar", | ||
| ], | ||
| ) |
24 changes: 24 additions & 0 deletions
24
src/main/java/com/google/api/generator/gapic/composer/common/ClassComposer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Copyright 2020 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.gapic.composer.common; | ||
|
|
||
| import com.google.api.generator.gapic.model.GapicClass; | ||
| import com.google.api.generator.gapic.model.GapicContext; | ||
| import com.google.api.generator.gapic.model.Service; | ||
|
|
||
| // TODO: remove after Pre-DIREGAPIC refactoring is fully merged | ||
| public interface ClassComposer { | ||
| GapicClass generate(GapicContext context, Service serivce); | ||
| } |
51 changes: 51 additions & 0 deletions
51
src/main/java/com/google/api/generator/gapic/composer/grpc/BUILD.bazel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| load("@rules_java//java:defs.bzl", "java_library") | ||
|
|
||
| package(default_visibility = ["//visibility:public"]) | ||
|
|
||
| filegroup( | ||
| name = "grpc_files", | ||
| srcs = glob(["*.java"]), | ||
| ) | ||
|
|
||
| java_library( | ||
| name = "grpc", | ||
| srcs = [ | ||
| ":grpc_files", | ||
| ], | ||
| deps = [ | ||
| "//:service_config_java_proto", | ||
| "//src/main/java/com/google/api/generator/engine/ast", | ||
| "//src/main/java/com/google/api/generator/engine/writer", | ||
| "//src/main/java/com/google/api/generator/gapic:status_java_proto", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/comment", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/common", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/defaultvalue", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/resourcename", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/samplecode", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/store", | ||
| "//src/main/java/com/google/api/generator/gapic/composer/utils", | ||
| "//src/main/java/com/google/api/generator/gapic/model", | ||
| "//src/main/java/com/google/api/generator/gapic/utils", | ||
| "//src/main/java/com/google/api/generator/util", | ||
| "@com_google_api_api_common//jar", | ||
| "@com_google_api_gax_java//gax", | ||
| "@com_google_api_gax_java//gax:gax_testlib", | ||
| "@com_google_api_gax_java//gax-grpc:gax_grpc", | ||
| "@com_google_api_gax_java//gax-grpc:gax_grpc_testlib", | ||
| "@com_google_code_findbugs_jsr305//jar", | ||
| "@com_google_googleapis//gapic/metadata:metadata_java_proto", | ||
| "@com_google_googleapis//google/api:api_java_proto", | ||
| "@com_google_googleapis//google/longrunning:longrunning_java_proto", | ||
| "@com_google_googleapis//google/rpc:rpc_java_proto", | ||
| "@com_google_guava_guava//jar", | ||
| "@com_google_protobuf//:protobuf_java", | ||
| "@com_google_protobuf//:protobuf_java_util", | ||
| "@com_google_protobuf//java/core", | ||
| "@io_grpc_grpc_java//api", | ||
| "@io_grpc_grpc_java//protobuf", | ||
| "@io_grpc_grpc_java//stub", | ||
| "@javax_annotation_javax_annotation_api//jar", | ||
| "@junit_junit//jar", | ||
| "@org_threeten_threetenbp//jar", | ||
| ], | ||
| ) |
Oops, something went wrong.