use diamond operator
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/63fbe194 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/63fbe194 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/63fbe194 Branch: refs/heads/master Commit: 63fbe19405c07f11e80e8be91df398ead71ac2fe Parents: 62dfa21 Author: Hayri Cicek <[email protected]> Authored: Sun Sep 16 00:50:17 2018 +0200 Committer: Hayri Cicek <[email protected]> Committed: Sun Sep 16 00:50:17 2018 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/tomee/loader/UrlSet.java | 18 +++++++++--------- .../apache/tomee/loader/filter/FilterList.java | 2 +- .../org/apache/tomee/loader/filter/Filters.java | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/63fbe194/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java index 0316745..d87c4c1 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java @@ -52,7 +52,7 @@ public class UrlSet implements Iterable<URL> { * @param urls */ public UrlSet(final Collection<URL> urls){ - this.urls = new HashMap<String,URL>(); + this.urls = new HashMap<>(); for (final URL location : urls) { try { // if (location.getProtocol().equals("file")) { @@ -78,20 +78,20 @@ public class UrlSet implements Iterable<URL> { } public UrlSet include(final UrlSet urlSet){ - final Map<String, URL> urls = new HashMap<String, URL>(this.urls); + final Map<String, URL> urls = new HashMap<>(this.urls); urls.putAll(urlSet.urls); return new UrlSet(urls); } public UrlSet include(final URL url){ - final Map<String, URL> urls = new HashMap<String, URL>(this.urls); + final Map<String, URL> urls = new HashMap<>(this.urls); urls.put(url.toExternalForm(), url); return new UrlSet(urls); } public UrlSet exclude(final UrlSet urlSet) { - final Map<String, URL> urls = new HashMap<String, URL>(this.urls); + final Map<String, URL> urls = new HashMap<>(this.urls); final Map<String, URL> parentUrls = urlSet.urls; for (final String url : parentUrls.keySet()) { urls.remove(url); @@ -100,7 +100,7 @@ public class UrlSet implements Iterable<URL> { } public UrlSet exclude(final URL url) { - final Map<String, URL> urls = new HashMap<String, URL>(this.urls); + final Map<String, URL> urls = new HashMap<>(this.urls); urls.remove(url.toExternalForm()); return new UrlSet(urls); } @@ -161,7 +161,7 @@ public class UrlSet implements Iterable<URL> { } public UrlSet filter(final Filter filter) { - final Map<String, URL> urls = new HashMap<String, URL>(); + final Map<String, URL> urls = new HashMap<>(); for (final Map.Entry<String, URL> entry : this.urls.entrySet()) { final String url = entry.getKey(); if (filter.accept(url)){ @@ -177,7 +177,7 @@ public class UrlSet implements Iterable<URL> { public UrlSet relative(final File file) throws MalformedURLException { final String urlPath = file.toURI().toURL().toExternalForm(); - final Map<String, URL> urls = new HashMap<String, URL>(); + final Map<String, URL> urls = new HashMap<>(); for (final Map.Entry<String, URL> entry : this.urls.entrySet()) { final String url = entry.getKey(); if (url.startsWith(urlPath) || url.startsWith("jar:"+urlPath)){ @@ -188,7 +188,7 @@ public class UrlSet implements Iterable<URL> { } public List<URL> getUrls() { - return new ArrayList<URL>(urls.values()); + return new ArrayList<>(urls.values()); } public int size() { @@ -200,7 +200,7 @@ public class UrlSet implements Iterable<URL> { } private static List<URL> getUrls(final ClassLoader classLoader) throws IOException { - final List<URL> list = new ArrayList<URL>(); + final List<URL> list = new ArrayList<>(); final ArrayList<URL> urls = Collections.list(classLoader.getResources("META-INF")); for (URL url : urls) { String externalForm = url.toExternalForm(); http://git-wip-us.apache.org/repos/asf/tomee/blob/63fbe194/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java index defd248..3951ed7 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java @@ -25,7 +25,7 @@ import java.util.List; */ public class FilterList implements Filter { - private final List<Filter> filters = new ArrayList<Filter>(); + private final List<Filter> filters = new ArrayList<>(); public FilterList(final Filter... filters) { this(Arrays.asList(filters)); http://git-wip-us.apache.org/repos/asf/tomee/blob/63fbe194/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java index cd89b2e..a9b9cd2 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java @@ -34,7 +34,7 @@ public class Filters { }; public static Filter packages(final String... packages) { - final List<Filter> filters = new ArrayList<Filter>(); + final List<Filter> filters = new ArrayList<>(); for (final String s : packages) { filters.add(new PackageFilter(s)); } @@ -43,7 +43,7 @@ public class Filters { } public static Filter classes(final String... classes) { - final List<Filter> filters = new ArrayList<Filter>(); + final List<Filter> filters = new ArrayList<>(); for (final String s : classes) { filters.add(new ClassFilter(s)); } @@ -52,7 +52,7 @@ public class Filters { } public static Filter prefixes(final String... prefixes) { - final List<Filter> filters = new ArrayList<Filter>(); + final List<Filter> filters = new ArrayList<>(); for (final String s : prefixes) { filters.add(new PrefixFilter(s)); } @@ -61,7 +61,7 @@ public class Filters { } public static Filter tokens(final String... tokens) { - final List<Filter> filters = new ArrayList<Filter>(); + final List<Filter> filters = new ArrayList<>(); for (final String s : tokens) { filters.add(new ContainsFilter(s)); } @@ -70,7 +70,7 @@ public class Filters { } public static Filter suffixes(final String... suffixes) { - final List<Filter> filters = new ArrayList<Filter>(); + final List<Filter> filters = new ArrayList<>(); for (final String s : suffixes) { filters.add(new SuffixFilter(s)); } @@ -79,7 +79,7 @@ public class Filters { } public static Filter patterns(final String... patterns) { - final List<Filter> filters = new ArrayList<Filter>(); + final List<Filter> filters = new ArrayList<>(); for (final String s : patterns) { filters.add(new PatternFilter(s)); } @@ -93,7 +93,7 @@ public class Filters { } public static Filter optimize(final List<Filter>... filterss) { - final Set<Filter> unwrapped = new LinkedHashSet<Filter>(); + final Set<Filter> unwrapped = new LinkedHashSet<>(); for (final List<Filter> filters : filterss) { unwrap(filters, unwrapped); @@ -109,7 +109,7 @@ public class Filters { } } - if (unwrapped.size() == 0) { + if (unwrapped.isEmpty()) { return NONE; } if (unwrapped.size() == 1) {
