github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6086 from seakider/impro_quarkus_try_resource

Browse Source 
Improvement - quarkus should make an attempt to read config file using Thread's ContextClassLoader
pull/6089/head
Nikita Koksharov 6 months ago committed by GitHub
parent f45186d072 f40f634ddc
commit 5ec516a0d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File

BIN
redisson-quarkus/redisson-quarkus-16/runtime/RedissonConfig.class
View File

Binary file not shown.

29
redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
Unescape Escape View File

@ -34,7 +34,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.time.Duration; import java.time.Duration;
import java.util.*; import java.util.Optional;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -57,27 +57,24 @@ public class RedissonClientProducer {
@Singleton @Singleton
@DefaultBean @DefaultBean
public RedissonClient create() throws IOException { public RedissonClient create() throws IOException {
InputStream configStream; String config = null;
Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class); Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class);
if (configFile.isPresent()) { String configFileName = configFile.orElse("redisson.yaml");
configStream = getClass().getResourceAsStream(configFile.get()); try (InputStream configStream = Optional.ofNullable(getClass().getResourceAsStream(configFileName))
if (configStream == null) { .orElse(Thread.currentThread().getContextClassLoader().getResourceAsStream(configFileName))
configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(configFile.get()); ) {
if (configStream != null) {
byte[] array = new byte[configStream.available()];
if (configStream.read(array) != -1) {
config = new String(array, StandardCharsets.UTF_8);
}
} }
} else {
configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("redisson.yaml");
} }
String config; if (config == null) {
if (configStream != null) {
byte[] array = new byte[configStream.available()];
configStream.read(array);
config = new String(array, StandardCharsets.UTF_8);
} else {
Stream<String> s = StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false); Stream<String> s = StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false);
String yaml = PropertiesConvertor.toYaml("quarkus.redisson.", s.sorted().collect(Collectors.toList()), prop -> { config = PropertiesConvertor.toYaml("quarkus.redisson.", s.sorted().collect(Collectors.toList()), prop -> {
return ConfigProvider.getConfig().getValue(prop, String.class); return ConfigProvider.getConfig().getValue(prop, String.class);
}, false); }, false);
config = yaml;
} }
ConfigSupport support = new ConfigSupport() { ConfigSupport support = new ConfigSupport() {

27
redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
Unescape Escape View File

@ -57,27 +57,24 @@ public class RedissonClientProducer {
@Singleton @Singleton
@DefaultBean @DefaultBean
public RedissonClient create() throws IOException { public RedissonClient create() throws IOException {
InputStream configStream; String config = null;
Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class); Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class);
if (configFile.isPresent()) { String configFileName = configFile.orElse("redisson.yaml");
configStream = getClass().getResourceAsStream(configFile.get()); try (InputStream configStream = Optional.ofNullable(getClass().getResourceAsStream(configFileName))
if (configStream == null) { .orElse(Thread.currentThread().getContextClassLoader().getResourceAsStream(configFileName))
configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(configFile.get()); ) {
if (configStream != null) {
byte[] array = new byte[configStream.available()];
if (configStream.read(array) != -1) {
config = new String(array, StandardCharsets.UTF_8);
}
} }
} else {
configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("redisson.yaml");
} }
String config; if (config == null) {
if (configStream != null) {
byte[] array = new byte[configStream.available()];
configStream.read(array);
config = new String(array, StandardCharsets.UTF_8);
} else {
Stream<String> s = StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false); Stream<String> s = StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false);
String yaml = PropertiesConvertor.toYaml("quarkus.redisson.", s.sorted().collect(Collectors.toList()), prop -> { config = PropertiesConvertor.toYaml("quarkus.redisson.", s.sorted().collect(Collectors.toList()), prop -> {
return ConfigProvider.getConfig().getValue(prop, String.class); return ConfigProvider.getConfig().getValue(prop, String.class);
}, false); }, false);
config = yaml;
} }
ConfigSupport support = new ConfigSupport() { ConfigSupport support = new ConfigSupport() {

27
redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
Unescape Escape View File

@ -57,27 +57,24 @@ public class RedissonClientProducer {
@Singleton @Singleton
@DefaultBean @DefaultBean
public RedissonClient create() throws IOException { public RedissonClient create() throws IOException {
InputStream configStream; String config = null;
Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class); Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class);
if (configFile.isPresent()) { String configFileName = configFile.orElse("redisson.yaml");
configStream = getClass().getResourceAsStream(configFile.get()); try (InputStream configStream = Optional.ofNullable(getClass().getResourceAsStream(configFileName))
if (configStream == null) { .orElse(Thread.currentThread().getContextClassLoader().getResourceAsStream(configFileName))
configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(configFile.get()); ) {
if (configStream != null) {
byte[] array = new byte[configStream.available()];
if (configStream.read(array) != -1) {
config = new String(array, StandardCharsets.UTF_8);
}
} }
} else {
configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("redisson.yaml");
} }
String config; if (config == null) {
if (configStream != null) {
byte[] array = new byte[configStream.available()];
configStream.read(array);
config = new String(array, StandardCharsets.UTF_8);
} else {
Stream<String> s = StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false); Stream<String> s = StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false);
String yaml = PropertiesConvertor.toYaml("quarkus.redisson.", s.sorted().collect(Collectors.toList()), prop -> { config = PropertiesConvertor.toYaml("quarkus.redisson.", s.sorted().collect(Collectors.toList()), prop -> {
return ConfigProvider.getConfig().getValue(prop, String.class); return ConfigProvider.getConfig().getValue(prop, String.class);
}, false); }, false);
config = yaml;
} }
ConfigSupport support = new ConfigSupport() { ConfigSupport support = new ConfigSupport() {

Write Preview
Loading…
Cancel
Save