uses EnumSet instead of HasSet
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d1135d33 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d1135d33 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d1135d33 Branch: refs/heads/master Commit: d1135d3318fb82c2c67a08100f4202a250f26832 Parents: a381b9f Author: Otavio Santana <[email protected]> Authored: Tue Dec 4 12:36:20 2018 -0200 Committer: Otavio Santana <[email protected]> Committed: Tue Dec 4 12:36:20 2018 -0200 ---------------------------------------------------------------------- .../openejb/assembler/classic/InterceptorBindingBuilder.java | 4 ++-- .../org/apache/openejb/assembler/classic/ValidatorBuilder.java | 3 ++- .../main/java/org/apache/openejb/config/DeploymentLoader.java | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d1135d33/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java index 70c42ce..c330ca9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java @@ -30,8 +30,8 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.EnumSet; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -206,7 +206,7 @@ public class InterceptorBindingBuilder { // - Any addition for current level and/or exclusion for a lower level // (lowest) // - final Set<Level> excludes = new HashSet<>(); + final Set<Level> excludes = EnumSet.noneOf(Level.class); for (final InterceptorBindingInfo info : bindings) { final Level level = level(info); http://git-wip-us.apache.org/repos/asf/tomee/blob/d1135d33/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java index f55d165..92a6fae 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java @@ -50,6 +50,7 @@ import javax.validation.valueextraction.ValueExtractor; import java.io.InputStream; import java.io.Serializable; import java.util.Collection; +import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; @@ -161,7 +162,7 @@ public final class ValidatorBuilder { thread.setContextClassLoader(classLoader); } - final Set<ExecutableType> types = new HashSet<>(); + final Set<ExecutableType> types = EnumSet.noneOf(ExecutableType.class); for (final String type : info.validatedTypes) { types.add(ExecutableType.valueOf(type)); } http://git-wip-us.apache.org/repos/asf/tomee/blob/d1135d33/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java index c9aafc4..a66be39 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java @@ -75,6 +75,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -93,8 +94,6 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.zip.ZipEntry; -import static java.util.Arrays.asList; - /** * @version $Revision$ $Date$ */ @@ -1907,7 +1906,7 @@ public class DeploymentLoader implements DeploymentFilterable { } public Class<? extends DeploymentModule> discoverModuleType(final URL baseUrl, final ClassLoader classLoader, final boolean searchForDescriptorlessApplications) throws IOException, UnknownModuleTypeException { - final Set<RequireDescriptors> search = new HashSet<>(); + final Set<RequireDescriptors> search = EnumSet.noneOf(RequireDescriptors.class); if (!searchForDescriptorlessApplications) { search.addAll(Arrays.asList(RequireDescriptors.values()));
