From 367259b89841657cd59ff708fefde67742da22e4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 19 Apr 2018 11:58:21 +0200
Subject: [PATCH] DATACASS-548 - Upgrade to Cassandra Java Driver 3.5.0.

---
 pom.xml                                                   | 2 +-
 .../config/CassandraClusterFactoryBeanUnitTests.java      | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0b7514e0..ab062bae1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.2</cassandra.version>
-		<cassandra-driver.version>3.4.0</cassandra-driver.version>
+		<cassandra-driver.version>3.5.0</cassandra-driver.version>
 		<dist.id>spring-data-cassandra</dist.id>
 		<el.version>1.0</el.version>
 		<multithreadedtc.version>1.01</multithreadedtc.version>
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBeanUnitTests.java
index 9cf0c2b81..ba39abed2 100755
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBeanUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBeanUnitTests.java
@@ -125,16 +125,14 @@ public class CassandraClusterFactoryBeanUnitTests {
 		assertThat(getConfiguration(bean).getQueryOptions()).isEqualTo(queryOptions);
 	}
 
-	@Test // DATACASS-226
-	public void defaultQueryOptionsShouldHaveOwnObjectIdentity() throws Exception {
-
-		QueryOptions queryOptions = new QueryOptions();
+	@Test // DATACASS-226, DATACASS-548
+	public void shouldConfigureDefaultQueryOptions() throws Exception {
 
 		CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean();
 		bean.afterPropertiesSet();
 
 		assertThat(getConfiguration(bean).getQueryOptions()).isNotNull();
-		assertThat(getConfiguration(bean).getQueryOptions()).isNotEqualTo(queryOptions);
+		assertThat(getConfiguration(bean).getQueryOptions()).isEqualTo(new QueryOptions());
 	}
 
 	@Test // DATACASS-226