You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/27 20:40:21 UTC
svn commit: r1842162 - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration2/
main/java/org/apache/commons/configuration2/tree/
test/java/org/apache/commons/configuration2/builder/
Author: ggregory
Date: Thu Sep 27 20:40:21 2018
New Revision: 1842162
URL: http://svn.apache.org/viewvc?rev=1842162&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/XMLConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.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/TestFileBasedConfigurationBuilder.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.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=1842162&r1=1842161&r2=1842162&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 Thu Sep 27 20:40:21 2018
@@ -1563,7 +1563,7 @@ public abstract class AbstractConfigurat
}
Collection<T> targetCol =
- (target != null) ? target : new ArrayList<T>();
+ (target != null) ? target : new ArrayList<>();
getConversionHandler().toCollection(src, cls, getInterpolator(),
targetCol);
return targetCol;
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=1842162&r1=1842161&r2=1842162&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 Thu Sep 27 20:40:21 2018
@@ -555,7 +555,7 @@ public class XMLConfiguration extends Ba
ImmutableNode.Builder rootBuilder = new ImmutableNode.Builder();
MutableObject<String> rootValue = new MutableObject<>();
Map<ImmutableNode, Object> elemRefMap =
- elemRefs ? new HashMap<ImmutableNode, Object>() : null;
+ elemRefs ? new HashMap<>() : null;
Map<String, String> attributes =
constructHierarchy(rootBuilder, rootValue,
document.getDocumentElement(), elemRefMap, true, 0);
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java?rev=1842162&r1=1842161&r2=1842162&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java Thu Sep 27 20:40:21 2018
@@ -567,7 +567,7 @@ class ModelTransaction
}
Collection<E> result =
- (col1 != null) ? col1 : new ArrayList<E>(col2.size());
+ (col1 != null) ? col1 : new ArrayList<>(col2.size());
result.addAll(col2);
return result;
}
@@ -587,7 +587,7 @@ class ModelTransaction
return set1;
}
- Set<E> result = (set1 != null) ? set1 : new HashSet<E>();
+ Set<E> result = (set1 != null) ? set1 : new HashSet<>();
result.addAll(set2);
return result;
}
@@ -609,7 +609,7 @@ class ModelTransaction
return map1;
}
- Map<K, V> result = (map1 != null) ? map1 : new HashMap<K, V>();
+ Map<K, V> result = (map1 != null) ? map1 : new HashMap<>();
result.putAll(map2);
return result;
}
@@ -625,7 +625,7 @@ class ModelTransaction
*/
private static <E> Collection<E> append(Collection<E> col, E node)
{
- Collection<E> result = (col != null) ? col : new LinkedList<E>();
+ Collection<E> result = (col != null) ? col : new LinkedList<>();
result.add(node);
return result;
}
@@ -641,7 +641,7 @@ class ModelTransaction
*/
private static <E> Set<E> append(Set<E> col, E elem)
{
- Set<E> result = (col != null) ? col : new HashSet<E>();
+ Set<E> result = (col != null) ? col : new HashSet<>();
result.add(elem);
return result;
}
@@ -659,7 +659,7 @@ class ModelTransaction
*/
private static <K, V> Map<K, V> append(Map<K, V> map, K key, V value)
{
- Map<K, V> result = (map != null) ? map : new HashMap<K, V>();
+ Map<K, V> result = (map != null) ? map : new HashMap<>();
result.put(key, value);
return result;
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java?rev=1842162&r1=1842161&r2=1842162&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java Thu Sep 27 20:40:21 2018
@@ -104,7 +104,7 @@ public class TestBasicConfigurationBuild
{
Map<String, Object> params = createTestParameters();
BasicConfigurationBuilder<Configuration> builder =
- new BasicConfigurationBuilder<Configuration>(
+ new BasicConfigurationBuilder<>(
PropertiesConfiguration.class, params);
Map<String, Object> params2 =
new HashMap<>(builder.getParameters());
@@ -581,7 +581,7 @@ public class TestBasicConfigurationBuild
EasyMock.replay(detector);
ReloadingController controller = new ReloadingController(detector);
BasicConfigurationBuilder<Configuration> builder =
- new BasicConfigurationBuilder<Configuration>(
+ new BasicConfigurationBuilder<>(
PropertiesConfiguration.class);
Configuration configuration = builder.getConfiguration();
@@ -600,7 +600,7 @@ public class TestBasicConfigurationBuild
public void testConnectToReloadingControllerNull()
{
BasicConfigurationBuilder<Configuration> builder =
- new BasicConfigurationBuilder<Configuration>(
+ new BasicConfigurationBuilder<>(
PropertiesConfiguration.class);
builder.connectToReloadingController(null);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java?rev=1842162&r1=1842161&r2=1842162&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java Thu Sep 27 20:40:21 2018
@@ -551,7 +551,7 @@ public class TestFileBasedConfigurationB
folder.newFolder(folderName);
folder.newFile(folderName + File.separatorChar + fileName);
FileBasedConfigurationBuilder<FileBasedConfiguration> homeDirConfigurationBuilder =
- new FileBasedConfigurationBuilder<FileBasedConfiguration>(
+ new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
PropertiesBuilderParameters homeDirProperties =
new Parameters().properties();
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java?rev=1842162&r1=1842161&r2=1842162&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java Thu Sep 27 20:40:21 2018
@@ -46,7 +46,7 @@ public class TestReloadingBuilderSupport
EasyMock.replay(detector);
ReloadingController controller = new ReloadingController(detector);
BasicConfigurationBuilder<Configuration> builder =
- new BasicConfigurationBuilder<Configuration>(
+ new BasicConfigurationBuilder<>(
PropertiesConfiguration.class);
BuilderEventListenerImpl builderListener =
new BuilderEventListenerImpl();
@@ -76,7 +76,7 @@ public class TestReloadingBuilderSupport
controller.resetReloadingState();
EasyMock.replay(controller);
BasicConfigurationBuilder<Configuration> builder =
- new BasicConfigurationBuilder<Configuration>(
+ new BasicConfigurationBuilder<>(
PropertiesConfiguration.class);
ReloadingBuilderSupportListener listener =