Switch to records.

See #606.

Author: mp911de

jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/LegoSetRepository.java

@@ -15,35 +15,39 @@
  */
 package example.springdata.jdbc.basics.aggregate;
 
+import java.util.List;
+
 import org.springframework.data.jdbc.repository.query.Modifying;
 import org.springframework.data.jdbc.repository.query.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-
 /**
  * A repository for {@link LegoSet}.
  *
  * @author Jens Schauder
  */
 interface LegoSetRepository extends CrudRepository<LegoSet, Integer> {
 
-	@Query("SELECT m.name model_name, m.description, l.name set_name" +
-			"  FROM model m" +
-			"  JOIN lego_set l" +
-			"  ON m.lego_set = l.id" +
-			"  WHERE :age BETWEEN l.min_age and l.max_age")
+	@Query("""
+			SELECT m.name model_name, m.description, l.name set_name
+			  FROM model m
+			  JOIN lego_set l
+			  ON m.lego_set = l.id
+			  WHERE :age BETWEEN l.min_age and l.max_age
+			""")
 	List<ModelReport> reportModelForAge(@Param("age") int age);
 
 	/**
 	 * See https://stackoverflow.com/questions/52978700/how-to-write-a-custom-query-in-spring-data-jdbc
 	 * @param name
 	 * @return
 	 */
-	@Query("select a.*, b.handbuch_id as manual_handbuch_id, b.author as manual_author, b.text as manual_text from lego_set a " +
-			"join handbuch b on a.id = b.handbuch_id " +
-			"where a.name = :name")
+	@Query("""
+			select a.*, b.handbuch_id as manual_handbuch_id, b.author as manual_author, b.text as manual_text from lego_set a
+			join handbuch b on a.id = b.handbuch_id
+			where a.name = :name
+			""")
 	List<LegoSet> findByName(@Param("name") String name);
 
 	@Modifying

jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Model.java

@@ -24,8 +24,5 @@
  *
  * @author Jens Schauder
  */
-@Value
-@With(AccessLevel.PACKAGE)
-public class Model {
-	String name, description;
+public record Model(String name, String description) {
 }

jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/ModelReport.java

@@ -22,8 +22,5 @@
 /**
  * @author Jens Schauder
  */
-@Value
-@With(AccessLevel.PACKAGE)
-public class ModelReport {
-	String modelName, description, setName;
+public record ModelReport(String modelName, String description, String setName) {
 }

jdbc/basics/src/test/java/example/springdata/jdbc/basics/aggregate/AggregateTests.java

@@ -103,13 +103,13 @@ void customQueries() {
 		Output.list(report, "Model Report");
 
 		assertThat(report).hasSize(7)
-				.allMatch(m -> m.getDescription() != null && m.getModelName() != null && m.getSetName() != null);
+				.allMatch(m -> m.description() != null && m.modelName() != null && m.setName() != null);
 
 		var updated = repository.lowerCaseMapKeys();
 		// SUV, F1 Ferrari 2018 and Muck get updated
 		assertThat(updated).isEqualTo(3);
 
-		final var legoSetsByName = repository.findByName(smallCarsSetName);
+		var legoSetsByName = repository.findByName(smallCarsSetName);
 		assertThat(legoSetsByName).hasSize(1);
 	}
 

jdbc/jmolecules/pom.xml

@@ -66,4 +66,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>

jdbc/jmolecules/src/main/java/example/springdata/jdbc/jmolecules/customer/Address.java

@@ -15,12 +15,8 @@
  */
 package example.springdata.jdbc.jmolecules.customer;
 
-import lombok.Value;
-
 import org.jmolecules.ddd.annotation.ValueObject;
 
-@Value
 @ValueObject
-public class Address {
-	private final String street, city, zipCode;
+public record Address(String street, String city, String zipCode) {
 }

jdbc/jmolecules/src/main/java/example/springdata/jdbc/jmolecules/customer/Customer.java

@@ -48,7 +48,7 @@ public Customer(String firstname, String lastname, Address address) {
 
 		Assert.notNull(address, "Address must not be null!");
 
-		this.id = CustomerId.of(UUID.randomUUID().toString());
+		this.id = new CustomerId(UUID.randomUUID().toString());
 
 		this.firstname = firstname;
 		this.lastname = lastname;
@@ -57,8 +57,6 @@ public Customer(String firstname, String lastname, Address address) {
 		this.addresses.add(address);
 	}
 
-	@Value(staticConstructor = "of")
-	public static class CustomerId implements Identifier {
-		private final String id;
+	public record CustomerId(String id) implements Identifier {
 	}
 }

jdbc/jmolecules/src/main/java/example/springdata/jdbc/jmolecules/order/LineItem.java

@@ -15,12 +15,8 @@
  */
 package example.springdata.jdbc.jmolecules.order;
 
-import lombok.Value;
-
 import org.jmolecules.ddd.annotation.ValueObject;
 
-@Value
 @ValueObject
-public class LineItem {
-	String description;
+public record LineItem(String description) {
 }

jdbc/jmolecules/src/main/java/example/springdata/jdbc/jmolecules/order/Order.java

@@ -20,7 +20,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import lombok.Value;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +46,7 @@ public class Order implements AggregateRoot<Order, Order.OrderId> {
 
 	public Order(Customer customer) {
 
-		this.id = OrderId.of(UUID.randomUUID());
+		this.id = new OrderId(UUID.randomUUID());
 		this.customer = Association.forAggregate(customer);
 		this.lineItems = new ArrayList<>();
 	}
@@ -61,13 +60,10 @@ public Order addLineItem(String description) {
 		return this;
 	}
 
-	@Value(staticConstructor = "of")
-	public static class OrderId implements Identifier {
-
-		private final UUID orderId;
+	public record OrderId(UUID orderId) implements Identifier {
 
 		public static OrderId create() {
-			return OrderId.of(UUID.randomUUID());
+			return new OrderId(UUID.randomUUID());
 		}
 	}
 }

jdbc/jmolecules/src/test/java/example/springdata/jdbc/jmolecules/ApplicationIntegrationTests.java

@@ -28,17 +28,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
-import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 
 /**
  * @author Oliver Drotbohm
  */
 @SpringBootTest
-@RequiredArgsConstructor
-class ApplicationIntegrationTests {
-
-	private final ConfigurableApplicationContext context;
+record ApplicationIntegrationTests(ConfigurableApplicationContext context) {
 
 	@Test
 	void exposesAssociationInMetamodel() {

jdbc/jooq/src/main/java/example/springdata/jdbc/jooq/JooqRepositoryImpl.java

@@ -11,13 +11,7 @@
  *
  * @author Florian Lüdiger
  */
-public class JooqRepositoryImpl implements JooqRepository {
-
-	private final DSLContext dslContext;
-
-	public JooqRepositoryImpl(DSLContext dslContext) {
-		this.dslContext = dslContext;
-	}
+public record JooqRepositoryImpl(DSLContext dslContext) implements JooqRepository {
 
 	public List<Category> getCategoriesWithAgeGroup(AgeGroup ageGroup) {
 		return this.dslContext.select().from(CATEGORY).where(CATEGORY.AGE_GROUP.equal(ageGroup.name()))

jdbc/jooq/src/test/java/example/springdata/jdbc/jooq/SimpleEntityTests.java

@@ -53,7 +53,7 @@ void exerciseRepositoryForSimpleEntity() {
 		var saved = repository.saveAll(asList(cars, buildings));
 		Output.list(repository.findAll(), "`Cars` and `Buildings` got saved");
 
-		assertThat(saved).extracting(c -> c.getId()).isNotNull();
+		assertThat(saved).extracting(Category::getId).isNotNull();
 
 		// update one
 		buildings.setDescription("Famous and impressive buildings incl. the 'bike shed'.");

jdbc/mybatis/src/test/java/example/springdata/jdbc/mybatis/MyBatisTests.java

@@ -28,7 +28,7 @@
  * Demonstrates queries can be mapped using MyBatis.
  *
  * @author Jens Schauder
- * @author Divya Srivastava
+ * @author Divya Srivastava
  */
 @SpringBootTest(classes = MyBatisConfiguration.class)
 @AutoConfigureJdbc