myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] 02/02: refactored
Date Tue, 13 Aug 2019 12:44:42 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git

commit 7262f0a3296bd2c31402dc571d65a1816a4e45a9
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Tue Aug 13 14:44:33 2019 +0200

    refactored
---
 .../config/impl/elements/AbsoluteOrderingImpl.java |  15 +-
 .../config/impl/elements/ApplicationImpl.java      | 180 ++++++++++++++++++---
 .../config/impl/elements/AttributeImpl.java        |  81 +++++-----
 .../myfaces/config/impl/elements/BehaviorImpl.java |  33 ++--
 .../impl/elements/ClientBehaviorRendererImpl.java  |  13 +-
 .../config/impl/elements/ComponentImpl.java        |   2 -
 .../config/impl/elements/ContractMappingImpl.java  |  10 +-
 .../config/impl/elements/ConverterImpl.java        |  36 ++---
 .../impl/elements/FaceletsProcessingImpl.java      |   2 -
 .../impl/elements/FaceletsTemplateMappingImpl.java |   7 -
 .../impl/elements/FacesConfigExtensionImpl.java    |  15 +-
 .../config/impl/elements/FacesConfigImpl.java      | 110 ++++++-------
 .../config/impl/elements/FacesFlowCallImpl.java    |  20 +--
 .../impl/elements/FacesFlowDefinitionImpl.java     | 142 ++++++++++------
 .../impl/elements/FacesFlowMethodCallImpl.java     |  39 ++---
 .../impl/elements/FacesFlowParameterImpl.java      |  12 +-
 .../impl/elements/FacesFlowReferenceImpl.java      |  17 +-
 .../config/impl/elements/FacesFlowReturnImpl.java  |  12 +-
 .../config/impl/elements/FacesFlowSwitchImpl.java  |  26 +--
 .../config/impl/elements/FacesFlowViewImpl.java    |  16 +-
 .../myfaces/config/impl/elements/FactoryImpl.java  | 169 ++++++++++++++++---
 .../config/impl/elements/LocaleConfigImpl.java     |  11 +-
 .../config/impl/elements/NavigationCaseImpl.java   |   2 +-
 .../config/impl/elements/NavigationRuleImpl.java   |  12 +-
 .../myfaces/config/impl/elements/OrderingImpl.java |  24 ++-
 .../myfaces/config/impl/elements/PropertyImpl.java |  77 +++++----
 .../myfaces/config/impl/elements/RedirectImpl.java |  15 +-
 .../config/impl/elements/RenderKitImpl.java        |  67 ++++++--
 .../config/impl/elements/ResourceBundleImpl.java   |   2 +-
 .../config/impl/elements/ViewParamImpl.java        |   1 -
 .../config/impl/elements/ViewPoolMappingImpl.java  |  20 ++-
 .../impl/elements/ViewPoolParameterImpl.java       |  12 +-
 .../myfaces/config/OrderingFacesConfigTest.java    |  58 +++----
 33 files changed, 821 insertions(+), 437 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java
