Merge pull request #32316 from radcortez/srconfig-2.3.1

Update SmallRye Config to 3.2.1
quarkusio · Apr 6, 2023 · 4746a69 · 4746a69
2 parents aaefdf4 + 8fd0657
commit 4746a69
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -58,7 +58,7 @@
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>3.1</microprofile-openapi.version>
         <smallrye-common.version>2.1.0</smallrye-common.version>
-        <smallrye-config.version>3.2.0</smallrye-config.version>
+        <smallrye-config.version>3.2.1</smallrye-config.version>
         <smallrye-health.version>4.0.1</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.3.2</smallrye-open-api.version>

diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java
@@ -3,7 +3,6 @@
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.StreamSupport.stream;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -304,8 +303,8 @@ void defaults() {
         assertEquals("bar", defaults.bar());
         assertEquals("foo", config.getValue("defaults.foo", String.class));
 
-        final List<String> propertyNames = stream(config.getPropertyNames().spliterator(), false).collect(toList());
-        assertFalse(propertyNames.contains("defaults.foo"));
+        List<String> propertyNames = stream(config.getPropertyNames().spliterator(), false).collect(toList());
+        assertTrue(propertyNames.contains("defaults.foo"));
     }
 
     @ConfigMapping(prefix = "converters")

diff --git a/...cache/deployment/src/main/java/io/quarkus/cache/redis/deployment/RedisCacheProcessor.java b/...cache/deployment/src/main/java/io/quarkus/cache/redis/deployment/RedisCacheProcessor.java
@@ -34,7 +34,6 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.redis.client.deployment.RequestedRedisClientBuildItem;
 import io.quarkus.redis.runtime.client.config.RedisConfig;
@@ -62,11 +61,6 @@ RequestedRedisClientBuildItem requestedRedisClientBuildItem(RedisCachesBuildTime
         return new RequestedRedisClientBuildItem(buildConfig.clientName.orElse(RedisConfig.DEFAULT_CLIENT_NAME));
     }
 
-    @BuildStep
-    RunTimeConfigurationDefaultBuildItem redisCacheByDefault() {
-        return new RunTimeConfigurationDefaultBuildItem("quarkus.cache.type", "redis");
-    }
-
     @BuildStep
     void nativeImage(BuildProducer<ReflectiveClassBuildItem> producer) {
         producer.produce(ReflectiveClassBuildItem.builder(CompositeCacheKey.class).methods(true).build());

diff --git a/extensions/redis-cache/deployment/src/main/resources/application.properties b/extensions/redis-cache/deployment/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# To override "quarkus.cache.type" io.quarkus.cache.runtime.CacheBuildConfig#type()
+quarkus.cache.type=redis
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# To override "quarkus.cache.type" io.quarkus.cache.runtime.CacheBuildConfig#type()
		quarkus.cache.type=redis