From d9b074330e7266d5ea7a84da86869ff5e9752fdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 21:36:02 +0000 Subject: [PATCH] Bump io.smallrye.config:smallrye-config from 3.4.1 to 3.4.3 Bumps [io.smallrye.config:smallrye-config](https://github.com/smallrye/smallrye-config) from 3.4.1 to 3.4.3. - [Release notes](https://github.com/smallrye/smallrye-config/releases) - [Commits](https://github.com/smallrye/smallrye-config/compare/3.4.1...3.4.3) --- updated-dependencies: - dependency-name: io.smallrye.config:smallrye-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- .../providers/impl/ConnectorConfig.java | 6 ++-- .../providers/impl/ConnectorConfigTest.java | 31 +++++++++++++------ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 739430425f..3a8914d3cf 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 4.0.1 4.0 - 3.4.1 + 3.4.3 4.0.0 2.2.0 4.0.4 diff --git a/smallrye-reactive-messaging-provider/src/main/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfig.java b/smallrye-reactive-messaging-provider/src/main/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfig.java index 522f586181..3a534701a4 100644 --- a/smallrye-reactive-messaging-provider/src/main/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfig.java +++ b/smallrye-reactive-messaging-provider/src/main/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfig.java @@ -182,7 +182,7 @@ public Iterable getPropertyNames() { } } else if (name.startsWith(connectorPrefixAlphaUpper)) { String computed = name.substring(connectorPrefixAlphaUpper.length()); - if (nameExists(connectorPrefix + computed)) { + if (nameExists(connectorPrefixAlphaUpper + computed)) { names.add(computed); } } else if (name.startsWith(prefix)) { @@ -190,12 +190,12 @@ public Iterable getPropertyNames() { names.add(computed); } else if (name.startsWith(prefixAlpha)) { String computed = name.substring(prefixAlpha.length()); - if (nameExists(prefix + computed)) { + if (nameExists(prefixAlpha + computed)) { names.add(computed); } } else if (name.startsWith(prefixAlphaUpper)) { String computed = name.substring(prefixAlphaUpper.length()); - if (nameExists(prefix + computed)) { + if (nameExists(prefixAlphaUpper + computed)) { names.add(computed); } } diff --git a/smallrye-reactive-messaging-provider/src/test/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfigTest.java b/smallrye-reactive-messaging-provider/src/test/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfigTest.java index 25a68b3a07..6d80b4dc13 100644 --- a/smallrye-reactive-messaging-provider/src/test/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfigTest.java +++ b/smallrye-reactive-messaging-provider/src/test/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfigTest.java @@ -15,6 +15,7 @@ import org.junit.jupiter.api.condition.JRE; import org.junitpioneer.jupiter.SetEnvironmentVariable; +import io.smallrye.config.EnvConfigSource; import io.smallrye.config.SmallRyeConfig; import io.smallrye.config.SmallRyeConfigBuilder; @@ -100,19 +101,19 @@ public void testPropertyNames() { assertThat(names) .containsExactlyInAnyOrder("connector", "ATTR1", "attr1", "attr2", "attr.2", "ATTR", "attr", "AT_TR", "at-tr", "key", - "SOME_KEY", "some-key", "SOME_OTHER_KEY", "ATTR3", "attr4", "channel-name"); + "SOME_KEY", "some-key", "SOME_OTHER_KEY", "ATTR3", "attr4", "channel-name", "CAPSKEY"); assertThat(config.getOptionalValue("connector", String.class)).hasValue("some-connector"); assertThat(config.getOptionalValue("attr1", String.class)).hasValue("value"); assertThat(config.getOptionalValue("attr2", Integer.class)).hasValue(23); assertThat(config.getOptionalValue("attr.2", String.class)).hasValue("test"); assertThat(config.getOptionalValue("at-tr", String.class)).hasValue("another-value"); - assertThat(config.getOptionalValue("AT_TR", String.class)).hasValue("another-value"); + assertThat(config.getConfigValue("at-tr")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource"); assertThat(config.getOptionalValue("some-key", String.class)).hasValue("another-value-from-connector"); - assertThat(config.getOptionalValue("SOME_KEY", String.class)).hasValue("another-value-from-connector"); + assertThat(config.getConfigValue("some-key")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource"); assertThat(config.getOptionalValue("key", String.class)).hasValue("value"); assertThat(config.getOptionalValue("attr3", String.class)).hasValue("used"); - assertThat(config.getOptionalValue("ATTR3", String.class)).hasValue("used"); + assertThat(config.getConfigValue("attr3")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource"); assertThat(config.getOptionalValue("attr4", String.class)).hasValue("used"); } @@ -120,13 +121,23 @@ public void testPropertyNames() { @SetEnvironmentVariable(key = "MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR3", value = "used") @SetEnvironmentVariable(key = "MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR4", value = "used-2") public void testGetFromEnv() { - // All uppercase value in env - assertThat(config.getOptionalValue("ATTR3", String.class)).hasValue("used"); - // All lowercase value in env - assertThat(config.getOptionalValue("ATTR4", String.class)).hasValue("used-2"); - // Mixed case value in env should not be found as it does not match the key we're looking for - // either in its original casing, or after conversion to uppercase. + // mp_messaging_connector_some_connector_attr4 is selected because is closer to mp.messaging.connector.some-connector.attr4 + assertThat(new EnvConfigSource(Map.of("mp_messaging_connector_some_connector_attr4", "used", + "MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR4", "used-2"), 100).getValue( + "mp.messaging.connector.some-connector.attr4")) + .isEqualTo("used"); + // when there are no competing properties select the one that exists + assertThat(new EnvConfigSource(Map.of("MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR4", "used-2"), 100).getValue( + "mp.messaging.connector.some-connector.attr4")).isEqualTo("used-2"); + + assertThat(config.getOptionalValue("attr3", String.class)).hasValue("used"); + assertThat(config.getConfigValue("attr3")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource"); + // both mp_messaging_connector_some_connector_attr4 and MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR4 are set in Env + // lookup is done to mp.messaging.connector.some-connector.attr4, selects mp_messaging_connector_some_connector_attr4 + assertThat(config.getOptionalValue("attr4", String.class)).hasValue("used"); + assertThat(config.getConfigValue("attr4")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource"); assertThat(config.getOptionalValue("mixedcase", String.class)).hasValue("used"); + assertThat(config.getConfigValue("mixedcase")).extracting(ConfigValue::getSourceName).isEqualTo("EnvConfigSource"); } @Test