Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2023-06-02 20:45:26 +02:00
parent 25a1e8d414
commit 1dba8f6add
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/BeanPropertyRowMapperTests.java
View File

@@ -147,11 +147,12 @@ class BeanPropertyRowMapperTests {
} }
private static class Person { private static class Person {
String firstName; String firstName;
String lastName; String lastName;
int age; int age;
public String getFirstName() { public String getFirstName() {
@@ -179,6 +180,7 @@ class BeanPropertyRowMapperTests {
} }
} }
private static class ExtendedPerson extends Person { private static class ExtendedPerson extends Person {
String address; String address;
@@ -192,6 +194,7 @@ class BeanPropertyRowMapperTests {
} }
} }
private static class TypeMismatchExtendedPerson extends ExtendedPerson { private static class TypeMismatchExtendedPerson extends ExtendedPerson {
@Override @Override
@@ -200,6 +203,7 @@ class BeanPropertyRowMapperTests {
} }
} }
private static class EmailPerson extends Person { private static class EmailPerson extends Person {
String email; String email;
@@ -213,6 +217,7 @@ class BeanPropertyRowMapperTests {
} }
} }
private static final MockRow SIMPLE_PERSON_ROW = MockRow.builder() private static final MockRow SIMPLE_PERSON_ROW = MockRow.builder()
.metadata(MockRowMetadata.builder() .metadata(MockRowMetadata.builder()
.columnMetadata(MockColumnMetadata.builder().name("firstName").javaType(String.class).build()) .columnMetadata(MockColumnMetadata.builder().name("firstName").javaType(String.class).build())
@@ -237,10 +242,12 @@ class BeanPropertyRowMapperTests {
.identified(3, String.class, "123 Sesame Street") .identified(3, String.class, "123 Sesame Street")
.build(); .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"); 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() return MockRow.builder()
.metadata(MockRowMetadata.builder() .metadata(MockRowMetadata.builder()
.columnMetadata(MockColumnMetadata.builder().name("firstName").javaType(String.class).build()) .columnMetadata(MockColumnMetadata.builder().name("firstName").javaType(String.class).build())

9
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DataClassRowMapperTests.java
View File

@@ -78,6 +78,7 @@ class DataClassRowMapperTests {
assertThat(person.balance()).isEqualTo(new BigDecimal("1234.56")); assertThat(person.balance()).isEqualTo(new BigDecimal("1234.56"));
} }
static class ConstructorPerson { static class ConstructorPerson {
final String name; final String name;
@@ -105,6 +106,7 @@ class DataClassRowMapperTests {
} }
} }
static class ConstructorPersonWithGenerics extends ConstructorPerson { static class ConstructorPersonWithGenerics extends ConstructorPerson {
private final List<BigDecimal> balance; private final List<BigDecimal> balance;
@@ -119,6 +121,7 @@ class DataClassRowMapperTests {
} }
} }
static class ConstructorPersonWithSetters { static class ConstructorPersonWithSetters {
private String name; private String name;
@@ -129,7 +132,6 @@ class DataClassRowMapperTests {
private BigDecimal balance; private BigDecimal balance;
public ConstructorPersonWithSetters(String name, long age, Date birthDate, BigDecimal balance) { public ConstructorPersonWithSetters(String name, long age, Date birthDate, BigDecimal balance) {
this.name = name.toUpperCase(); this.name = name.toUpperCase();
this.age = age; this.age = age;
@@ -137,7 +139,6 @@ class DataClassRowMapperTests {
this.balance = balance; this.balance = balance;
} }
public void setName(String name) { public void setName(String name) {
this.name = 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); static MockRow MOCK_ROW = buildMockRow("birth_date", false);
private static MockRow buildMockRow(String birthDateColumnName, boolean balanceObjectIdentifier) { private static MockRow buildMockRow(String birthDateColumnName, boolean balanceObjectIdentifier) {