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

DATACMNS-1259 - Polishing.

Browse Source 
Removed unnecessary imports. Tiny refactoring to pull exception creation into static helper method. Made methods static in test cases where possible.

Original pull request: #273.
This commit is contained in:
Oliver Gierke
2018-02-15 14:24:53 +01:00
parent 9d3540cc54
commit 6675e33233
3 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java
View File

@@ -20,7 +20,6 @@ import lombok.RequiredArgsConstructor;
import java.lang.reflect.Field;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAccessor;
import java.util.Calendar;
import java.util.Date;
@@ -112,8 +111,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
@Override
public TemporalAccessor setCreatedDate(TemporalAccessor value) {
auditable.setCreatedDate(
getAsTemporalAccessor(Optional.of(value), type).orElseThrow(IllegalStateException::new));
auditable.setCreatedDate(getAsTemporalAccessor(Optional.of(value), type).orElseThrow(IllegalStateException::new));
return value;
}
@@ -146,8 +144,8 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
@Override
public TemporalAccessor setLastModifiedDate(TemporalAccessor value) {
auditable.setLastModifiedDate(
getAsTemporalAccessor(Optional.of(value), type).orElseThrow(IllegalStateException::new));
auditable
.setLastModifiedDate(getAsTemporalAccessor(Optional.of(value), type).orElseThrow(IllegalStateException::new));
return value;
}
@@ -209,7 +207,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
return conversionService.convert(date, targetType);
}
throw new IllegalArgumentException(createUnsupportedTypeErrorMessage(source));
throw rejectUnsupportedType(source);
}
/**
@@ -232,19 +230,17 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
Class<?> typeToConvertTo = Stream.of(target, Instant.class)//
.filter(type -> target.isAssignableFrom(type))//
.filter(type -> conversionService.canConvert(it.getClass(), type))//
.findFirst()
.orElseThrow(() -> new IllegalArgumentException(
createUnsupportedTypeErrorMessage(((Optional<Object>)source).orElseGet(() -> source))));
.findFirst() //
.orElseThrow(() -> rejectUnsupportedType(source.map(Object.class::cast).orElseGet(() -> source)));
return (T) conversionService.convert(it, typeToConvertTo);
});
}
}
private static String createUnsupportedTypeErrorMessage(Object source) {
return String.format("Invalid date type %s for member %s! Supported types are %s.", source.getClass(), source,
AnnotationAuditingMetadata.SUPPORTED_DATE_TYPES);
private static IllegalArgumentException rejectUnsupportedType(Object source) {
return new IllegalArgumentException(String.format("Invalid date type %s for member %s! Supported types are %s.",
source.getClass(), source, AnnotationAuditingMetadata.SUPPORTED_DATE_TYPES));
}
/**

2
src/main/java/org/springframework/data/convert/JodaTimeConverters.java
View File

@@ -22,12 +22,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import javax.annotation.Nonnull;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.springframework.core.convert.converter.Converter;