Browse Source

DATACMNS-1259 - Polishing.

Refactored lambdas to method references. Simplified type parameter. Added comment to test to indicate related issue.

Original pull request: #273.
pull/271/merge
Jens Schauder 8 years ago committed by Oliver Gierke
parent
commit
dc24d2cedd
  1. 6
      src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java
  2. 2
      src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java

6
src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java

@ -113,7 +113,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
public TemporalAccessor setCreatedDate(TemporalAccessor value) { public TemporalAccessor setCreatedDate(TemporalAccessor value) {
auditable.setCreatedDate( auditable.setCreatedDate(
getAsTemporalAccessor(Optional.of(value), type).orElseThrow(() -> new IllegalStateException())); getAsTemporalAccessor(Optional.of(value), type).orElseThrow(IllegalStateException::new));
return value; return value;
} }
@ -147,7 +147,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
public TemporalAccessor setLastModifiedDate(TemporalAccessor value) { public TemporalAccessor setLastModifiedDate(TemporalAccessor value) {
auditable.setLastModifiedDate( auditable.setLastModifiedDate(
getAsTemporalAccessor(Optional.of(value), type).orElseThrow(() -> new IllegalStateException())); getAsTemporalAccessor(Optional.of(value), type).orElseThrow(IllegalStateException::new));
return value; return value;
} }
@ -220,7 +220,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
* @return * @return
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected <T extends TemporalAccessor> Optional<T> getAsTemporalAccessor(Optional<? extends Object> source, protected <T extends TemporalAccessor> Optional<T> getAsTemporalAccessor(Optional<?> source,
Class<? extends T> target) { Class<? extends T> target) {
return source.map(it -> { return source.map(it -> {

2
src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java

@ -163,7 +163,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests {
ThreeTenBackPortConverters.LocalDateTimeToJsr310LocalDateTimeConverter.INSTANCE.convert(reference)); ThreeTenBackPortConverters.LocalDateTimeToJsr310LocalDateTimeConverter.INSTANCE.convert(reference));
} }
@Test @Test // DATACMNS-1109
public void exposesInstantAsModificationDate() { public void exposesInstantAsModificationDate() {
SampleWithInstant sample = new SampleWithInstant(); SampleWithInstant sample = new SampleWithInstant();

Loading…
Cancel
Save