refactored / initial capacity
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
index 9860c47..37e95bf 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
@@ -58,8 +58,7 @@
     }
 
     @Override
-    public Collection<URL> getMetaInfConfigurationResources(
-            ExternalContext context) throws IOException
+    public Collection<URL> getMetaInfConfigurationResources(ExternalContext context) throws IOException
     {
         List<URL> urlSet = new ArrayList<URL>();
         
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
index 0399092..98aabc4 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
@@ -204,7 +204,7 @@
                         = StringUtils.splitShortString(_replaceTabOrEnterCharactersWithSpaces(executeMode), ' ');
 
                 //The collection must be mutable
-                List<String> tempList = new ArrayList<String>();
+                List<String> tempList = new ArrayList<>(clientIds.length);
                 for (String clientId : clientIds)
                 {
                     if (clientId.length() > 0)
@@ -233,7 +233,7 @@
             }
             else
             {
-                _executeClientIds = new ArrayList<String>();
+                _executeClientIds = new ArrayList<>(5);
             }
         }
         return _executeClientIds;
@@ -288,7 +288,7 @@
                         = StringUtils.splitShortString(_replaceTabOrEnterCharactersWithSpaces(renderMode), ' ');
 
                 //The collection must be mutable
-                List<String> tempList = new ArrayList<String>();
+                List<String> tempList = new ArrayList<>(clientIds.length);
                 for (String clientId : clientIds)
                 {
                     if (clientId.length() > 0)
@@ -300,7 +300,7 @@
             }
             else
             {
-                _renderClientIds = new ArrayList<String>();
+                _renderClientIds = new ArrayList<>(5);
                 if (PartialViewContext.ALL_PARTIAL_PHASE_CLIENT_IDS.equals(renderMode))
                 {
                     _renderClientIds.add(PartialResponseWriter.RENDER_ALL_MARKER);
diff --git a/impl/src/main/java/org/apache/myfaces/flow/builder/NavigationCaseBuilderImpl.java b/impl/src/main/java/org/apache/myfaces/flow/builder/NavigationCaseBuilderImpl.java
index 866169d..864e15e 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/builder/NavigationCaseBuilderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/builder/NavigationCaseBuilderImpl.java
@@ -120,7 +120,7 @@
             Map<String, List<String>> map = _navigationCaseImpl.getParameters();

             if (map == null)

             {

-                map = new HashMap<String, List<String>>();

+                map = new HashMap<>();

                 _navigationCaseImpl.setParameters(map);

             }

             

diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
index 1cfa439..be4b29c 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
@@ -293,12 +293,7 @@
         Flow flow = flowHandler.getCurrentFlow(facesContext);
         String flowMapKey = FlowUtils.getFlowMapKey(facesContext, flow);
 
-        List<String> activeFlowKeys = activeFlowMapKeys.get(baseKey);
-        if (activeFlowKeys == null)
-        {
-            activeFlowKeys = new ArrayList<String>();
-            
-        }
+        List<String> activeFlowKeys = activeFlowMapKeys.computeIfAbsent(baseKey, k -> new ArrayList<String>());
         activeFlowKeys.add(0, flowMapKey);
         activeFlowMapKeys.put(baseKey, activeFlowKeys);
         refreshClientWindow(facesContext);
diff --git a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
index 66d3338..9a5abdf 100644
--- a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
@@ -86,7 +86,7 @@
         
         if (_supportedVDLs == null)
         {
-            List<ViewDeclarationLanguage> list = new ArrayList<>();
+            List<ViewDeclarationLanguage> list = new ArrayList<>(_supportedLanguages.length);
             for (ViewDeclarationLanguageStrategy strategy : _supportedLanguages)
             {        
                 list.add(strategy.getViewDeclarationLanguage());