From 4433486573eb9008bd3d0799c6a439715e3053c5 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 20 Dec 2022 23:28:36 +0000 Subject: [PATCH] fix: remove spring.auto from property prefix. --- .../java/com/google/api/generator/spring/utils/Utils.java | 6 ++---- .../composer/goldens/EchoSpringAutoConfigurationFull.golden | 4 +--- .../composer/goldens/EchoSpringAutoConfigurationGrpc.golden | 4 +--- .../goldens/EchoSpringAutoConfigurationGrpcRest.golden | 4 +--- .../spring/composer/goldens/EchoSpringPropertiesFull.golden | 2 +- .../spring/composer/goldens/EchoSpringPropertiesGrpc.golden | 2 +- .../composer/goldens/EchoSpringPropertiesGrpcRest.golden | 2 +- .../spring/goldens/SpringAdditionalMetadataJson.golden | 2 +- 8 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/utils/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java index e74451bfa9..919ffc4288 100644 --- a/src/main/java/com/google/api/generator/spring/utils/Utils.java +++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java @@ -75,12 +75,10 @@ public static String getSpringPropertyPrefix(String packageName, String serviceN // Returns unique prefix for setting properties and enabling autoconfiguration // Pattern: [package-name].spring.auto.[service-name] // e.g. for vision's ImageAnnotator service: - // com.google.cloud.vision.v1.spring.auto.image-annotator + // com.google.cloud.vision.v1.image-annotator // Service name is converted to lower hyphen as required by ConfigurationPropertyName // https://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/context/properties/source/ConfigurationPropertyName.html - return packageName - + ".spring.auto." - + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, serviceName); + return packageName + "." + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, serviceName); } private static TypeStore createStaticTypes() { diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 7e07ecfe33..9d1020bb16 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -59,9 +59,7 @@ import org.springframework.context.annotation.Bean; @BetaApi("Autogenerated Spring autoconfiguration is not yet stable") @AutoConfiguration @ConditionalOnClass(EchoClient.class) -@ConditionalOnProperty( - value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "com.google.showcase.v1beta1.echo.enabled", matchIfMissing = true) @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden index a822ef8805..4d94bda11f 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden @@ -39,9 +39,7 @@ import org.springframework.context.annotation.Bean; */ @AutoConfiguration @ConditionalOnClass(EchoClient.class) -@ConditionalOnProperty( - value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "com.google.showcase.v1beta1.echo.enabled", matchIfMissing = true) @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden index 055274714b..032111945f 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden @@ -40,9 +40,7 @@ import org.springframework.context.annotation.Bean; */ @AutoConfiguration @ConditionalOnClass(EchoClient.class) -@ConditionalOnProperty( - value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "com.google.showcase.v1beta1.echo.enabled", matchIfMissing = true) @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index 440f66c440..64f2d24334 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; /** Provides default property values for Echo client bean */ @Generated("by google-cloud-spring-generator") @BetaApi("Autogenerated Spring autoconfiguration is not yet stable") -@ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") +@ConfigurationProperties("com.google.showcase.v1beta1.echo") public class EchoSpringProperties implements CredentialsSupplier { @NestedConfigurationProperty private final Credentials credentials = diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden index 4f7d07a43e..ac170442b7 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** Provides default property values for Echo client bean */ -@ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") +@ConfigurationProperties("com.google.showcase.v1beta1.echo") public class EchoSpringProperties implements CredentialsSupplier { @NestedConfigurationProperty private final Credentials credentials = diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden index f28ef77a8f..9bb3205822 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** Provides default property values for Echo client bean */ -@ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") +@ConfigurationProperties("com.google.showcase.v1beta1.echo") public class EchoSpringProperties implements CredentialsSupplier { @NestedConfigurationProperty private final Credentials credentials = diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden index 16963f0b1c..4e42cb414c 100644 --- a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden @@ -1,7 +1,7 @@ { "properties": [ { - "name": "com.google.showcase.v1beta1.spring.auto.echo.enabled", + "name": "com.google.showcase.v1beta1.echo.enabled", "type": "java.lang.Boolean", "description": "Auto-configure Google Cloud localhost:7469/Echo components.", "defaultValue": true