Skip to content

Commit

Permalink
Case-sensitive EnvProperty
Browse files Browse the repository at this point in the history
  • Loading branch information
@radcortez
radcortez committed Nov 7, 2023
1 parent bf9969f commit aad0659
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 48 deletions.
13 changes: 7 additions & 6 deletions implementation/src/main/java/io/smallrye/config/EnvConfigSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import static io.smallrye.config.common.utils.ConfigSourceUtil.CONFIG_ORDINAL_KEY;
import static io.smallrye.config.common.utils.StringUtil.isNumeric;
import static java.lang.Character.toLowerCase;
import static java.security.AccessController.doPrivileged;

import java.io.Serializable;
Expand Down Expand Up @@ -78,7 +77,9 @@ public EnvConfigSource(final Map<String, String> properties, final int ordinal)
for (Map.Entry<String, String> entry : properties.entrySet()) {
this.properties.put(new EnvProperty(entry.getKey()), entry.getValue());
this.names.add(entry.getKey());
this.names.add(StringUtil.toLowerCaseAndDotted(entry.getKey()));
String keyLowerCaseAndDotted = StringUtil.toLowerCaseAndDotted(entry.getKey());
this.properties.putIfAbsent(new EnvProperty(keyLowerCaseAndDotted), entry.getValue());
this.names.add(keyLowerCaseAndDotted);
}
}

Expand Down Expand Up @@ -198,7 +199,7 @@ public int hashCode() {
case '/':
continue;
}
h = 31 * h + Character.toLowerCase(c);
h = 31 * h + c;
}
return h;
}
Expand Down Expand Up @@ -244,11 +245,11 @@ static boolean equals(final String name, final String other) {
}

if (o == '.') {
if (n != '.' && n != '-' && n != '_') {
if (n != '.' && n != '-' && n != '_' && n != '/') {
return false;
}
} else if (o == '-') {
if (n != '.' && n != '-' && n != '_') {
if (n != '.' && n != '-' && n != '_' && n != '/') {
return false;
}
} else if (o == '"') {
Expand Down Expand Up @@ -287,7 +288,7 @@ && isNumeric(name, matchPosition - range, matchPosition)) {
return false;
}
}
} else if (toLowerCase(o) != toLowerCase(n)) {
} else if (o != n) {
return false;
}
matchPosition--;
Expand Down
89 changes: 47 additions & 42 deletions implementation/src/test/java/io/smallrye/config/EnvConfigSourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package io.smallrye.config;

