From 63fec4a32b1fb631b2b24660c00679095ea06756 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 16 Feb 2018 18:21:30 +0100 Subject: [PATCH] DATACMNS-1251 - Polishing. Made methods static where possible. Original pull request: #270. --- .../history/AnnotationRevisionMetadata.java | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java b/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java index 48c8ab659..868d536e1 100755 --- a/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java +++ b/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java @@ -76,7 +76,7 @@ public class AnnotationRevisionMetadata> implem @Deprecated public Optional getRevisionDate() { - return revisionDate.get().map(this::convertToLocalDateTime); + return revisionDate.get().map(AnnotationRevisionMetadata::convertToLocalDateTime); } /* @@ -84,33 +84,7 @@ public class AnnotationRevisionMetadata> implem * @see org.springframework.data.history.RevisionMetadata#getRevisionDate() */ public Optional 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> 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)); + } }