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

Polishing.

Browse Source 
See #557
This commit is contained in:
Mark Paluch
2021-03-17 09:04:54 +01:00
parent 5a024fb3fe
commit 690c693c9c
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/test/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverterUnitTests.java
View File

@@ -56,11 +56,11 @@ import org.springframework.r2dbc.core.Parameter;
*/
public class MappingR2dbcConverterUnitTests {
RelationalMappingContext mappingContext = new R2dbcMappingContext();
MappingR2dbcConverter converter = new MappingR2dbcConverter(mappingContext);
private RelationalMappingContext mappingContext = new R2dbcMappingContext();
private MappingR2dbcConverter converter = new MappingR2dbcConverter(mappingContext);
@BeforeEach
public void before() {
void before() {
R2dbcCustomConversions conversions = new R2dbcCustomConversions(
Arrays.asList(StringToMapConverter.INSTANCE, MapToStringConverter.INSTANCE,
@@ -72,7 +72,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-61, gh-207
public void shouldIncludeAllPropertiesInOutboundRow() {
void shouldIncludeAllPropertiesInOutboundRow() {
OutboundRow row = new OutboundRow();
@@ -89,7 +89,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-41
public void shouldPassThroughRow() {
void shouldPassThroughRow() {
Row rowMock = mock(Row.class);
@@ -99,7 +99,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-41
public void shouldConvertRowToNumber() {
void shouldConvertRowToNumber() {
Row rowMock = mock(Row.class);
when(rowMock.get(0)).thenReturn(42);
@@ -110,7 +110,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldFailOnUnsupportedEntity() {
void shouldFailOnUnsupportedEntity() {
PersonWithConversions withMap = new PersonWithConversions(null, null, new NonMappableEntity());
OutboundRow row = new OutboundRow();
@@ -119,7 +119,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldConvertMapToString() {
void shouldConvertMapToString() {
PersonWithConversions withMap = new PersonWithConversions("foo", Collections.singletonMap("map", "value"), null);
OutboundRow row = new OutboundRow();
@@ -129,7 +129,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldReadMapFromString() {
void shouldReadMapFromString() {
Row rowMock = mock(Row.class);
when(rowMock.get("nested")).thenReturn("map");
@@ -140,7 +140,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldConvertEnum() {
void shouldConvertEnum() {
WithEnum withMap = new WithEnum("foo", Condition.Mint);
OutboundRow row = new OutboundRow();
@@ -150,7 +150,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldConvertNullEnum() {
void shouldConvertNullEnum() {
WithEnum withMap = new WithEnum("foo", null);
OutboundRow row = new OutboundRow();
@@ -160,7 +160,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldReadEnum() {
void shouldReadEnum() {
Row rowMock = mock(Row.class);
when(rowMock.get("condition")).thenReturn("Mint");
@@ -171,7 +171,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldWriteTopLevelEntity() {
void shouldWriteTopLevelEntity() {
CustomConversionPerson person = new CustomConversionPerson();
person.entity = new NonMappableEntity();
@@ -185,7 +185,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-530
public void shouldReadTopLevelEntity() {
void shouldReadTopLevelEntity() {
mappingContext.setForceQuote(true);
@@ -200,7 +200,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldReadTopLevelEntityWithConverter() {
void shouldReadTopLevelEntityWithConverter() {
Row rowMock = mock(Row.class);
when(rowMock.get("foo_column", String.class)).thenReturn("bar");
@@ -213,7 +213,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-402
public void writeShouldWritePrimitiveIdIfValueIsNonZero() {
void writeShouldWritePrimitiveIdIfValueIsNonZero() {
OutboundRow row = new OutboundRow();
converter.write(new WithPrimitiveId(1), row);
@@ -222,7 +222,7 @@ public class MappingR2dbcConverterUnitTests {
}
@Test // gh-59
public void shouldEvaluateSpelExpression() {
void shouldEvaluateSpelExpression() {
MockRow row = MockRow.builder().identified("id", Object.class, 42).identified("world", Object.class, "No, universe")
.build();
@@ -281,7 +281,7 @@ public class MappingR2dbcConverterUnitTests {
NonMappableEntity entity;
}
static class NonMappableEntity {}
private static class NonMappableEntity {}
@ReadingConverter
enum StringToMapConverter implements Converter<String, Map<String, String>> {

52
src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
View File

@@ -70,12 +70,12 @@ import org.springframework.util.CollectionUtils;
*/
public class R2dbcEntityTemplateUnitTests {
org.springframework.r2dbc.core.DatabaseClient client;
R2dbcEntityTemplate entityTemplate;
StatementRecorder recorder;
private org.springframework.r2dbc.core.DatabaseClient client;
private R2dbcEntityTemplate entityTemplate;
private StatementRecorder recorder;
@BeforeEach
public void before() {
void before() {
recorder = StatementRecorder.newInstance();
client = DatabaseClient.builder().connectionFactory(recorder)
@@ -84,7 +84,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-220
public void shouldCountBy() {
void shouldCountBy() {
MockRowMetadata metadata = MockRowMetadata.builder()
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
@@ -105,7 +105,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-469
public void shouldProjectExistsResult() {
void shouldProjectExistsResult() {
MockRowMetadata metadata = MockRowMetadata.builder()
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
@@ -123,7 +123,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-469
public void shouldExistsByCriteria() {
void shouldExistsByCriteria() {
MockRowMetadata metadata = MockRowMetadata.builder()
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
@@ -144,7 +144,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-220
public void shouldSelectByCriteria() {
void shouldSelectByCriteria() {
recorder.addStubbing(s -> s.startsWith("SELECT"), Collections.emptyList());
@@ -160,7 +160,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-215
public void selectShouldInvokeCallback() {
void selectShouldInvokeCallback() {
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
.columnMetadata(MockColumnMetadata.builder().name("THE_NAME").build()).build();
@@ -185,7 +185,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-220
public void shouldSelectOne() {
void shouldSelectOne() {
recorder.addStubbing(s -> s.startsWith("SELECT"), Collections.emptyList());
@@ -201,7 +201,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-220
public void shouldUpdateByQuery() {
void shouldUpdateByQuery() {
MockRowMetadata metadata = MockRowMetadata.builder()
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
@@ -223,7 +223,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-220
public void shouldDeleteByQuery() {
void shouldDeleteByQuery() {
MockRowMetadata metadata = MockRowMetadata.builder()
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
@@ -243,7 +243,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-220
public void shouldDeleteEntity() {
void shouldDeleteEntity() {
Person person = new Person();
person.id = "Walter";
@@ -260,7 +260,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-365
public void shouldInsertVersioned() {
void shouldInsertVersioned() {
MockRowMetadata metadata = MockRowMetadata.builder().build();
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
@@ -281,7 +281,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-557, gh-402
public void shouldSkipDefaultIdValueOnInsert() {
void shouldSkipDefaultIdValueOnInsert() {
MockRowMetadata metadata = MockRowMetadata.builder().build();
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
@@ -299,7 +299,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-557, gh-402
public void shouldSkipDefaultIdValueOnVersionedInsert() {
void shouldSkipDefaultIdValueOnVersionedInsert() {
MockRowMetadata metadata = MockRowMetadata.builder().build();
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
@@ -321,7 +321,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-451
public void shouldInsertCorrectlyVersionedAndAudited() {
void shouldInsertCorrectlyVersionedAndAudited() {
MockRowMetadata metadata = MockRowMetadata.builder().build();
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
@@ -349,7 +349,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-451
public void shouldUpdateCorrectlyVersionedAndAudited() {
void shouldUpdateCorrectlyVersionedAndAudited() {
MockRowMetadata metadata = MockRowMetadata.builder().build();
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
@@ -378,7 +378,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-215
public void insertShouldInvokeCallback() {
void insertShouldInvokeCallback() {
MockRowMetadata metadata = MockRowMetadata.builder().build();
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
@@ -406,7 +406,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-365
public void shouldUpdateVersioned() {
void shouldUpdateVersioned() {
MockRowMetadata metadata = MockRowMetadata.builder().build();
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
@@ -428,7 +428,7 @@ public class R2dbcEntityTemplateUnitTests {
}
@Test // gh-215
public void updateShouldInvokeCallback() {
void updateShouldInvokeCallback() {
MockRowMetadata metadata = MockRowMetadata.builder().build();
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
@@ -480,7 +480,7 @@ public class R2dbcEntityTemplateUnitTests {
@Value
@With
static class VersionedPerson {
private static class VersionedPerson {
@Id String id;
@@ -491,7 +491,7 @@ public class R2dbcEntityTemplateUnitTests {
@Value
@With
static class PersonWithPrimitiveId {
private static class PersonWithPrimitiveId {
@Id int id;
@@ -500,7 +500,7 @@ public class R2dbcEntityTemplateUnitTests {
@Value
@With
static class VersionedPersonWithPrimitiveId {
private static class VersionedPersonWithPrimitiveId {
@Id int id;
@@ -511,7 +511,7 @@ public class R2dbcEntityTemplateUnitTests {
@Value
@With
static class WithAuditingAndOptimisticLocking {
private static class WithAuditingAndOptimisticLocking {
@Id String id;
@@ -527,7 +527,7 @@ public class R2dbcEntityTemplateUnitTests {
private final List<T> values = new ArrayList<>(1);
protected void capture(T value) {
void capture(T value) {
values.add(value);
}