index df9e7c0..ccd42c9 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java
@@ -20,21 +20,30 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class AbsoluteOrderingImpl extends org.apache.myfaces.config.element.AbsoluteOrdering implements Serializable
 {
-    private List<org.apache.myfaces.config.element.OrderSlot> orderList = 
-        new ArrayList<>();
+    private List<org.apache.myfaces.config.element.OrderSlot> orderList;
     
     public void addOrderSlot(org.apache.myfaces.config.element.OrderSlot slot)
     {
+        if (orderList == null)
+        {
+            orderList = new ArrayList<>();
+        }
         orderList.add(slot);
     }
-    
+
     @Override
     public List<org.apache.myfaces.config.element.OrderSlot> getOrderList()
     {
+        if (orderList == null)
+        {
+            return Collections.emptyList();
+        }
+        
         return orderList;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java
index 2b24e7e..a17d95e 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java
@@ -20,6 +20,7 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.apache.myfaces.config.element.ContractMapping;
 
@@ -28,182 +29,289 @@ import org.apache.myfaces.config.element.ContractMapping;
  */
 public class ApplicationImpl extends org.apache.myfaces.config.element.Application implements Serializable
 {
-
-    private final List<String> actionListener = new ArrayList<String>();
-    private final List<String> defaultRenderkitId = new ArrayList<String>();
-    private final List<String> defaultValidatorIds = new ArrayList<String>();
-    private final List<String> messageBundle = new ArrayList<String>();
-    private final List<String> navigationHandler = new ArrayList<String>();
-    private final List<String> resourceHandler = new ArrayList<String>();
-    private final List<String> viewHandler = new ArrayList<String>();
-    private final List<String> stateManager = new ArrayList<String>();
-    private final List<String> propertyResolver = new ArrayList<String>();
-    private final List<String> variableResolver = new ArrayList<String>();
-    private final List<org.apache.myfaces.config.element.LocaleConfig> localeConfig
-            = new ArrayList<org.apache.myfaces.config.element.LocaleConfig>();
-    private final List<String> elResolver = new ArrayList<String>();
-    private final List<org.apache.myfaces.config.element.ResourceBundle> resourceBundle
-            = new ArrayList<org.apache.myfaces.config.element.ResourceBundle>();
-    private final List<org.apache.myfaces.config.element.SystemEventListener> systemEventListeners
-            = new ArrayList<org.apache.myfaces.config.element.SystemEventListener>();
-    private final List<ContractMapping> resourceLibraryContractMappings 
-            = new ArrayList<ContractMapping>();
-    private final List<String> searchKeywordResolver = new ArrayList<String>();
-    private final List<String> searchExpressionHandler = new ArrayList<String>();
+    private List<String> actionListener;
+    private List<String> defaultRenderkitId;
+    private List<String> defaultValidatorIds;
+    private List<String> messageBundle;
+    private List<String> navigationHandler;
+    private List<String> resourceHandler;
+    private List<String> viewHandler;
+    private List<String> stateManager;
+    private List<String> propertyResolver;
+    private List<String> variableResolver;
+    private List<org.apache.myfaces.config.element.LocaleConfig> localeConfig;
+    private List<String> elResolver;
+    private List<org.apache.myfaces.config.element.ResourceBundle> resourceBundle;
+    private List<org.apache.myfaces.config.element.SystemEventListener> systemEventListeners;
+    private List<ContractMapping> resourceLibraryContractMappings;
+    private List<String> searchKeywordResolver;
+    private List<String> searchExpressionHandler;
     
     private boolean defaultValidatorsPresent = false;
     
     public void addActionListener(String listener)
     {
+        if (actionListener == null)
+        {
+            actionListener = new ArrayList<>();
+        }
         actionListener.add(listener);
     }
 
     public void addDefaultRenderkitId(String id)
     {
+        if (defaultRenderkitId == null)
+        {
+            defaultRenderkitId = new ArrayList<>();
+        }
         defaultRenderkitId.add(id);
     }
     
     public void addDefaultValidatorId (String id)
     {
-        defaultValidatorIds.add (id);
+        if (defaultValidatorIds == null)
+        {
+            defaultValidatorIds = new ArrayList<>();
+        }
+        defaultValidatorIds.add(id);
     }
     
     public void addMessageBundle(String bundle)
     {
+        if (messageBundle == null)
+        {
+            messageBundle = new ArrayList<>();
+        }
         messageBundle.add(bundle);
     }
 
     public void addNavigationHandler(String handler)
     {
+        if (navigationHandler == null)
+        {
+            navigationHandler = new ArrayList<>();
+        }
         navigationHandler.add(handler);
     }
 
     public void addStateManager(String manager)
     {
+        if (stateManager == null)
+        {
+            stateManager = new ArrayList<>();
+        }
         stateManager.add(manager);
     }
     
-    public void addSystemEventListener (org.apache.myfaces.config.element.SystemEventListener systemEventListener)
+    public void addSystemEventListener(org.apache.myfaces.config.element.SystemEventListener systemEventListener)
     {
+        if (systemEventListeners == null)
+        {
+            systemEventListeners = new ArrayList<>();
+        }
         systemEventListeners.add (systemEventListener);
     }
     
     public void addPropertyResolver(String resolver)
     {
+        if (propertyResolver == null)
+        {
+            propertyResolver = new ArrayList<>();
+        }
         propertyResolver.add(resolver);
     }
 
     public void addVariableResolver(String handler)
     {
+        if (variableResolver == null)
+        {
+            variableResolver = new ArrayList<>();
+        }
         variableResolver.add(handler);
     }
 
     public void addLocaleConfig(org.apache.myfaces.config.element.LocaleConfig config)
     {
+        if (localeConfig == null)
+        {
+            localeConfig = new ArrayList<>();
+        }
         localeConfig.add(config);
     }
 
     public void addResourceHandler(String handler)
     {
+        if (resourceHandler == null)
+        {
+            resourceHandler = new ArrayList<>();
+        }
         resourceHandler.add(handler);
     }
 
     public void addViewHandler(String handler)
     {
+        if (viewHandler == null)
+        {
+            viewHandler = new ArrayList<>();
+        }
         viewHandler.add(handler);
     }
 
     public void addElResolver(String handler)
     {
+        if (elResolver == null)
+        {
+            elResolver = new ArrayList<>();
+        }
         elResolver.add(handler);
     }
 
     public void addResourceBundle(org.apache.myfaces.config.element.ResourceBundle bundle)
     {
+        if (resourceBundle == null)
+        {
+            resourceBundle = new ArrayList<>();
+        }
         resourceBundle.add(bundle);
     }
 
     @Override
     public List<String> getActionListener()
     {
+        if (actionListener == null)
+        {
+            return Collections.emptyList();
+        }
         return actionListener;
     }
 
     @Override
     public List<String> getDefaultRenderkitId()
     {
+        if (defaultRenderkitId == null)
+        {
+            return Collections.emptyList();
+        }
         return defaultRenderkitId;
     }
     
     @Override
     public List<String> getDefaultValidatorIds()
     {
+        if (defaultValidatorIds == null)
+        {
+            return Collections.emptyList();
+        }
         return defaultValidatorIds;
     }
     
     @Override
     public List<String> getMessageBundle()
     {
+        if (messageBundle == null)
+        {
+            return Collections.emptyList();
+        }
         return messageBundle;
     }
 
     @Override
     public List<String> getNavigationHandler()
     {
+        if (navigationHandler == null)
+        {
+            return Collections.emptyList();
+        }
         return navigationHandler;
     }
 
     @Override
     public List<String> getResourceHandler()
     {
+        if (resourceHandler == null)
+        {
+            return Collections.emptyList();
+        }
         return resourceHandler;
     }
     
     @Override
     public List<org.apache.myfaces.config.element.SystemEventListener> getSystemEventListeners()
     {
+        if (systemEventListeners == null)
+        {
+            return Collections.emptyList();
+        }
         return systemEventListeners;
     }
     
     @Override
     public List<String> getViewHandler()
     {
+        if (viewHandler == null)
+        {
+            return Collections.emptyList();
+        }
         return viewHandler;
     }
 
     @Override
     public List<String> getStateManager()
     {
+        if (stateManager == null)
+        {
+            return Collections.emptyList();
+        }
         return stateManager;
     }
 
     @Override
     public List<String> getPropertyResolver()
     {
+        if (propertyResolver == null)
+        {
+            return Collections.emptyList();
+        }
         return propertyResolver;
     }
 
     @Override
     public List<String> getVariableResolver()
     {
+        if (variableResolver == null)
+        {
+            return Collections.emptyList();
+        }
         return variableResolver;
     }
 
     @Override
     public List<org.apache.myfaces.config.element.LocaleConfig> getLocaleConfig()
     {
+        if (localeConfig == null)
+        {
+            return Collections.emptyList();
+        }
         return localeConfig;
     }
 
     @Override
     public List<String> getElResolver()
     {
+        if (elResolver == null)
+        {
+            return Collections.emptyList();
+        }
         return elResolver;
     }
 
     @Override
     public List<org.apache.myfaces.config.element.ResourceBundle> getResourceBundle()
     {
+        if (resourceBundle == null)
+        {
+            return Collections.emptyList();
+        }
         return resourceBundle;
     }
 
@@ -221,33 +329,57 @@ public class ApplicationImpl extends org.apache.myfaces.config.element.Applicati
     @Override
     public List<ContractMapping> getResourceLibraryContractMappings()
     {
+        if (resourceLibraryContractMappings == null)
+        {
+            return Collections.emptyList();
+        }
         return resourceLibraryContractMappings;
     }
     
     public void addResourceLibraryContractMapping(ContractMapping mapping)
     {
+        if (resourceLibraryContractMappings == null)
+        {
+            resourceLibraryContractMappings = new ArrayList<>();
+        }
         resourceLibraryContractMappings.add(mapping);
     }
 
     @Override
     public List<String> getSearchKeywordResolver()
     {
+        if (searchKeywordResolver == null)
+        {
+            return Collections.emptyList();
+        }
         return searchKeywordResolver;
     }
     
     public void addSearchKeywordResolver(String resolver)
     {
+        if (searchKeywordResolver == null)
+        {
+            searchKeywordResolver = new ArrayList<>();
+        }
         searchKeywordResolver.add(resolver);
     }
 
     @Override
     public List<String> getSearchExpressionHandler()
     {
+        if (searchExpressionHandler == null)
+        {
+            return Collections.emptyList();
+        }
         return searchExpressionHandler;
     }
     
     public void addSearchExpressionHandler(String handler)
     {
+        if (searchExpressionHandler == null)
+        {
+            searchExpressionHandler = new ArrayList<>();
+        }
         searchExpressionHandler.add(handler);
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java
index 4e26802..dbbca0b 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java
@@ -30,141 +30,132 @@ import java.util.List;
  */
 public class AttributeImpl extends org.apache.myfaces.config.element.Attribute implements Serializable
 {
-    private List<String> _description;
-    private List<String> _displayName;
-    private List<String> _icon;
-    private String _attributeName;
-    private String _attributeClass;
-    private String _defaultValue;
-    private String _suggestedValue;
-    private List<String> _attributeExtension;
-
+    private List<String> description;
+    private List<String> displayName;
+    private List<String> icon;
+    private String attributeName;
+    private String attributeClass;
+    private String defaultValue;
+    private String suggestedValue;
+    private List<String> attributeExtensions;
 
     public void addDescription(String value)
     {
-        if(_description == null)
+        if (description == null)
         {
-            _description = new ArrayList<String>();
+            description = new ArrayList<>();
         }
-        
-        _description.add(value);
+        description.add(value);
     }
 
     @Override
     public Collection<? extends String> getDescriptions()
     {
-        if(_description == null)
+        if (description == null)
         {
             return Collections.emptyList();
         }
-        
-        return _description;
+        return description;
     }
 
     public void addDisplayName(String value)
     {
-        if(_displayName == null)
+        if (displayName == null)
         {
-            _displayName = new ArrayList<String>();
+            displayName = new ArrayList<>();
         }
-
-        _displayName.add(value);
+        displayName.add(value);
     }
 
     @Override
     public Collection<? extends String> getDisplayNames()
     {
-        if(_displayName == null)
+        if (displayName == null)
         {
             return Collections.emptyList();
         }
-        
-        return _displayName;
+        return displayName;
     }
 
     public void addIcon(String value)
     {
-        if(_icon == null)
+        if (icon == null)
         {
-            _icon = new ArrayList<String>();
+            icon = new ArrayList<>();
         }
-        
-        _icon.add(value);
+        icon.add(value);
     }
 
     @Override
     public Collection<? extends String> getIcons()
     {
-        if(_icon == null)
+        if (icon == null)
         {
             return Collections.emptyList();
         }
-
-        return _icon;
+        return icon;
     }
 
     public void setAttributeName(String attributeName)
     {
-        _attributeName = attributeName;
+        this.attributeName = attributeName;
     }
 
     @Override
     public String getAttributeName()
     {
-        return _attributeName;
+        return attributeName;
     }
 
     public void setAttributeClass(String attributeClass)
     {
-        _attributeClass = attributeClass;
+        this.attributeClass = attributeClass;
     }
 
     @Override
     public String getAttributeClass()
     {
-        return _attributeClass;
+        return attributeClass;
     }
 
     public void setDefaultValue(String defaultValue)
     {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
     }
 
     @Override
     public String getDefaultValue()
     {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public void setSuggestedValue(String suggestedValue)
     {
-        _suggestedValue = suggestedValue;
+        this.suggestedValue = suggestedValue;
     }
 
     @Override
     public String getSuggestedValue()
     {
-        return _suggestedValue;
+        return suggestedValue;
     }
 
     public void addAttributeExtension(String attributeExtension)
     {
-        if(_attributeExtension == null)
+        if (attributeExtension == null)
         {
-            _attributeExtension = new ArrayList<String>();
+            attributeExtensions = new ArrayList<>();
         }
-
-        _attributeExtension.add(attributeExtension);
+        attributeExtensions.add(attributeExtension);
     }
 
     @Override
     public Collection<? extends String> getAttributeExtensions()
     {
-        if(_attributeExtension == null)
+        if (attributeExtensions == null)
         {
             return Collections.emptyList();
         }
-
-        return _attributeExtension;
+        return attributeExtensions;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java
index 7aae1d4..80fc02b 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java
@@ -21,30 +21,29 @@ package org.apache.myfaces.config.impl.elements;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+
 /**
  * Implementation of model for &lt;behavior&gt; element.
  */
-
 public class BehaviorImpl extends org.apache.myfaces.config.element.Behavior implements Serializable
 {
     private String behaviorClass;
     private String behaviorId;
-    
-    private List<AttributeImpl> attributes = new ArrayList<AttributeImpl>();
-    private List<PropertyImpl> properties = new ArrayList<PropertyImpl>();
-
+    private List<AttributeImpl> attributes;
+    private List<PropertyImpl> properties;
 
     @Override
     public String getBehaviorClass()
     {
-        return this.behaviorClass;
+        return behaviorClass;
     }
 
     @Override
     public String getBehaviorId()
     {
-        return this.behaviorId;
+        return behaviorId;
     }
     
     public void setBehaviorClass(String behaviorClass)
@@ -59,21 +58,37 @@ public class BehaviorImpl extends org.apache.myfaces.config.element.Behavior imp
     
     public Collection<AttributeImpl> getAttributes()
     {
+        if (attributes == null)
+        {
+            return Collections.emptyList();
+        }
         return attributes;
     }
 
     public void addAttribute(AttributeImpl attribute)
     {
-        attributes.add (attribute);
+        if (attributes == null)
+        {
+            attributes = new ArrayList<>();
+        }
+        attributes.add(attribute);
     }
 
     public Collection<PropertyImpl> getProperties()
     {
+        if (properties == null)
+        {
+            return Collections.emptyList();
+        }
         return properties;
     }
     
     public void addProperty(PropertyImpl property)
     {
-        properties.add (property);
+        if (properties == null)
+        {
+            properties = new ArrayList<>();
+        }
+        properties.add(property);
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java
index 8cde49b..15781a0 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java
@@ -41,14 +41,15 @@ public class ClientBehaviorRendererImpl
     {
         return rendererType;
     }
-    
-    public void setRendererClass (String clazz)
+
+    public void setRendererType(String rendererType)
     {
-        rendererClass = clazz;
+        this.rendererType = rendererType;
     }
-    
-    public void setRendererType (String type)
+
+    public void setRendererClass(String rendererClass)
     {
-        rendererType = type;
+        this.rendererClass = rendererClass;
     }
+    
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java
index a428b8d..ec1df0a 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java
@@ -20,13 +20,11 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 
-
 /**
  * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
  */
 public class ComponentImpl extends org.apache.myfaces.config.element.Component implements Serializable
 {
-
     private String componentType;
     private String componentClass;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java
index 15d23d7..35de2c1 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java
@@ -46,8 +46,7 @@ public class ContractMappingImpl extends ContractMapping
         }
         if (unmodifiableUrlPatternList == null)
         {
-            unmodifiableUrlPatternList = 
-                Collections.unmodifiableList(urlPatternList);
+            unmodifiableUrlPatternList = Collections.unmodifiableList(urlPatternList);
         }
         return unmodifiableUrlPatternList;
     }
@@ -61,8 +60,7 @@ public class ContractMappingImpl extends ContractMapping
         }
         if (unmodifiableContractsList == null)
         {
-            unmodifiableContractsList = 
-                Collections.unmodifiableList(contractsList);
+            unmodifiableContractsList =  Collections.unmodifiableList(contractsList);
         }
         return unmodifiableContractsList;
     }
@@ -71,7 +69,7 @@ public class ContractMappingImpl extends ContractMapping
     {
         if (contractsList == null)
         {
-            contractsList = new ArrayList<String>();
+            contractsList = new ArrayList<>();
         }
         contractsList.add(contract);
     }
@@ -80,7 +78,7 @@ public class ContractMappingImpl extends ContractMapping
     {
         if (urlPatternList == null)
         {
-            urlPatternList = new ArrayList<String>();
+            urlPatternList = new ArrayList<>();
         }
         urlPatternList.add(urlPattern);
     }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java
index 73b4c41..a5fa309 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java
@@ -28,12 +28,11 @@ import java.util.List;
  */
 public class ConverterImpl extends org.apache.myfaces.config.element.Converter implements Serializable
 {
-
     private String converterId;
     private String forClass;
     private String converterClass;
-    private List<org.apache.myfaces.config.element.Property> _properties = null;
-    private List<org.apache.myfaces.config.element.Attribute> _attributes = null;
+    private List<org.apache.myfaces.config.element.Property> properties = null;
+    private List<org.apache.myfaces.config.element.Attribute> attributes = null;
 
     @Override
     public String getConverterId()
@@ -41,7 +40,6 @@ public class ConverterImpl extends org.apache.myfaces.config.element.Converter i
         return converterId;
     }
 
-
     public void setConverterId(String converterId)
     {
         this.converterId = converterId;
@@ -53,7 +51,6 @@ public class ConverterImpl extends org.apache.myfaces.config.element.Converter i
         return forClass;
     }
 
-
     public void setForClass(String forClass)
     {
         this.forClass = forClass;
@@ -65,7 +62,6 @@ public class ConverterImpl extends org.apache.myfaces.config.element.Converter i
         return converterClass;
     }
 
-
     public void setConverterClass(String converterClass)
     {
         this.converterClass = converterClass;
@@ -73,43 +69,39 @@ public class ConverterImpl extends org.apache.myfaces.config.element.Converter i
 
     public void addProperty(org.apache.myfaces.config.element.Property value)
     {
-        if(_properties == null)
+        if (properties == null)
         {
-            _properties = new ArrayList<org.apache.myfaces.config.element.Property>();
+            properties = new ArrayList<>();
         }
-
-        _properties.add(value);
+        properties.add(value);
     }
 
-        @Override
+    @Override
     public List<? extends org.apache.myfaces.config.element.Property> getProperties()
     {
-        if(_properties == null)
+        if (properties == null)
         {
             return Collections.emptyList();
         }
-
-        return _properties;
+        return properties;
     }
     
     public void addAttribute(org.apache.myfaces.config.element.Attribute value)
     {
-        if(_attributes == null)
+        if (attributes == null)
         {
-            _attributes = new ArrayList<org.apache.myfaces.config.element.Attribute>();
+            attributes = new ArrayList<>();
         }
-
-        _attributes.add(value);
+        attributes.add(value);
     }
 
-        @Override
+    @Override
     public List<? extends org.apache.myfaces.config.element.Attribute> getAttributes()
     {
-        if(_attributes == null)
+        if (attributes == null)
         {
             return Collections.emptyList();
         }
-
-        return _attributes;
+        return attributes;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java
index 422a301..3c65860 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java
@@ -28,9 +28,7 @@ public class FaceletsProcessingImpl extends org.apache.myfaces.config.element.Fa
     private static final long serialVersionUID = 7692451499973040255L;
 
     private String fileExtension;
-    
     private String processAs;
-    
     private String oamCompressSpaces;
 
     @Override
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java
index 31cfe75..998b334 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java
@@ -21,16 +21,9 @@ package org.apache.myfaces.config.impl.elements;
 import java.io.Serializable;
 import org.apache.myfaces.config.element.FaceletsTemplateMapping;
 
-/**
- *
- */
 public class FaceletsTemplateMappingImpl extends FaceletsTemplateMapping implements Serializable
 {
     private String urlPattern;
-    
-    public FaceletsTemplateMappingImpl()
-    {
-    }
 
     @Override
     public String getUrlPattern()
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java
index ce6bc9f..dd903a3 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java
@@ -33,8 +33,7 @@ public class FacesConfigExtensionImpl extends org.apache.myfaces.config.element.
 {
     private static final long serialVersionUID = 7624583794474223864L;
     
-    private List<org.apache.myfaces.config.element.FaceletsProcessing> _faceletsProcessingList = 
-        new ArrayList<org.apache.myfaces.config.element.FaceletsProcessing>();
+    private List<org.apache.myfaces.config.element.FaceletsProcessing> _faceletsProcessingList;
     
     private List<ViewPoolMapping> viewPoolMappings;
     private transient List<ViewPoolMapping> unmodifiableViewPoolMappings;
@@ -45,11 +44,19 @@ public class FacesConfigExtensionImpl extends org.apache.myfaces.config.element.
     @Override
     public List<org.apache.myfaces.config.element.FaceletsProcessing> getFaceletsProcessingList()
     {
+        if (_faceletsProcessingList == null)
+        {
+            return Collections.emptyList();
+        }
         return _faceletsProcessingList;
     }
     
     public void addFaceletsProcessing(org.apache.myfaces.config.element.FaceletsProcessing elem)
     {
+        if (_faceletsProcessingList == null)
+        {
+            _faceletsProcessingList = new ArrayList<>();
+        }
         _faceletsProcessingList.add(elem);
     }
     
@@ -72,7 +79,7 @@ public class FacesConfigExtensionImpl extends org.apache.myfaces.config.element.
     {
         if (viewPoolMappings == null)
         {
-            viewPoolMappings = new ArrayList<ViewPoolMapping>();
+            viewPoolMappings = new ArrayList<>();
         }
         viewPoolMappings.add(mapping);
     }
@@ -96,7 +103,7 @@ public class FacesConfigExtensionImpl extends org.apache.myfaces.config.element.
     {
         if (faceletsTemplateMappings == null)
         {
-            faceletsTemplateMappings = new ArrayList<FaceletsTemplateMapping>();
+            faceletsTemplateMappings = new ArrayList<>();
         }
         faceletsTemplateMappings.add(mapping);
     }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java
index 479ce04..6b97dc2 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java
@@ -46,7 +46,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
 {
     private static final long serialVersionUID = 1L;
 
-    private static final Logger log = Logger.getLogger(FacesConfigImpl.class.getName());
+    private static final Logger LOG = Logger.getLogger(FacesConfigImpl.class.getName());
 
     private List<Application> applications;
     private List<Factory> factories;
@@ -95,7 +95,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (applications == null)
         {
-            applications = new ArrayList<Application>();
+            applications = new ArrayList<>();
         }
         applications.add(application); 
     }
@@ -104,7 +104,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (factories == null)
         {
-            factories = new ArrayList<Factory>();
+            factories = new ArrayList<>();
         }
         factories.add(factory);
     }
@@ -113,17 +113,16 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (components == null)
         {
-            components = new HashMap<String, String>();
+            components = new HashMap<>();
         }
         components.put(componentType, componentClass);
     }
     
-    public void addComponentTagDeclaration(String componentType, 
-            ComponentTagDeclaration tagDeclaration)
+    public void addComponentTagDeclaration(String componentType, ComponentTagDeclaration tagDeclaration)
     {
         if (componentTagDeclarations == null)
         {
-            componentTagDeclarations = new HashMap<String, ComponentTagDeclaration>();
+            componentTagDeclarations = new HashMap<>();
         }
         componentTagDeclarations.put(componentType, tagDeclaration);
     }
@@ -132,7 +131,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (converters == null)
         {
-            converters = new ArrayList<Converter>();
+            converters = new ArrayList<>();
         }
         converters.add(converter);
     }
@@ -141,7 +140,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (navigationRules == null)
         {
-            navigationRules = new ArrayList<NavigationRule>();
+            navigationRules = new ArrayList<>();
         }
         navigationRules.add(rule);
     }
@@ -150,7 +149,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (renderKits == null)
         {
-            renderKits = new ArrayList<RenderKit>();
+            renderKits = new ArrayList<>();
         }
         renderKits.add(renderKit);
     }
@@ -159,7 +158,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (lifecyclePhaseListener == null)
         {
-            lifecyclePhaseListener = new ArrayList<String>();
+            lifecyclePhaseListener = new ArrayList<>();
         }
         lifecyclePhaseListener.add(value);
     }
@@ -168,14 +167,14 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (validators == null)
         {
-            validators = new HashMap<String, String>();
+            validators = new HashMap<>();
         }
 
         String oldValidator = validators.get(id);
         // don't log if someone overwrites the built-in converters
         if (oldValidator != null && !oldValidator.startsWith("javax.faces.validator."))
         {
-            log.warning("There is already a validator defined for id: " + id + "."
+            LOG.warning("There is already a validator defined for id: " + id + "."
                     + " old: " + oldValidator
                     + " new: " + validatorClass);
         }
@@ -187,7 +186,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (behaviors == null)
         {
-            behaviors = new ArrayList<Behavior>();
+            behaviors = new ArrayList<>();
         }
         behaviors.add (behavior);
     }
@@ -196,7 +195,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (namedEvents == null)
         {
-            namedEvents = new ArrayList<NamedEvent>();
+            namedEvents = new ArrayList<>();
         }
         namedEvents.add(namedEvent);
     }
@@ -205,7 +204,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (facesConfigExtensions == null)
         {
-            facesConfigExtensions = new ArrayList<FacesConfigExtension>();
+            facesConfigExtensions = new ArrayList<>();
         }
         facesConfigExtensions.add(elem);
     }
@@ -214,7 +213,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (facesFlowDefinitions == null)
         {
-            facesFlowDefinitions = new ArrayList<FacesFlowDefinition>();
+            facesFlowDefinitions = new ArrayList<>();
         }
         facesFlowDefinitions.add(elem);
     }
@@ -223,7 +222,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (protectedViewsUrlPatternList == null)
         {
-            protectedViewsUrlPatternList = new ArrayList<String>();
+            protectedViewsUrlPatternList = new ArrayList<>();
         }
         protectedViewsUrlPatternList.add(urlPattern);
     }
