From 01583a0dd84dcd0a3e60591ce604c67117c54063 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 1 Dec 2022 20:08:37 +0000 Subject: [PATCH] fix(spring): set autoconfig to be enabled by default. --- .../spring/composer/SpringAutoConfigClassComposer.java | 2 +- .../composer/goldens/EchoSpringAutoConfigurationFull.golden | 2 +- .../composer/goldens/EchoSpringAutoConfigurationGrpc.golden | 2 +- .../composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 index 368c4ff01c..3d32292145 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -262,7 +262,7 @@ private static List createClassAnnotations( Variable.builder().setName("matchIfMissing").setType(TypeNode.BOOLEAN).build())) .setValueExpr( ValueExpr.withValue( - PrimitiveValue.builder().setValue("false").setType(TypeNode.BOOLEAN).build())) + PrimitiveValue.builder().setValue("true").setType(TypeNode.BOOLEAN).build())) .build(); AnnotationNode conditionalOnPropertyNode = AnnotationNode.builder() 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 f742818547..6858cfbcff 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 @@ -61,7 +61,7 @@ import org.threeten.bp.Duration; @ConditionalOnClass(EchoClient.class) @ConditionalOnProperty( value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", - matchIfMissing = false) + matchIfMissing = true) @EnableConfigurationProperties({EchoSpringProperties.class, GlobalProperties.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 70a77bff70..1c34352e5a 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 @@ -41,7 +41,7 @@ import org.threeten.bp.Duration; @ConditionalOnClass(EchoClient.class) @ConditionalOnProperty( value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", - matchIfMissing = false) + matchIfMissing = true) @EnableConfigurationProperties({EchoSpringProperties.class, GlobalProperties.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 a710b16903..00fccb6b39 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 @@ -42,7 +42,7 @@ import org.threeten.bp.Duration; @ConditionalOnClass(EchoClient.class) @ConditionalOnProperty( value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", - matchIfMissing = false) + matchIfMissing = true) @EnableConfigurationProperties({EchoSpringProperties.class, GlobalProperties.class}) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties;