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=1790899&r1=1790898&r2=1790899&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 Mon Apr 10 21:56:46 2017 @@ -107,10 +107,10 @@ public class TestFileBasedConfigurationB @Test public void testGetConfigurationNoLocation() throws ConfigurationException { - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put("throwExceptionOnMissing", Boolean.TRUE); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class, params); PropertiesConfiguration conf = builder.getConfiguration(); assertTrue("Property not set", conf.isThrowExceptionOnMissing()); @@ -127,7 +127,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(1); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -146,7 +146,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(1); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -166,7 +166,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(1); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -186,7 +186,7 @@ public class TestFileBasedConfigurationB File file1 = createTestFile(1); File file2 = createTestFile(2); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file1)); @@ -206,7 +206,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(1); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -228,7 +228,7 @@ public class TestFileBasedConfigurationB File file1 = createTestFile(1); File file2 = createTestFile(2); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file1)); @@ -251,7 +251,7 @@ public class TestFileBasedConfigurationB public void testInitAllowFailOnInitFlag() { FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class, null, true); assertTrue("Flag not set", builder.isAllowFailOnInit()); } @@ -265,7 +265,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(1); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class); builder.getFileHandler().setFile(file); PropertiesConfiguration config = builder.getConfiguration(); @@ -297,7 +297,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(1); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -314,7 +314,7 @@ public class TestFileBasedConfigurationB public void testSaveNewFile() throws ConfigurationException, IOException { FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class); PropertiesConfiguration config = builder.getConfiguration(); config.setProperty(PROP, 2); @@ -333,7 +333,7 @@ public class TestFileBasedConfigurationB throws ConfigurationException { File outFile = ConfigurationAssert.getOutFile("save.properties"); Parameters parameters = new Parameters(); - FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<PropertiesConfiguration>( + FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class, null, true).configure(parameters .properties().setFile(outFile)); Configuration config = builder.getConfiguration(); @@ -351,7 +351,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(0); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -373,7 +373,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(0); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -395,7 +395,7 @@ public class TestFileBasedConfigurationB { File file = createTestFile(0); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -418,7 +418,7 @@ public class TestFileBasedConfigurationB { File file = folder.newFile(); FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(new FileBasedBuilderParametersImpl() .setFile(file)); @@ -507,7 +507,7 @@ public class TestFileBasedConfigurationB throws ConfigurationException { FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class); FileHandler handler = new FileHandler(); builder.initFileHandler(handler); @@ -524,7 +524,7 @@ public class TestFileBasedConfigurationB throws ConfigurationException { FileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class); FileHandler handler = new FileHandler(); String encoding = "testEncoding";
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java Mon Apr 10 21:56:46 2017 @@ -140,7 +140,7 @@ public class TestPropertiesBuilderParame PropertiesConfiguration.IOFactory factory = new PropertiesConfiguration.DefaultIOFactory(); ConfigurationBuilder<PropertiesConfiguration> builder = - new FileBasedConfigurationBuilder<PropertiesConfiguration>( + new FileBasedConfigurationBuilder<>( PropertiesConfiguration.class) .configure(params.setIOFactory(factory)); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java Mon Apr 10 21:56:46 2017 @@ -47,10 +47,10 @@ public class TestReloadingFileBasedConfi @Test public void testGetConfigurationNoLocation() throws ConfigurationException { - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put("throwExceptionOnMissing", Boolean.TRUE); ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration>( + new ReloadingFileBasedConfigurationBuilder<>( PropertiesConfiguration.class, params); PropertiesConfiguration conf = builder.getConfiguration(); assertTrue("Property not set", conf.isThrowExceptionOnMissing()); @@ -65,7 +65,7 @@ public class TestReloadingFileBasedConfi public void testCreateReloadingDetectorDefaultFactory() throws ConfigurationException { ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration>( + new ReloadingFileBasedConfigurationBuilder<>( PropertiesConfiguration.class); FileHandler handler = new FileHandler(); FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl(); @@ -98,7 +98,7 @@ public class TestReloadingFileBasedConfi EasyMock.replay(detector, factory); params.setReloadingDetectorFactory(factory); ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration>( + new ReloadingFileBasedConfigurationBuilder<>( PropertiesConfiguration.class); assertSame("Wrong detector", detector, builder.createReloadingDetector(handler, params)); @@ -160,7 +160,7 @@ public class TestReloadingFileBasedConfi public void testReloadingDetectorNoFileHandler() { ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration>( + new ReloadingFileBasedConfigurationBuilder<>( PropertiesConfiguration.class); ReloadingDetector ctrlDetector = builder.getReloadingController().getDetector(); @@ -221,7 +221,7 @@ public class TestReloadingFileBasedConfi public void testInitAllowFailOnInitFlag() { ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder = - new ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration>( + new ReloadingFileBasedConfigurationBuilder<>( PropertiesConfiguration.class, null, true); assertTrue("Flag not set", builder.isAllowFailOnInit()); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java Mon Apr 10 21:56:46 2017 @@ -121,7 +121,7 @@ public class TestCombinedBuilderParamete CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl(); assertNull("Got a definition builder", params.getDefinitionBuilder()); ConfigurationBuilder<XMLConfiguration> builder = - new BasicConfigurationBuilder<XMLConfiguration>( + new BasicConfigurationBuilder<>( XMLConfiguration.class); assertSame("Wrong result", params, params.setDefinitionBuilder(builder)); assertSame("Builder was not set", builder, @@ -205,7 +205,7 @@ public class TestCombinedBuilderParamete CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl(); params.registerProvider(tagPrefix, provider1); Map<String, ConfigurationBuilderProvider> map = - new HashMap<String, ConfigurationBuilderProvider>(); + new HashMap<>(); map.put(tagPrefix, provider2); map.put(tagPrefix + 1, provider3); assertSame("Wrong result", params, params.registerMissingProviders(map)); @@ -234,7 +234,7 @@ public class TestCombinedBuilderParamete public void testRegisterMissingProvidersNullEntry() { Map<String, ConfigurationBuilderProvider> map = - new HashMap<String, ConfigurationBuilderProvider>(); + new HashMap<>(); map.put("tag", null); new CombinedBuilderParametersImpl().registerMissingProviders(map); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java Mon Apr 10 21:56:46 2017 @@ -344,7 +344,7 @@ public class TestCombinedConfigurationBu public void testLoadOptionalForceCreate() throws ConfigurationException { String name = "optionalConfig"; - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); attrs.put("fileName", "nonExisting.xml"); attrs.put("config-name", name); attrs.put("config-optional", Boolean.TRUE); @@ -477,7 +477,7 @@ public class TestCombinedConfigurationBu @Test public void testResetBuilder() throws ConfigurationException { - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); BasicConfigurationBuilder<? extends HierarchicalConfiguration<ImmutableNode>> defBuilder = prepareSubBuilderTest(attrs); CombinedConfiguration cc = builder.getConfiguration(); @@ -497,7 +497,7 @@ public class TestCombinedConfigurationBu @Test public void testReloadingBuilder() throws ConfigurationException { - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); attrs.put("config-reload", Boolean.TRUE); prepareSubBuilderTest(attrs); builder.getConfiguration(); @@ -513,7 +513,7 @@ public class TestCombinedConfigurationBu @Test public void testReactOnSubBuilderChange() throws ConfigurationException { - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); prepareSubBuilderTest(attrs); CombinedConfiguration cc = builder.getConfiguration(); BasicConfigurationBuilder<?> subBuilder = @@ -531,7 +531,7 @@ public class TestCombinedConfigurationBu @Test public void testRemoveSubBuilderListener() throws ConfigurationException { - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); prepareSubBuilderTest(attrs); builder.getConfiguration(); BasicConfigurationBuilder<?> subBuilder = @@ -636,7 +636,7 @@ public class TestCombinedConfigurationBu final BaseHierarchicalConfiguration dataConf = new BaseHierarchicalConfiguration(); dataConf.addProperty(tagName, Boolean.TRUE); - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); attrs.put("config-name", BUILDER_NAME); attrs.put("config-at", "tests"); builder.configure(new CombinedBuilderParametersImpl() @@ -1519,7 +1519,7 @@ public class TestCombinedConfigurationBu */ public static class TestLookup implements Lookup { - private final Map<String, String> map = new HashMap<String, String>(); + private final Map<String, String> map = new HashMap<>(); public TestLookup() { Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java Mon Apr 10 21:56:46 2017 @@ -60,7 +60,7 @@ public class TestCombinedConfigurationBu public void testSetConfigurationBasePath() throws ConfigurationException { File deepDir = new File(ConfigurationAssert.TEST_DIR, "config/deep"); - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put("fileName", "test.properties"); BaseHierarchicalConfiguration defConfig = createDefinitionConfig("properties", params); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java Mon Apr 10 21:56:46 2017 @@ -70,7 +70,7 @@ public class TestMultiFileConfigurationB private static MultiFileConfigurationBuilder<XMLConfiguration> createTestBuilder( BuilderParameters managedParams) { - return new MultiFileConfigurationBuilder<XMLConfiguration>( + return new MultiFileConfigurationBuilder<>( XMLConfiguration.class) .configure(createTestBuilderParameters(managedParams)); } @@ -144,7 +144,7 @@ public class TestMultiFileConfigurationB DefaultLookups.SYSTEM_PROPERTIES .getLookup())); MultiFileConfigurationBuilder<XMLConfiguration> builder = - new MultiFileConfigurationBuilder<XMLConfiguration>( + new MultiFileConfigurationBuilder<>( XMLConfiguration.class); builder.configure(params); switchToConfig(1); @@ -160,7 +160,7 @@ public class TestMultiFileConfigurationB throws ConfigurationException { MultiFileConfigurationBuilder<XMLConfiguration> builder = - new MultiFileConfigurationBuilder<XMLConfiguration>( + new MultiFileConfigurationBuilder<>( XMLConfiguration.class); ExpressionEngine engine = new XPathExpressionEngine(); BuilderParameters xmlParams = @@ -229,7 +229,7 @@ public class TestMultiFileConfigurationB { BasicBuilderParameters params = createTestBuilderParameters(null); MultiFileConfigurationBuilder<XMLConfiguration> builder = - new MultiFileConfigurationBuilder<XMLConfiguration>( + new MultiFileConfigurationBuilder<>( XMLConfiguration.class, params.getParameters(), true); switchToConfig("unknown configuration ID"); XMLConfiguration config = builder.getConfiguration(); @@ -246,7 +246,7 @@ public class TestMultiFileConfigurationB new MultiFileBuilderParametersImpl() .setInterpolator(createInterpolator()); MultiFileConfigurationBuilder<XMLConfiguration> builder = - new MultiFileConfigurationBuilder<XMLConfiguration>( + new MultiFileConfigurationBuilder<>( XMLConfiguration.class, params.getParameters(), true); switchToConfig(1); builder.getConfiguration(); @@ -291,7 +291,7 @@ public class TestMultiFileConfigurationB public void testCaching() throws ConfigurationException { Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders = - new ArrayList<FileBasedConfigurationBuilder<XMLConfiguration>>(); + new ArrayList<>(); MultiFileConfigurationBuilder<XMLConfiguration> builder = createBuilderWithAccessToManagedBuilders(managedBuilders); switchToConfig(1); @@ -315,7 +315,7 @@ public class TestMultiFileConfigurationB public void testCachingWithReset() throws ConfigurationException { Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders = - new ArrayList<FileBasedConfigurationBuilder<XMLConfiguration>>(); + new ArrayList<>(); MultiFileConfigurationBuilder<XMLConfiguration> builder = createBuilderWithAccessToManagedBuilders(managedBuilders); switchToConfig(1); @@ -336,7 +336,7 @@ public class TestMultiFileConfigurationB BasicBuilderParameters params = new MultiFileBuilderParametersImpl().setFilePattern(PATTERN); MultiFileConfigurationBuilder<XMLConfiguration> builder = - new MultiFileConfigurationBuilder<XMLConfiguration>( + new MultiFileConfigurationBuilder<>( XMLConfiguration.class); builder.configure(params); ConfigurationInterpolator interpolator = builder.getInterpolator(); @@ -354,7 +354,7 @@ public class TestMultiFileConfigurationB { BuilderEventListenerImpl listener = new BuilderEventListenerImpl(); Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders = - new ArrayList<FileBasedConfigurationBuilder<XMLConfiguration>>(); + new ArrayList<>(); MultiFileConfigurationBuilder<XMLConfiguration> builder = createBuilderWithAccessToManagedBuilders(managedBuilders); switchToConfig(1); @@ -378,7 +378,7 @@ public class TestMultiFileConfigurationB { BuilderEventListenerImpl listener = new BuilderEventListenerImpl(); Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders = - new ArrayList<FileBasedConfigurationBuilder<XMLConfiguration>>(); + new ArrayList<>(); MultiFileConfigurationBuilder<XMLConfiguration> builder = createBuilderWithAccessToManagedBuilders(managedBuilders); switchToConfig(1); @@ -450,7 +450,7 @@ public class TestMultiFileConfigurationB ci.addDefaultLookup(new ConfigurationLookup(config)); params.setInterpolator(ci); MultiFileConfigurationBuilder<XMLConfiguration> builder = - new MultiFileConfigurationBuilder<XMLConfiguration>( + new MultiFileConfigurationBuilder<>( XMLConfiguration.class, null, true); builder.configure(params); BuilderConfigurationWrapperFactory wrapFactory = Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java Mon Apr 10 21:56:46 2017 @@ -64,7 +64,7 @@ public class TestMultiWrapDynaBean { params = new BasicBuilderParameters(); wrapBean = new WrappedBeanTestImpl(); - Collection<Object> beans = new ArrayList<Object>(); + Collection<Object> beans = new ArrayList<>(); beans.add(params); beans.add(wrapBean); if (withDynaBean) @@ -217,7 +217,7 @@ public class TestMultiWrapDynaBean @Test public void testOrderOfProperties() throws Exception { - Collection<Object> beans = new ArrayList<Object>(); + Collection<Object> beans = new ArrayList<>(); params = new BasicBuilderParameters(); beans.add(params); beans.add(new FileBasedBuilderParametersImpl()); @@ -245,7 +245,7 @@ public class TestMultiWrapDynaBean { /** Stores mapped properties. */ private final Map<String, String> mapProperties = - new HashMap<String, String>(); + new HashMap<>(); /** Stores indexed properties. */ private final int[] indexedValues = new int[8]; Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java Mon Apr 10 21:56:46 2017 @@ -63,7 +63,7 @@ public class TestReloadingCombinedConfig .getTestFile("testDigesterConfiguration.xml"); builder.configure(new CombinedBuilderParametersImpl() .setDefinitionBuilder( - new FileBasedConfigurationBuilder<XMLConfiguration>( + new FileBasedConfigurationBuilder<>( XMLConfiguration.class)) .setDefinitionBuilderParameters( new FileBasedBuilderParametersImpl().setFile(testFile))); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java Mon Apr 10 21:56:46 2017 @@ -332,7 +332,7 @@ public class TestReloadingCombinedConfig { File defFile = folder.newFile(); builder.configure(parameters.combined().setDefinitionBuilder( - new ReloadingFileBasedConfigurationBuilder<XMLConfiguration>( + new ReloadingFileBasedConfigurationBuilder<>( XMLConfiguration.class).configure(parameters.xml() .setReloadingRefreshDelay(0L).setFile(defFile)))); checkReloadDefinitionFile(defFile); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java Mon Apr 10 21:56:46 2017 @@ -57,7 +57,7 @@ public class TestReloadingMultiFileConfi createTestBuilderParameters(new XMLBuilderParametersImpl() .setExpressionEngine(engine)); ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder = - new ReloadingMultiFileConfigurationBuilder<XMLConfiguration>( + new ReloadingMultiFileConfigurationBuilder<>( XMLConfiguration.class, params.getParameters()); switchToConfig(1); XMLConfiguration config = builder.getConfiguration(); @@ -72,7 +72,7 @@ public class TestReloadingMultiFileConfi public void testCreateManagedBuilder() throws ConfigurationException { ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder = - new ReloadingMultiFileConfigurationBuilder<XMLConfiguration>( + new ReloadingMultiFileConfigurationBuilder<>( XMLConfiguration.class); FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder = builder.createManagedBuilder("test.xml", @@ -92,7 +92,7 @@ public class TestReloadingMultiFileConfi throws ConfigurationException { ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder = - new ReloadingMultiFileConfigurationBuilder<XMLConfiguration>( + new ReloadingMultiFileConfigurationBuilder<>( XMLConfiguration.class, null, true); FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder = builder.createManagedBuilder("test.xml", @@ -203,7 +203,7 @@ public class TestReloadingMultiFileConfi { super(XMLConfiguration.class, createTestBuilderParameters(null) .getParameters()); - reloadingControllers = new ArrayList<ReloadingController>(); + reloadingControllers = new ArrayList<>(); } /** Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java Mon Apr 10 21:56:46 2017 @@ -370,7 +370,7 @@ public class TestParameters { DefaultParametersManager manager = EasyMock.createMock(DefaultParametersManager.class); - final List<Object> initializedParams = new ArrayList<Object>(1); + final List<Object> initializedParams = new ArrayList<>(1); manager.initializeParameters(EasyMock .anyObject(BuilderParameters.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java Mon Apr 10 21:56:46 2017 @@ -158,7 +158,7 @@ public class TestDefaultConversionHandle @Test public void testToFromEmptyCollection() { - assertNull("Wrong result", handler.to(new ArrayList<Object>(), + assertNull("Wrong result", handler.to(new ArrayList<>(), Integer.class, createInterpolator())); } @@ -177,7 +177,7 @@ public class TestDefaultConversionHandle @Test public void testToCollectionNullInput() { - ArrayList<Integer> col = new ArrayList<Integer>(); + ArrayList<Integer> col = new ArrayList<>(); handler.toCollection(null, Integer.class, null, col); assertTrue("Got elements", col.isEmpty()); } @@ -200,7 +200,7 @@ public class TestDefaultConversionHandle Object[] src = new Object[] { VAR, "100" }; - List<Integer> col = new ArrayList<Integer>(src.length); + List<Integer> col = new ArrayList<>(src.length); handler.toCollection(src, Integer.class, createInterpolator(), col); assertEquals("Wrong number of elements", src.length, col.size()); assertEquals("Wrong element (1)", Integer.parseInt(REPLACEMENT), col @@ -216,7 +216,7 @@ public class TestDefaultConversionHandle @Test public void testToCollectionEmptyString() { - List<Integer> col = new ArrayList<Integer>(1); + List<Integer> col = new ArrayList<>(1); handler.toCollection("", Integer.class, null, col); assertTrue("Got elements", col.isEmpty()); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDisabledListDelimiterHandler.java Mon Apr 10 21:56:46 2017 @@ -211,7 +211,7 @@ public class TestDisabledListDelimiterHa @Test public void testFlattenCollectionWithArrayWithLimit() { - Collection<Object> src = new ArrayList<Object>(2); + Collection<Object> src = new ArrayList<>(2); src.add(STR_VALUE); src.add(VALUES); Collection<?> res = handler.flatten(src, 2); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java Mon Apr 10 21:56:46 2017 @@ -49,7 +49,7 @@ public abstract class AbstractEventListe protected AbstractEventListenerTestImpl(Object source) { expectedSource = source; - events = new LinkedList<T>(); + events = new LinkedList<>(); } @Override Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestConfigurationEventTypes.java Mon Apr 10 21:56:46 2017 @@ -68,7 +68,7 @@ public class TestConfigurationEventTypes Set<EventType<?>> superTypes = EventType.fetchSuperEventTypes(ConfigurationEvent.ADD_NODES); List<EventType<? extends Event>> expected = - new LinkedList<EventType<? extends Event>>(); + new LinkedList<>(); expected.add(ConfigurationEvent.ADD_NODES); expected.add(ConfigurationEvent.ANY_HIERARCHICAL); expected.add(ConfigurationEvent.ANY); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java Mon Apr 10 21:56:46 2017 @@ -58,9 +58,9 @@ public class TestEventListenerList @BeforeClass public static void setUpBeforeClass() throws Exception { - typeBase = new EventType<EventBase>(Event.ANY, "BASE"); - typeSub1 = new EventType<EventSub1>(typeBase, "SUB1"); - typeSub2 = new EventType<EventSub2>(typeBase, "SUB2"); + typeBase = new EventType<>(Event.ANY, "BASE"); + typeSub1 = new EventType<>(typeBase, "SUB1"); + typeSub2 = new EventType<>(typeBase, "SUB2"); } @Before @@ -178,7 +178,7 @@ public class TestEventListenerList { ListenerTestImpl listener = new ListenerTestImpl(); EventListenerRegistrationData<EventSub1> regData = - new EventListenerRegistrationData<EventSub1>(typeSub1, listener); + new EventListenerRegistrationData<>(typeSub1, listener); list.addEventListener(regData); list.fire(new EventSub1(this, typeSub1, MESSAGE)); @@ -286,7 +286,7 @@ public class TestEventListenerList */ private static <T> List<T> fetchElements(Iterable<? extends T> iterable) { - List<T> elems = new LinkedList<T>(); + List<T> elems = new LinkedList<>(); for (T listener : iterable) { elems.add(listener); @@ -433,10 +433,10 @@ public class TestEventListenerList public void testGetRegistrations() { EventListenerRegistrationData<EventSub1> reg1 = - new EventListenerRegistrationData<EventSub1>(typeSub1, + new EventListenerRegistrationData<>(typeSub1, new ListenerTestImpl()); EventListenerRegistrationData<EventSub2> reg2 = - new EventListenerRegistrationData<EventSub2>(typeSub2, + new EventListenerRegistrationData<>(typeSub2, new ListenerTestImpl()); list.addEventListener(reg1); list.addEventListener(reg2); @@ -455,7 +455,7 @@ public class TestEventListenerList public void testGetRegistrationsModify() { list.getRegistrations().add( - new EventListenerRegistrationData<EventBase>(typeBase, + new EventListenerRegistrationData<>(typeBase, new ListenerTestImpl())); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestEventType.java Mon Apr 10 21:56:46 2017 @@ -34,7 +34,7 @@ public class TestEventType @Before public void setUp() throws Exception { - eventType = new EventType<Event>(null, "TEST"); + eventType = new EventType<>(null, "TEST"); } /** Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/event/TestHierarchicalConfigurationEvents.java Mon Apr 10 21:56:46 2017 @@ -71,7 +71,7 @@ public class TestHierarchicalConfigurati public void testAddNodesEvent() { BaseHierarchicalConfiguration hc = (BaseHierarchicalConfiguration) config; - Collection<ImmutableNode> nodes = new ArrayList<ImmutableNode>(1); + Collection<ImmutableNode> nodes = new ArrayList<>(1); nodes.add(NodeStructureHelper.createNode("a_key", TEST_PROPVALUE)); hc.addNodes(TEST_PROPNAME, nodes); listener.checkEvent(ConfigurationEvent.ADD_NODES, TEST_PROPNAME, Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java Mon Apr 10 21:56:46 2017 @@ -290,7 +290,7 @@ public class TestConfigurationInterpolat { Lookup l1 = setUpTestLookup(); Lookup l2 = setUpTestLookup("someVar", "someValue"); - Map<String, Lookup> lookups = new HashMap<String, Lookup>(); + Map<String, Lookup> lookups = new HashMap<>(); lookups.put(TEST_PREFIX, l1); String prefix2 = TEST_PREFIX + "_other"; lookups.put(prefix2, l2); @@ -328,7 +328,7 @@ public class TestConfigurationInterpolat @Test public void testAddDefaultLookups() { - List<Lookup> lookups = new ArrayList<Lookup>(); + List<Lookup> lookups = new ArrayList<>(); lookups.add(setUpTestLookup()); lookups.add(setUpTestLookup("test", "value")); interpolator.addDefaultLookups(lookups); @@ -367,7 +367,7 @@ public class TestConfigurationInterpolat @Test public void testRemoveDefaultLookup() { - List<Lookup> lookups = new ArrayList<Lookup>(); + List<Lookup> lookups = new ArrayList<>(); lookups.add(setUpTestLookup()); lookups.add(setUpTestLookup("test", "value")); interpolator.addDefaultLookups(lookups); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestInterpolatorSpecification.java Mon Apr 10 21:56:46 2017 @@ -149,7 +149,7 @@ public class TestInterpolatorSpecificati Lookup prefLook2 = createLookup(); Lookup defLook1 = createLookup(); Lookup defLook2 = createLookup(); - Map<String, Lookup> prefixLookups = new HashMap<String, Lookup>(); + Map<String, Lookup> prefixLookups = new HashMap<>(); prefixLookups.put(PREFIX1, prefLook1); prefixLookups.put(PREFIX2, prefLook2); InterpolatorSpecification spec = Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestCombinedLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestCombinedLocationStrategy.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestCombinedLocationStrategy.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestCombinedLocationStrategy.java Mon Apr 10 21:56:46 2017 @@ -154,7 +154,7 @@ public class TestCombinedLocationStrateg public void testInitCollectionWithNullEntries() { Collection<FileLocationStrategy> col = - new LinkedList<FileLocationStrategy>( + new LinkedList<>( Arrays.asList(getSubStrategies())); col.add(null); new CombinedLocationStrategy(col); @@ -168,7 +168,7 @@ public class TestCombinedLocationStrateg public void testInitDefensiveCopy() { Collection<FileLocationStrategy> col = - new LinkedList<FileLocationStrategy>( + new LinkedList<>( Arrays.asList(getSubStrategies())); CombinedLocationStrategy strategy = new CombinedLocationStrategy(col); col.add(EasyMock.createMock(FileLocationStrategy.class)); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java Mon Apr 10 21:56:46 2017 @@ -1526,7 +1526,7 @@ public class TestFileHandler FileLocatorUtils.fileLocator().fileName(TEST_FILENAME) .basePath("someBasePath").encoding("someEncoding") .create(); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); FileLocatorUtils.put(locator, map); FileHandler handler = FileHandler.fromMap(map); assertEquals("Wrong locator", locator, handler.getFileLocator()); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java Mon Apr 10 21:56:46 2017 @@ -576,7 +576,7 @@ public class TestFileLocatorUtils .encoding(ENCODING).fileName(FILE_NAME) .fileSystem(fileSystem).locationStrategy(strategy) .sourceURL(sourceURL).create(); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); FileLocatorUtils.put(locator, map); FileLocator locator2 = FileLocatorUtils.fromMap(map); assertEquals("Different locators", locator, locator2); @@ -588,7 +588,7 @@ public class TestFileLocatorUtils @Test public void testPutNoLocator() { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); FileLocatorUtils.put(null, map); assertTrue("Got properties", map.isEmpty()); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestCombinedReloadingController.java Mon Apr 10 21:56:46 2017 @@ -75,7 +75,7 @@ public class TestCombinedReloadingContro { initSubControllers(); List<ReloadingController> lstCtrls = - new ArrayList<ReloadingController>( + new ArrayList<>( Arrays.asList(subControllers)); CombinedReloadingController result = new CombinedReloadingController(lstCtrls); @@ -101,7 +101,7 @@ public class TestCombinedReloadingContro { initSubControllers(); Collection<ReloadingController> ctrls = - new ArrayList<ReloadingController>( + new ArrayList<>( Arrays.asList(subControllers)); ctrls.add(null); new CombinedReloadingController(ctrls); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java Mon Apr 10 21:56:46 2017 @@ -134,7 +134,7 @@ public class TestPeriodicReloadingTrigge public void testStart() { final ScheduledFuture<Void> future = createFutureMock(); - final MutableObject<Runnable> refTask = new MutableObject<Runnable>(); + final MutableObject<Runnable> refTask = new MutableObject<>(); expectSchedule(null); EasyMock.expectLastCall().andAnswer( new IAnswer<ScheduledFuture<Void>>() Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java Mon Apr 10 21:56:46 2017 @@ -117,7 +117,7 @@ public class TestReloadingController { EventListener<ReloadingEvent> l = createListenerMock(); EventListener<ReloadingEvent> lRemoved = createListenerMock(); - MutableObject<ReloadingEvent> evRef = new MutableObject<ReloadingEvent>(); + MutableObject<ReloadingEvent> evRef = new MutableObject<>(); expectEvent(l, evRef); EasyMock.expect(detector.isReloadingRequired()).andReturn(Boolean.TRUE); EasyMock.replay(detector, l, lRemoved); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandlerTest.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandlerTest.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandlerTest.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandlerTest.java Mon Apr 10 21:56:46 2017 @@ -162,7 +162,7 @@ public abstract class AbstractImmutableN NodeHandler<ImmutableNode> handler = createHandler(ROOT_PERSONAE_TREE); String name = "Achilles"; Set<ImmutableNode> children = - new HashSet<ImmutableNode>(handler.getChildren( + new HashSet<>(handler.getChildren( ROOT_PERSONAE_TREE, name)); assertEquals("Wrong number of children", 3, children.size()); for (ImmutableNode c : children) @@ -369,7 +369,7 @@ public abstract class AbstractImmutableN final ImmutableNode target = NodeStructureHelper.nodeForKey(ROOT_AUTHORS_TREE, NodeStructureHelper.author(1)); - final Set<String> encounteredAuthors = new HashSet<String>(); + final Set<String> encounteredAuthors = new HashSet<>(); NodeMatcher<ImmutableNode> matcher = new NodeMatcher<ImmutableNode>() { Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestImmutableNode.java Mon Apr 10 21:56:46 2017 @@ -137,7 +137,7 @@ public class TestImmutableNode public void testNodeWithChildren() { final int childCount = 8; - List<ImmutableNode> childNodes = new ArrayList<ImmutableNode>(childCount); + List<ImmutableNode> childNodes = new ArrayList<>(childCount); ImmutableNode.Builder builder = new ImmutableNode.Builder(childCount); for (int i = 0; i < childCount; i++) { @@ -158,7 +158,7 @@ public class TestImmutableNode { final int childCount = 4; List<ImmutableNode> childNodes = - new ArrayList<ImmutableNode>(childCount); + new ArrayList<>(childCount); for (int i = 0; i < childCount; i++) { ImmutableNode.Builder childBuilder = new ImmutableNode.Builder(); @@ -231,7 +231,7 @@ public class TestImmutableNode { ImmutableNode.Builder builder = setUpBuilder(); final int attrCount = 4; - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); for (int i = 0; i < attrCount; i++) { String attrName = NAME + i; @@ -284,7 +284,7 @@ public class TestImmutableNode { ImmutableNode.Builder builder = setUpBuilder(); final int attrCount = 4; - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); for (int i = 0; i < attrCount; i++) { String attrName = NAME + i; @@ -496,7 +496,7 @@ public class TestImmutableNode checkUpdatedNode(node, node2); assertSame("Wrong children", node.getChildren(), node2.getChildren()); Map<String, Object> newAttrs = - new HashMap<String, Object>(node.getAttributes()); + new HashMap<>(node.getAttributes()); newAttrs.put(ATTR, ATTR_VALUE); checkAttributes(node2, newAttrs); } @@ -509,7 +509,7 @@ public class TestImmutableNode { ImmutableNode.Builder builder = setUpBuilder(); final String attr2 = ATTR + "_other"; - Map<String, Object> attrs = new HashMap<String, Object>(); + Map<String, Object> attrs = new HashMap<>(); attrs.put(ATTR, ATTR_VALUE); attrs.put(attr2, "someValue"); ImmutableNode node = builder.addAttributes(attrs).create(); @@ -525,7 +525,7 @@ public class TestImmutableNode public void testSetAttributes() { ImmutableNode node = createDefaultNode(VALUE); - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); attributes.put("newAttribute1", "value1"); attributes.put("newAttribute2", "value2"); ImmutableNode node2 = node.setAttributes(attributes); @@ -614,7 +614,7 @@ public class TestImmutableNode { final int childCount = 8; Collection<ImmutableNode> newChildren = - new ArrayList<ImmutableNode>(childCount); + new ArrayList<>(childCount); for (int i = 0; i < childCount; i++) { newChildren.add(createChild()); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java Mon Apr 10 21:56:46 2017 @@ -115,7 +115,7 @@ public class TestInMemoryNodeModel { NodeKeyResolver<ImmutableNode> resolver = createResolver(); NodeAddData<ImmutableNode> addData = - new NodeAddData<ImmutableNode>(nodeForKey(ROOT_AUTHORS_TREE, + new NodeAddData<>(nodeForKey(ROOT_AUTHORS_TREE, "Homer/Ilias"), "location", false, Collections.singleton("locations")); InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); @@ -152,7 +152,7 @@ public class TestInMemoryNodeModel { NodeKeyResolver<ImmutableNode> resolver = createResolver(); NodeAddData<ImmutableNode> addData = - new NodeAddData<ImmutableNode>(nodeForKey(ROOT_AUTHORS_TREE, + new NodeAddData<>(nodeForKey(ROOT_AUTHORS_TREE, "Homer"), "work", false, null); InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); EasyMock.expect( @@ -176,7 +176,7 @@ public class TestInMemoryNodeModel { NodeKeyResolver<ImmutableNode> resolver = createResolver(); NodeAddData<ImmutableNode> addData = - new NodeAddData<ImmutableNode>(nodeForKey(ROOT_AUTHORS_TREE, + new NodeAddData<>(nodeForKey(ROOT_AUTHORS_TREE, "Homer/Ilias"), "location", false, Collections.singleton("locations")); InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); @@ -226,7 +226,7 @@ public class TestInMemoryNodeModel { NodeKeyResolver<ImmutableNode> resolver = createResolver(); NodeAddData<ImmutableNode> addData = - new NodeAddData<ImmutableNode>(nodeForKey(ROOT_AUTHORS_TREE, + new NodeAddData<>(nodeForKey(ROOT_AUTHORS_TREE, "Homer/Ilias"), "number", true, Arrays.asList("scenes", "scene")); InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); @@ -249,7 +249,7 @@ public class TestInMemoryNodeModel { NodeKeyResolver<ImmutableNode> resolver = createResolver(); NodeAddData<ImmutableNode> addData = - new NodeAddData<ImmutableNode>(nodeForKey(ROOT_AUTHORS_TREE, + new NodeAddData<>(nodeForKey(ROOT_AUTHORS_TREE, NodeStructureHelper.author(0)), "year", true, Arrays.asList("dateOfBirth")); InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); @@ -274,7 +274,7 @@ public class TestInMemoryNodeModel { NodeKeyResolver<ImmutableNode> resolver = createResolver(); NodeAddData<ImmutableNode> addData = - new NodeAddData<ImmutableNode>(nodeForKey(ROOT_AUTHORS_TREE, + new NodeAddData<>(nodeForKey(ROOT_AUTHORS_TREE, "Shakespeare/The Tempest"), "year", true, null); InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); EasyMock.expect( @@ -425,7 +425,7 @@ public class TestInMemoryNodeModel InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); ImmutableNode node = nodeForKey(model, "Homer/Ilias"); List<QueryResult<ImmutableNode>> results = - new ArrayList<QueryResult<ImmutableNode>>(node.getChildren() + new ArrayList<>(node.getChildren() .size()); for (ImmutableNode child : node.getChildren()) { @@ -508,7 +508,7 @@ public class TestInMemoryNodeModel final String nodeName = "Puck"; ImmutableNode orgNode = nodeForKey(model, nodeName); List<QueryResult<ImmutableNode>> results = - new ArrayList<QueryResult<ImmutableNode>>(2); + new ArrayList<>(2); results.add(QueryResult.createAttributeResult(orgNode, NodeStructureHelper.ATTR_AUTHOR)); results.add(QueryResult.createNodeResult(orgNode.getChildren().get(0))); @@ -572,7 +572,7 @@ public class TestInMemoryNodeModel NodeKeyResolver<ImmutableNode> resolver = createResolver(); InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); List<QueryResult<ImmutableNode>> results = - new ArrayList<QueryResult<ImmutableNode>>(2); + new ArrayList<>(2); results.add(QueryResult.createNodeResult(nodeForKey(model, NodeStructureHelper.author(0)))); results.add(QueryResult.createNodeResult(ROOT_AUTHORS_TREE)); @@ -612,7 +612,7 @@ public class TestInMemoryNodeModel assertSame("Wrong root node", model.getRootNode(), EasyMock.getCurrentArguments()[0]); ImmutableNode addParent = nodeForKey(model, key); - return new NodeAddData<ImmutableNode>(addParent, + return new NodeAddData<>(addParent, "Warrior" + index, false, null); } }); @@ -654,7 +654,7 @@ public class TestInMemoryNodeModel { ImmutableNode addParent = (ImmutableNode) EasyMock.getCurrentArguments()[0]; - return new NodeAddData<ImmutableNode>(addParent, + return new NodeAddData<>(addParent, "name", false, Collections.singleton("author")); } }).anyTimes(); @@ -694,7 +694,7 @@ public class TestInMemoryNodeModel Pattern patternAuthorName = Pattern.compile(Pattern.quote(authorPrefix) + "(\\d+)"); - Set<Integer> indices = new HashSet<Integer>(); + Set<Integer> indices = new HashSet<>(); for (int i = 0; i < threadCount; i++) { ImmutableNode node = nodeForKey(model, "author(" + i + ")/name"); @@ -785,10 +785,10 @@ public class TestInMemoryNodeModel { NodeKeyResolver<ImmutableNode> resolver = createResolver(); NodeAddData<ImmutableNode> addData = - new NodeAddData<ImmutableNode>(nodeForKey(ROOT_AUTHORS_TREE, + new NodeAddData<>(nodeForKey(ROOT_AUTHORS_TREE, "Homer"), "work", false, null); NodeUpdateData<ImmutableNode> updateData = - new NodeUpdateData<ImmutableNode>(null, + new NodeUpdateData<>(null, Collections.<Object> singleton("Odyssee"), null, KEY); InMemoryNodeModel model = new InMemoryNodeModel(ROOT_AUTHORS_TREE); EasyMock.expect( @@ -818,7 +818,7 @@ public class TestInMemoryNodeModel final String nodeKey = "Ariel/The Tempest/" + NodeStructureHelper.ELEM_ORG_VALUE; NodeUpdateData<ImmutableNode> updateData = - new NodeUpdateData<ImmutableNode>(null, null, + new NodeUpdateData<>(null, null, Collections.singletonList(QueryResult .createNodeResult(nodeForKey(model, nodeKey))), null); @@ -845,14 +845,14 @@ public class TestInMemoryNodeModel final String nodeKey = "Ariel/The Tempest/" + NodeStructureHelper.ELEM_ORG_VALUE; Map<QueryResult<ImmutableNode>, Object> changedValues = - new HashMap<QueryResult<ImmutableNode>, Object>(); + new HashMap<>(); final String newValue = "of course"; ImmutableNode changedNode = nodeForKey(model, nodeKey); changedValues.put(QueryResult.createAttributeResult(changedNode, NodeStructureHelper.ATTR_TESTED), newValue); changedValues.put(QueryResult.createNodeResult(changedNode), newValue); NodeUpdateData<ImmutableNode> updateData = - new NodeUpdateData<ImmutableNode>(changedValues, null, null, + new NodeUpdateData<>(changedValues, null, null, null); EasyMock.expect( resolver.resolveUpdateKey( @@ -938,7 +938,7 @@ public class TestInMemoryNodeModel EasyMock.expect( resolver.resolveAddKey(NodeStructureHelper.ROOT_AUTHORS_TREE, KEY, model.getNodeHandler())).andReturn( - new NodeAddData<ImmutableNode>( + new NodeAddData<>( NodeStructureHelper.ROOT_AUTHORS_TREE, newWork, false, Arrays.asList(newAuthor))); EasyMock.replay(resolver); @@ -988,7 +988,7 @@ public class TestInMemoryNodeModel EasyMock.expect( resolver.resolveAddKey(NodeStructureHelper.ROOT_AUTHORS_TREE, KEY, model.getNodeHandler())).andReturn( - new NodeAddData<ImmutableNode>( + new NodeAddData<>( NodeStructureHelper.ROOT_AUTHORS_TREE, "test", true, null)); EasyMock.replay(resolver); Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelReferences.java Mon Apr 10 21:56:46 2017 @@ -73,7 +73,7 @@ public class TestInMemoryNodeModelRefere Collection<ImmutableNode> nodes = collectNodes(NodeStructureHelper.ROOT_AUTHORS_TREE); nodes.remove(NodeStructureHelper.ROOT_AUTHORS_TREE); - Map<ImmutableNode, String> refs = new HashMap<ImmutableNode, String>(); + Map<ImmutableNode, String> refs = new HashMap<>(); for (ImmutableNode node : nodes) { refs.put(node, node.getNodeName()); @@ -90,7 +90,7 @@ public class TestInMemoryNodeModelRefere */ private Collection<ImmutableNode> collectNodes(ImmutableNode root) { - final Set<ImmutableNode> nodes = new HashSet<ImmutableNode>(); + final Set<ImmutableNode> nodes = new HashSet<>(); NodeTreeWalker.INSTANCE.walkBFS(root, new ConfigurationNodeVisitorAdapter<ImmutableNode>() { Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java Mon Apr 10 21:56:46 2017 @@ -360,8 +360,8 @@ public class TestInMemoryNodeModelTracke assertEquals("Field not removed", NodeStructureHelper.fieldsLength(1) - 1, nodeFields .getChildren().size()); - Set<String> expectedNames = new HashSet<String>(); - Set<String> actualNames = new HashSet<String>(); + Set<String> expectedNames = new HashSet<>(); + Set<String> actualNames = new HashSet<>(); for (int i = 0; i < NodeStructureHelper.fieldsLength(1); i++) { if (idx != i) @@ -563,7 +563,7 @@ public class TestInMemoryNodeModelTracke key, handler); assertEquals("Wrong number of query results", 1, results.size()); - return new NodeUpdateData<ImmutableNode>(Collections + return new NodeUpdateData<>(Collections .singletonMap(results.get(0), EasyMock.getCurrentArguments()[2]), null, null, null); @@ -737,7 +737,7 @@ public class TestInMemoryNodeModelTracke private void expectNodeKey(NodeKeyResolver<ImmutableNode> resolver, ImmutableNode node, String key) { - Map<ImmutableNode, String> cache = new HashMap<ImmutableNode, String>(); + Map<ImmutableNode, String> cache = new HashMap<>(); EasyMock.expect(resolver.nodeKey(node, cache, model.getNodeHandler())) .andReturn(key); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeAddData.java Mon Apr 10 21:56:46 2017 @@ -55,7 +55,7 @@ public class TestNodeAddData public void testPathNodesNull() { NodeAddData<ImmutableNode> data = - new NodeAddData<ImmutableNode>(parentNode, TEST_NODENAME, + new NodeAddData<>(parentNode, TEST_NODENAME, false, null); assertTrue("Got path nodes", data.getPathNodes().isEmpty()); } @@ -68,7 +68,7 @@ public class TestNodeAddData public void testPathNodesNullModify() { NodeAddData<ImmutableNode> data = - new NodeAddData<ImmutableNode>(parentNode, TEST_NODENAME, + new NodeAddData<>(parentNode, TEST_NODENAME, false, null); data.getPathNodes().add("test"); } @@ -80,10 +80,10 @@ public class TestNodeAddData @Test public void testInitPathNodesDefensiveCopy() { - List<String> pathNodes = new ArrayList<String>(); + List<String> pathNodes = new ArrayList<>(); pathNodes.add(PATH_NODE_NAME); NodeAddData<ImmutableNode> data = - new NodeAddData<ImmutableNode>(parentNode, TEST_NODENAME, + new NodeAddData<>(parentNode, TEST_NODENAME, false, pathNodes); pathNodes.add("anotherNode"); assertEquals("Wrong number of path nodes", 1, data.getPathNodes() @@ -100,7 +100,7 @@ public class TestNodeAddData public void testPathNodesDefinedModify() { NodeAddData<ImmutableNode> data = - new NodeAddData<ImmutableNode>(parentNode, TEST_NODENAME, + new NodeAddData<>(parentNode, TEST_NODENAME, false, Collections.singleton(PATH_NODE_NAME)); data.getPathNodes().add("anotherNode"); } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java Mon Apr 10 21:56:46 2017 @@ -116,7 +116,7 @@ public class TestNodeSelector NodeKeyResolver<ImmutableNode> resolverMock = NodeStructureHelper.createResolverMock(); List<QueryResult<ImmutableNode>> results = - new LinkedList<QueryResult<ImmutableNode>>(); + new LinkedList<>(); results.add(QueryResult.createAttributeResult( NodeStructureHelper.nodeForKey(root, "tables/table(0)"), "type")); ImmutableNode target = Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java Mon Apr 10 21:56:46 2017 @@ -131,7 +131,7 @@ public class TestNodeTreeWalker */ private List<String> expectDFS() { - List<String> expected = new LinkedList<String>(); + List<String> expected = new LinkedList<>(); expected.add(NodeStructureHelper.ROOT_AUTHORS_TREE.getNodeName()); for (int authorIdx = 0; authorIdx < NodeStructureHelper.authorsLength(); authorIdx++) { @@ -206,9 +206,9 @@ public class TestNodeTreeWalker */ private List<String> expectBFS() { - List<String> expected = new LinkedList<String>(); - List<String> works = new LinkedList<String>(); - List<String> personae = new LinkedList<String>(); + List<String> expected = new LinkedList<>(); + List<String> works = new LinkedList<>(); + List<String> personae = new LinkedList<>(); expected.add(NodeStructureHelper.ROOT_AUTHORS_TREE.getNodeName()); for (int authorIdx = 0; authorIdx < NodeStructureHelper.authorsLength(); authorIdx++) { @@ -255,7 +255,7 @@ public class TestNodeTreeWalker ConfigurationNodeVisitor<ImmutableNode> { /** A list with the names of the visited nodes. */ - private final List<String> visitedNodes = new LinkedList<String>(); + private final List<String> visitedNodes = new LinkedList<>(); /** The maximum number of nodes to be visited. */ private int maxNodeCount = Integer.MAX_VALUE; Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/TestNodeUpdateData.java Mon Apr 10 21:56:46 2017 @@ -41,7 +41,7 @@ public class TestNodeUpdateData public void testInitNoData() { NodeUpdateData<Object> data = - new NodeUpdateData<Object>(null, null, null, null); + new NodeUpdateData<>(null, null, null, null); assertTrue("Got changed values", data.getChangedValues().isEmpty()); assertTrue("Got new values", data.getNewValues().isEmpty()); assertTrue("Got removed nodes", data.getRemovedNodes().isEmpty()); @@ -65,10 +65,10 @@ public class TestNodeUpdateData public void testInitChangedValuesDefensiveCopy() { Map<QueryResult<Object>, Object> map = - new HashMap<QueryResult<Object>, Object>(); + new HashMap<>(); map.put(result("test"), "value"); NodeUpdateData<Object> data = - new NodeUpdateData<Object>(map, null, null, null); + new NodeUpdateData<>(map, null, null, null); map.put(result("anotherTest"), "anotherValue"); Map<QueryResult<Object>, Object> changedValues = data.getChangedValues(); @@ -83,10 +83,10 @@ public class TestNodeUpdateData @Test public void testInitNewValuesDefensiveCopy() { - Collection<Object> col = new LinkedList<Object>(); + Collection<Object> col = new LinkedList<>(); col.add(42); NodeUpdateData<Object> data = - new NodeUpdateData<Object>(null, col, null, null); + new NodeUpdateData<>(null, col, null, null); col.add("anotherValue"); Collection<Object> newValues = data.getNewValues(); assertEquals("Wrong number of new values", 1, newValues.size()); @@ -100,10 +100,10 @@ public class TestNodeUpdateData public void testInitRemovedNodesDefensiveCopy() { Collection<QueryResult<Object>> col = - new LinkedList<QueryResult<Object>>(); + new LinkedList<>(); col.add(result("n1")); NodeUpdateData<Object> data = - new NodeUpdateData<Object>(null, null, col, null); + new NodeUpdateData<>(null, null, col, null); col.add(result("n2")); Collection<QueryResult<Object>> removedNodes = data.getRemovedNodes(); assertEquals("Wrong number of new values", 1, removedNodes.size()); @@ -118,10 +118,10 @@ public class TestNodeUpdateData public void testGetChangedValuesModify() { Map<QueryResult<Object>, Object> map = - new HashMap<QueryResult<Object>, Object>(); + new HashMap<>(); map.put(result("n1"), 42); NodeUpdateData<Object> data = - new NodeUpdateData<Object>(map, null, null, null); + new NodeUpdateData<>(map, null, null, null); data.getChangedValues().put(result("n2"), 43); } @@ -131,10 +131,10 @@ public class TestNodeUpdateData @Test(expected = UnsupportedOperationException.class) public void testGetNewValuesModify() { - Collection<Object> col = new LinkedList<Object>(); + Collection<Object> col = new LinkedList<>(); col.add(42); NodeUpdateData<Object> data = - new NodeUpdateData<Object>(null, col, null, null); + new NodeUpdateData<>(null, col, null, null); data.getNewValues().add(43); } @@ -145,10 +145,10 @@ public class TestNodeUpdateData public void testGetRemovedNodesModify() { Collection<QueryResult<Object>> col = - new LinkedList<QueryResult<Object>>(); + new LinkedList<>(); col.add(result("n1")); NodeUpdateData<Object> data = - new NodeUpdateData<Object>(null, null, col, null); + new NodeUpdateData<>(null, null, col, null); data.getRemovedNodes().add(result("newNode")); } } Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java?rev=1790899&r1=1790898&r2=1790899&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java Mon Apr 10 21:56:46 2017 @@ -127,7 +127,7 @@ public abstract class AbstractXPathTest */ protected List<NodePointer> iterationElements(NodeIterator iterator) { - List<NodePointer> result = new ArrayList<NodePointer>(); + List<NodePointer> result = new ArrayList<>(); for (int pos = 1; iterator.setPosition(pos); pos++) { result.add(iterator.getNodePointer());
