Browse Source

DATAJDBC-183 - Polishing.

Removed calls to System.out.
Formatting.
Import order.
pull/53/merge
Jens Schauder 8 years ago committed by Greg Turnquist
parent
commit
8885ce342b
No known key found for this signature in database
GPG Key ID: CB2FA4D512B5C413
  1. 14
      src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
  2. 2
      src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java
  3. 2
      src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java

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

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

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

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

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

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

Loading…
Cancel
Save