@@ -232,7 +231,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (resourceResolvers == null)
         {
-            resourceResolvers = new ArrayList<String>();
+            resourceResolvers = new ArrayList<>();
         }
         resourceResolvers.add(resourceResolverClass);
     }
@@ -241,7 +240,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
     {
         if (faceletTagLibraryList == null)
         {
-            faceletTagLibraryList = new ArrayList<FaceletTagLibrary>();
+            faceletTagLibraryList = new ArrayList<>();
         }
         faceletTagLibraryList.add(library);
     }
@@ -255,8 +254,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableApplications == null)
         {
-            unmodifiableApplications = 
-                Collections.unmodifiableList(applications);
+            unmodifiableApplications = Collections.unmodifiableList(applications);
         }
         return unmodifiableApplications;
     }
@@ -270,12 +268,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableFactories == null)
         {
-            unmodifiableFactories = 
-                Collections.unmodifiableList(factories);
+            unmodifiableFactories =  Collections.unmodifiableList(factories);
         }
         return unmodifiableFactories;
     }
 
+    @Override
     public Map<String, String> getComponents()
     {
         if (components == null)
@@ -284,12 +282,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableComponents == null)
         {
-            unmodifiableComponents = 
-                Collections.unmodifiableMap(components);
+            unmodifiableComponents = Collections.unmodifiableMap(components);
         }
         return unmodifiableComponents;
     }
     
