DATACMNS-1251 - Polishing.

Made methods static where possible.

Original pull request: #270.

Author: odrotbohm

src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java

@@ -76,18 +76,37 @@ public Optional<N> getRevisionNumber() {
 	@Deprecated
 	public Optional<LocalDateTime> getRevisionDate() {
 
-		return revisionDate.get().map(this::convertToLocalDateTime);
+		return revisionDate.get().map(AnnotationRevisionMetadata::convertToLocalDateTime);
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.history.RevisionMetadata#getRevisionDate()
 	 */
 	public Optional<Instant> getRevisionInstant() {
-		return revisionDate.get().map(this::convertToInstant);
+		return revisionDate.get().map(AnnotationRevisionMetadata::convertToInstant);
 	}
 
-	private LocalDateTime convertToLocalDateTime(TemporalAccessor temporalAccessor) {
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.history.RevisionMetadata#getDelegate()
+	 */
+	@SuppressWarnings("unchecked")
+	public <T> T getDelegate() {
+		return (T) entity;
+	}
+
+	private static <T> Lazy<Optional<T>> detectAnnotation(Object entity, Class<? extends Annotation> annotationType) {
+
+		return Lazy.of(() -> {
+
+			AnnotationDetectionFieldCallback callback = new AnnotationDetectionFieldCallback(annotationType);
+			ReflectionUtils.doWithFields(entity.getClass(), callback);
+			return Optional.ofNullable(callback.getValue(entity));
+		});
+	}
+
+	private static LocalDateTime convertToLocalDateTime(TemporalAccessor temporalAccessor) {
 
 		if (temporalAccessor instanceof LocalDateTime) {
 			return (LocalDateTime) temporalAccessor;
@@ -97,10 +116,10 @@ private LocalDateTime convertToLocalDateTime(TemporalAccessor temporalAccessor)
 			return LocalDateTime.ofInstant((Instant) temporalAccessor, ZoneOffset.systemDefault());
 		}
 
-		throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime", temporalAccessor));
+		throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime!", temporalAccessor));
 	}
 
-	private Instant convertToInstant(TemporalAccessor temporalAccessor) {
+	private static Instant convertToInstant(TemporalAccessor temporalAccessor) {
 
 		if (temporalAccessor instanceof Instant) {
 			return (Instant) temporalAccessor;
@@ -110,25 +129,6 @@ private Instant convertToInstant(TemporalAccessor temporalAccessor) {
 			return ((LocalDateTime) temporalAccessor).atZone(ZoneOffset.systemDefault()).toInstant();
 		}
 
-		throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime", temporalAccessor));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.history.RevisionMetadata#getDelegate()
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> T getDelegate() {
-		return (T) entity;
-	}
-
-	private static <T> Lazy<Optional<T>> detectAnnotation(Object entity, Class<? extends Annotation> annotationType) {
-
-		return Lazy.of(() -> {
-
-			AnnotationDetectionFieldCallback callback = new AnnotationDetectionFieldCallback(annotationType);
-			ReflectionUtils.doWithFields(entity.getClass(), callback);
-			return Optional.ofNullable(callback.getValue(entity));
-		});
+		throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime!", temporalAccessor));
 	}
 }