Skip to content

fix(Spring CodeGen): Add Spring dependencies to build files and use static types instead of vapor references #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhumin8 merged 14 commits into from
Nov 21, 2022
Merged

fix(Spring CodeGen): Add Spring dependencies to build files and use static types instead of vapor references #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
498f405
added a Spring dep and replace vapor references. not completed.
zhumin8 Sep 1, 2022
dbefb94
added a Spring dep and replace vapor references.continued.
zhumin8 Sep 1, 2022
4936a48
added a Spring dep and replace vapor references. more.
zhumin8 Sep 1, 2022
4028a66
minor cleanup unused code.
zhumin8 Sep 1, 2022
d7bbe23
fix mistakes made when rebasing to autoconfig-gen-draft2.
zhumin8 Sep 27, 2022
9776b6c
use spring-boot-starter 2.7.4 instead of 2.6.x.
zhumin8 Sep 27, 2022
f4586ae
also add spring dependencies to pom.xml
zhumin8 Sep 27, 2022
a9a1ed6
Merge branch 'autoconfig-gen-draft2' into add-spring-dep, resolved
zhumin8 Nov 17, 2022
9c6f35a
update loc to add spring deps in BUILD.bazel to adjust for new proto…
zhumin8 Nov 17, 2022
1637092
minor cleanups.
zhumin8 Nov 17, 2022
c778ff6
move log classes from vapor to concrete.
zhumin8 Nov 17, 2022
c966379
fix typos.
zhumin8 Nov 18, 2022
7397afa
Merge branch 'autoconfig-gen-draft2' into add-spring-dep
zhumin8 Nov 18, 2022
89dcb4c
Merge branch 'autoconfig-gen-draft2' into add-spring-dep
zhumin8 Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ TEST_DEPS = [
"@io_github_java_diff_utils//jar",
]

SPRING_DEPS = [
"@maven//:org_springframework_boot_spring_boot_starter",
"@maven//:org_springframework_boot_spring_boot_autoconfigure",
"@maven//:org_springframework_boot_spring_boot",
"@maven//:org_springframework_spring_context",
"@maven//:org_springframework_spring_beans",
"@maven//:com_google_cloud_spring_cloud_gcp_core",
"@maven//:commons_logging_commons_logging",
]

proto_library(
name = "service_config_proto",
srcs = ["src/main/proto/service_config.proto"],
Expand Down Expand Up @@ -100,13 +110,13 @@ java_library(
name = "gapic_generator_java",
srcs = glob(["src/main/java/**/*.java"]),
plugins = [":autovalue_plugin"],
deps = MAIN_DEPS,
deps = MAIN_DEPS + SPRING_DEPS,
)

java_library(
name = "gapic_generator_java_test",
srcs = glob(["src/test/java/**/*.java"]),
deps = [":gapic_generator_java"] + MAIN_DEPS + TEST_DEPS,
deps = [":gapic_generator_java"] + MAIN_DEPS + TEST_DEPS + SPRING_DEPS,
)

java_binary(
Expand All @@ -118,7 +128,7 @@ java_binary(
java_binary(
name = "protoc-gen-java_gapic_spring",
main_class = "com.google.api.generator.spring.Main",
runtime_deps = [":gapic_generator_java"] + MAIN_DEPS,
runtime_deps = [":gapic_generator_java"] + MAIN_DEPS + SPRING_DEPS,
)

# Request dumper binary, which dumps the CodeGeneratorRequest to a file on disk
Expand Down
8 changes: 7 additions & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,14 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "pr

load("@rules_jvm_external//:defs.bzl", "maven_install")


SPRING_MAVEN_ARTIFACTS = [
"org.springframework.boot:spring-boot-starter:2.7.4",
"com.google.cloud:spring-cloud-gcp-core:3.3.0",
]

maven_install(
artifacts = PROTOBUF_MAVEN_ARTIFACTS,
artifacts = PROTOBUF_MAVEN_ARTIFACTS + SPRING_MAVEN_ARTIFACTS,
generate_compat_repositories = True,
repositories = [
"https://repo.maven.apache.org/maven2/",
Expand Down
12 changes: 12 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,18 @@
<version>4.13.2</version>
</dependency>

<!-- Spring related dependencies-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.7.4</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>spring-cloud-gcp-core</artifactId>
<version>3.3.0</version>
</dependency>

<!--
TODO: remove when dropping Java 8.
https://github.com/googleapis/gapic-generator-java/issues/888
Expand Down
Loading