+    @Override
     public Map<String, ComponentTagDeclaration> getComponentTagDeclarations()
     {
         if (componentTagDeclarations == null)
@@ -298,12 +296,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableComponentTagDeclarations == null)
         {
-            unmodifiableComponentTagDeclarations = 
-                Collections.unmodifiableMap(componentTagDeclarations);
+            unmodifiableComponentTagDeclarations = Collections.unmodifiableMap(componentTagDeclarations);
         }
         return unmodifiableComponentTagDeclarations;
     }
 
+    @Override
     public List<Converter> getConverters()
     {
         if (converters == null)
@@ -312,12 +310,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableConverters == null)
         {
-            unmodifiableConverters = 
-                Collections.unmodifiableList(converters);
+            unmodifiableConverters = Collections.unmodifiableList(converters);
         }
         return unmodifiableConverters;
     }
 
+    @Override
     public List<NavigationRule> getNavigationRules()
     {
         if (navigationRules == null)
@@ -326,12 +324,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableNavigationRules == null)
         {
-            unmodifiableNavigationRules = 
-                Collections.unmodifiableList(navigationRules);
+            unmodifiableNavigationRules = Collections.unmodifiableList(navigationRules);
         }
         return unmodifiableNavigationRules;
     }
 
+    @Override
     public List<RenderKit> getRenderKits()
     {
         if (renderKits == null)
@@ -340,12 +338,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableRenderKits == null)
         {
-            unmodifiableRenderKits = 
-                Collections.unmodifiableList(renderKits);
+            unmodifiableRenderKits = Collections.unmodifiableList(renderKits);
         }
         return unmodifiableRenderKits;
     }
 
+    @Override
     public List<String> getLifecyclePhaseListener()
     {
         if (lifecyclePhaseListener == null)
@@ -354,12 +352,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableLifecyclePhaseListener == null)
         {
-            unmodifiableLifecyclePhaseListener = 
-                Collections.unmodifiableList(lifecyclePhaseListener);
+            unmodifiableLifecyclePhaseListener = Collections.unmodifiableList(lifecyclePhaseListener);
         }
         return unmodifiableLifecyclePhaseListener;
     }
 
+    @Override
     public Map<String, String> getValidators()
     {
         if (validators == null)
@@ -368,12 +366,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableValidators == null)
         {
-            unmodifiableValidators = 
-                Collections.unmodifiableMap(validators);
+            unmodifiableValidators = Collections.unmodifiableMap(validators);
         }
         return unmodifiableValidators;
     }
     
+    @Override
     public List<Behavior> getBehaviors ()
     {
         if (behaviors == null)
@@ -382,13 +380,13 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableBehaviors == null)
         {
-            unmodifiableBehaviors = 
-                Collections.unmodifiableList(behaviors);
+            unmodifiableBehaviors = Collections.unmodifiableList(behaviors);
         }
         return unmodifiableBehaviors;
     }
     
-    public List<NamedEvent> getNamedEvents ()
+    @Override
+    public List<NamedEvent> getNamedEvents()
     {
         if (namedEvents == null)
         {
@@ -396,12 +394,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableNamedEvents == null)
         {
-            unmodifiableNamedEvents = 
-                Collections.unmodifiableList(namedEvents);
+            unmodifiableNamedEvents = Collections.unmodifiableList(namedEvents);
         }
         return unmodifiableNamedEvents;
     }
     
+    @Override
     public RenderKit getRenderKit(String renderKitId)
     {
         for (RenderKit rk : getRenderKits())
@@ -418,6 +416,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         return null;
     }
     
+    @Override
     public String getName()
     {
         return name;
@@ -428,6 +427,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         this.name = name;
     }
     
+    @Override
     public org.apache.myfaces.config.element.AbsoluteOrdering getAbsoluteOrdering()
     {
         return absoluteOrdering;
@@ -438,6 +438,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         this.absoluteOrdering = absoluteOrdering;
     }
 
+    @Override
     public org.apache.myfaces.config.element.Ordering getOrdering()
     {
         return ordering;
@@ -448,6 +449,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         this.ordering = ordering;
     }
 
+    @Override
     public String getMetadataComplete()
     {
         return metadataComplete;
@@ -458,12 +460,13 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         this.metadataComplete = metadataComplete;
     }
     
-    public String getVersion ()
+    @Override
+    public String getVersion()
     {
         return version;
     }
     
-    public void setVersion (String version)
+    public void setVersion(String version)
     {
         this.version = version;
     }
@@ -477,8 +480,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableFacesConfigExtensions == null)
         {
-            unmodifiableFacesConfigExtensions = 
-                Collections.unmodifiableList(facesConfigExtensions);
+            unmodifiableFacesConfigExtensions = Collections.unmodifiableList(facesConfigExtensions);
         }
         return unmodifiableFacesConfigExtensions;
     }
@@ -492,12 +494,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableFacesFlowDefinitions == null)
         {
-            unmodifiableFacesFlowDefinitions = 
-                Collections.unmodifiableList(facesFlowDefinitions);
+            unmodifiableFacesFlowDefinitions = Collections.unmodifiableList(facesFlowDefinitions);
         }
         return unmodifiableFacesFlowDefinitions;
     }
     
+    @Override
     public List<String> getProtectedViewsUrlPatternList()
     {
         if (protectedViewsUrlPatternList == null)
@@ -506,12 +508,12 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableProtectedViewsUrlPatternList == null)
         {
-            unmodifiableProtectedViewsUrlPatternList = 
-                Collections.unmodifiableList(protectedViewsUrlPatternList);
+            unmodifiableProtectedViewsUrlPatternList = Collections.unmodifiableList(protectedViewsUrlPatternList);
         }
         return unmodifiableProtectedViewsUrlPatternList;
     }
     
+    @Override
     public List<String> getResourceResolversList()
     {
         if (resourceResolvers == null)
@@ -520,8 +522,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableResourceResolvers == null)
         {
-            unmodifiableResourceResolvers = 
-                Collections.unmodifiableList(resourceResolvers);
+            unmodifiableResourceResolvers = Collections.unmodifiableList(resourceResolvers);
         }
         return unmodifiableResourceResolvers;
     }
@@ -535,8 +536,7 @@ public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConf
         }
         if (unmodifiableFaceletTagLibraryList == null)
         {
-            unmodifiableFaceletTagLibraryList = 
-                Collections.unmodifiableList(faceletTagLibraryList);
+            unmodifiableFaceletTagLibraryList = Collections.unmodifiableList(faceletTagLibraryList);
         }
         return unmodifiableFaceletTagLibraryList;
     }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java
