diff --git a/pom.xml b/pom.xml index 199d655bc..5d8f2fe38 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 17001 17000 3.11.5 - 4.7.0 + 4.7.1 spring-data-cassandra 1.0 diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java index a274ff91f..b8504fc0d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java @@ -302,11 +302,11 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware { ConfigFactory.invalidateCaches(); - return ConfigFactory.defaultOverrides().withFallback(options.build()) // - .withFallback(ConfigFactory.defaultReference()) // - .getConfig(DefaultDriverConfigLoader.DEFAULT_ROOT_PATH); + return ConfigFactory.defaultOverrides() // + .withFallback(options.build()) // + .withFallback(ConfigFactory.defaultReference()); - }); + }, DefaultDriverConfigLoader.DEFAULT_ROOT_PATH); sessionBuilder.withConfigLoader(builder.build()); @@ -334,8 +334,7 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware { private final Map options = new LinkedHashMap<>(); private CassandraDriverOptions add(DriverOption option, String value) { - String key = createKeyFor(option); - this.options.put(key, value); + this.options.put(option.getPath(), value); return this; } @@ -347,8 +346,5 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware { return ConfigFactory.parseMap(this.options, "Environment"); } - private static String createKeyFor(DriverOption option) { - return String.format("%s.%s", DefaultDriverConfigLoader.DEFAULT_ROOT_PATH, option.getPath()); - } } }