commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1790899 [1/5] - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration2/ main/java/org/apache/commons/configuration2/beanutils/ main/java/org/apache/commons/configuration2/builder/ main/java/org/apache/commo...
Date Mon, 10 Apr 2017 21:56:48 GMT
Author: ggregory
Date: Mon Apr 10 21:56:46 2017
New Revision: 1790899

URL: http://svn.apache.org/viewvc?rev=1790899&view=rev
Log:
Remove redundant type arguments.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLListReference.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/Event.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/event/EventType.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/TreeData.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestCombinedLocationStrategy.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandlerTest.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java Mon Apr 10 21:56:46 2017
@@ -130,7 +130,7 @@ public abstract class AbstractConfigurat
      */
     public AbstractConfiguration()
     {
-        interpolator = new AtomicReference<ConfigurationInterpolator>();
+        interpolator = new AtomicReference<>();
         initLogger(null);
         installDefaultInterpolator();
         listDelimiterHandler = DisabledListDelimiterHandler.INSTANCE;
@@ -434,7 +434,7 @@ public abstract class AbstractConfigurat
      */
     protected void cloneInterpolator(AbstractConfiguration orgConfig)
     {
-        interpolator = new AtomicReference<ConfigurationInterpolator>();
+        interpolator = new AtomicReference<>();
         ConfigurationInterpolator orgInterpolator = orgConfig.getInterpolator();
         List<Lookup> defaultLookups = orgInterpolator.getDefaultLookups();
         Lookup lookup = findConfigurationLookup(orgInterpolator, orgConfig);
@@ -1432,7 +1432,7 @@ public abstract class AbstractConfigurat
     @Override
     public List<Object> getList(String key)
     {
-        return getList(key, new ArrayList<Object>());
+        return getList(key, new ArrayList<>());
     }
 
     @Override
@@ -1443,12 +1443,12 @@ public abstract class AbstractConfigurat
 
         if (value instanceof String)
         {
-            list = new ArrayList<Object>(1);
+            list = new ArrayList<>(1);
             list.add(interpolate((String) value));
         }
         else if (value instanceof List)
         {
-            list = new ArrayList<Object>();
+            list = new ArrayList<>();
             List<?> l = (List<?>) value;
 
             // add the interpolated elements in the new list
@@ -1532,7 +1532,7 @@ public abstract class AbstractConfigurat
     @Override
     public <T> List<T> getList(Class<T> cls, String key, List<T> defaultValue)
     {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
         if (getCollection(cls, key, result, defaultValue) == null)
         {
             return null;
@@ -1735,7 +1735,7 @@ public abstract class AbstractConfigurat
      */
     private Object encodeListForCopy(Collection<?> values)
     {
-        List<Object> result = new ArrayList<Object>(values.size());
+        List<Object> result = new ArrayList<>(values.size());
         for (Object value : values)
         {
             result.add(encodeForCopy(value));
@@ -1870,7 +1870,7 @@ public abstract class AbstractConfigurat
         Collection<T> result;
         if (target == null)
         {
-            result = new ArrayList<T>(defaultValue);
+            result = new ArrayList<>(defaultValue);
         }
         else
         {

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java Mon Apr 10 21:56:46 2017
@@ -292,7 +292,7 @@ public abstract class AbstractHierarchic
         else
         {
             NodeHandler<T> handler = getModel().getNodeHandler();
-            List<Object> list = new ArrayList<Object>();
+            List<Object> list = new ArrayList<>();
             for (QueryResult<T> result : results)
             {
                 Object value = valueFromResult(result, handler);
@@ -463,7 +463,7 @@ public abstract class AbstractHierarchic
     public List<T> resolveNodeKey(T root, String key, NodeHandler<T> handler)
     {
         List<QueryResult<T>> results = resolveKey(root, key, handler);
-        List<T> targetNodes = new LinkedList<T>();
+        List<T> targetNodes = new LinkedList<>();
         for (QueryResult<T> result : results)
         {
             if (!result.isAttributeResult())
@@ -497,7 +497,7 @@ public abstract class AbstractHierarchic
         Iterator<QueryResult<T>> itNodes = fetchNodeList(key).iterator();
         Iterator<?> itValues = getListDelimiterHandler().parse(newValue).iterator();
         Map<QueryResult<T>, Object> changedValues =
-                new HashMap<QueryResult<T>, Object>();
+                new HashMap<>();
         Collection<Object> additionalValues = null;
         Collection<QueryResult<T>> removedItems = null;
 
@@ -509,7 +509,7 @@ public abstract class AbstractHierarchic
         // Add additional nodes if necessary
         if (itValues.hasNext())
         {
-            additionalValues = new LinkedList<Object>();
+            additionalValues = new LinkedList<>();
             while (itValues.hasNext())
             {
                 additionalValues.add(itValues.next());
@@ -519,14 +519,14 @@ public abstract class AbstractHierarchic
         // Remove remaining nodes
         if (itNodes.hasNext())
         {
-            removedItems = new LinkedList<QueryResult<T>>();
+            removedItems = new LinkedList<>();
             while (itNodes.hasNext())
             {
                 removedItems.add(itNodes.next());
             }
         }
 
-        return new NodeUpdateData<T>(changedValues, additionalValues,
+        return new NodeUpdateData<>(changedValues, additionalValues,
                 removedItems, key);
     }
 
@@ -539,7 +539,7 @@ public abstract class AbstractHierarchic
     @Override
     public String nodeKey(T node, Map<T, String> cache, NodeHandler<T> handler)
     {
-        List<T> path = new LinkedList<T>();
+        List<T> path = new LinkedList<>();
         T currentNode = node;
         String key = cache.get(node);
         while (key == null && currentNode != null)
@@ -804,7 +804,7 @@ public abstract class AbstractHierarchic
      */
     protected boolean nodeDefined(T node)
     {
-        DefinedVisitor<T> visitor = new DefinedVisitor<T>();
+        DefinedVisitor<T> visitor = new DefinedVisitor<>();
         NodeTreeWalker.INSTANCE.walkBFS(node, visitor, getModel().getNodeHandler());
         return visitor.isDefined();
     }
@@ -903,8 +903,8 @@ public abstract class AbstractHierarchic
          */
         public DefinedKeysVisitor()
         {
-            keyList = new LinkedHashSet<String>();
-            parentKeys = new Stack<String>();
+            keyList = new LinkedHashSet<>();
+            parentKeys = new Stack<>();
         }
 
         /**

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java Mon Apr 10 21:56:46 2017
@@ -52,7 +52,7 @@ import org.apache.commons.configuration2
 public class BaseConfiguration extends AbstractConfiguration implements Cloneable
 {
     /** stores the configuration key-value pairs */
-    private Map<String, Object> store = new LinkedHashMap<String, Object>();
+    private Map<String, Object> store = new LinkedHashMap<>();
 
     /**
      * Adds a key/value pair to the map.  This routine does no magic morphing.
@@ -81,7 +81,7 @@ public class BaseConfiguration extends A
         else
         {
             // the previous value is replaced by a list containing the previous value and the new value
-            List<Object> list = new ArrayList<Object>();
+            List<Object> list = new ArrayList<>();
             list.add(previousValue);
             list.add(value);
 
@@ -215,7 +215,7 @@ public class BaseConfiguration extends A
                 // This is safe because the collections were created by ourselves
                 @SuppressWarnings("unchecked")
                 Collection<String> strList = (Collection<String>) e.getValue();
-                copy.store.put(e.getKey(), new ArrayList<String>(strList));
+                copy.store.put(e.getKey(), new ArrayList<>(strList));
             }
         }
     }

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java Mon Apr 10 21:56:46 2017
@@ -338,7 +338,7 @@ public class BaseHierarchicalConfigurati
             Collection<NodeSelector> selectors)
     {
         List<HierarchicalConfiguration<ImmutableNode>> configs =
-                new ArrayList<HierarchicalConfiguration<ImmutableNode>>(
+                new ArrayList<>(
                         selectors.size());
         for (NodeSelector selector : selectors)
         {
@@ -459,7 +459,7 @@ public class BaseHierarchicalConfigurati
         }
 
         List<HierarchicalConfiguration<ImmutableNode>> results =
-                new ArrayList<HierarchicalConfiguration<ImmutableNode>>(
+                new ArrayList<>(
                         nodes.size());
         for (ImmutableNode node : nodes)
         {
@@ -540,7 +540,7 @@ public class BaseHierarchicalConfigurati
 
         ImmutableNode parent = nodes.get(0);
         List<HierarchicalConfiguration<ImmutableNode>> subs =
-                new ArrayList<HierarchicalConfiguration<ImmutableNode>>(parent
+                new ArrayList<>(parent
                         .getChildren().size());
         for (ImmutableNode node : parent.getChildren())
         {
@@ -678,7 +678,7 @@ public class BaseHierarchicalConfigurati
             List<? extends HierarchicalConfiguration<?>> subs)
     {
         List<ImmutableHierarchicalConfiguration> res =
-                new ArrayList<ImmutableHierarchicalConfiguration>(subs.size());
+                new ArrayList<>(subs.size());
         for (HierarchicalConfiguration<?> sub : subs)
         {
             res.add(ConfigurationUtils.unmodifiableConfiguration(sub));
@@ -803,7 +803,7 @@ public class BaseHierarchicalConfigurati
                 ReferenceNodeHandler refHandler)
         {
             Collection<ImmutableNode> subNodes =
-                    new LinkedList<ImmutableNode>(refHandler.getChildren(node));
+                    new LinkedList<>(refHandler.getChildren(node));
             Iterator<ImmutableNode> children = subNodes.iterator();
             ImmutableNode sibling1;
             ImmutableNode nd = null;
@@ -822,7 +822,7 @@ public class BaseHierarchicalConfigurati
                 {
                     // find all following new nodes
                     List<ImmutableNode> newNodes =
-                            new LinkedList<ImmutableNode>();
+                            new LinkedList<>();
                     newNodes.add(nd);
                     while (children.hasNext())
                     {
@@ -872,7 +872,7 @@ public class BaseHierarchicalConfigurati
          */
         public InterpolatedVisitor()
         {
-            builderStack = new LinkedList<ImmutableNode.Builder>();
+            builderStack = new LinkedList<>();
         }
 
         /**
@@ -976,7 +976,7 @@ public class BaseHierarchicalConfigurati
         {
             Object value = interpolate(node.getValue());
             Map<String, Object> interpolatedAttributes =
-                    new HashMap<String, Object>();
+                    new HashMap<>();
             boolean attributeChanged =
                     interpolateAttributes(node, handler, interpolatedAttributes);
             ImmutableNode newNode =
@@ -1044,7 +1044,7 @@ public class BaseHierarchicalConfigurati
         private Map<String, Object> interpolateAttributes(ImmutableNode node,
                 NodeHandler<ImmutableNode> handler)
         {
-            Map<String, Object> attributes = new HashMap<String, Object>();
+            Map<String, Object> attributes = new HashMap<>();
             interpolateAttributes(node, handler, attributes);
             return attributes;
         }

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java Mon Apr 10 21:56:46 2017
@@ -191,7 +191,7 @@ public class CombinedConfiguration exten
      * @since 2.0
      */
     public static final EventType<ConfigurationEvent> COMBINED_INVALIDATE =
-            new EventType<ConfigurationEvent>(ConfigurationEvent.ANY,
+            new EventType<>(ConfigurationEvent.ANY,
                     "COMBINED_INVALIDATE");
 
     /** Constant for the expression engine for parsing the at path. */
@@ -498,7 +498,7 @@ public class CombinedConfiguration exten
         try
         {
             List<Configuration> list =
-                    new ArrayList<Configuration>(getNumberOfConfigurationsInternal());
+                    new ArrayList<>(getNumberOfConfigurationsInternal());
             for (ConfigData cd : configurations)
             {
                 list.add(cd.getConfiguration());
@@ -523,7 +523,7 @@ public class CombinedConfiguration exten
         beginRead(true);
         try
         {
-            List<String> list = new ArrayList<String>(getNumberOfConfigurationsInternal());
+            List<String> list = new ArrayList<>(getNumberOfConfigurationsInternal());
             for (ConfigData cd : configurations)
             {
                 list.add(cd.getName());
@@ -760,7 +760,7 @@ public class CombinedConfiguration exten
         try
         {
             List<QueryResult<ImmutableNode>> results = fetchNodeList(key);
-            Set<Configuration> sources = new HashSet<Configuration>();
+            Set<Configuration> sources = new HashSet<>();
 
             for (QueryResult<ImmutableNode> result : results)
             {
@@ -877,8 +877,8 @@ public class CombinedConfiguration exten
      */
     private void initChildCollections()
     {
-        configurations = new ArrayList<ConfigData>();
-        namedConfigurations = new HashMap<String, Configuration>();
+        configurations = new ArrayList<>();
+        namedConfigurations = new HashMap<>();
     }
 
     /**
@@ -926,9 +926,9 @@ public class CombinedConfiguration exten
      */
     private Set<Configuration> findSourceConfigurations(ImmutableNode node)
     {
-        Set<Configuration> result = new HashSet<Configuration>();
+        Set<Configuration> result = new HashSet<>();
         FindNodeVisitor<ImmutableNode> visitor =
-                new FindNodeVisitor<ImmutableNode>(node);
+                new FindNodeVisitor<>(node);
 
         for (ConfigData cd : configurations)
         {
@@ -1178,7 +1178,7 @@ public class CombinedConfiguration exten
                 return null;
             }
 
-            Collection<String> result = new ArrayList<String>();
+            Collection<String> result = new ArrayList<>();
             DefaultConfigurationKey.KeyIterator it = new DefaultConfigurationKey(
                     AT_ENGINE, at).iterator();
             while (it.hasNext())

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java Mon Apr 10 21:56:46 2017
@@ -71,7 +71,7 @@ public class CompositeConfiguration exte
 implements Cloneable
 {
     /** List holding all the configuration */
-    private List<Configuration> configList = new LinkedList<Configuration>();
+    private List<Configuration> configList = new LinkedList<>();
 
     /**
      * Configuration that holds in memory stuff.  Inserted as first so any
@@ -316,7 +316,7 @@ implements Cloneable
     @Override
     protected Iterator<String> getKeysInternal()
     {
-        Set<String> keys = new LinkedHashSet<String>();
+        Set<String> keys = new LinkedHashSet<>();
         for (Configuration config : configList)
         {
             for (Iterator<String> it = config.getKeys(); it.hasNext();)
@@ -331,7 +331,7 @@ implements Cloneable
     @Override
     protected Iterator<String> getKeysInternal(String key)
     {
-        Set<String> keys = new LinkedHashSet<String>();
+        Set<String> keys = new LinkedHashSet<>();
         for (Configuration config : configList)
         {
             for (Iterator<String> it = config.getKeys(key); it.hasNext();)
@@ -382,7 +382,7 @@ implements Cloneable
     @Override
     public List<Object> getList(String key, List<?> defaultValue)
     {
-        List<Object> list = new ArrayList<Object>();
+        List<Object> list = new ArrayList<>();
 
         // add all elements from the first configuration containing the requested key
         Iterator<Configuration> it = configList.iterator();
@@ -486,7 +486,7 @@ implements Cloneable
         {
             CompositeConfiguration copy = (CompositeConfiguration) super
                     .clone();
-            copy.configList = new LinkedList<Configuration>();
+            copy.configList = new LinkedList<>();
             copy.inMemoryConfiguration = ConfigurationUtils
                     .cloneConfiguration(getInMemoryConfiguration());
             copy.configList.add(copy.inMemoryConfiguration);

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DataConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DataConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DataConfiguration.java Mon Apr 10 21:56:46 2017
@@ -107,7 +107,7 @@ public class DataConfiguration extends A
     public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     /** Stores temporary date formats. */
-    private static final ThreadLocal<String> TEMP_DATE_FORMAT = new ThreadLocal<String>();
+    private static final ThreadLocal<String> TEMP_DATE_FORMAT = new ThreadLocal<>();
 
     /** Stores the wrapped configuration.*/
     private final Configuration configuration;

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java Mon Apr 10 21:56:46 2017
@@ -333,7 +333,7 @@ public class DatabaseConfiguration exten
                         openResultSet(String.format(SQL_GET_PROPERTY,
                                 table, keyColumn), true, key);
 
-                List<Object> results = new ArrayList<Object>();
+                List<Object> results = new ArrayList<>();
                 while (rs.next())
                 {
                     Object value = extractPropertyValue(rs);
@@ -559,7 +559,7 @@ public class DatabaseConfiguration exten
     @Override
     protected Iterator<String> getKeysInternal()
     {
-        final Collection<String> keys = new ArrayList<String>();
+        final Collection<String> keys = new ArrayList<>();
         new JdbcOperation<Collection<String>>(ConfigurationErrorEvent.READ,
                 ConfigurationErrorEvent.READ, null, null)
         {

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java Mon Apr 10 21:56:46 2017
@@ -69,18 +69,18 @@ public class DynamicCombinedConfiguratio
      * set at the beginning of an operation and removed at the end.
      */
     private static final ThreadLocal<CurrentConfigHolder> CURRENT_CONFIG =
-            new ThreadLocal<CurrentConfigHolder>();
+            new ThreadLocal<>();
 
     /** The CombinedConfigurations */
     private final ConcurrentMap<String, CombinedConfiguration> configs =
-            new ConcurrentHashMap<String, CombinedConfiguration>();
+            new ConcurrentHashMap<>();
 
     /** Stores a list with the contained configurations. */
-    private final List<ConfigData> configurations = new ArrayList<ConfigData>();
+    private final List<ConfigData> configurations = new ArrayList<>();
 
     /** Stores a map with the named configurations. */
     private final Map<String, Configuration> namedConfigurations =
-            new HashMap<String, Configuration>();
+            new HashMap<>();
 
     /** The key pattern for the CombinedConfiguration map */
     private String keyPattern;

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java Mon Apr 10 21:56:46 2017
@@ -65,7 +65,7 @@ abstract class HierarchicalConfiguration
             DefaultConfigurationKey keyEmpty =
                     new DefaultConfigurationKey(exprEngine);
             DefaultConfigurationKey keyLast = keyEmpty;
-            Set<String> keySet = new HashSet<String>();
+            Set<String> keySet = new HashSet<>();
 
             for (Iterator<String> it = config.getKeys(); it.hasNext();)
             {
@@ -145,7 +145,7 @@ abstract class HierarchicalConfiguration
      */
     protected Iterator<String> reverseIterator(DefaultConfigurationKey key)
     {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (DefaultConfigurationKey.KeyIterator it = key.iterator(); it.hasNext();)
         {
             list.add(it.nextKey());

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java Mon Apr 10 21:56:46 2017
@@ -379,7 +379,7 @@ public class INIConfiguration extends Ba
     public void read(Reader in) throws ConfigurationException, IOException
     {
         BufferedReader bufferedReader = new BufferedReader(in);
-        Map<String, ImmutableNode.Builder> sectionBuilders = new LinkedHashMap<String, ImmutableNode.Builder>();
+        Map<String, ImmutableNode.Builder> sectionBuilders = new LinkedHashMap<>();
         ImmutableNode.Builder rootBuilder = new ImmutableNode.Builder();
 
         createNodeBuilders(bufferedReader, rootBuilder, sectionBuilders);
@@ -833,7 +833,7 @@ public class INIConfiguration extends Ba
      */
     public Set<String> getSections()
     {
-        Set<String> sections = new LinkedHashSet<String>();
+        Set<String> sections = new LinkedHashSet<>();
         boolean globalSection = false;
         boolean inSection = false;
 
@@ -1037,7 +1037,7 @@ public class INIConfiguration extends Ba
                     if (node == getRootNode())
                     {
                         filteredList =
-                                new ArrayList<ImmutableNode>(children.size());
+                                new ArrayList<>(children.size());
                         for (ImmutableNode child : children)
                         {
                             if (!isSectionNode(child))

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java Mon Apr 10 21:56:46 2017
@@ -56,7 +56,7 @@ public class JNDIConfiguration extends A
     private Context baseContext;
 
     /** The Set of keys that have been virtually cleared. */
-    private final Set<String> clearedProperties = new HashSet<String>();
+    private final Set<String> clearedProperties = new HashSet<>();
 
     /**
      * Creates a JNDIConfiguration using the default initial context as the
@@ -204,7 +204,7 @@ public class JNDIConfiguration extends A
             Context context = getContext(path, getBaseContext());
 
             // return all the keys under the context found
-            Set<String> keys = new HashSet<String>();
+            Set<String> keys = new HashSet<>();
             if (context != null)
             {
                 recursiveGetKeys(keys, context, prefix, new HashSet<Context>());

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java Mon Apr 10 21:56:46 2017
@@ -195,7 +195,7 @@ public class MapConfiguration extends Ab
         else
         {
             // the previous value is replaced by a list containing the previous value and the new value
-            List<Object> list = new ArrayList<Object>();
+            List<Object> list = new ArrayList<>();
             list.add(previousValue);
             list.add(value);
 

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java Mon Apr 10 21:56:46 2017
@@ -675,7 +675,7 @@ public class PropertiesConfiguration ext
         public PropertiesReader(Reader reader)
         {
             super(reader);
-            commentLines = new ArrayList<String>();
+            commentLines = new ArrayList<>();
         }
 
         /**

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java Mon Apr 10 21:56:46 2017
@@ -156,7 +156,7 @@ public class PropertiesConfigurationLayo
     public PropertiesConfigurationLayout(PropertiesConfigurationLayout c)
     {
         loadCounter = new AtomicInteger();
-        layoutData = new LinkedHashMap<String, PropertyLayoutData>();
+        layoutData = new LinkedHashMap<>();
 
         if (c != null)
         {

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java Mon Apr 10 21:56:46 2017
@@ -556,7 +556,7 @@ public class XMLConfiguration extends Ba
         setSystemID(docHelper.getSourceSystemID());
 
         ImmutableNode.Builder rootBuilder = new ImmutableNode.Builder();
-        MutableObject<String> rootValue = new MutableObject<String>();
+        MutableObject<String> rootValue = new MutableObject<>();
         Map<ImmutableNode, Object> elemRefMap =
                 elemRefs ? new HashMap<ImmutableNode, Object>() : null;
         Map<String, String> attributes =
@@ -607,7 +607,7 @@ public class XMLConfiguration extends Ba
                 ImmutableNode.Builder childNode = new ImmutableNode.Builder();
                 childNode.name(child.getTagName());
                 MutableObject<String> refChildValue =
-                        new MutableObject<String>();
+                        new MutableObject<>();
                 Map<String, String> attrmap =
                         constructHierarchy(childNode, refChildValue, child,
                                 elemRefs, trimFlag, level + 1);
@@ -669,7 +669,7 @@ public class XMLConfiguration extends Ba
     private static Map<String, String> processAttributes(Element element)
     {
         NamedNodeMap attributes = element.getAttributes();
-        Map<String, String> attrmap = new HashMap<String, String>();
+        Map<String, String> attrmap = new HashMap<>();
 
         for (int i = 0; i < attributes.getLength(); ++i)
         {
@@ -1124,7 +1124,7 @@ public class XMLConfiguration extends Ba
             document = docHelper.getDocument();
             elementMapping = docHelper.getElementMapping();
             listDelimiterHandler = handler;
-            newElements = new HashMap<ImmutableNode, Element>();
+            newElements = new HashMap<>();
         }
 
         /**
@@ -1372,7 +1372,7 @@ public class XMLConfiguration extends Ba
             // Find all Text nodes
             NodeList children = elem.getChildNodes();
             Collection<org.w3c.dom.Node> textNodes =
-                    new ArrayList<org.w3c.dom.Node>();
+                    new ArrayList<>();
             for (int i = 0; i < children.getLength(); i++)
             {
                 org.w3c.dom.Node nd = children.item(i);

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java Mon Apr 10 21:56:46 2017
@@ -353,7 +353,7 @@ class XMLDocumentHelper
     private static Map<Node, Node> createElementMapping(Document doc1,
             Document doc2)
     {
-        Map<Node, Node> mapping = new HashMap<Node, Node>();
+        Map<Node, Node> mapping = new HashMap<>();
         createElementMappingForNodes(doc1.getDocumentElement(),
                 doc2.getDocumentElement(), mapping);
         return mapping;

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLListReference.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLListReference.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLListReference.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLListReference.java Mon Apr 10 21:56:46 2017
@@ -172,7 +172,7 @@ class XMLListReference
         ImmutableNode parent = nodeHandler.getParent(node);
         List<ImmutableNode> items =
                 nodeHandler.getChildren(parent, node.getNodeName());
-        List<Object> values = new ArrayList<Object>(items.size());
+        List<Object> values = new ArrayList<>(items.size());
         for (ImmutableNode n : items)
         {
             values.add(n.getValue());

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java Mon Apr 10 21:56:46 2017
@@ -391,11 +391,11 @@ public final class BeanHelper
 
         if (List.class.isAssignableFrom(propertyClass))
         {
-            beanCollection = new ArrayList<Object>();
+            beanCollection = new ArrayList<>();
         }
         else if (Set.class.isAssignableFrom(propertyClass))
         {
-            beanCollection = new TreeSet<Object>();
+            beanCollection = new TreeSet<>();
         }
         else
         {

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java Mon Apr 10 21:56:46 2017
@@ -63,7 +63,7 @@ public class CombinedBeanDeclaration imp
      */
     public CombinedBeanDeclaration(BeanDeclaration... decl)
     {
-        childDeclarations = new ArrayList<BeanDeclaration>(Arrays.asList(decl));
+        childDeclarations = new ArrayList<>(Arrays.asList(decl));
     }
 
     /**
@@ -135,7 +135,7 @@ public class CombinedBeanDeclaration imp
     @Override
     public Map<String, Object> getBeanProperties()
     {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = new HashMap<>();
         for (int i = childDeclarations.size() - 1; i >= 0; i--)
         {
             Map<String, Object> props =
@@ -157,7 +157,7 @@ public class CombinedBeanDeclaration imp
     @Override
     public Map<String, Object> getNestedBeanDeclarations()
     {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = new HashMap<>();
         for (int i = childDeclarations.size() - 1; i >= 0; i--)
         {
             Map<String, Object> decls =

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java Mon Apr 10 21:56:46 2017
@@ -128,7 +128,7 @@ public class ConfigurationDynaClass impl
         }
 
         Iterator<String> keys = configuration.getKeys();
-        List<DynaProperty> properties = new ArrayList<DynaProperty>();
+        List<DynaProperty> properties = new ArrayList<>();
         while (keys.hasNext())
         {
             String key = keys.next();

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java Mon Apr 10 21:56:46 2017
@@ -245,7 +245,7 @@ public class DefaultBeanFactory implemen
     private static <T> List<Constructor<T>> findMatchingConstructors(
             Class<T> beanClass, BeanDeclaration data)
     {
-        List<Constructor<T>> result = new LinkedList<Constructor<T>>();
+        List<Constructor<T>> result = new LinkedList<>();
         Collection<ConstructorArg> args = getConstructorArgs(data);
         for (Constructor<?> ctor : beanClass.getConstructors())
         {

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java Mon Apr 10 21:56:46 2017
@@ -345,7 +345,7 @@ public class XMLBeanDeclaration implemen
     @Override
     public Map<String, Object> getBeanProperties()
     {
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         for (String key : getAttributeNames())
         {
             if (!isReservedAttributeName(key))
@@ -367,7 +367,7 @@ public class XMLBeanDeclaration implemen
     @Override
     public Map<String, Object> getNestedBeanDeclarations()
     {
-        Map<String, Object> nested = new HashMap<String, Object>();
+        Map<String, Object> nested = new HashMap<>();
         for (NodeData<?> child : getNode().getChildren())
         {
             if (!isReservedChildName(child.nodeName()))
@@ -385,7 +385,7 @@ public class XMLBeanDeclaration implemen
                     }
                     else
                     {
-                        list = new ArrayList<BeanDeclaration>();
+                        list = new ArrayList<>();
                         list.add((BeanDeclaration) obj);
                         nested.put(child.nodeName(), list);
                     }
@@ -411,7 +411,7 @@ public class XMLBeanDeclaration implemen
     @Override
     public Collection<ConstructorArg> getConstructorArgs()
     {
-        Collection<ConstructorArg> args = new LinkedList<ConstructorArg>();
+        Collection<ConstructorArg> args = new LinkedList<>();
         for (NodeData<?> child : getNode().getChildren(ELEM_CTOR_ARG))
         {
             args.add(createConstructorArg(child));
@@ -600,7 +600,7 @@ public class XMLBeanDeclaration implemen
             HierarchicalConfiguration<T> config)
     {
         NodeHandler<T> handler = config.getNodeModel().getNodeHandler();
-        return new NodeData<T>(handler.getRootNode(), handler);
+        return new NodeData<>(handler.getRootNode(), handler);
     }
 
     /**
@@ -720,10 +720,10 @@ public class XMLBeanDeclaration implemen
          */
         private List<NodeData<T>> wrapInNodeData(List<T> nodes)
         {
-            List<NodeData<T>> result = new ArrayList<NodeData<T>>(nodes.size());
+            List<NodeData<T>> result = new ArrayList<>(nodes.size());
             for (T node : nodes)
             {
-                result.add(new NodeData<T>(node, handler));
+                result.add(new NodeData<>(node, handler));
             }
             return result;
         }

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java Mon Apr 10 21:56:46 2017
@@ -97,7 +97,7 @@ public class BasicBuilderParameters impl
      */
     public BasicBuilderParameters()
     {
-        properties = new HashMap<String, Object>();
+        properties = new HashMap<>();
     }
 
     /**
@@ -110,7 +110,7 @@ public class BasicBuilderParameters impl
     public Map<String, Object> getParameters()
     {
         HashMap<String, Object> result =
-                new HashMap<String, Object>(properties);
+                new HashMap<>(properties);
         if (result.containsKey(PROP_INTERPOLATOR))
         {
             // A custom ConfigurationInterpolator overrides lookups
@@ -199,7 +199,7 @@ public class BasicBuilderParameters impl
         else
         {
             return setProperty(PROP_PREFIX_LOOKUPS,
-                    new HashMap<String, Lookup>(lookups));
+                    new HashMap<>(lookups));
         }
     }
 
@@ -219,7 +219,7 @@ public class BasicBuilderParameters impl
         }
         else
         {
-            return setProperty(PROP_DEFAULT_LOOKUPS, new ArrayList<Lookup>(
+            return setProperty(PROP_DEFAULT_LOOKUPS, new ArrayList<>(
                     lookups));
         }
     }
@@ -491,13 +491,13 @@ public class BasicBuilderParameters impl
                 fetchPrefixLookups(params);
         if (prefixLookups != null)
         {
-            params.put(PROP_PREFIX_LOOKUPS, new HashMap<String, Lookup>(
+            params.put(PROP_PREFIX_LOOKUPS, new HashMap<>(
                     prefixLookups));
         }
         Collection<? extends Lookup> defLookups = fetchDefaultLookups(params);
         if (defLookups != null)
         {
-            params.put(PROP_DEFAULT_LOOKUPS, new ArrayList<Lookup>(defLookups));
+            params.put(PROP_DEFAULT_LOOKUPS, new ArrayList<>(defLookups));
         }
     }
 

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java Mon Apr 10 21:56:46 2017
@@ -231,7 +231,7 @@ public class BasicConfigurationBuilder<T
             Map<String, Object> params)
     {
         Map<String, Object> newParams =
-                new HashMap<String, Object>(getParameters());
+                new HashMap<>(getParameters());
         if (params != null)
         {
             newParams.putAll(params);
@@ -251,7 +251,7 @@ public class BasicConfigurationBuilder<T
      */
     public BasicConfigurationBuilder<T> configure(BuilderParameters... params)
     {
-        Map<String, Object> newParams = new HashMap<String, Object>();
+        Map<String, Object> newParams = new HashMap<>();
         for (BuilderParameters p : params)
         {
             newParams.putAll(p.getParameters());
@@ -643,7 +643,7 @@ public class BasicConfigurationBuilder<T
      */
     private void updateParameters(Map<String, Object> newParams)
     {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         if (newParams != null)
         {
             map.putAll(newParams);
@@ -739,7 +739,7 @@ public class BasicConfigurationBuilder<T
     private Map<String, Object> getFilteredParameters()
     {
         Map<String, Object> filteredMap =
-                new HashMap<String, Object>(getParameters());
+                new HashMap<>(getParameters());
         for (Iterator<String> it = filteredMap.keySet().iterator(); it
                 .hasNext();)
         {

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java Mon Apr 10 21:56:46 2017
@@ -37,14 +37,14 @@ public class ConfigurationBuilderEvent e
 {
     /** The common super type for all events related to configuration builders. */
     public static final EventType<ConfigurationBuilderEvent> ANY =
-            new EventType<ConfigurationBuilderEvent>(Event.ANY, "BUILDER");
+            new EventType<>(Event.ANY, "BUILDER");
 
     /**
      * The specific event type for builder reset events. Events of this type are
      * generated each time the builder's {@code resetResult()} method is called.
      */
     public static final EventType<ConfigurationBuilderEvent> RESET =
-            new EventType<ConfigurationBuilderEvent>(ANY, "RESET");
+            new EventType<>(ANY, "RESET");
 
     /**
      * The specific event type for configuration request events. Events of this
@@ -59,7 +59,7 @@ public class ConfigurationBuilderEvent e
      * @see ConfigurationBuilder#getConfiguration()
      */
     public static final EventType<ConfigurationBuilderEvent> CONFIGURATION_REQUEST =
-            new EventType<ConfigurationBuilderEvent>(ANY,
+            new EventType<>(ANY,
                     "CONFIGURATION_REQUEST");
 
     /**

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java Mon Apr 10 21:56:46 2017
@@ -48,7 +48,7 @@ public class ConfigurationBuilderResultC
      * result configuration has been created.
      */
     public static final EventType<ConfigurationBuilderResultCreatedEvent> RESULT_CREATED =
-            new EventType<ConfigurationBuilderResultCreatedEvent>(ANY,
+            new EventType<>(ANY,
                     "RESULT_CREATED");
 
     /** The newly created configuration object. */

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java Mon Apr 10 21:56:46 2017
@@ -56,7 +56,7 @@ public class DefaultParametersManager
      */
     public DefaultParametersManager()
     {
-        defaultHandlers = new CopyOnWriteArrayList<DefaultHandlerData>();
+        defaultHandlers = new CopyOnWriteArrayList<>();
     }
 
     /**
@@ -170,7 +170,7 @@ public class DefaultParametersManager
             Class<?> startClass)
     {
         Collection<DefaultHandlerData> toRemove =
-                new LinkedList<DefaultHandlerData>();
+                new LinkedList<>();
         for (DefaultHandlerData dhd : defaultHandlers)
         {
             if (dhd.isOccurrence(handler, startClass))

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java Mon Apr 10 21:56:46 2017
@@ -390,7 +390,7 @@ public class FileBasedConfigurationBuild
      */
     private static Map<Class<?>, String> initializeDefaultEncodings()
     {
-        Map<Class<?>, String> enc = new ConcurrentHashMap<Class<?>, String>();
+        Map<Class<?>, String> enc = new ConcurrentHashMap<>();
         enc.put(PropertiesConfiguration.class,
                 PropertiesConfiguration.DEFAULT_ENCODING);
         enc.put(XMLPropertiesConfiguration.class,

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java Mon Apr 10 21:56:46 2017
@@ -218,7 +218,7 @@ public class BaseConfigurationBuilderPro
             throws Exception
     {
         Collection<BuilderParameters> params =
-                new ArrayList<BuilderParameters>(
+                new ArrayList<>(
                         getParameterClasses().size());
         for (String paramcls : getParameterClasses())
         {
@@ -393,7 +393,7 @@ public class BaseConfigurationBuilderPro
         }
         else
         {
-            return Collections.unmodifiableCollection(new ArrayList<String>(
+            return Collections.unmodifiableCollection(new ArrayList<>(
                     paramCls));
         }
     }

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java Mon Apr 10 21:56:46 2017
@@ -83,8 +83,8 @@ public class CombinedBuilderParametersIm
      */
     public CombinedBuilderParametersImpl()
     {
-        providers = new HashMap<String, ConfigurationBuilderProvider>();
-        childParameters = new LinkedList<BuilderParameters>();
+        providers = new HashMap<>();
+        childParameters = new LinkedList<>();
         inheritSettings = true;
     }
 
@@ -377,7 +377,7 @@ public class CombinedBuilderParametersIm
      */
     public Collection<? extends BuilderParameters> getDefaultChildParameters()
     {
-        return new ArrayList<BuilderParameters>(childParameters);
+        return new ArrayList<>(childParameters);
     }
 
     /**

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java Mon Apr 10 21:56:46 2017
@@ -706,7 +706,7 @@ public class CombinedConfigurationBuilde
     protected ConfigurationBuilder<? extends HierarchicalConfiguration<?>> createXMLDefinitionBuilder(
             BuilderParameters builderParams)
     {
-        return new FileBasedConfigurationBuilder<XMLConfiguration>(
+        return new FileBasedConfigurationBuilder<>(
                 XMLConfiguration.class).configure(builderParams);
     }
 
@@ -848,7 +848,7 @@ public class CombinedConfigurationBuilde
             HierarchicalConfiguration<?> defConfig, Configuration resultConfig)
             throws ConfigurationException
     {
-        Map<String, Lookup> lookups = new HashMap<String, Lookup>();
+        Map<String, Lookup> lookups = new HashMap<>();
 
         List<? extends HierarchicalConfiguration<?>> nodes =
                 defConfig.configurationsAt(KEY_CONFIGURATION_LOOKUPS);
@@ -1341,7 +1341,7 @@ public class CombinedConfigurationBuilde
     private static Map<String, ConfigurationBuilderProvider> createDefaultProviders()
     {
         Map<String, ConfigurationBuilderProvider> providers =
-                new HashMap<String, ConfigurationBuilderProvider>();
+                new HashMap<>();
         for (int i = 0; i < DEFAULT_TAGS.length; i++)
         {
             providers.put(DEFAULT_TAGS[i], DEFAULT_PROVIDERS[i]);
@@ -1381,13 +1381,13 @@ public class CombinedConfigurationBuilde
         public ConfigurationSourceData()
         {
             overrideBuilders =
-                    new LinkedList<HierarchicalConfiguration<?>>();
+                    new LinkedList<>();
             unionBuilders =
-                    new LinkedList<HierarchicalConfiguration<?>>();
+                    new LinkedList<>();
             namedBuilders =
-                    new HashMap<String, ConfigurationBuilder<? extends Configuration>>();
+                    new HashMap<>();
             allBuilders =
-                    new LinkedList<ConfigurationBuilder<? extends Configuration>>();
+                    new LinkedList<>();
         }
 
         /**

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java Mon Apr 10 21:56:46 2017
@@ -88,18 +88,18 @@ public class MultiFileConfigurationBuild
 
     /** A cache for already created managed builders. */
     private final ConcurrentMap<String, FileBasedConfigurationBuilder<T>> managedBuilders =
-            new ConcurrentHashMap<String, FileBasedConfigurationBuilder<T>>();
+            new ConcurrentHashMap<>();
 
     /** Stores the {@code ConfigurationInterpolator} object. */
     private final AtomicReference<ConfigurationInterpolator> interpolator =
-            new AtomicReference<ConfigurationInterpolator>();
+            new AtomicReference<>();
 
     /**
      * A flag for preventing reentrant access to managed builders on
      * interpolation of the file name pattern.
      */
     private final ThreadLocal<Boolean> inInterpolation =
-            new ThreadLocal<Boolean>();
+            new ThreadLocal<>();
 
     /** A list for the event listeners to be passed to managed builders. */
     private final EventListenerList configurationListeners = new EventListenerList();
@@ -375,7 +375,7 @@ public class MultiFileConfigurationBuild
             String fileName, Map<String, Object> params)
             throws ConfigurationException
     {
-        return new FileBasedConfigurationBuilder<T>(getResultClass(), params,
+        return new FileBasedConfigurationBuilder<>(getResultClass(), params,
                 isAllowFailOnInit());
     }
 
@@ -524,7 +524,7 @@ public class MultiFileConfigurationBuild
             Map<String, Object> params,
             MultiFileBuilderParametersImpl multiParams)
     {
-        Map<String, Object> newParams = new HashMap<String, Object>(params);
+        Map<String, Object> newParams = new HashMap<>(params);
         newParams.remove(KEY_INTERPOLATOR);
         BuilderParameters managedBuilderParameters =
                 multiParams.getManagedBuilderParameters();

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java Mon Apr 10 21:56:46 2017
@@ -60,9 +60,9 @@ class MultiWrapDynaBean implements DynaB
      */
     public MultiWrapDynaBean(Collection<?> beans)
     {
-        propsToBeans = new HashMap<String, DynaBean>();
+        propsToBeans = new HashMap<>();
         Collection<DynaClass> beanClasses =
-                new ArrayList<DynaClass>(beans.size());
+                new ArrayList<>(beans.size());
 
         for (Object bean : beans)
         {

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java Mon Apr 10 21:56:46 2017
@@ -53,8 +53,8 @@ class MultiWrapDynaClass implements Dyna
      */
     public MultiWrapDynaClass(Collection<? extends DynaClass> wrappedCls)
     {
-        properties = new LinkedList<DynaProperty>();
-        namedProperties = new HashMap<String, DynaProperty>();
+        properties = new LinkedList<>();
+        namedProperties = new HashMap<>();
         initProperties(wrappedCls);
     }
 

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java Mon Apr 10 21:56:46 2017
@@ -130,7 +130,7 @@ public class ReloadingCombinedConfigurat
     protected ConfigurationBuilder<? extends HierarchicalConfiguration<?>> createXMLDefinitionBuilder(
             BuilderParameters builderParams)
     {
-        return new ReloadingFileBasedConfigurationBuilder<XMLConfiguration>(
+        return new ReloadingFileBasedConfigurationBuilder<>(
                 XMLConfiguration.class).configure(builderParams);
     }
 
@@ -161,7 +161,7 @@ public class ReloadingCombinedConfigurat
             throws ConfigurationException
     {
         Collection<ReloadingController> subControllers =
-                new LinkedList<ReloadingController>();
+                new LinkedList<>();
         ConfigurationBuilder<? extends HierarchicalConfiguration<?>> defBuilder =
                 getDefinitionBuilder();
         obtainReloadingController(subControllers, defBuilder);

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java Mon Apr 10 21:56:46 2017
@@ -133,7 +133,7 @@ public class ReloadingMultiFileConfigura
             String fileName, Map<String, Object> params)
             throws ConfigurationException
     {
-        return new ReloadingFileBasedConfigurationBuilder<T>(getResultClass(),
+        return new ReloadingFileBasedConfigurationBuilder<>(getResultClass(),
                 params, isAllowFailOnInit());
     }
 
@@ -155,7 +155,7 @@ public class ReloadingMultiFileConfigura
                 Collection<FileBasedConfigurationBuilder<T>> builders =
                         getManagedBuilders().values();
                 Collection<ReloadingController> controllers =
-                        new ArrayList<ReloadingController>(builders.size());
+                        new ArrayList<>(builders.size());
                 for (FileBasedConfigurationBuilder<T> b : builders)
                 {
                     controllers.add(((ReloadingControllerSupport) b)

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java?rev=1790899&r1=1790898&r2=1790899&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java Mon Apr 10 21:56:46 2017
@@ -587,7 +587,7 @@ public class Configurations
     private <T extends FileBasedConfiguration> FileBasedConfigurationBuilder<T> createFileBasedBuilder(
             Class<T> configClass, FileBasedBuilderParameters params)
     {
-        return new FileBasedConfigurationBuilder<T>(configClass)
+        return new FileBasedConfigurationBuilder<>(configClass)
                 .configure(params);
     }
 



Mime
View raw message