SpringCloud/spring-cloud-connectors
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with Cassandra driver 3.3.0.

Browse Source
This commit is contained in:
Scott Frederick
2017-10-25 14:57:50 -05:00
parent 69bd3751e3
commit ca7f0e47d0
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-spring-service-connector/build.gradle
View File

@@ -14,7 +14,7 @@ ext {
lettuceVersion = "5.0.0.RELEASE"
springDataCassandraVersion = "2.0.0.RELEASE"
cassandraDriverVersion = "3.1.3"
cassandraDriverVersion = "3.3.0"
mysqlDriverVersion = "6.0.6"
mariadbDriverVersion = "1.5.9"

5
spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/column/CassandraClusterCreator.java
View File

@@ -61,7 +61,10 @@ public class CassandraClusterCreator
builder.withLoadBalancingPolicy(config.getLoadBalancingPolicy());
builder.withReconnectionPolicy(config.getReconnectionPolicy());
builder.withRetryPolicy(config.getRetryPolicy());
builder.withProtocolVersion(config.getProtocolVersion());
if (config.getProtocolVersion() != null) {
builder.withProtocolVersion(config.getProtocolVersion());
}
if (!config.isMetricsEnabled()) {
builder.withoutMetrics();

2
spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/CassandraClusterFactoryJavaConfigTest.java
View File

@@ -47,7 +47,7 @@ public class CassandraClusterFactoryJavaConfigTest
}
@Test
public void cloudRedisConnectionFactoryConfig() {
public void cloudCassandraConnectionFactoryConfig() {
ApplicationContext testContext = getTestApplicationContext(
CassandraClusterConfigWithServiceConfig.class,
createService("my-service"));