diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java
index 0b87cd887..b994258b4 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java
@@ -189,7 +189,7 @@ public class CassandraMappingBeanFactoryPostProcessor implements BeanFactoryPost
 
 	private Collection<String> getNames(Class<?>[] types) {
 
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 
 		for (Class<?> type : types) {
 			names.add(type.getName());
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java
index 7b9455794..80308e5af 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java
@@ -15,9 +15,9 @@
  */
 package org.springframework.data.cassandra.core.mapping;
 
-import static org.springframework.data.cassandra.core.cql.CqlIdentifier.cqlId;
-import static org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification.createTable;
-import static org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder.getDataTypeFor;
+import static org.springframework.data.cassandra.core.cql.CqlIdentifier.*;
+import static org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification.*;
+import static org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -95,7 +95,7 @@ public class CassandraMappingContext
 	public CassandraMappingContext() {
 
 		setCustomConversions(
-				new CustomConversions(StoreConversions.of(CassandraSimpleTypeHolder.HOLDER), Collections.EMPTY_LIST));
+				new CustomConversions(StoreConversions.of(CassandraSimpleTypeHolder.HOLDER), Collections.emptyList()));
 		setSimpleTypeHolder(CassandraSimpleTypeHolder.HOLDER);
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java
index 692a8d80f..fa8aca368 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java
@@ -91,7 +91,7 @@ public class SimpleCassandraRepository<T, ID> implements CassandraRepository<T,
 
 		Assert.notNull(entities, "The given Iterable of entities must not be null");
 
-		List<S> result = new ArrayList<S>();
+		List<S> result = new ArrayList<>();
 
 		for (S entity : entities) {
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java
index be9127de4..2795b8fe5 100755
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java
@@ -15,10 +15,8 @@
  */
 package org.springframework.data.cassandra.core.mapping;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -29,7 +27,6 @@ import java.util.NoSuchElementException;
 
 import org.junit.Before;
 import org.junit.Test;
-
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.annotation.Id;
@@ -373,7 +370,7 @@ public class CassandraMappingContextUnitTests {
 	@Test // DATACASS-296
 	public void shouldCreatePersistentEntityIfNoConversionRegistered() {
 
-		mappingContext.setCustomConversions(new CassandraCustomConversions(Collections.EMPTY_LIST));
+		mappingContext.setCustomConversions(new CassandraCustomConversions(Collections.emptyList()));
 		assertThat(mappingContext.shouldCreatePersistentEntityFor(ClassTypeInformation.from(Human.class))).isTrue();
 	}
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java
index 8905b79e4..0057f2a11 100755
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java
@@ -298,7 +298,7 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests {
 
 	private CreateTableSpecification getCreateTableSpecificationFor(Class<?> persistentEntityClass) {
 
-		CassandraCustomConversions customConversions = new CassandraCustomConversions(Collections.EMPTY_LIST);
+		CassandraCustomConversions customConversions = new CassandraCustomConversions(Collections.emptyList());
 		ctx.setCustomConversions(customConversions);
 
 		CassandraPersistentEntity<?> persistentEntity = ctx.getRequiredPersistentEntity(persistentEntityClass);
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryUnitTests.java
index 29cc4a306..cc3820a2e 100755
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQueryUnitTests.java
@@ -200,7 +200,7 @@ public class StringBasedCassandraQueryUnitTests {
 		SimpleStatement actual = cassandraQuery.createQuery(accessor);
 
 		assertThat(actual.toString()).isEqualTo("SELECT * FROM person WHERE lastname IN (?);");
-		assertThat(actual.getObject(0)).isEqualTo(new HashSet<String>(Arrays.asList("White", "Heisenberg")));
+		assertThat(actual.getObject(0)).isEqualTo(new HashSet<>(Arrays.asList("White", "Heisenberg")));
 	}
 
 	@Test // DATACASS-117
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraRule.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraRule.java
index 4e84c5641..b6bc6acf2 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraRule.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraRule.java
@@ -429,14 +429,10 @@ public class CassandraRule extends ExternalResource {
 			this.cluster = cluster;
 			this.session = session;
 
-			Runtime.getRuntime().addShutdownHook(new Thread() {
-
-				@Override
-				public void run() {
-					session.close();
-					cluster.close();
-				}
-			});
+			Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+				session.close();
+				cluster.close();
+			}));
 		}
 	}
 }