Skip to content

Commit 164ffcf

Browse files
radcortezradcortez
committed
Update SmallRye Config to 3.13.0
1 parent 61ea91e commit 164ffcf

File tree

5 files changed

+63
-179
lines changed

5 files changed

+63
-179
lines changed

‎bom/application/pom.xml

Lines changed: 6 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<microprofile-lra.version>2.0.1</microprofile-lra.version>
4848
<microprofile-openapi.version>4.0.2</microprofile-openapi.version>
4949
<smallrye-common.version>2.12.0</smallrye-common.version>
50-
<smallrye-config.version>3.12.4</smallrye-config.version>
50+
<smallrye-config.version>3.13.0</smallrye-config.version>
5151
<smallrye-health.version>4.2.0</smallrye-health.version>
5252
<smallrye-metrics.version>4.0.0</smallrye-metrics.version>
5353
<smallrye-open-api.version>4.0.10</smallrye-open-api.version>
@@ -4119,69 +4119,23 @@
41194119
<version>${project.version}</version>
41204120
</dependency>
41214121
<dependency>
4122-
<!-- NOTE: this dependency is here to cause relocations to work; DO NOT MODIFY -->
4123-
<groupId>io.smallrye</groupId>
4124-
<artifactId>smallrye-config</artifactId>
4125-
<!-- This is intentionally hard-coded -->
4126-
<version>1.5.0</version>
4127-
</dependency>
4128-
<dependency>
4129-
<!-- NOTE: this dependency is here to cause relocations to work; DO NOT MODIFY -->
4130-
<groupId>io.smallrye</groupId>
4131-
<artifactId>smallrye-config-common</artifactId>
4132-
<!-- This is intentionally hard-coded -->
4133-
<version>1.5.0</version>
4122+
<groupId>io.smallrye.config</groupId>
4123+
<artifactId>smallrye-config-bom</artifactId>
4124+
<version>${smallrye-config.version}</version>
4125+
<type>pom</type>
4126+
<scope>import</scope>
41344127
</dependency>
41354128
<dependency>
41364129
<groupId>io.smallrye.config</groupId>
41374130
<artifactId>smallrye-config</artifactId>
41384131
<version>${smallrye-config.version}</version>
41394132
<exclusions>
4140-
<exclusion>
4141-
<groupId>org.osgi</groupId>
4142-
<artifactId>org.osgi.annotation.versioning</artifactId>
4143-
</exclusion>
41444133
<exclusion>
41454134
<groupId>org.ow2.asm</groupId>
41464135
<artifactId>asm</artifactId>
41474136
</exclusion>
41484137
</exclusions>
41494138
</dependency>
4150-
<dependency>
4151-
<groupId>io.smallrye.config</groupId>
4152-
<artifactId>smallrye-config-common</artifactId>
4153-
<version>${smallrye-config.version}</version>
4154-
</dependency>
4155-
<dependency>
4156-
<groupId>io.smallrye.config</groupId>
4157-
<artifactId>smallrye-config-core</artifactId>
4158-
<version>${smallrye-config.version}</version>
4159-
</dependency>
4160-
<dependency>
4161-
<groupId>io.smallrye.config</groupId>
4162-
<artifactId>smallrye-config-validator</artifactId>
4163-
<version>${smallrye-config.version}</version>
4164-
</dependency>
4165-
<dependency>
4166-
<groupId>io.smallrye.config</groupId>
4167-
<artifactId>smallrye-config-source-file-system</artifactId>
4168-
<version>${smallrye-config.version}</version>
4169-
</dependency>
4170-
<dependency>
4171-
<groupId>io.smallrye.config</groupId>
4172-
<artifactId>smallrye-config-source-yaml</artifactId>
4173-
<version>${smallrye-config.version}</version>
4174-
</dependency>
4175-
<dependency>
4176-
<groupId>io.smallrye.config</groupId>
4177-
<artifactId>smallrye-config-source-keystore</artifactId>
4178-
<version>${smallrye-config.version}</version>
4179-
</dependency>
4180-
<dependency>
4181-
<groupId>io.smallrye.config</groupId>
4182-
<artifactId>smallrye-config-crypto</artifactId>
4183-
<version>${smallrye-config.version}</version>
4184-
</dependency>
41854139
<dependency>
41864140
<groupId>io.smallrye</groupId>
41874141
<artifactId>smallrye-health</artifactId>

