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

DATAJDBC-183 - Polishing.

Browse Source 
Removed calls to System.out.
Formatting.
Import order.
This commit is contained in:
Jens Schauder
2018-03-19 15:31:33 +01:00
committed by Greg Turnquist
parent cb302e90a6
commit 8885ce342b
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
View File

@@ -78,13 +78,13 @@ public class JdbcEntityWriter extends JdbcEntityWriterSupport {
Update<Object> update = DbAction.update(o, propertyPath, dependingOn);
aggregateChange.addAction(update);
referencedEntities(o).forEach(
propertyAndValue -> insertReferencedEntities(propertyAndValue, aggregateChange, propertyPath.nested(propertyAndValue.property.getName()), update));
referencedEntities(o).forEach(propertyAndValue -> insertReferencedEntities(propertyAndValue, aggregateChange,
propertyPath.nested(propertyAndValue.property.getName()), update));
}
}
private void insertReferencedEntities(PropertyAndValue propertyAndValue, AggregateChange aggregateChange,
JdbcPropertyPath propertyPath, DbAction dependingOn) {
JdbcPropertyPath propertyPath, DbAction dependingOn) {
Insert<Object> insert;
if (propertyAndValue.property.isQualified()) {
@@ -116,7 +116,7 @@ public class JdbcEntityWriter extends JdbcEntityWriterSupport {
.flatMap( //
p -> referencedEntity(p, persistentEntity.getPropertyAccessor(o)) //
.map(e -> new PropertyAndValue(p, e)) //
);
);
}
private Stream<Object> referencedEntity(JdbcPersistentProperty p, PersistentPropertyAccessor propertyAccessor) {
@@ -147,7 +147,7 @@ public class JdbcEntityWriter extends JdbcEntityWriterSupport {
}
private Stream<Object> collectionPropertyAsStream(JdbcPersistentProperty p,
PersistentPropertyAccessor propertyAccessor) {
PersistentPropertyAccessor propertyAccessor) {
Object property = propertyAccessor.getProperty(p);
@@ -160,7 +160,9 @@ public class JdbcEntityWriter extends JdbcEntityWriterSupport {
Object property = propertyAccessor.getProperty(p);
if (property == null) return Stream.empty();
if (property == null) {
return Stream.empty();
}
// ugly hackery since Java streams don't have a zip method.
AtomicInteger index = new AtomicInteger();

2
src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java
View File

@@ -132,8 +132,6 @@ public class JdbcRepositoryWithListsIntegrationTests {
Iterable<DummyEntity> reloaded = repository.findAll();
reloaded.forEach(de -> System.out.println("id " + de.id + " content " + de.content.iterator().next().content));
assertThat(reloaded) //
.extracting(e -> e.id, e -> e.content.size()) //
.containsExactly(tuple(entity.id, entity.content.size()));

2
src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java
View File

@@ -127,8 +127,6 @@ public class JdbcRepositoryWithMapsIntegrationTests {
Iterable<DummyEntity> reloaded = repository.findAll();
reloaded.forEach(de -> System.out.println("id " + de.id + " content " + de.content.values().iterator().next().content));
assertThat(reloaded) //
.extracting(e -> e.id, e -> e.content.size()) //
.containsExactly(tuple(entity.id, entity.content.size()));