Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-778 - Upgrade to Cassandra driver 4.7.1.

Browse Source
This commit is contained in:
Mark Paluch
2020-06-22 13:36:21 +02:00
parent 3b348bfcad
commit d176636d67
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -90,7 +90,7 @@
<build.cassandra.ssl_storage_port>17001</build.cassandra.ssl_storage_port>
<build.cassandra.storage_port>17000</build.cassandra.storage_port>
<cassandra.version>3.11.5</cassandra.version>
<cassandra-driver.version>4.7.0</cassandra-driver.version>
<cassandra-driver.version>4.7.1</cassandra-driver.version>
<dist.id>spring-data-cassandra</dist.id>
<el.version>1.0</el.version>
<!-- NOTE: com.carrotsearch:hppc dependency version set to same version as Apache Cassandra 3.11.5 -->

14
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java
View File

@@ -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<String, String> 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());
}
}
}