From f54ddf7cb16663bd43b717569f47417788d2e3e5 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 11 Oct 2011 13:02:21 +0200 Subject: [PATCH] Polishing. --- .../context/AbstractMappingContext.java | 1 - .../DefaultPersistentPropertyPath.java | 42 ++++++++++++------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java index 5fe42c595..c513d7293 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java @@ -26,7 +26,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java index 5e2d225af..aaec65a7b 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java @@ -153,7 +153,8 @@ class DefaultPersistentPropertyPath> implements List properties = new ArrayList(); Iterator iterator = iterator(); - for (@SuppressWarnings("unused") T candidate : base) { + for (@SuppressWarnings("unused") + T candidate : base) { iterator.next(); } @@ -164,13 +165,26 @@ class DefaultPersistentPropertyPath> implements return new DefaultPersistentPropertyPath(properties); } - public PersistentPropertyPath getParentPath() { - int size = properties.size(); - if (size <= 1) { - return this; - } - return new DefaultPersistentPropertyPath(properties.subList(0,size-1)); - } + /* + * (non-Javadoc) + * @see org.springframework.data.mapping.context.PersistentPropertyPath#getParentPath() + */ + public PersistentPropertyPath getParentPath() { + int size = properties.size(); + if (size <= 1) { + return this; + } + return new DefaultPersistentPropertyPath(properties.subList(0, size - 1)); + } + + /* + * (non-Javadoc) + * @see org.springframework.data.mapping.context.PersistentPropertyPath#getLength() + */ + public int getLength() { + return properties.size(); + } + /* * (non-Javadoc) * @see java.lang.Iterable#iterator() @@ -208,12 +222,8 @@ class DefaultPersistentPropertyPath> implements return properties.hashCode(); } - @Override - public String toString() { - return toDotPath(); - } - - public int getLength() { - return properties.size(); - } + @Override + public String toString() { + return toDotPath(); + } }