‎extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientBuildTimeConfigBuilderCustomizer.java

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package io.quarkus.restclient.configuration;
2+
3+
import java.util.Collections;
4+
import java.util.Map;
5+
import java.util.Set;
6+
7+
import org.eclipse.microprofile.config.spi.ConfigSource;
8+
9+
import io.smallrye.config.SmallRyeConfigBuilder;
10+
import io.smallrye.config.SmallRyeConfigBuilderCustomizer;
11+
import io.smallrye.config.common.MapBackedConfigSource;
12+
13+
public class RestClientBuildTimeConfigBuilderCustomizer implements SmallRyeConfigBuilderCustomizer {
14+
private static final Map<String, String> BUILD_TIME_PROPERTIES = Map.of(
15+
"io.quarkus.restclient.configuration.EchoClient/mp-rest/url", "http://nohost",
16+
"BT-MP/mp-rest/url", "from-mp",
17+
"BT-QUARKUS-MP/mp-rest/url", "from-mp",
18+
"quarkus.rest-client.BT-QUARKUS-MP.url", "from-quarkus");
19+
20+
@Override
21+
public void configBuilder(final SmallRyeConfigBuilder builder) {
22+
boolean isBuildTime = false;
23+
for (ConfigSource source : builder.getSources()) {
24+
if ("PropertiesConfigSource[source=Build system]".equals(source.getName())) {
25+
isBuildTime = true;
26+
break;
27+
}
28+
}
29+
30+
if (isBuildTime) {
31+
// A build time only source to test the recording of configuration values.
32+
builder.withSources(
33+
new MapBackedConfigSource("RestClientBuildTimeConfigSource", BUILD_TIME_PROPERTIES, Integer.MAX_VALUE) {
34+
});
35+
} else {
36+
builder.withSources(new MapBackedConfigSource("RestClientRuntimeConfigSource", Map.of(), Integer.MAX_VALUE) {
37+
@Override
38+
public String getValue(final String propertyName) {
39+
if (!propertyName.equals("io.quarkus.restclient.configuration.EchoClient/mp-rest/url")) {
40+
return null;
41+
}
42+
43+
return "http://localhost:${quarkus.http.test-port:8081}";
44+
}
45+
46+
@Override
47+
public Set<String> getPropertyNames() {
48+
return Collections.singleton("io.quarkus.restclient.configuration.EchoClient/mp-rest/url");
49+
}
50+
});
51+
}
52+
}
53+
}

‎extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientBuildTimeConfigSource.java

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientOverrideRuntimeConfigTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ public class RestClientOverrideRuntimeConfigTest {
2727
@RegisterExtension
2828
static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(
2929
() -> ShrinkWrap.create(JavaArchive.class)
30-
.addClasses(EchoResource.class, EchoClient.class, RestClientBuildTimeConfigSource.class,
31-
RestClientRunTimeConfigSource.class)
32-
.addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource",
33-
"io.quarkus.restclient.configuration.RestClientBuildTimeConfigSource",
34-
"io.quarkus.restclient.configuration.RestClientRunTimeConfigSource"));
30+
.addClasses(EchoResource.class, EchoClient.class, RestClientBuildTimeConfigBuilderCustomizer.class)
31+
.addAsServiceProvider("io.smallrye.config.SmallRyeConfigBuilderCustomizer",
32+
"io.quarkus.restclient.configuration.RestClientBuildTimeConfigBuilderCustomizer"));
3533

3634
@Inject
3735
@RestClient
@@ -59,7 +57,7 @@ void overrideConfig() {
5957
ConfigValue quarkusValue = config
6058
.getConfigValue("quarkus.rest-client.\"io.quarkus.restclient.configuration.EchoClient\".url");
6159
assertEquals(mpValue.getValue(), quarkusValue.getValue());
62-
assertEquals(RestClientRunTimeConfigSource.class.getName(), quarkusValue.getConfigSourceName());
60+
assertEquals("RestClientRuntimeConfigSource", quarkusValue.getConfigSourceName());
6361
// There is no relocate for MP names, so it keeps the same name
6462
assertEquals(mpValue.getName(), "io.quarkus.restclient.configuration.EchoClient/mp-rest/url");
6563
// We use the Quarkus name, because that is the one that has priority

‎extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientRunTimeConfigSource.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)