Update dependency from spring-cloud-gcp-core to autoconfigure

googleapis · Jan 4, 2023 · d6e400e · d6e400e
1 parent 94b1d09
commit d6e400e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -53,6 +53,7 @@ SPRING_DEPS = [
     "@maven//:org_springframework_boot_spring_boot",
     "@maven//:org_springframework_spring_context",
     "@maven//:org_springframework_spring_beans",
+    "@maven//:com_google_cloud_spring_cloud_gcp_autoconfigure",
     "@maven//:com_google_cloud_spring_cloud_gcp_core",
     "@maven//:commons_logging_commons_logging",
 ]

diff --git a/WORKSPACE b/WORKSPACE
@@ -82,7 +82,7 @@ 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",
+    "com.google.cloud:spring-cloud-gcp-autoconfigure:3.3.0",
 ]
 
 maven_install(

diff --git a/pom.xml b/pom.xml
@@ -332,7 +332,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
-      <artifactId>spring-cloud-gcp-core</artifactId>
+      <artifactId>spring-cloud-gcp-autoconfigure</artifactId>
       <version>3.3.0</version>
     </dependency>
 

diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
@@ -58,6 +58,7 @@
 import com.google.api.generator.spring.utils.ComposerUtils;
 import com.google.api.generator.spring.utils.LoggerUtils;
 import com.google.api.generator.spring.utils.Utils;
+import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
 import com.google.cloud.spring.core.Credentials;
 import com.google.cloud.spring.core.DefaultCredentialsProvider;
 import com.google.common.base.CaseFormat;
@@ -316,7 +317,7 @@ private static List<AnnotationNode> createClassAnnotations(
                 VariableExpr.builder()
                     .setVariable(
                         Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build())
-                    .setStaticReferenceType(types.get("GcpContextAutoConfiguration"))
+                    .setStaticReferenceType(STATIC_TYPES.get("GcpContextAutoConfiguration"))
                     .build())
             .build();
     AnnotationNode configurationNode =
@@ -963,6 +964,7 @@ private static Map<String, TypeNode> createStaticTypes() {
             ConditionalOnMissingBean.class,
             EnableConfigurationProperties.class,
             CredentialsProvider.class,
+            GcpContextAutoConfiguration.class,
             AutoConfiguration.class,
             AutoConfigureAfter.class,
             Bean.class,
@@ -1013,15 +1015,6 @@ private static Map<String, TypeNode> createDynamicTypes(Service service, String
                 .setPakkage("com.google.cloud.spring.core.util")
                 .build());
 
-    // TODO: This should move to static types after adding spring-cloud-gcp-autoconfigure as
-    // dependency
-    TypeNode gcpContextAutoConfiguration =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("GcpContextAutoConfiguration")
-                .setPakkage("com.google.cloud.spring.autoconfigure")
-                .build());
-
     TypeNode serviceClient =
         TypeNode.withReference(
             VaporReference.builder()
@@ -1049,7 +1042,6 @@ private static Map<String, TypeNode> createDynamicTypes(Service service, String
     typeMap.put("ServiceSettingsBuilder", serviceSettingsBuilder);
     typeMap.put("Retry", retryProperties);
     typeMap.put("RetryUtil", retryUtil);
-    typeMap.put("GcpContextAutoConfiguration", gcpContextAutoConfiguration);
 
     return typeMap;
   }