index 42cd8aa..949b017 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java
@@ -30,46 +30,46 @@ import org.apache.myfaces.config.element.FacesFlowReference;
  */
 public class FacesFlowCallImpl extends FacesFlowCall
 {
-    private FacesFlowReference _flowReference;
-    private List<FacesFlowParameter> _outboundParameterList;
-    private String _id;
+    private FacesFlowReference flowReference;
+    private List<FacesFlowParameter> outboundParameterList;
+    private String id;
 
     public FacesFlowCallImpl()
     {
-        _outboundParameterList = new ArrayList<FacesFlowParameter>();
+        outboundParameterList = new ArrayList<>();
     }
 
     @Override
     public List<FacesFlowParameter> getOutboundParameterList()
     {
-        return _outboundParameterList;
+        return outboundParameterList;
     }
     
     public void addOutboundParameter(FacesFlowParameter parameter)
     {
-        _outboundParameterList.add(parameter);
+        outboundParameterList.add(parameter);
     }
 
     @Override
     public String getId()
     {
-        return _id;
+        return id;
     }
 
     public void setId(String id)
     {
-        this._id = id;
+        this.id = id;
     }
 
     @Override
     public FacesFlowReference getFlowReference()
     {
-        return _flowReference;
+        return flowReference;
     }
 
     public void setFlowReference(FacesFlowReference flowReference)
     {
-        this._flowReference = flowReference;
+        this.flowReference = flowReference;
     }
 
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java
index 2c4af46..ea95009 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java
@@ -19,6 +19,7 @@
 package org.apache.myfaces.config.impl.elements;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.apache.myfaces.config.element.FacesFlowCall;
 import org.apache.myfaces.config.element.FacesFlowMethodCall;
@@ -34,160 +35,205 @@ import org.apache.myfaces.config.element.NavigationRule;
  */
 public class FacesFlowDefinitionImpl extends org.apache.myfaces.config.element.FacesFlowDefinition
 {
-    private String _definingDocumentId;
-    private String _id;
-    private String _startNode;
-    private String _initializer;
-    private String _finalizer;
-    
-    private List<FacesFlowView> _viewList;
-    private List<FacesFlowSwitch> _switchList;
-    private List<FacesFlowReturn> _returnList;
-    private List<NavigationRule> _navigationRuleList;
-    private List<FacesFlowCall> _flowCallList;
-    private List<FacesFlowMethodCall> _methodCallList;
-    private List<FacesFlowParameter> _inboundParameterList;
-
-    public FacesFlowDefinitionImpl()
-    {
-        _viewList = new ArrayList<FacesFlowView>();
-        _switchList = new ArrayList<FacesFlowSwitch>();
-        _returnList = new ArrayList<FacesFlowReturn>();
-        _navigationRuleList = new ArrayList<NavigationRule>();
-        _flowCallList = new ArrayList<FacesFlowCall>();
-        _methodCallList = new ArrayList<FacesFlowMethodCall>();
-        _inboundParameterList = new ArrayList<FacesFlowParameter>();
-    }
+    private String definingDocumentId;
+    private String id;
+    private String startNode;
+    private String initializer;
+    private String finalizer;
     
+    private List<FacesFlowView> viewList;
+    private List<FacesFlowSwitch> switchList;
+    private List<FacesFlowReturn> returnList;
+    private List<NavigationRule> navigationRuleList;
+    private List<FacesFlowCall> flowCallList;
+    private List<FacesFlowMethodCall> methodCallList;
+    private List<FacesFlowParameter> inboundParameterList;
+
     @Override
     public String getStartNode()
     {
-        return _startNode;
+        return startNode;
     }
 
     @Override
     public List<FacesFlowView> getViewList()
     {
-        return _viewList;
+        if (viewList == null)
+        {
+            return Collections.emptyList();
+        }
+        return viewList;
     }
     
     public void addView(FacesFlowView view)
     {
-        _viewList.add(view);
+        if (viewList == null)
+        {
+            viewList = new ArrayList<>();
+        }
+        viewList.add(view);
     }
 
     @Override
     public List<FacesFlowSwitch> getSwitchList()
     {
-        return _switchList;
+        if (switchList == null)
+        {
+            return Collections.emptyList();
+        }
+        return switchList;
     }
     
     public void addSwitch(FacesFlowSwitch switchItem)
     {
-        _switchList.add(switchItem);
+        if (switchList == null)
+        {
+            switchList = new ArrayList<>();
+        }
+        switchList.add(switchItem);
     }
 
     @Override
     public List<FacesFlowReturn> getReturnList()
     {
-        return _returnList;
+        if (returnList == null)
+        {
+            return Collections.emptyList();
+        }
+        return returnList;
     }
 
     public void addReturn(FacesFlowReturn value)
     {
-        _returnList.add(value);
+        if (returnList == null)
+        {
+            returnList = new ArrayList<>();
+        }
+        returnList.add(value);
     }
     
     @Override
     public List<NavigationRule> getNavigationRuleList()
     {
-        return _navigationRuleList;
+        if (navigationRuleList == null)
+        {
+            return Collections.emptyList();
+        }
+        return navigationRuleList;
     }
 
     public void addNavigationRule(NavigationRule value)
     {
-        _navigationRuleList.add(value);
+        if (navigationRuleList == null)
+        {
+            navigationRuleList = new ArrayList<>();
+        }
+        navigationRuleList.add(value);
     }
     
     @Override
     public List<FacesFlowCall> getFlowCallList()
     {
-        return _flowCallList;
+        if (flowCallList == null)
+        {
+            return Collections.emptyList();
+        }
+        return flowCallList;
     }
 
     public void addFlowCall(FacesFlowCall value)
     {
-        _flowCallList.add(value);
+        if (flowCallList == null)
+        {
+            flowCallList = new ArrayList<>();
+        }
+        flowCallList.add(value);
     }
 
     @Override
     public List<FacesFlowMethodCall> getMethodCallList()
     {
-        return _methodCallList;
+        if (methodCallList == null)
+        {
+            return Collections.emptyList();
+        }
+        return methodCallList;
     }
 
     public void addMethodCall(FacesFlowMethodCall value)
     {
-        _methodCallList.add(value);
+        if (methodCallList == null)
+        {
+            methodCallList = new ArrayList<>();
+        }
+        methodCallList.add(value);
     }
     
     @Override
     public String getInitializer()
     {
-        return _initializer;
+        return initializer;
     }
 
     @Override
     public String getFinalizer()
     {
-        return _finalizer;
+        return finalizer;
     }
 
     @Override
     public List<FacesFlowParameter> getInboundParameterList()
     {
-        return _inboundParameterList;
+        if (inboundParameterList == null)
+        {
+            return Collections.emptyList();
+        }
+        return inboundParameterList;
     }
 
     public void addInboundParameter(FacesFlowParameter value)
     {
-        _inboundParameterList.add(value);
+        if (inboundParameterList == null)
+        {
+            inboundParameterList = new ArrayList<>();
+        }
+        inboundParameterList.add(value);
     }
 
     public void setStartNode(String startNode)
     {
-        this._startNode = startNode;
+        this.startNode = startNode;
     }
 
     public void setInitializer(String initializer)
     {
-        this._initializer = initializer;
+        this.initializer = initializer;
     }
 
     public void setFinalizer(String finalizer)
     {
-        this._finalizer = finalizer;
+        this.finalizer = finalizer;
     }
     
     @Override
     public String getId()
     {
-        return _id;
+        return id;
     }
 
     public void setId(String id)
     {
-        this._id = id;
+        this.id = id;
     }
 
     @Override
     public String getDefiningDocumentId()
     {
-        return _definingDocumentId;
+        return definingDocumentId;
     }
 
     public void setDefiningDocumentId(String definingDocumentId)
     {
-        this._definingDocumentId = definingDocumentId;
+        this.definingDocumentId = definingDocumentId;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java
index e0099e2..5d3069e 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java
@@ -19,6 +19,7 @@
 package org.apache.myfaces.config.impl.elements;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.apache.myfaces.config.element.FacesFlowMethodParameter;
 
@@ -28,58 +29,60 @@ import org.apache.myfaces.config.element.FacesFlowMethodParameter;
  */
 public class FacesFlowMethodCallImpl extends org.apache.myfaces.config.element.FacesFlowMethodCall
 {
-    private String _id;
-    private String _method;
-    private String _defaultOutcome;
-    
-    private List<FacesFlowMethodParameter> _parameterList;
-    
-    public FacesFlowMethodCallImpl()
-    {
-        _parameterList = new ArrayList<FacesFlowMethodParameter>();
-    }
+    private String id;
+    private String method;
+    private String defaultOutcome;
+    private List<FacesFlowMethodParameter> parameterList;
 
     @Override
     public String getMethod()
     {
-        return _method;
+        return method;
     }
 
     @Override
     public String getDefaultOutcome()
     {
-        return _defaultOutcome;
+        return defaultOutcome;
     }
 
     public void setMethod(String method)
     {
-        this._method = method;
+        this.method = method;
     }
 
     public void setDefaultOutcome(String defaultOutcome)
     {
-        this._defaultOutcome = defaultOutcome;
+        this.defaultOutcome = defaultOutcome;
     }
     
     @Override
     public String getId()
     {
-        return _id;
+        return id;
     }
 
     public void setId(String id)
     {
-        this._id = id;
+        this.id = id;
     }
 
     @Override
     public List<FacesFlowMethodParameter> getParameterList()
     {
-        return _parameterList;
+        if (parameterList == null)
+        {
+            return Collections.emptyList();
+        }
+        return parameterList;
     }
     
     public void addParameter(FacesFlowMethodParameter parameter)
     {
-        _parameterList.add(parameter);
+        if (parameterList == null)
+        {
+            parameterList = new ArrayList<>();
+        }
+        parameterList.add(parameter);
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java
index 0fe5308..ea3df95 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java
@@ -24,28 +24,28 @@ package org.apache.myfaces.config.impl.elements;
  */
 public class FacesFlowParameterImpl extends org.apache.myfaces.config.element.FacesFlowParameter
 {
-    private String _name;
-    private String _value;
+    private String name;
+    private String value;
 
     @Override
     public String getName()
     {
-        return _name;
+        return name;
     }
 
     @Override
     public String getValue()
     {
-        return _value;
+        return value;
     }
 
     public void setName(String name)
     {
-        this._name = name;
+        this.name = name;
     }
 
     public void setValue(String value)
     {
-        this._value = value;
+        this.value = value;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java
index af3da6b..2a65934 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java
@@ -26,34 +26,29 @@ import org.apache.myfaces.config.element.FacesFlowReference;
  */
 public class FacesFlowReferenceImpl extends FacesFlowReference
 {
-    private String _flowId;
-    private String _flowDocumentId;
-
-    public FacesFlowReferenceImpl()
-    {
-        
-    }
+    private String flowId;
+    private String flowDocumentId;
 
     @Override
     public String getFlowId()
     {
-        return _flowId;
+        return flowId;
     }
 
     public void setFlowId(String flowId)
     {
-        this._flowId = flowId;
+        this.flowId = flowId;
     }
 
     @Override
     public String getFlowDocumentId()
     {
-        return _flowDocumentId;
+        return flowDocumentId;
     }
 
     public void setFlowDocumentId(String flowDocumentId)
     {
-        this._flowDocumentId = flowDocumentId;
+        this.flowDocumentId = flowDocumentId;
     }
     
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java
index 3a415c1..00b9445 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java
@@ -26,29 +26,29 @@ import org.apache.myfaces.config.element.NavigationCase;
  */
 public class FacesFlowReturnImpl extends org.apache.myfaces.config.element.FacesFlowReturn
 {
-    private String _id;
-    private NavigationCase _navigationCase;
+    private String id;
+    private NavigationCase navigationCase;
 
     @Override
     public NavigationCase getNavigationCase()
     {
-        return _navigationCase;
+        return navigationCase;
     }
 
     public void setNavigationCase(NavigationCase navigationCase)
     {
-        this._navigationCase = navigationCase;
+        this.navigationCase = navigationCase;
     }
     
     @Override
     public String getId()
     {
-        return _id;
+        return id;
     }
 
     public void setId(String id)
     {
-        this._id = id;
+        this.id = id;
     }
 
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java
index c5aaf80..224cf15 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java
@@ -19,6 +19,7 @@
 package org.apache.myfaces.config.impl.elements;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.apache.myfaces.config.element.NavigationCase;
 
@@ -29,34 +30,37 @@ import org.apache.myfaces.config.element.NavigationCase;
 public class FacesFlowSwitchImpl extends org.apache.myfaces.config.element.FacesFlowSwitch
 {
     private String _id;
-    private NavigationCase _defaultOutcome;
-    private List<NavigationCase> _navigationCaseList;
-    
-    public FacesFlowSwitchImpl()
-    {
-        this._navigationCaseList = new ArrayList<>();
-    }
+    private NavigationCase defaultOutcome;
+    private List<NavigationCase> navigationCaseList;
 
     @Override
     public List<NavigationCase> getNavigationCaseList()
     {
-        return _navigationCaseList;
+        if (navigationCaseList == null)
+        {
+            return Collections.emptyList();
+        }
+        return navigationCaseList;
     }
     
     public void addNavigationCase(NavigationCase navcase)
     {
-        _navigationCaseList.add(navcase);
+        if (navigationCaseList == null)
+        {
+            navigationCaseList = new ArrayList<>();
+        }
+        navigationCaseList.add(navcase);
     }
 
     @Override
     public NavigationCase getDefaultOutcome()
     {
-        return _defaultOutcome;
+        return defaultOutcome;
     }
 
     public void setDefaultOutcome(NavigationCase defaultOutcome)
     {
-        this._defaultOutcome = defaultOutcome;
+        this.defaultOutcome = defaultOutcome;
     }
     
     @Override
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java
index ede88fb..c888b46 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java
@@ -24,33 +24,29 @@ package org.apache.myfaces.config.impl.elements;
  */
 public class FacesFlowViewImpl extends org.apache.myfaces.config.element.FacesFlowView
 {
-    private String _id;
-    private String _vdlDocument;
+    private String id;
+    private String vdlDocument;
 
-    public FacesFlowViewImpl()
-    {
-    }
-    
     @Override
     public String getVdlDocument()
     {
-        return _vdlDocument;
+        return vdlDocument;
     }
 
     public void setVdlDocument(String vdlDocument)
     {
-        this._vdlDocument = vdlDocument;
+        this.vdlDocument = vdlDocument;
     }
     
     @Override
     public String getId()
     {
-        return _id;
+        return id;
     }
 
     public void setId(String id)
     {
-        this._id = id;
+        this.id = id;
     }
 
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java
index a47928a..e26db96 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java
@@ -20,6 +20,7 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -27,184 +28,304 @@ import java.util.List;
  */
 public class FactoryImpl extends org.apache.myfaces.config.element.Factory implements Serializable
 {
-    private List<String> applicationFactories = new ArrayList<>();
-    private List<String> exceptionHandlerFactories = new ArrayList<>();
-    private List<String> externalContextFactories = new ArrayList<>();
-    private List<String> facesContextFactories = new ArrayList<>();
-    private List<String> lifecycleFactories = new ArrayList<>();
-    private List<String> ViewDeclarationLanguageFactories = new ArrayList<>();
-    private List<String> partialViewContextFactories = new ArrayList<>();
-    private List<String> renderKitFactories = new ArrayList<>();
-    private List<String> tagHandlerDelegateFactories = new ArrayList<>();
-    private List<String> visitContextFactories = new ArrayList<>();
-    private List<String> faceletCacheFactories = new ArrayList<>();
-    private List<String> flowHandlerFactories = new ArrayList<>();
-    private List<String> flashFactories = new ArrayList<>();
-    private List<String> clientWindowFactories = new ArrayList<>();
-    private List<String> searchExpressionContextFactories = new ArrayList<>();
+    private List<String> applicationFactories;
+    private List<String> exceptionHandlerFactories;
+    private List<String> externalContextFactories;
+    private List<String> facesContextFactories;
+    private List<String> lifecycleFactories;
+    private List<String> viewDeclarationLanguageFactories;
+    private List<String> partialViewContextFactories;
+    private List<String> renderKitFactories;
+    private List<String> tagHandlerDelegateFactories;
+    private List<String> visitContextFactories;
+    private List<String> faceletCacheFactories;
+    private List<String> flowHandlerFactories;
+    private List<String> flashFactories;
+    private List<String> clientWindowFactories;
+    private List<String> searchExpressionContextFactories;
 
     public void addApplicationFactory(String factory)
     {
+        if (applicationFactories == null)
+        {
+            applicationFactories = new ArrayList<>();
+        }
         applicationFactories.add(factory);
     }
 
     public void addExceptionHandlerFactory(String factory)
     {
+        if (exceptionHandlerFactories == null)
+        {
+            exceptionHandlerFactories = new ArrayList<>();
+        }
         exceptionHandlerFactories.add(factory);
     }
 
     public void addExternalContextFactory(String factory)
     {
+        if (externalContextFactories == null)
+        {
+            externalContextFactories = new ArrayList<>();
+        }
         externalContextFactories.add(factory);
     }
 
     public void addFacesContextFactory(String factory)
     {
+        if (facesContextFactories == null)
+        {
+            facesContextFactories = new ArrayList<>();
+        }
         facesContextFactories.add(factory);
     }
 
     public void addLifecycleFactory(String factory)
     {
+        if (lifecycleFactories == null)
+        {
+            lifecycleFactories = new ArrayList<>();
+        }
         lifecycleFactories.add(factory);
     }
 
     public void addViewDeclarationLanguageFactory(String factory)
     {
-        ViewDeclarationLanguageFactories.add(factory);
+        if (viewDeclarationLanguageFactories == null)
+        {
+            viewDeclarationLanguageFactories = new ArrayList<>();
+        }
+        viewDeclarationLanguageFactories.add(factory);
     }
 
     public void addPartialViewContextFactory(String factory)
     {
+        if (partialViewContextFactories == null)
+        {
+            partialViewContextFactories = new ArrayList<>();
+        }
         partialViewContextFactories.add(factory);
     }
 
     public void addRenderkitFactory(String factory)
     {
+        if (renderKitFactories == null)
+        {
+            renderKitFactories = new ArrayList<>();
+        }
         renderKitFactories.add(factory);
     }
 
     public void addTagHandlerDelegateFactory(String factory)
     {
+        if (tagHandlerDelegateFactories == null)
+        {
+            tagHandlerDelegateFactories = new ArrayList<>();
+        }
         tagHandlerDelegateFactories.add(factory);
     }
 
     public void addVisitContextFactory(String factory)
     {
+        if (visitContextFactories == null)
+        {
+            visitContextFactories = new ArrayList<>();
+        }
         visitContextFactories.add(factory);
     }
     
     public void addFaceletCacheFactory(String factory)
     {
+        if (faceletCacheFactories == null)
+        {
+            faceletCacheFactories = new ArrayList<>();
+        }
         faceletCacheFactories.add(factory);
     }
 
     public void addFlashFactory(String factory)
     {
+        if (flashFactories == null)
+        {
+            flashFactories = new ArrayList<>();
+        }
         flashFactories.add(factory);
     }
     
     public void addFlowHandlerFactory(String factory)
     {
+        if (flowHandlerFactories == null)
+        {
+            flowHandlerFactories = new ArrayList<>();
+        }
         flowHandlerFactories.add(factory);
     }
 
     public void addClientWindowFactory(String factory)
     {
+        if (clientWindowFactories == null)
+        {
+            clientWindowFactories = new ArrayList<>();
+        }
         clientWindowFactories.add(factory);
     }
-    
+
+    public void addSearchExpressionContextFactory(String factory)
+    {
+        if (searchExpressionContextFactories == null)
+        {
+            searchExpressionContextFactories = new ArrayList<>();
+        }
+        searchExpressionContextFactories.add(factory);
+    }
+
     @Override
     public List<String> getApplicationFactory()
     {
+        if (applicationFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return applicationFactories;
     }
 
     @Override
     public List<String> getExceptionHandlerFactory()
     {
+        if (exceptionHandlerFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return exceptionHandlerFactories;
     }
 
     @Override
     public List<String> getExternalContextFactory()
     {
+        if (externalContextFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return externalContextFactories;
     }
 
     @Override
     public List<String> getFacesContextFactory()
     {
+        if (facesContextFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return facesContextFactories;
     }
 
     @Override
     public List<String> getLifecycleFactory()
     {
+        if (lifecycleFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return lifecycleFactories;
     }
 
     @Override
     public List<String> getViewDeclarationLanguageFactory()
     {
-        return ViewDeclarationLanguageFactories;
+        if (viewDeclarationLanguageFactories == null)
+        {
+            return Collections.emptyList();
+        }
+        return viewDeclarationLanguageFactories;
     }
 
     @Override
     public List<String> getPartialViewContextFactory()
     {
+        if (partialViewContextFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return partialViewContextFactories;
     }
 
     @Override
     public List<String> getRenderkitFactory()
     {
+        if (renderKitFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return renderKitFactories;
     }
 
     @Override
     public List<String> getTagHandlerDelegateFactory()
     {
+        if (tagHandlerDelegateFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return tagHandlerDelegateFactories;
     }
 
     @Override
     public List<String> getVisitContextFactory()
     {
+        if (visitContextFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return visitContextFactories;
     }
 
     @Override
     public List<String> getFaceletCacheFactory()
     {
+        if (faceletCacheFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return faceletCacheFactories;
     }
 
     @Override
     public List<String> getFlashFactory()
     {
+        if (flashFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return flashFactories;
     }
 
     @Override
     public List<String> getFlowHandlerFactory()
     {
+        if (flowHandlerFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return flowHandlerFactories;
     }
 
     @Override
     public List<String> getClientWindowFactory()
     {
+        if (clientWindowFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return clientWindowFactories;
     }
-    
-    public void addSearchExpressionContextFactory(String factory)
-    {
-        searchExpressionContextFactories.add(factory);
-    }
-    
+
     @Override
     public List<String> getSearchExpressionContextFactory()
     {
+        if (searchExpressionContextFactories == null)
+        {
+            return Collections.emptyList();
+        }
         return searchExpressionContextFactories;
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java
index 8b3cd47..4e0d663 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java
@@ -20,6 +20,7 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -28,7 +29,7 @@ import java.util.List;
 public class LocaleConfigImpl extends org.apache.myfaces.config.element.LocaleConfig implements Serializable
 {
     private String defaultLocale;
-    private List<String> supportedLocales = new ArrayList<String>();
+    private List<String> supportedLocales;
 
     public void setDefaultLocale(String defaultLocale)
     {
@@ -37,6 +38,10 @@ public class LocaleConfigImpl extends org.apache.myfaces.config.element.LocaleCo
 
     public void addSupportedLocale(String locale)
     {
+        if (supportedLocales == null)
+        {
+            supportedLocales = new ArrayList<>();
+        }
         supportedLocales.add(locale);
     }
 
@@ -49,6 +54,10 @@ public class LocaleConfigImpl extends org.apache.myfaces.config.element.LocaleCo
     @Override
     public List<String> getSupportedLocales()
     {
+        if (supportedLocales == null)
+        {
+            return Collections.emptyList();
+        }
         return supportedLocales;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java
index 1882269..a1b72e4 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java
@@ -59,7 +59,7 @@ public class NavigationCaseImpl extends org.apache.myfaces.config.element.Naviga
         return ifValue;
     }
     
-    public void setIf (String ifValue)
+    public void setIf(String ifValue)
     {
         this.ifValue = ifValue;
     }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java
index 06179a3..4f08393 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java
@@ -20,16 +20,16 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-
 /**
  * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
  */
 public class NavigationRuleImpl extends org.apache.myfaces.config.element.NavigationRule implements Serializable
 {
     private String fromViewId;
-    private List<org.apache.myfaces.config.element.NavigationCase> navigationCases = new ArrayList<>();
+    private List<org.apache.myfaces.config.element.NavigationCase> navigationCases;
 
     @Override
     public String getFromViewId()
@@ -44,12 +44,20 @@ public class NavigationRuleImpl extends org.apache.myfaces.config.element.Naviga
 
     public void addNavigationCase(org.apache.myfaces.config.element.NavigationCase value)
     {
+        if (navigationCases == null)
+        {
+            navigationCases = new ArrayList<>();
+        }
         navigationCases.add(value);
     }
 
     @Override
     public List<org.apache.myfaces.config.element.NavigationCase> getNavigationCases()
     {
+        if (navigationCases == null)
+        {
+            return Collections.emptyList();
+        }
         return navigationCases;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java
index 97f6573..38fa666 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java
@@ -20,35 +20,49 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class OrderingImpl extends org.apache.myfaces.config.element.Ordering implements Serializable
 {
-    
-    private List<org.apache.myfaces.config.element.OrderSlot> beforeList
-            = new ArrayList<>();
-    private List<org.apache.myfaces.config.element.OrderSlot> afterList
-            = new ArrayList<>();
+    private List<org.apache.myfaces.config.element.OrderSlot> beforeList;
+    private List<org.apache.myfaces.config.element.OrderSlot> afterList;
 
     public void addBeforeSlot(org.apache.myfaces.config.element.OrderSlot slot)
     {
+        if (beforeList == null)
+        {
+            beforeList = new ArrayList<>();
+        }
         beforeList.add(slot);
     }
     
     @Override
     public List<org.apache.myfaces.config.element.OrderSlot> getBeforeList()
     {
+        if (beforeList == null)
+        {
+            return Collections.emptyList();
+        }
         return beforeList;
     }
     
     public void addAfterSlot(org.apache.myfaces.config.element.OrderSlot slot)
     {
+        if (afterList == null)
+        {
+            afterList = new ArrayList<>();
+        }
         afterList.add(slot);
     }
     
     @Override
     public List<org.apache.myfaces.config.element.OrderSlot> getAfterList()
     {
+        if (afterList == null)
+        {
+            return Collections.emptyList();
+        }
         return afterList;
     }    
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java
index 1a434ac..aafbb1e 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java
@@ -39,142 +39,137 @@ import java.util.List;
  */
 public class PropertyImpl extends org.apache.myfaces.config.element.Property implements Serializable
 {
-    private List<String> _description;
-    private List<String> _displayName;
-    private List<String> _icon;
-    private String _propertyName;
-    private String _propertyClass;
-    private String _defaultValue;
-    private String _suggestedValue;
-    private List<String> _propertyExtension;
-
+    private List<String> description;
+    private List<String> displayName;
+    private List<String> icon;
+    private String propertyName;
+    private String propertyClass;
+    private String defaultValue;
+    private String suggestedValue;
+    private List<String> propertyExtensions;
 
     public void addDescription(String value)
     {
-        if(_description == null)
+        if (description == null)
         {
-            _description = new ArrayList<String>();
+            description = new ArrayList<>();
         }
-
-        _description.add(value);
+        description.add(value);
     }
 
     @Override
     public Collection<? extends String> getDescriptions()
     {
-        if(_description == null)
+        if (description == null)
         {
             return Collections.emptyList();
         }
 
-        return _description;
+        return description;
     }
 
     public void addDisplayName(String value)
     {
-        if(_displayName == null)
+        if (displayName == null)
         {
-            _displayName = new ArrayList<String>();
+            displayName = new ArrayList<String>();
         }
 
-        _displayName.add(value);
+        displayName.add(value);
     }
 
     @Override
     public Collection<? extends String> getDisplayNames()
     {
-        if(_displayName==null)
+        if (displayName == null)
         {
             return Collections.emptyList();
         }
 
-        return _displayName;
+        return displayName;
     }
 
     public void addIcon(String value)
     {
-        if(_icon == null)
+        if (icon == null)
         {
-            _icon = new ArrayList<String>();
+            icon = new ArrayList<>();
         }
 
-        _icon.add(value);
+        icon.add(value);
     }
 
     @Override
     public Collection<? extends String> getIcons()
     {
-        if(_icon == null)
+        if (icon == null)
         {
             return Collections.emptyList();
         }
-
-        return _icon;
+        return icon;
     }
 
     public void setPropertyName(String propertyName)
     {
-        _propertyName = propertyName;
+        this.propertyName = propertyName;
     }
 
     @Override
     public String getPropertyName()
     {
-        return _propertyName;
+        return propertyName;
     }
 
     public void setPropertyClass(String propertyClass)
     {
-        _propertyClass = propertyClass;
+        this.propertyClass = propertyClass;
     }
 
     @Override
     public String getPropertyClass()
     {
-        return _propertyClass;
+        return propertyClass;
     }
 
     public void setDefaultValue(String defaultValue)
     {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
     }
 
     @Override
     public String getDefaultValue()
     {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public void setSuggestedValue(String suggestedValue)
     {
-        _suggestedValue = suggestedValue;
+        this.suggestedValue = suggestedValue;
     }
 
     @Override
     public String getSuggestedValue()
     {
-        return _suggestedValue;
+        return suggestedValue;
     }
 
     public void addPropertyExtension(String propertyExtension)
     {
-        if(_propertyExtension == null)
+        if (propertyExtensions == null)
         {
-            _propertyExtension = new ArrayList<String>();
+            propertyExtensions = new ArrayList<>();
         }
-
-        _propertyExtension.add(propertyExtension);
+        propertyExtensions.add(propertyExtension);
     }
 
     @Override
     public Collection<? extends String> getPropertyExtensions()
     {
-        if(_propertyExtension == null)
+        if (propertyExtensions == null)
         {
             return Collections.emptyList();
         }
-
-        return _propertyExtension;
+        return propertyExtensions;
     }
 
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java
index 398047a..b7ed5b5 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java
@@ -21,24 +21,33 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class RedirectImpl extends org.apache.myfaces.config.element.Redirect implements Serializable
 {
-    private Map<String,List<String>> viewParams = new HashMap<>();
+    private Map<String,List<String>> viewParams;
     private String includeViewParams;     
     
     public void addViewParam(ViewParamImpl viewParam)
     {
-        List<String> params = viewParams.computeIfAbsent(viewParam.getName(), k -> new ArrayList<String>());
+        if (viewParams == null)
+        {
+            viewParams = new HashMap<>();
+        }
+        List<String> params = viewParams.computeIfAbsent(viewParam.getName(), k -> new ArrayList<>());
         params.add(viewParam.getValue());
     }
     
     @Override
-    public Map<String,List<String>> getViewParams()
+    public Map<String, List<String>> getViewParams()
     {
+        if (viewParams == null)
+        {
+            return Collections.emptyMap();
+        }
         return viewParams;
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java
index eee8f79..55a0c8c 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java
@@ -20,6 +20,7 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -28,11 +29,9 @@ import java.util.List;
 public class RenderKitImpl extends org.apache.myfaces.config.element.RenderKit implements Serializable
 {
     private String id;
-    private List<String> renderKitClasses = new ArrayList<>();
-    private List<org.apache.myfaces.config.element.Renderer> renderer
-            = new ArrayList<>();
-    private List<org.apache.myfaces.config.element.ClientBehaviorRenderer> clientBehaviorRenderers
-            = new ArrayList<>();
+    private List<String> renderKitClasses;
+    private List<org.apache.myfaces.config.element.Renderer> renderer;
+    private List<org.apache.myfaces.config.element.ClientBehaviorRenderer> clientBehaviorRenderers;
     
     @Override
     public String getId()
@@ -48,42 +47,90 @@ public class RenderKitImpl extends org.apache.myfaces.config.element.RenderKit i
     @Override
     public List<String> getRenderKitClasses()
     {
+        if (renderKitClasses == null)
+        {
+            return Collections.emptyList();
+        }
         return renderKitClasses;
     }
 
     public void addRenderKitClass(String renderKitClass)
     {
+        if (renderKitClasses == null)
+        {
+            renderKitClasses = new ArrayList<>();
+        }
         renderKitClasses.add(renderKitClass);
     }
 
     @Override
     public List<org.apache.myfaces.config.element.ClientBehaviorRenderer> getClientBehaviorRenderers ()
     {
+        if (clientBehaviorRenderers == null)
+        {
+            return Collections.emptyList();
+        }
         return clientBehaviorRenderers;
     }
     
     @Override
     public List<org.apache.myfaces.config.element.Renderer> getRenderer()
     {
+        if (renderer == null)
+        {
+            return Collections.emptyList();
+        }
         return renderer;
     }
 
-    public void addClientBehaviorRenderer (org.apache.myfaces.config.element.ClientBehaviorRenderer renderer)
+    public void addClientBehaviorRenderer(org.apache.myfaces.config.element.ClientBehaviorRenderer renderer)
     {
-        clientBehaviorRenderers.add (renderer);   
+        if (clientBehaviorRenderers == null)
+        {
+            clientBehaviorRenderers = new ArrayList<>();
+        }
+        clientBehaviorRenderers.add(renderer);   
     }
     
     public void addRenderer(org.apache.myfaces.config.element.Renderer value)
     {
+        if (renderer == null)
+        {
+            renderer = new ArrayList<>();
+        }
         renderer.add(value);
     }
 
     @Override
     public void merge(org.apache.myfaces.config.element.RenderKit renderKit)
     {
-        renderKitClasses.addAll(renderKit.getRenderKitClasses());
-        clientBehaviorRenderers.addAll (renderKit.getClientBehaviorRenderers());
-        renderer.addAll(renderKit.getRenderer());
+        if (!renderKit.getRenderKitClasses().isEmpty())
+        {
+            if (renderKitClasses == null)
+            {
+                renderKitClasses = new ArrayList<>();
+            }
+            renderKitClasses.addAll(renderKit.getRenderKitClasses());
+        }
+        
+        if (!renderKit.getClientBehaviorRenderers().isEmpty())
+        {
+            if (clientBehaviorRenderers == null)
+            {
+                clientBehaviorRenderers = new ArrayList<>();
+            }
+            clientBehaviorRenderers.addAll(renderKit.getClientBehaviorRenderers());
+        }
+
+        if (!renderKit.getRenderer().isEmpty())
+        {
+            if (renderer == null)
+            {
+                renderer = new ArrayList<>();
+            }
+            renderer.addAll(renderKit.getRenderer());
+        }
+        
     }
 
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java
index b2c483d..8d88c86 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java
@@ -41,7 +41,7 @@ public class ResourceBundleImpl extends org.apache.myfaces.config.element.Resour
         this.baseName = baseName;
     }
 
-        @Override
+    @Override
     public String getVar()
     {
         return var;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java
index 92d372d..49e9b57 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java
index 7ba6284..5d2b75a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java
@@ -20,6 +20,7 @@ package org.apache.myfaces.config.impl.elements;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.apache.myfaces.config.element.ViewPoolMapping;
 import org.apache.myfaces.config.element.ViewPoolParameter;
@@ -27,12 +28,7 @@ import org.apache.myfaces.config.element.ViewPoolParameter;
 public class ViewPoolMappingImpl extends ViewPoolMapping implements Serializable
 {
     private String urlPattern;
-    private List<ViewPoolParameter> _parameterList;
-
-    public ViewPoolMappingImpl()
-    {
-        _parameterList = new ArrayList<ViewPoolParameter>();
-    }
+    private List<ViewPoolParameter> parameterList;
 
     @Override
     public String getUrlPattern()
@@ -48,11 +44,19 @@ public class ViewPoolMappingImpl extends ViewPoolMapping implements Serializable
     @Override
     public List<ViewPoolParameter> getParameterList()
     {
-        return _parameterList;
+        if (parameterList == null)
+        {
+            return Collections.emptyList();
+        }
+        return parameterList;
     }
     
     public void addParameter(ViewPoolParameter parameter)
     {
-        _parameterList.add(parameter);
+        if (parameterList == null)
+        {
+            parameterList = new ArrayList<>();
+        }
+        parameterList.add(parameter);
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java
index 1b315ae..ce924cf 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java
@@ -22,28 +22,28 @@ import org.apache.myfaces.config.element.ViewPoolParameter;
 
 public class ViewPoolParameterImpl extends ViewPoolParameter
 {
-    private String _name;
-    private String _value;
+    private String name;
+    private String value;
 
     @Override
     public String getName()
     {
-        return _name;
+        return name;
     }
 
     @Override
     public String getValue()
     {
-        return _value;
+        return value;
     }
 
     public void setName(String name)
     {
-        this._name = name;
+        this.name = name;
     }
 
     public void setValue(String value)
     {
-        this._value = value;
+        this.value = value;
     }
 }
diff --git a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
index fa20c0f..7cc183a 100644
--- a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
@@ -140,32 +140,32 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
         cfgC.setOrdering(new OrderingImpl());
         FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
         temp.setName("D");
-        cfgC.getOrdering().getBeforeList().add(temp);
+        ((OrderingImpl) cfgC.getOrdering()).addBeforeSlot(temp);
         temp = new FacesConfigNameSlotImpl();
-        temp.setName("E");
-        cfgC.getOrdering().getBeforeList().add(temp);        
+        temp.setName("E");       
+        ((OrderingImpl) cfgC.getOrdering()).addBeforeSlot(temp);
         temp = new FacesConfigNameSlotImpl();
         temp.setName("A");
-        cfgC.getOrdering().getAfterList().add(temp);
+        ((OrderingImpl) cfgC.getOrdering()).addAfterSlot(temp);
         temp = new FacesConfigNameSlotImpl();
         temp.setName("B");
-        cfgC.getOrdering().getAfterList().add(temp);
+        ((OrderingImpl) cfgC.getOrdering()).addAfterSlot(temp);
         
         cfgA.setOrdering(new OrderingImpl());
         temp = new FacesConfigNameSlotImpl();
         temp.setName("B");
-        cfgA.getOrdering().getBeforeList().add(temp);
+        ((OrderingImpl) cfgA.getOrdering()).addBeforeSlot(temp);
         temp = new FacesConfigNameSlotImpl();
         temp.setName("E");
-        cfgA.getOrdering().getBeforeList().add(temp);
+        ((OrderingImpl) cfgA.getOrdering()).addBeforeSlot(temp);
         
         cfgE.setOrdering(new OrderingImpl());
         temp = new FacesConfigNameSlotImpl();
         temp.setName("D");
-        cfgE.getOrdering().getAfterList().add(temp);
+        ((OrderingImpl) cfgE.getOrdering()).addAfterSlot(temp);
         
         cfgD.setOrdering(new OrderingImpl());
-        cfgD.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgD.getOrdering()).addBeforeSlot(new ConfigOthersSlotImpl());
         
         List<FacesConfig> appConfigResources = new ArrayList<FacesConfig>();
         appConfigResources.add(cfgA);
@@ -212,27 +212,26 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
         cfgA.setOrdering(new OrderingImpl());
         FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
         temp.setName("B");
-        cfgA.getOrdering().getBeforeList().add(temp);
+        ((OrderingImpl) cfgA.getOrdering()).addBeforeSlot(temp);
         temp = new FacesConfigNameSlotImpl();
         temp.setName("C");
-        cfgA.getOrdering().getBeforeList().add(temp);
+        ((OrderingImpl) cfgA.getOrdering()).addBeforeSlot(temp);
         
         cfgB.setOrdering(new OrderingImpl());
         temp = new FacesConfigNameSlotImpl();
         temp.setName("A");
-        cfgB.getOrdering().getAfterList().add(temp);
+        ((OrderingImpl) cfgB.getOrdering()).addAfterSlot(temp);
         temp = new FacesConfigNameSlotImpl();
         temp.setName("C");
-        cfgB.getOrdering().getBeforeList().add(temp);
+        ((OrderingImpl) cfgB.getOrdering()).addBeforeSlot(temp);
         
         cfgC.setOrdering(new OrderingImpl());
         temp = new FacesConfigNameSlotImpl();
         temp.setName("A");
-        cfgC.getOrdering().getAfterList().add(temp);
+        ((OrderingImpl) cfgC.getOrdering()).addAfterSlot(temp);
         temp = new FacesConfigNameSlotImpl();
         temp.setName("B");
-        cfgC.getOrdering().getAfterList().add(temp);
-        //cfgC.getOrdering().getBeforeList().add(new ConfigOthersSlot());
+        ((OrderingImpl) cfgC.getOrdering()).addAfterSlot(temp);
         
         List<FacesConfig> appConfigResources = new ArrayList<FacesConfig>();
         appConfigResources.add(cfgC);
@@ -264,22 +263,22 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
         cfgF.setName("F");
         
         cfgA.setOrdering(new OrderingImpl());
-        cfgA.getOrdering().getAfterList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgA.getOrdering()).addAfterSlot(new ConfigOthersSlotImpl());
         FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
         temp.setName("C");
-        cfgA.getOrdering().getAfterList().add(temp);
+        ((OrderingImpl) cfgA.getOrdering()).addAfterSlot(temp);
         
         cfgB.setOrdering(new OrderingImpl());
-        cfgB.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgB.getOrdering()).addBeforeSlot(new ConfigOthersSlotImpl());
 
         cfgC.setOrdering(new OrderingImpl());
-        cfgC.getOrdering().getAfterList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgC.getOrdering()).addAfterSlot(new ConfigOthersSlotImpl());
 
         cfgF.setOrdering(new OrderingImpl());
-        cfgF.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgF.getOrdering()).addBeforeSlot(new ConfigOthersSlotImpl());
         temp = new FacesConfigNameSlotImpl();
         temp.setName("B");
-        cfgF.getOrdering().getBeforeList().add(temp);
+        ((OrderingImpl) cfgF.getOrdering()).addBeforeSlot(temp);
         
         
         List<FacesConfig> appConfigResources = new ArrayList<FacesConfig>();
@@ -314,19 +313,19 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
         cfgF.setName("F");
         
         cfg.setOrdering(new OrderingImpl());
-        cfg.getOrdering().getAfterList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfg.getOrdering()).addAfterSlot(new ConfigOthersSlotImpl());
         FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
         temp.setName("C");
-        cfg.getOrdering().getBeforeList().add(temp);
+        ((OrderingImpl) cfg.getOrdering()).addBeforeSlot(temp);
 
         cfgB.setOrdering(new OrderingImpl());
-        cfgB.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgB.getOrdering()).addBeforeSlot(new ConfigOthersSlotImpl());
         
         cfgD.setOrdering(new OrderingImpl());
-        cfgD.getOrdering().getAfterList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgD.getOrdering()).addAfterSlot(new ConfigOthersSlotImpl());
 
         cfgE.setOrdering(new OrderingImpl());
-        cfgE.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgE.getOrdering()).addBeforeSlot(new ConfigOthersSlotImpl());
 
         List<FacesConfig> appConfigResources = new ArrayList<FacesConfig>();
         appConfigResources.add(cfg);
@@ -359,10 +358,11 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
         cfgA.setOrdering(new OrderingImpl());
         FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
         temp.setName("B");
-        cfgA.getOrdering().getAfterList().add(temp);
+        ((OrderingImpl) cfgA.getOrdering()).addAfterSlot(temp);
+        
 
         cfgC.setOrdering(new OrderingImpl());
-        cfgC.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
+        ((OrderingImpl) cfgC.getOrdering()).addAfterSlot(new ConfigOthersSlotImpl());
         
         List<FacesConfig> appConfigResources = new ArrayList<FacesConfig>();
         appConfigResources.add(cfgA);


Mime
View raw message