Java 16 migration for Cassandra examples.

See #606.
This commit is contained in:
Mark Paluch
2021-04-28 10:03:37 +02:00
parent 23dcae3a17
commit 7938ee4cfa
23 changed files with 109 additions and 167 deletions

View File

@@ -57,7 +57,7 @@ class BasicConfiguration {
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);

View File

@@ -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 @@ import org.springframework.data.cassandra.core.mapping.Tuple;
*
* @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;
}

View File

@@ -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;
}

View File

@@ -93,12 +93,7 @@ class ConverterConfiguration {
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"));
}
}

View File

@@ -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;
}

View File

@@ -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 @@ import org.springframework.data.cassandra.core.mapping.Table;
*
* @author Mark Paluch
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Table(value = "users")
public class User {
public record User(@PrimaryKey long id, String firstname, String lastname) {
private @PrimaryKey long id;
private String firstname;
private String lastname;
}

View File

@@ -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 @@ import org.springframework.data.cassandra.core.mapping.Table;
*
* @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);
}
}

View File

@@ -23,10 +23,7 @@ import org.springframework.data.cassandra.core.mapping.Table;
/**
* @author Mark Paluch
*/
@Value
@Table
class Customer {
record Customer(@Id String id, String firstname, String lastname) {
@Id String id;
String firstname, lastname;
}

View File

@@ -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;
}