Replace explicit type arguments with diamond type

(cherry picked from commit ce387cb)

Author: mawiesne

arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java

@@ -52,7 +52,7 @@ public static boolean isCurrentAdapter(final String name) {
     }
 
     public static Collection<Archive<?>> toDeploy(final Properties properties) {
-        final Collection<Archive<?>> list = new ArrayList<Archive<?>>();
+        final Collection<Archive<?>> list = new ArrayList<>();
         if (properties.containsKey(ArquillianUtil.PREDEPLOYING_KEY)) {
             final String toSplit = properties.getProperty(PREDEPLOYING_KEY).trim();
             final ClassLoader loader = Thread.currentThread().getContextClassLoader();

arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java

@@ -26,8 +26,8 @@
 import java.util.Set;
 
 public class DeploymentExceptionObserver {
-    private static final Map<Class<?>, Exception> EXCEPTIONS = new HashMap<Class<?>, Exception>();
-    private static final Map<Class<?>, Exception> PARENT_EXCEPTIONS = new HashMap<Class<?>, Exception>();
+    private static final Map<Class<?>, Exception> EXCEPTIONS = new HashMap<>();
+    private static final Map<Class<?>, Exception> PARENT_EXCEPTIONS = new HashMap<>();
 
     public void observes(@Observes final DeploymentException t) throws Exception {
         EXCEPTIONS.put(t.getClass(), t);
@@ -54,7 +54,7 @@ public static Exception getExceptions(final Class<?> clazz) {
     }
 
     public static Set<Class<?>> availableExceptionTypes() {
-        final Set<Class<?>> set = new HashSet<Class<?>>(EXCEPTIONS.keySet());
+        final Set<Class<?>> set = new HashSet<>(EXCEPTIONS.keySet());
         set.addAll(PARENT_EXCEPTIONS.keySet());
         return set;
     }

arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java

@@ -270,7 +270,7 @@ private ParamAnnotated(final Method method, final int position) {
             types.add(getBaseType());
             types.add(Object.class);
 
-            annotations = new HashSet<Annotation>(asList(method.getParameterAnnotations()[position]));
+            annotations = new HashSet<>(asList(method.getParameterAnnotations()[position]));
         }
 
         @Override

arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java

@@ -180,8 +180,8 @@ public static AppModule createModule(final Archive<?> archive, final TestClass t
 
                         final List<URL> webappAdditionalPaths = new LinkedList<>();
                         final CompositeBeans webAppBeansXml = new CompositeBeans();
-                        final List<Archive> webAppArchives = new LinkedList<Archive>();
-                        final Map<URL, List<String>> webAppClassesByUrl = new HashMap<URL, List<String>>();
+                        final List<Archive> webAppArchives = new LinkedList<>();
+                        final Map<URL, List<String>> webAppClassesByUrl = new HashMap<>();
                         final CompositeArchive webAppArchive = analyzeLibs(parent,
                                 webappAdditionalPaths, webAppClassesByUrl,
                                 webAppArchives, webAppBeansXml,
@@ -216,7 +216,7 @@ public static AppModule createModule(final Archive<?> archive, final TestClass t
 
                         addPersistenceXml(archive, WEB_INF, appModule);
                         addOpenEJbJarXml(archive, WEB_INF, ejbModule);
-                        addValidationXml(archive, WEB_INF, new HashMap<String, Object>(), ejbModule);
+                        addValidationXml(archive, WEB_INF, new HashMap<>(), ejbModule);
                         addResourcesXml(archive, WEB_INF, ejbModule);
                         addEnvEntries(archive, WEB_INF, appModule, ejbModule);
                     }
@@ -384,7 +384,7 @@ private static CompositeArchive analyzeLibs(final ClassLoader parent,
             } if (UrlAsset.class.isInstance(asset) || FileAsset.class.isInstance(asset)) {
                 try {
                     final URL url = UrlAsset.class.isInstance(asset) ? get(URL.class, "url", asset) : get(File.class, "file", asset).toURI().toURL();
-                    final List<String> classes = new ArrayList<String>();
+                    final List<String> classes = new ArrayList<>();
                     archives.add(new FilteredArchive(
                             new JarArchive(parent, url),
                             new WebappAggregatedArchive.ScanXmlSaverFilter(false, null, classes, null)));
@@ -596,7 +596,7 @@ private static class SimpleWebappAggregatedArchive extends WebappAggregatedArchi
         private final Map<URL, List<String>> classesMap;
 
         public SimpleWebappAggregatedArchive(final ClassLoader cl, final CompositeArchive archive, final Map<URL, List<String>> map) {
-            super(cl, new HashMap<String, Object>(), new ArrayList<URL>());
+            super(cl, new HashMap<>(), new ArrayList<>());
 
             delegate = archive;
             classesMap = map;

arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java

@@ -68,6 +68,6 @@ public boolean isSingleDeploymentByArchiveName(final String name) {
 
     public void setSingleDeploymentByArchiveName(final String singleDeploymentByArchiveName) {
         this.singleDeploymentByArchiveName = singleDeploymentByArchiveName == null || singleDeploymentByArchiveName.trim().isEmpty() ?
-                Collections.<String>emptyList() : new HashSet<String>(asList(singleDeploymentByArchiveName.split(" *, *")));
+                Collections.<String>emptyList() : new HashSet<>(asList(singleDeploymentByArchiveName.split(" *, *")));
     }
 }

arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java

@@ -98,7 +98,7 @@ public class OpenEJBDeployableContainer implements DeployableContainer<OpenEJBCo
         }
     }
 
-    private static final ConcurrentMap<String, DeploymentInfo> DEPLOYMENT_INFO = new ConcurrentHashMap<String, DeploymentInfo>();
+    private static final ConcurrentMap<String, DeploymentInfo> DEPLOYMENT_INFO = new ConcurrentHashMap<>();
     public static final AppContext NO_APP_CTX = new AppContext(null, SystemInstance.get(), null, null, null, false);
 
     // config

arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java

@@ -67,7 +67,7 @@ public class SWClassLoader extends ClassLoader implements Closeable {
     }
 
     private final Collection<Archive<?>> archives;
-    private final Collection<Closeable> closeables = new ArrayList<Closeable>();
+    private final Collection<Closeable> closeables = new ArrayList<>();
 
     public SWClassLoader(final ClassLoader parent, final Archive<?>... ar) {
         super(parent);
@@ -115,7 +115,7 @@ public Enumeration<URL> getResources(final String name) throws IOException {
                 if ("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.arquillian.cdi.extension.skip-externals", "false"))) {
                     return enumerator(Collections.<URL>emptyList());
                 }
-                return enumerator(addContainerExtensions(name, new ArrayList<URL>(2)));
+                return enumerator(addContainerExtensions(name, new ArrayList<>(2)));
             }
         }
         return super.getResources(name);
@@ -193,8 +193,8 @@ protected URL findResource(final String name) {
     }
 
     private static class ArchiveStreamHandler extends URLStreamHandler {
-        public static final Map<String, Archive<?>> archives = new HashMap<String, Archive<?>>();
-        public static final Map<String, Collection<Closeable>> closeables = new HashMap<String, Collection<Closeable>>();
+        public static final Map<String, Archive<?>> archives = new HashMap<>();
+        public static final Map<String, Collection<Closeable>> closeables = new HashMap<>();
 
         public static void set(final Archive<?> ar, final Collection<Closeable> c) {
             final String archiveName = ar.getName();

arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java

@@ -45,7 +45,7 @@ public Iterator<Resource> createIterator(final URL url, final String path, final
 
     private Collection<Resource> findResources(final String path, final String suffix) {
         final ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        final Collection<Resource> resources = new ArrayList<Resource>();
+        final Collection<Resource> resources = new ArrayList<>();
         if (SWClassLoader.class.isInstance(loader)) {
             final Collection<Archive<?>> archives = SWClassLoader.class.cast(loader).getArchives();
             final ClassLoader parent = loader.getParent();

arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java

@@ -83,7 +83,7 @@ public static void apply(final Object configuration, final Properties systemProp
     }
 
     private static List<Properties> read(final List<URL> urls) {
-        final List<Properties> propertiesList = new ArrayList<Properties>();
+        final List<Properties> propertiesList = new ArrayList<>();
         for (final URL url : urls) {
             try {
                 propertiesList.add(IO.readProperties(url));
@@ -95,7 +95,7 @@ private static List<Properties> read(final List<URL> urls) {
     }
 
     public static List<URL> findPropertiesFiles(final String name, final String... prefixes) {
-        final List<URL> urls = new ArrayList<URL>();
+        final List<URL> urls = new ArrayList<>();
 
         final ClassLoader loader = Thread.currentThread().getContextClassLoader();
 

arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java

@@ -76,7 +76,7 @@ private Files() {
     }
 
     // Shutdown hook for recursive delete on tmp directories
-    static final List<String> delete = new ArrayList<String>();
+    static final List<String> delete = new ArrayList<>();
 
     private static volatile boolean shutdown;