diff --git a/redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java b/redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java index aa65203a3..cb06f04e6 100644 --- a/redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java +++ b/redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java @@ -31,7 +31,10 @@ import javax.inject.Singleton; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; /** * @@ -60,7 +63,8 @@ public class RedissonClientProducer { configStream.read(array); config = new String(array, StandardCharsets.UTF_8); } else { - String yaml = PropertiesConvertor.toYaml("quarkus.redisson.", ConfigProvider.getConfig().getPropertyNames(), prop -> { + Stream s = StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false); + String yaml = PropertiesConvertor.toYaml("quarkus.redisson.", s.sorted().collect(Collectors.toList()), prop -> { return ConfigProvider.getConfig().getValue(prop, String.class); }, false); config = yaml; diff --git a/redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java b/redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java index 2f3e95f98..e64603d67 100644 --- a/redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java +++ b/redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java @@ -32,6 +32,9 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; /** * @@ -60,7 +63,8 @@ public class RedissonClientProducer { configStream.read(array); config = new String(array, StandardCharsets.UTF_8); } else { - String yaml = PropertiesConvertor.toYaml("quarkus.redisson.", ConfigProvider.getConfig().getPropertyNames(), prop -> { + Stream s = StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false); + String yaml = PropertiesConvertor.toYaml("quarkus.redisson.", s.sorted().collect(Collectors.toList()), prop -> { return ConfigProvider.getConfig().getValue(prop, String.class); }, false); config = yaml; diff --git a/redisson/src/main/java/org/redisson/config/PropertiesConvertor.java b/redisson/src/main/java/org/redisson/config/PropertiesConvertor.java index a3736116c..f6657ef5e 100644 --- a/redisson/src/main/java/org/redisson/config/PropertiesConvertor.java +++ b/redisson/src/main/java/org/redisson/config/PropertiesConvertor.java @@ -28,11 +28,7 @@ public class PropertiesConvertor { public static String toYaml(String suffix, Iterable propertyNames, Function resolver, boolean caseSensitive) { Map map = new HashMap<>(); - List names = new ArrayList<>(); - propertyNames.iterator().forEachRemaining(names::add); - names.sort(Comparator.naturalOrder()); - - for (String propertyName : names) { + for (String propertyName : propertyNames) { if (!propertyName.startsWith(suffix)) { continue; }