import static io.smallrye.config.Converters.BOOLEAN_CONVERTER;
import static io.smallrye.config.Converters.STRING_CONVERTER;
import static io.smallrye.config.KeyValuesConfigSource.config;
import static java.util.stream.Collectors.toList;
Expand Down Expand Up @@ -175,52 +176,40 @@ void envEquals() {
assertFalse(EnvProperty.equals("BAR", new String("foo.bar")));
assertFalse(EnvProperty.equals("foo.bar", new String("BAR")));

assertTrue(EnvProperty.equals("FOO_BAR", new String("FOO_BAR")));
assertTrue(EnvProperty.equals("FOO_BAR", new String("foo.bar")));
assertTrue(EnvProperty.equals("FOO_BAR", new String("FOO.BAR")));
assertTrue(EnvProperty.equals("FOO_BAR", new String("foo-bar")));
assertTrue(EnvProperty.equals("FOO_BAR", new String("foo_bar")));
assertTrue(envSourceEquals("FOO_BAR", new String("FOO_BAR")));
assertTrue(envSourceEquals("FOO_BAR", new String("foo.bar")));
assertTrue(envSourceEquals("FOO_BAR", new String("FOO.BAR")));
assertTrue(envSourceEquals("FOO_BAR", new String("foo-bar")));
assertTrue(envSourceEquals("FOO_BAR", new String("foo_bar")));

assertTrue(EnvProperty.equals("foo.bar", new String("foo.bar")));
assertTrue(EnvProperty.equals("foo-bar", new String("foo-bar")));
assertTrue(EnvProperty.equals("foo.bar", new String("FOO_BAR")));
assertTrue(EnvProperty.equals("FOO.BAR", new String("FOO_BAR")));
assertTrue(EnvProperty.equals("foo-bar", new String("FOO_BAR")));
assertTrue(EnvProperty.equals("foo_bar", new String("FOO_BAR")));

assertTrue(EnvProperty.equals("FOO__BAR__BAZ", new String("foo.\"bar\".baz")));
assertTrue(EnvProperty.equals("foo.\"bar\".baz", new String("FOO__BAR__BAZ")));

assertTrue(EnvProperty.equals("FOO__BAR__BAZ_0__Z_0_", new String("foo.\"bar\".baz[0].z[0]")));

assertTrue(EnvProperty.equals("_DEV_FOO_BAR", new String("%dev.foo.bar")));
assertTrue(EnvProperty.equals("%dev.foo.bar", new String("_DEV_FOO_BAR")));
assertTrue(EnvProperty.equals("_ENV_SMALLRYE_MP_CONFIG_PROP", new String("_ENV_SMALLRYE_MP_CONFIG_PROP")));
assertTrue(EnvProperty.equals("%env.smallrye.mp.config.prop", new String("%env.smallrye.mp.config.prop")));
assertTrue(EnvProperty.equals("_ENV_SMALLRYE_MP_CONFIG_PROP", new String("%env.smallrye.mp.config.prop")));
assertTrue(EnvProperty.equals("%env.smallrye.mp.config.prop", new String("_ENV_SMALLRYE_MP_CONFIG_PROP")));

assertTrue(EnvProperty.equals("indexed[0]", new String("indexed[0]")));
assertTrue(EnvProperty.equals("INDEXED_0_", new String("INDEXED_0_")));
assertTrue(EnvProperty.equals("indexed[0]", new String("INDEXED_0_")));
assertTrue(EnvProperty.equals("INDEXED_0_", new String("indexed[0]")));
assertTrue(EnvProperty.equals("foo.bar.indexed[0]", new String("foo.bar.indexed[0]")));
assertTrue(EnvProperty.equals("FOO_BAR_INDEXED_0_", new String("foo.bar.indexed[0]")));
assertTrue(EnvProperty.equals("foo.bar[0].indexed[0]", new String("foo.bar[0].indexed[0]")));
assertTrue(EnvProperty.equals("FOO_BAR_0__INDEXED_0_", new String("foo.bar[0].indexed[0]")));

assertTrue(EnvProperty.equals("env.\"quoted.key\".value", new String("env.\"quoted.key\".value")));
assertTrue(EnvProperty.equals("ENV__QUOTED_KEY__VALUE", new String("ENV__QUOTED_KEY__VALUE")));
assertTrue(EnvProperty.equals("ENV__QUOTED_KEY__VALUE", new String("env.\"quoted.key\".value")));
assertTrue(EnvProperty.equals("env.\"quoted.key\".value", new String("ENV__QUOTED_KEY__VALUE")));
assertTrue(EnvProperty.equals("env.\"quoted.key\".value", new String("env.\"quoted-key\".value")));
assertTrue(EnvProperty.equals("env.\"quoted-key\".value", new String("env.\"quoted.key\".value")));

assertTrue(EnvProperty.equals("TEST_LANGUAGE__DE_ETR__", new String("test.language.\"de.etr\"")));
assertTrue(EnvProperty.equals("test.language.\"de.etr\"", new String("TEST_LANGUAGE__DE_ETR__")));

assertEquals(new EnvProperty("TEST_LANGUAGE__DE_ETR_").hashCode(),
new EnvProperty("test.language.\"de.etr\"").hashCode());

assertTrue(envSourceEquals("FOO__BAR__BAZ", new String("foo.\"bar\".baz")));
assertTrue(envSourceEquals("FOO__BAR__BAZ_0__Z_0_", new String("foo.\"bar\".baz[0].z[0]")));

assertTrue(envSourceEquals("_DEV_FOO_BAR", new String("%dev.foo.bar")));
assertTrue(envSourceEquals("%env.smallrye.mp.config.prop", new String("%env.smallrye.mp.config.prop")));
assertTrue(envSourceEquals("_ENV_SMALLRYE_MP_CONFIG_PROP", new String("%env.smallrye.mp.config.prop")));

assertTrue(envSourceEquals("indexed[0]", new String("indexed[0]")));
assertTrue(envSourceEquals("INDEXED_0_", new String("INDEXED_0_")));
assertTrue(envSourceEquals("INDEXED_0_", new String("indexed[0]")));
assertTrue(envSourceEquals("foo.bar.indexed[0]", new String("foo.bar.indexed[0]")));
assertTrue(envSourceEquals("FOO_BAR_INDEXED_0_", new String("foo.bar.indexed[0]")));
assertTrue(envSourceEquals("foo.bar[0].indexed[0]", new String("foo.bar[0].indexed[0]")));
assertTrue(envSourceEquals("FOO_BAR_0__INDEXED_0_", new String("foo.bar[0].indexed[0]")));

assertTrue(envSourceEquals("env.\"quoted.key\".value", new String("env.\"quoted.key\".value")));
assertTrue(envSourceEquals("ENV__QUOTED_KEY__VALUE", new String("ENV__QUOTED_KEY__VALUE")));
assertTrue(envSourceEquals("ENV__QUOTED_KEY__VALUE", new String("env.\"quoted.key\".value")));
assertTrue(envSourceEquals("env.\"quoted.key\".value", new String("env.\"quoted-key\".value")));
assertTrue(envSourceEquals("env.\"quoted-key\".value", new String("env.\"quoted.key\".value")));
assertTrue(envSourceEquals("TEST_LANGUAGE__DE_ETR__", new String("test.language.\"de.etr\"")));

assertTrue(EnvProperty.equals("smallrye/mp/config/prop", new String("smallrye/mp/config/prop")));
assertTrue(envSourceEquals("SMALLRYE_MP_CONFIG_PROP", new String("smallrye/mp/config/prop")));
}

@Test
Expand All @@ -237,4 +226,20 @@ void sameSemanticMeaning() {

assertEquals("fromEnv", config.getRawValue("foo.bar-baz"));
}

@Test
void sameNames() {
EnvConfigSource envConfigSource = new EnvConfigSource(
Map.of("my_string_property", "lower", "MY_STRING_PROPERTY", "upper"), 100);
assertFalse(EnvProperty.equals("MY_STRING_PROPERTY", "my_string_property"));
assertFalse(EnvProperty.equals("my_string_property", "MY_STRING_PROPERTY"));
assertTrue(EnvProperty.equals("my_string_property", "my_string_property"));
assertTrue(EnvProperty.equals("MY_STRING_PROPERTY", "MY_STRING_PROPERTY"));
assertEquals("lower", envConfigSource.getValue("my_string_property"));
assertEquals("upper", envConfigSource.getValue("MY_STRING_PROPERTY"));
}

private static boolean envSourceEquals(String name, String lookup) {
return BOOLEAN_CONVERTER.convert(new EnvConfigSource(Map.of(name, "true"), 100).getValue(lookup));
}
}

0 comments on commit aad0659

Please sign in to comment.