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

DATACMNS-1251 - Polishing.

Browse Source 
Made methods static where possible.

Original pull request: #270.
This commit is contained in:
Oliver Gierke
2018-02-16 18:21:30 +01:00
parent 139e098e85
commit 63fec4a32b
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java
View File

@@ -76,7 +76,7 @@ public class AnnotationRevisionMetadata<N extends Number & Comparable<N>> implem
@Deprecated
public Optional<LocalDateTime> getRevisionDate() {
return revisionDate.get().map(this::convertToLocalDateTime);
return revisionDate.get().map(AnnotationRevisionMetadata::convertToLocalDateTime);
}
/*
@@ -84,33 +84,7 @@ public class AnnotationRevisionMetadata<N extends Number & Comparable<N>> implem
* @see org.springframework.data.history.RevisionMetadata#getRevisionDate()
*/
public Optional<Instant> getRevisionInstant() {
return revisionDate.get().map(this::convertToInstant);
}
private LocalDateTime convertToLocalDateTime(TemporalAccessor temporalAccessor) {
if (temporalAccessor instanceof LocalDateTime) {
return (LocalDateTime) temporalAccessor;
}
if (temporalAccessor instanceof Instant) {
return LocalDateTime.ofInstant((Instant) temporalAccessor, ZoneOffset.systemDefault());
}
throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime", temporalAccessor));
}
private Instant convertToInstant(TemporalAccessor temporalAccessor) {
if (temporalAccessor instanceof Instant) {
return (Instant) temporalAccessor;
}
if (temporalAccessor instanceof LocalDateTime) {
return ((LocalDateTime) temporalAccessor).atZone(ZoneOffset.systemDefault()).toInstant();
}
throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime", temporalAccessor));
return revisionDate.get().map(AnnotationRevisionMetadata::convertToInstant);
}
/*
@@ -131,4 +105,30 @@ public class AnnotationRevisionMetadata<N extends Number & Comparable<N>> implem
return Optional.ofNullable(callback.getValue(entity));
});
}
private static LocalDateTime convertToLocalDateTime(TemporalAccessor temporalAccessor) {
if (temporalAccessor instanceof LocalDateTime) {
return (LocalDateTime) temporalAccessor;
}
if (temporalAccessor instanceof Instant) {
return LocalDateTime.ofInstant((Instant) temporalAccessor, ZoneOffset.systemDefault());
}
throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime!", temporalAccessor));
}
private static Instant convertToInstant(TemporalAccessor temporalAccessor) {
if (temporalAccessor instanceof Instant) {
return (Instant) temporalAccessor;
}
if (temporalAccessor instanceof LocalDateTime) {
return ((LocalDateTime) temporalAccessor).atZone(ZoneOffset.systemDefault()).toInstant();
}
throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime!", temporalAccessor));
}
}