From 1dba8f6addc3e6dc46b4e2e4e26965bd975dda21 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 2 Jun 2023 20:45:26 +0200 Subject: [PATCH] Polishing --- .../r2dbc/core/BeanPropertyRowMapperTests.java | 13 ++++++++++--- .../r2dbc/core/DataClassRowMapperTests.java | 9 ++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/BeanPropertyRowMapperTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/BeanPropertyRowMapperTests.java index 67a076f7f58..e72a457549c 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/BeanPropertyRowMapperTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/BeanPropertyRowMapperTests.java @@ -147,11 +147,12 @@ class BeanPropertyRowMapperTests { } - private static class Person { String firstName; + String lastName; + int age; public String getFirstName() { @@ -179,6 +180,7 @@ class BeanPropertyRowMapperTests { } } + private static class ExtendedPerson extends Person { String address; @@ -192,6 +194,7 @@ class BeanPropertyRowMapperTests { } } + private static class TypeMismatchExtendedPerson extends ExtendedPerson { @Override @@ -200,6 +203,7 @@ class BeanPropertyRowMapperTests { } } + private static class EmailPerson extends Person { String email; @@ -213,6 +217,7 @@ class BeanPropertyRowMapperTests { } } + private static final MockRow SIMPLE_PERSON_ROW = MockRow.builder() .metadata(MockRowMetadata.builder() .columnMetadata(MockColumnMetadata.builder().name("firstName").javaType(String.class).build()) @@ -237,10 +242,12 @@ class BeanPropertyRowMapperTests { .identified(3, String.class, "123 Sesame Street") .build(); - private static final MockRow EMAIL_PERSON_ROW = buildRowWithExtraColum("EMail", String.class, + private static final MockRow EMAIL_PERSON_ROW = buildRowWithExtraColumn("EMail", String.class, String.class, "mail@example.org"); - private static final MockRow buildRowWithExtraColum(String extraColumnName, Class extraColumnClass, Class identifiedClass, Object value) { + private static MockRow buildRowWithExtraColumn( + String extraColumnName, Class extraColumnClass, Class identifiedClass, Object value) { + return MockRow.builder() .metadata(MockRowMetadata.builder() .columnMetadata(MockColumnMetadata.builder().name("firstName").javaType(String.class).build()) diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DataClassRowMapperTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DataClassRowMapperTests.java index ecc9cb175f7..f0de42d27b1 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DataClassRowMapperTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DataClassRowMapperTests.java @@ -78,6 +78,7 @@ class DataClassRowMapperTests { assertThat(person.balance()).isEqualTo(new BigDecimal("1234.56")); } + static class ConstructorPerson { final String name; @@ -105,6 +106,7 @@ class DataClassRowMapperTests { } } + static class ConstructorPersonWithGenerics extends ConstructorPerson { private final List balance; @@ -119,6 +121,7 @@ class DataClassRowMapperTests { } } + static class ConstructorPersonWithSetters { private String name; @@ -129,7 +132,6 @@ class DataClassRowMapperTests { private BigDecimal balance; - public ConstructorPersonWithSetters(String name, long age, Date birthDate, BigDecimal balance) { this.name = name.toUpperCase(); this.age = age; @@ -137,7 +139,6 @@ class DataClassRowMapperTests { this.balance = balance; } - public void setName(String name) { this.name = name; } @@ -171,9 +172,11 @@ class DataClassRowMapperTests { } } - static record RecordPerson(String name, long age, Date birth_date, BigDecimal balance) { + + record RecordPerson(String name, long age, Date birth_date, BigDecimal balance) { } + static MockRow MOCK_ROW = buildMockRow("birth_date", false); private static MockRow buildMockRow(String birthDateColumnName, boolean balanceObjectIdentifier) {