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

DATACASS-776 - Upgrade to Cassandra driver 4.7.0.

Browse Source
This commit is contained in:
Mark Paluch
2020-06-16 11:57:06 +02:00
parent c4bd4d795c
commit 3b348bfcad
2 changed files with 6 additions and 8 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.6.1</cassandra-driver.version>
<cassandra-driver.version>4.7.0</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 -->

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

@@ -290,8 +290,7 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware {
if (StringUtils.hasText(getSessionName())) {
options.add(DefaultDriverOption.SESSION_NAME, getSessionName());
}
else if (StringUtils.hasText(getClusterName())) {
} else if (StringUtils.hasText(getClusterName())) {
options.add(DefaultDriverOption.SESSION_NAME, getClusterName());
}
@@ -303,12 +302,11 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware {
ConfigFactory.invalidateCaches();
return ConfigFactory.defaultOverrides()
.withFallback(options.build())
.withFallback(ConfigFactory.defaultReference())
.resolve();
return ConfigFactory.defaultOverrides().withFallback(options.build()) //
.withFallback(ConfigFactory.defaultReference()) //
.getConfig(DefaultDriverConfigLoader.DEFAULT_ROOT_PATH);
}, DefaultDriverConfigLoader.DEFAULT_ROOT_PATH);
});
sessionBuilder.withConfigLoader(builder.build());