From ca7f0e47d0f10aef2e872a9ba78ba4d971cc6105 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Wed, 25 Oct 2017 14:57:50 -0500 Subject: [PATCH] Fix compatibility with Cassandra driver 3.3.0. --- spring-cloud-spring-service-connector/build.gradle | 2 +- .../cloud/service/column/CassandraClusterCreator.java | 5 ++++- .../config/java/CassandraClusterFactoryJavaConfigTest.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-cloud-spring-service-connector/build.gradle b/spring-cloud-spring-service-connector/build.gradle index f376156..9c7db84 100644 --- a/spring-cloud-spring-service-connector/build.gradle +++ b/spring-cloud-spring-service-connector/build.gradle @@ -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" diff --git a/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/column/CassandraClusterCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/column/CassandraClusterCreator.java index 8d81ca7..a865150 100644 --- a/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/column/CassandraClusterCreator.java +++ b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/column/CassandraClusterCreator.java @@ -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(); diff --git a/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/CassandraClusterFactoryJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/CassandraClusterFactoryJavaConfigTest.java index e546731..d65e06b 100644 --- a/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/CassandraClusterFactoryJavaConfigTest.java +++ b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/CassandraClusterFactoryJavaConfigTest.java @@ -47,7 +47,7 @@ public class CassandraClusterFactoryJavaConfigTest } @Test - public void cloudRedisConnectionFactoryConfig() { + public void cloudCassandraConnectionFactoryConfig() { ApplicationContext testContext = getTestApplicationContext( CassandraClusterConfigWithServiceConfig.class, createService("my-service"));