From 8432f7b0d503c5a6d8e3e8c2a8306007cea2a742 Mon Sep 17 00:00:00 2001 From: Koen De Groote Date: Sat, 22 Apr 2017 05:43:56 +0200 Subject: [PATCH] Some changes that are possible in Java language level 7 and 8. (#1007) --- .../server/autotune/service/SortAutoTuneDocument.java | 8 ++++---- .../io/ebeaninternal/server/deploy/BeanDescriptor.java | 2 +- .../server/deploy/BeanDescriptorManager.java | 2 +- .../server/deploy/meta/DeployBeanDescriptor.java | 2 +- .../ebeaninternal/server/deploy/parse/AnnotationBase.java | 6 +++--- .../java/io/ebeaninternal/server/query/CQueryEngine.java | 2 +- .../ebeaninternal/server/text/json/DJsonBeanReader.java | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java b/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java index 0f9669fa7..5be61b3ef 100644 --- a/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java @@ -23,19 +23,19 @@ public class SortAutoTuneDocument { ProfileDiff profileDiff = document.getProfileDiff(); if (profileDiff != null) { - Collections.sort(profileDiff.getOrigin(), NAME_KEY_SORT); + profileDiff.getOrigin().sort(NAME_KEY_SORT); } ProfileNew profileNew = document.getProfileNew(); if (profileNew != null) { - Collections.sort(profileNew.getOrigin(), NAME_KEY_SORT); + profileNew.getOrigin().sort(NAME_KEY_SORT); } ProfileEmpty profileEmpty = document.getProfileEmpty(); if (profileEmpty != null) { - Collections.sort(profileEmpty.getOrigin(), KEY_SORT); + profileEmpty.getOrigin().sort(KEY_SORT); } List origins = document.getOrigin(); if (!origins.isEmpty()) { - Collections.sort(origins, NAME_KEY_SORT); + origins.sort(NAME_KEY_SORT); } } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index c9ffbacaa..3972ca4d4 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -1992,7 +1992,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { public void sort(List list, String sortByClause) { ElComparator comparator = getElComparator(sortByClause); - Collections.sort(list, comparator); + list.sort(comparator); } public ElComparator getElComparator(String propNameOrSortBy) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 132c9ac46..b9fe65f0b 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -328,7 +328,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { readEntityRelationships(); List> list = new ArrayList<>(descMap.values()); - Collections.sort(list, beanDescComparator); + list.sort(beanDescComparator); immutableDescriptorList = Collections.unmodifiableList(list); initialiseAll(); diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index f0146c98c..184ee00c3 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -635,7 +635,7 @@ public class DeployBeanDescriptor { public void sortProperties() { ArrayList list = new ArrayList<>(propMap.values()); - Collections.sort(list, PROP_ORDER); + list.sort(PROP_ORDER); propMap = new LinkedHashMap<>(list.size()); for (DeployBeanProperty aList : list) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java index ce53db9f9..9dcbd74c1 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java @@ -218,8 +218,8 @@ public abstract class AnnotationBase { if (annotationType == null) { return null; } - Set ret = new LinkedHashSet(); - findMetaAnnotations(annotatedElement, annotationType, ret, new HashSet()); + Set ret = new LinkedHashSet<>(); + findMetaAnnotations(annotatedElement, annotationType, ret, new HashSet<>()); return ret; } @@ -264,7 +264,7 @@ public abstract class AnnotationBase { } } - private static final ConcurrentMap valueMethods = new ConcurrentHashMap(); + private static final ConcurrentMap valueMethods = new ConcurrentHashMap<>(); private static final Method nullMethod = getNullMethod(); diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 7b6e495af..111a6b633 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -265,7 +265,7 @@ public class CQueryEngine { List> versions = cquery.readVersions(); // just order in memory rather than use NULLS LAST as that // is not universally supported, not expect huge list here - Collections.sort(versions, OrderVersionDesc.INSTANCE); + versions.sort(OrderVersionDesc.INSTANCE); deriveVersionDiffs(versions, request); if (request.isLogSummary()) { diff --git a/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java index acfa1ec6b..23511f17d 100644 --- a/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java +++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java @@ -46,6 +46,6 @@ public class DJsonBeanReader implements JsonBeanReader { @Override public JsonBeanReader forJson(JsonParser moreJson, boolean resetContext) { - return new DJsonBeanReader(desc, readJson.forJson(moreJson, resetContext)); + return new DJsonBeanReader<>(desc, readJson.forJson(moreJson, resetContext)); } }