Java 16 migration for Cassandra examples.

See #606.

Author: mp911de

cassandra/example/src/main/java/example/springdata/cassandra/auditing/BasicConfiguration.java

@@ -57,7 +57,7 @@ AuditorAware<String> auditorAware() {
 	public MappingCassandraConverter cassandraConverter(CassandraMappingContext mapping,
 			CassandraCustomConversions conversions, CqlSession session) {
 
-		MappingCassandraConverter converter = new MappingCassandraConverter(mapping);
+		var converter = new MappingCassandraConverter(mapping);
 
 		converter.setCodecRegistry(session.getContext().getCodecRegistry());
 		converter.setCustomConversions(conversions);

cassandra/example/src/main/java/example/springdata/cassandra/convert/Address.java

@@ -15,10 +15,6 @@
  */
 package example.springdata.cassandra.convert;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import org.springframework.data.cassandra.core.mapping.Element;
 import org.springframework.data.cassandra.core.mapping.Tuple;
 
@@ -27,13 +23,7 @@
  *
  * @author Mark Paluch
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Tuple
-public class Address {
+public record Address(@Element(0) String address, @Element(1) String city, @Element(2) String zip) {
 
-	@Element(0) String address;
-	@Element(1) String city;
-	@Element(2) String zip;
 }

cassandra/example/src/main/java/example/springdata/cassandra/convert/Contact.java

@@ -15,20 +15,11 @@
  */
 package example.springdata.cassandra.convert;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 /**
  * Sample Contact class.
  *
  * @author Mark Paluch
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Contact {
+public record Contact(String firstname, String lastname) {
 
-	String firstname;
-	String lastname;
 }

cassandra/example/src/main/java/example/springdata/cassandra/convert/ConverterConfiguration.java

@@ -93,12 +93,7 @@ static class CustomAddressbookReadConverter implements Converter<Row, CustomAddr
 
 		public CustomAddressbook convert(Row source) {
 
-			CustomAddressbook result = new CustomAddressbook();
-
-			result.setTheId(source.getString("id"));
-			result.setMyDetailsAsJson(source.getString("me"));
-
-			return result;
+			return new CustomAddressbook(source.getString("id"), source.getString("me"));
 		}
 	}
 

cassandra/example/src/main/java/example/springdata/cassandra/convert/CustomAddressbook.java

@@ -15,14 +15,9 @@
  */
 package example.springdata.cassandra.convert;
 
-import lombok.Data;
-
 /**
  * @author Mark Paluch
  */
-@Data
-public class CustomAddressbook {
+public record CustomAddressbook(String theId, String myDetailsAsJson) {
 
-	String theId;
-	String myDetailsAsJson;
 }

cassandra/example/src/main/java/example/springdata/cassandra/events/User.java

@@ -15,10 +15,6 @@
  */
 package example.springdata.cassandra.events;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import org.springframework.data.cassandra.core.mapping.PrimaryKey;
 import org.springframework.data.cassandra.core.mapping.Table;
 
@@ -27,14 +23,7 @@
  *
  * @author Mark Paluch
  */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
 @Table(value = "users")
-public class User {
-
-	private @PrimaryKey long id;
+public record User(@PrimaryKey long id, String firstname, String lastname) {
 
-	private String firstname;
-	private String lastname;
 }

cassandra/example/src/main/java/example/springdata/cassandra/optimisticlocking/OptimisticPerson.java

@@ -15,8 +15,6 @@
  */
 package example.springdata.cassandra.optimisticlocking;
 
-import lombok.Data;
-
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.cassandra.core.mapping.Table;
@@ -27,14 +25,10 @@
  *
  * @author Mark Paluch
  */
-@Data
 @Table
-public class OptimisticPerson {
-
-	@Id Long id;
-
-	@Version long version;
-
-	String name;
+public record OptimisticPerson(@Id Long id, @Version long version, String name) {
 
+	public OptimisticPerson withName(String name) {
+		return new OptimisticPerson(id, version, name);
+	}
 }

cassandra/example/src/main/java/example/springdata/cassandra/projection/Customer.java

@@ -23,10 +23,7 @@
 /**
  * @author Mark Paluch
  */
-@Value
 @Table
-class Customer {
+record Customer(@Id String id, String firstname, String lastname) {
 
-	@Id String id;
-	String firstname, lastname;
 }

cassandra/example/src/main/java/example/springdata/cassandra/udt/Address.java

@@ -15,18 +15,12 @@
  */
 package example.springdata.cassandra.udt;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
 import org.springframework.data.cassandra.core.mapping.UserDefinedType;
 
 /**
  * @author Mark Paluch
  */
-@Data
 @UserDefinedType
-@AllArgsConstructor
-public class Address {
+public record Address(String street, String zip, String city) {
 
-	String street, zip, city;
 }

cassandra/example/src/test/java/example/springdata/cassandra/auditing/AuditedPersonRepositoryTests.java

@@ -50,11 +50,11 @@ void setUp() {
 	@Test
 	void insertShouldSetCreatedDate() {
 
-		AuditedPerson person = new AuditedPerson();
+		var person = new AuditedPerson();
 		person.setId(42L);
 		person.setNew(true); // Cassandra does not support auto-generation hence we need
 		// to supply whether our object is a new one.
-		AuditedPerson saved = repository.save(person);
+		var saved = repository.save(person);
 
 		assertThat(saved.getCreatedBy()).isEqualTo("Some user");
 		assertThat(saved.getLastModifiedBy()).isEqualTo("Some user");
@@ -70,15 +70,15 @@ void insertShouldSetCreatedDate() {
 	@Test
 	void updateShouldSetLastModifiedDate() {
 
-		AuditedPerson person = new AuditedPerson();
+		var person = new AuditedPerson();
 		person.setId(42L);
 		person.setNew(true); // Cassandra does not support auto-generation hence we need
 		// to supply whether our object is a new one.
 		repository.save(person);
 
 		person.setNew(false);
 
-		AuditedPerson modified = repository.save(person);
+		var modified = repository.save(person);
 
 		assertThat(modified.getCreatedBy()).isEqualTo("Some user");
 		assertThat(modified.getLastModifiedBy()).isEqualTo("Some user");

cassandra/example/src/test/java/example/springdata/cassandra/basic/CassandraOperationsIntegrationTests.java

@@ -46,14 +46,14 @@
  */
 @SpringBootTest(classes = BasicConfiguration.class)
 @CassandraKeyspace
-public class CassandraOperationsIntegrationTests {
+class CassandraOperationsIntegrationTests {
 
 
 	@Autowired CqlSession session;
 	@Autowired CassandraOperations template;
 
 	@BeforeEach
-	public void setUp() throws Exception {
+	void setUp() throws Exception {
 		template.getCqlOperations().execute("TRUNCATE users");
 	}
 
@@ -62,20 +62,20 @@ public void setUp() throws Exception {
 	 * mapping layer.
 	 */
 	@Test
-	public void insertAndSelect() {
+	void insertAndSelect() {
 
-		Insert insert = QueryBuilder.insertInto("users").value("user_id", QueryBuilder.literal(42L)) //
+		var insert = QueryBuilder.insertInto("users").value("user_id", QueryBuilder.literal(42L)) //
 				.value("uname", QueryBuilder.literal("heisenberg")) //
 				.value("fname", QueryBuilder.literal("Walter")) //
 				.value("lname", QueryBuilder.literal("White")) //
 				.ifNotExists(); //
 
 		template.getCqlOperations().execute(insert.asCql());
 
-		User user = template.selectOneById(42L, User.class);
+		var user = template.selectOneById(42L, User.class);
 		assertThat(user.getUsername()).isEqualTo("heisenberg");
 
-		List<User> users = template.select(QueryBuilder.selectFrom("users").all().asCql(), User.class);
+		var users = template.select(QueryBuilder.selectFrom("users").all().asCql(), User.class);
 		assertThat(users).hasSize(1);
 		assertThat(users.get(0)).isEqualTo(user);
 	}
@@ -85,9 +85,9 @@ public void insertAndSelect() {
 	 * {@code select}.
 	 */
 	@Test
-	public void insertAndUpdate() {
+	void insertAndUpdate() {
 
-		User user = new User();
+		var user = new User();
 		user.setId(42L);
 		user.setUsername("heisenberg");
 		user.setFirstname("Walter");
@@ -98,7 +98,7 @@ public void insertAndUpdate() {
 		user.setFirstname(null);
 		template.update(user);
 
-		User loaded = template.selectOneById(42L, User.class);
+		var loaded = template.selectOneById(42L, User.class);
 		assertThat(loaded.getUsername()).isEqualTo("heisenberg");
 		assertThat(loaded.getFirstname()).isNull();
 	}
@@ -107,25 +107,25 @@ public void insertAndUpdate() {
 	 * Asynchronous query execution using callbacks.
 	 */
 	@Test
-	public void insertAsynchronously() throws InterruptedException {
+	void insertAsynchronously() throws InterruptedException {
 
-		User user = new User();
+		var user = new User();
 		user.setId(42L);
 		user.setUsername("heisenberg");
 		user.setFirstname("Walter");
 		user.setLastname("White");
 
-		final CountDownLatch countDownLatch = new CountDownLatch(1);
+		final var countDownLatch = new CountDownLatch(1);
 
-		AsyncCassandraTemplate asyncTemplate = new AsyncCassandraTemplate(session);
+		var asyncTemplate = new AsyncCassandraTemplate(session);
 
-		ListenableFuture<User> future = asyncTemplate.insert(user);
+		var future = asyncTemplate.insert(user);
 
 		future.addCallback(it -> countDownLatch.countDown(), throwable -> countDownLatch.countDown());
 
 		countDownLatch.await(5, TimeUnit.SECONDS);
 
-		User loaded = template.selectOneById(user.getId(), User.class);
+		var loaded = template.selectOneById(user.getId(), User.class);
 		assertThat(loaded).isEqualTo(user);
 	}
 
@@ -135,20 +135,20 @@ public void insertAsynchronously() throws InterruptedException {
 	 */
 	@Test
 	@SuppressWarnings("unchecked")
-	public void selectProjections() {
+	void selectProjections() {
 
-		User user = new User();
+		var user = new User();
 		user.setId(42L);
 		user.setUsername("heisenberg");
 		user.setFirstname("Walter");
 		user.setLastname("White");
 
 		template.insert(user);
 
-		Long id = template.selectOne(QueryBuilder.selectFrom("users").column("user_id").asCql(), Long.class);
+		var id = template.selectOne(QueryBuilder.selectFrom("users").column("user_id").asCql(), Long.class);
 		assertThat(id).isEqualTo(user.getId());
 
-		Row row = template.selectOne(QueryBuilder.selectFrom("users").column("user_id").asCql(), Row.class);
+		var row = template.selectOne(QueryBuilder.selectFrom("users").column("user_id").asCql(), Row.class);
 		assertThat(row.getLong(0)).isEqualTo(user.getId());
 
 		Map<String, Object> map = template.selectOne(QueryBuilder.selectFrom("users").all().asCql(), Map.class);