use of diamond operator, isEmpty() and log Level
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/22855e1e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/22855e1e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/22855e1e Branch: refs/heads/master Commit: 22855e1ebf3c914b21681e1575f72f43ab308483 Parents: 02a62bf Author: Hayri Cicek <[email protected]> Authored: Sun Sep 16 00:59:54 2018 +0200 Committer: Hayri Cicek <[email protected]> Committed: Sun Sep 16 00:59:54 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java | 6 +++--- .../src/main/java/org/apache/tomee/embedded/FatApp.java | 2 +- .../tomee/embedded/internal/StandardContextCustomizer.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/22855e1e/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java index ed300ec..39b3b8a 100644 --- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java +++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java @@ -47,7 +47,7 @@ public final class EmbeddedTomEEContainer extends EJBContainer { private static final List<String> CONTAINER_NAMES = Arrays.asList(EmbeddedTomEEContainer.class.getName(), "tomee-embedded", "embedded-tomee"); private final Container container = new Container(); - private final Collection<String> deployedIds = new ArrayList<String>(); + private final Collection<String> deployedIds = new ArrayList<>(); private EmbeddedTomEEContainer() { // no-op @@ -59,7 +59,7 @@ public final class EmbeddedTomEEContainer extends EJBContainer { @Override public void close() { - final Collection<Exception> errors = new ArrayList<Exception>(); + final Collection<Exception> errors = new ArrayList<>(); final EmbeddedTomEEContainer etc = tomEEContainer.get(); if (null != etc) { for (final String id : deployedIds) { @@ -169,7 +169,7 @@ public final class EmbeddedTomEEContainer extends EJBContainer { } else { SystemInstance.get().getProperties().putAll(properties); final Collection<File> files = etc.container.getConfigurationFactory().getModulesFromClassPath(null, Thread.currentThread().getContextClassLoader()); - if (files.size() == 0) { + if (files.isEmpty()) { try { etc.close(); } catch (final Exception e) { http://git-wip-us.apache.org/repos/asf/tomee/blob/22855e1e/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java index 2d5cf4d..187cdb6 100644 --- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java +++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java @@ -25,7 +25,7 @@ import static java.util.Arrays.asList; // common for fatjars public final class FatApp { public static void main(final String[] args) { - final Collection<String> a = args == null || args.length == 0 ? new ArrayList<String>() : new ArrayList<>(asList(args)); + final Collection<String> a = args == null || args.length == 0 ? new ArrayList<>() : new ArrayList<>(asList(args)); if (a.size() == 1 && "--help".equals(a.iterator().next())) { Main.main(new String[] {"--help"}); return; http://git-wip-us.apache.org/repos/asf/tomee/blob/22855e1e/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java index 736a1f5..72cd596 100644 --- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java +++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java @@ -40,6 +40,7 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.util.List; +import java.util.logging.Level; import java.util.logging.Logger; public class StandardContextCustomizer { @@ -109,7 +110,7 @@ public class StandardContextCustomizer { } } else { Logger.getLogger(StandardContextCustomizer.class.getName()) - .warning("'" + web + "' is not a directory, ignoring"); + .log(Level.WARNING, "''{0}'' is not a directory, ignoring", web); } } }
