[misc] Added missing @Override annotations, use diamond operators, use better list initialization
git-svn-id: https://svn.apache.org/repos/asf/velocity/tools/trunk@1770714 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java b/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java
index 12b2a27..6463532 100644
--- a/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java
+++ b/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java
@@ -166,6 +166,7 @@
* at any time, while preventing templates from doing so when
* configure(Map) is locked.
*/
+ @Override
protected void configure(ValueParser values)
{
super.configure(values);
@@ -227,7 +228,7 @@
public <T> Collection<T> sort(final Collection<T> c,
final Comparator<T> comparator)
{
- final ArrayList<T> list = new ArrayList<T>(c);
+ final ArrayList<T> list = new ArrayList<>(c);
Collections.sort(list, comparator);
return list;
}
@@ -345,8 +346,7 @@
*/
public Collection sort(Object object, String property)
{
- List properties = new ArrayList(1);
- properties.add(property);
+ List<String> properties = Collections.singletonList(property);
if (object instanceof Collection)
{
@@ -367,8 +367,7 @@
public Collection sort(Collection collection, List properties)
{
- List list = new ArrayList(collection.size());
- list.addAll(collection);
+ List<?> list = new ArrayList<>(collection);
return internalSort(list, properties);
}
@@ -468,6 +467,7 @@
}
}
+ @Override
public int compare(Object lhs, Object rhs)
{
for (int i = 0; i < properties.size(); i++)
