Java 7 diamonds in tests Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/3cf36b8c Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/3cf36b8c Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/3cf36b8c
Branch: refs/heads/master Commit: 3cf36b8cacd27557e0af0695c2c827f82d29d6e4 Parents: d7651dc Author: twogee <g.grigelio...@gmail.com> Authored: Tue Jun 13 21:23:23 2017 +0200 Committer: twogee <g.grigelio...@gmail.com> Committed: Tue Jun 13 21:23:23 2017 +0200 ---------------------------------------------------------------------- test/java/org/apache/ivy/TestFixture.java | 2 +- test/java/org/apache/ivy/TestHelper.java | 4 +- .../core/module/descriptor/IvyMakePomTest.java | 2 +- .../ivy/core/publish/PublishEventsTest.java | 2 +- .../ivy/core/report/ResolveReportTest.java | 4 +- .../apache/ivy/core/resolve/ResolveTest.java | 116 +++++++++---------- .../org/apache/ivy/core/search/SearchTest.java | 14 +-- .../java/org/apache/ivy/core/sort/SortTest.java | 2 +- .../ivy/osgi/core/ManifestParserTest.java | 4 +- .../apache/ivy/osgi/obr/OBRResolverTest.java | 6 +- .../apache/ivy/osgi/obr/OBRXMLWriterTest.java | 2 +- .../plugins/repository/vfs/VfsResourceTest.java | 4 +- .../plugins/repository/vfs/VfsTestHelper.java | 2 +- .../org/apache/ivy/util/ConfiguratorTest.java | 10 +- .../org/apache/ivy/util/MockMessageLogger.java | 6 +- 15 files changed, 90 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/TestFixture.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/TestFixture.java b/test/java/org/apache/ivy/TestFixture.java index b47b626..7886ead 100644 --- a/test/java/org/apache/ivy/TestFixture.java +++ b/test/java/org/apache/ivy/TestFixture.java @@ -65,7 +65,7 @@ import org.apache.ivy.plugins.resolver.util.ResolvedResource; */ public class TestFixture { - private final Collection<ModuleDescriptor> mds = new ArrayList<ModuleDescriptor>(); + private final Collection<ModuleDescriptor> mds = new ArrayList<>(); private Ivy ivy; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/TestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java index c260f5a..20fdfc3 100644 --- a/test/java/org/apache/ivy/TestHelper.java +++ b/test/java/org/apache/ivy/TestHelper.java @@ -108,7 +108,7 @@ public class TestHelper { * @return a collection of {@link ModuleRevisionId} */ public static Collection<ModuleRevisionId> parseMrids(String mrids) { - Collection<ModuleRevisionId> c = new LinkedHashSet<ModuleRevisionId>(); + Collection<ModuleRevisionId> c = new LinkedHashSet<>(); for (String s : mrids.split(",?\\s+")) { c.add(ModuleRevisionId.parse(s)); } @@ -201,7 +201,7 @@ public class TestHelper { * @return the collection of module descriptors parsed */ public static Collection<ModuleDescriptor> parseMicroIvyDescriptors(String microIvy) { - Collection<ModuleDescriptor> r = new ArrayList<ModuleDescriptor>(); + Collection<ModuleDescriptor> r = new ArrayList<>(); for (String md : microIvy.split("\\s*;;\\s*")) { r.add(parseMicroIvyDescriptor(md)); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java index d962e8d..8b4ba44 100644 --- a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java +++ b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java @@ -77,7 +77,7 @@ public class IvyMakePomTest { assertNotNull("Dependencies element wasn't found in the generated POM file", dependencies); assertEquals("Unexpected number of dependencies in the generated POM file", 2, dependencies.getLength()); - final Set<String> expectedPomArtifactIds = new HashSet<String>(); + final Set<String> expectedPomArtifactIds = new HashSet<>(); expectedPomArtifactIds.add("foo"); expectedPomArtifactIds.add("bar"); for (int i = 0; i < dependencies.getLength(); i++) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/core/publish/PublishEventsTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java index 13937c6..704a1fc 100644 --- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java +++ b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java @@ -124,7 +124,7 @@ public class PublishEventsTest { assertEquals("sanity check", "foo", dataArtifact.getName()); ivyArtifact = MDArtifact.newIvyArtifact(publishModule); - expectedPublications = new HashMap<ArtifactRevisionId, PublishTestCase>(); + expectedPublications = new HashMap<>(); expectedPublications.put(dataArtifact.getId(), new PublishTestCase(dataArtifact, dataFile, true)); expectedPublications.put(ivyArtifact.getId(), new PublishTestCase(ivyArtifact, ivyFile, http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/core/report/ResolveReportTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/report/ResolveReportTest.java b/test/java/org/apache/ivy/core/report/ResolveReportTest.java index 8890c75..d01d206 100644 --- a/test/java/org/apache/ivy/core/report/ResolveReportTest.java +++ b/test/java/org/apache/ivy/core/report/ResolveReportTest.java @@ -86,8 +86,8 @@ public class ResolveReportTest { String rev, String conf, String[] targetConfs) { assertEquals(ModuleRevisionId.newInstance(org, mod, rev), dep.getDependencyRevisionId()); assertTrue(Arrays.asList(dep.getModuleConfigurations()).contains(conf)); - assertEquals(new HashSet<String>(Arrays.asList(targetConfs)), - new HashSet<String>(Arrays.asList(dep.getDependencyConfigurations(conf)))); + assertEquals(new HashSet<>(Arrays.asList(targetConfs)), + new HashSet<>(Arrays.asList(dep.getDependencyConfigurations(conf)))); } @Test http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/core/resolve/ResolveTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/resolve/ResolveTest.java b/test/java/org/apache/ivy/core/resolve/ResolveTest.java index c274129..1bddd54 100644 --- a/test/java/org/apache/ivy/core/resolve/ResolveTest.java +++ b/test/java/org/apache/ivy/core/resolve/ResolveTest.java @@ -163,7 +163,7 @@ public class ResolveTest { getResolveOptions(new String[] {"default"}).setValidate(false)); assertNotNull(report); - Map<String, String> extra = new HashMap<String, String>(); + Map<String, String> extra = new HashMap<>(); extra.put("extra", "foo"); ArtifactDownloadReport[] dReports = report.getConfigurationReport("default") .getDownloadReports(ModuleRevisionId.newInstance("org15", "mod15.3", "1.1", extra)); @@ -549,8 +549,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); // now we clean the repository to simulate repo not available (network pb for instance) FileUtil.forceDelete(new File("build/testCache2")); @@ -561,8 +561,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); } @Test @@ -587,8 +587,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); // now we clean the repository to simulate repo not available (network pb for instance) FileUtil.forceDelete(new File("build/testCache2")); @@ -599,8 +599,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); } @Test @@ -626,8 +626,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); // now we wait for ttl expiration Thread.sleep(700); @@ -638,8 +638,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); // now we clean the repository to simulate repo not available (network pb for instance) FileUtil.forceDelete(new File("build/testCache2")); @@ -650,8 +650,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); } @Test @@ -673,8 +673,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); // now we update the repository FileUtil.copy(new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar"), new File( @@ -686,8 +686,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.6"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.6"))), report.getConfigurationReport("default").getModuleRevisionIds()); } @Test @@ -720,8 +720,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); // wait for org1 TTL to expire Thread.sleep(700); @@ -732,8 +732,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.6"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.6"))), report.getConfigurationReport("default").getModuleRevisionIds()); } @Test @@ -763,8 +763,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.5"))), report.getConfigurationReport("default").getModuleRevisionIds()); // resolve again with refresh: it should find the new version report = ivy.resolve(new File("test/repositories/1/org1/mod1.4/ivys/ivy-1.0.2.xml"), @@ -772,8 +772,8 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org1", - "mod1.2", "1.6"))), report.getConfigurationReport("default").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org1", + "mod1.2", "1.6"))), report.getConfigurationReport("default").getModuleRevisionIds()); FileUtil.forceDelete(new File("build/testCache2")); } @@ -1788,7 +1788,7 @@ public class ResolveTest { ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-225.xml"), getResolveOptions(new String[] {"default"})); - List<ModuleRevisionId> revisions = new ArrayList<ModuleRevisionId>(report + List<ModuleRevisionId> revisions = new ArrayList<>(report .getConfigurationReport("default").getModuleRevisionIds()); assertTrue("number of revisions is not correct", revisions.size() >= 3); @@ -1928,23 +1928,23 @@ public class ResolveTest { // here we should get all three recursive dependencies assertEquals( - new HashSet<ModuleRevisionId>(Arrays.asList( - ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), - ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), - ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))), + new HashSet<>(Arrays.asList( + ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), + ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))), r.getConfigurationReport("A").getModuleRevisionIds()); // here we should get only mod2.1 and mod1.1 cause compile is not transitive in mod2.1 assertEquals( - new HashSet<ModuleRevisionId>(Arrays.asList( - ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), - ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"))), + new HashSet<>(Arrays.asList( + ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"))), r.getConfigurationReport("B").getModuleRevisionIds()); // here we should get only mod2.1 cause compile is not transitive assertEquals( - new HashSet<ModuleRevisionId>(Collections.singletonList(ModuleRevisionId.newInstance("org2", - "mod2.1", "0.3.2"))), r.getConfigurationReport("compile").getModuleRevisionIds()); + new HashSet<>(Collections.singletonList(ModuleRevisionId.newInstance("org2", + "mod2.1", "0.3.2"))), r.getConfigurationReport("compile").getModuleRevisionIds()); } @Test @@ -1963,24 +1963,24 @@ public class ResolveTest { // here we should get all three recursive dependencies assertEquals( - new HashSet<ModuleRevisionId>(Arrays.asList( - ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), - ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), - ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))), + new HashSet<>(Arrays.asList( + ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), + ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))), r.getConfigurationReport("A").getModuleRevisionIds()); // here we should get only mod2.1 and mod1.1 cause compile is not transitive in mod2.1 assertEquals( - new HashSet<ModuleRevisionId>(Arrays.asList( - ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), - ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"))), + new HashSet<>(Arrays.asList( + ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"))), r.getConfigurationReport("B").getModuleRevisionIds()); // here we should get only mod2.1 cause compile is not transitive assertEquals( - new HashSet<ModuleRevisionId>(Arrays.asList( - ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), - ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"))), + new HashSet<>(Arrays.asList( + ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"), + ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"))), r.getConfigurationReport("compile").getModuleRevisionIds()); } @@ -2244,7 +2244,7 @@ public class ResolveTest { IvyNode[] evicted = compileReport.getEvictedNodes(); assertNotNull(evicted); - Collection<ModuleRevisionId> evictedModules = new ArrayList<ModuleRevisionId>(); + Collection<ModuleRevisionId> evictedModules = new ArrayList<>(); for (IvyNode anEvicted : evicted) { evictedModules.add(anEvicted.getId()); } @@ -2643,7 +2643,7 @@ public class ResolveTest { ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.5.xml"), getResolveOptions(new String[] {"*"})); - List<File> lockFiles = new ArrayList<File>(); + List<File> lockFiles = new ArrayList<>(); findLockFiles(cache, lockFiles); assertTrue("There were lockfiles left in the cache: " + lockFiles, lockFiles.isEmpty()); } @@ -3078,7 +3078,7 @@ public class ResolveTest { @Test public void testResolveModeDynamic2() throws Exception { // same as ResolveModeDynamic1, but resolve mode is set in settings - Map<String, String> attributes = new HashMap<String, String>(); + Map<String, String> attributes = new HashMap<>(); attributes.put("organisation", "org1"); attributes.put("module", "mod1.2"); ivy.getSettings().addModuleConfiguration(attributes, ExactPatternMatcher.INSTANCE, null, @@ -3131,7 +3131,7 @@ public class ResolveTest { public void testResolveModeDefaultOverrideSettings() throws Exception { // same as ResolveModeDynamic2, but resolve mode is set in settings, and overridden when // calling resolve - Map<String, String> attributes = new HashMap<String, String>(); + Map<String, String> attributes = new HashMap<>(); attributes.put("organisation", "org1"); attributes.put("module", "mod1.2"); ivy.getSettings().addModuleConfiguration(attributes, ExactPatternMatcher.INSTANCE, null, @@ -3518,7 +3518,7 @@ public class ResolveTest { assertTrue(modRevIds.contains(ModuleRevisionId.newInstance("org", "dep1", "1.0"))); assertTrue(modRevIds.contains(ModuleRevisionId.newInstance("org", "dep2", "1.0"))); - Map<String, String> extra = new HashMap<String, String>(); + Map<String, String> extra = new HashMap<>(); extra.put("o:a", "58701"); assertTrue(modRevIds.contains(ModuleRevisionId.newInstance("org", "badArtifact", "1.0.0.m4", extra))); @@ -4454,7 +4454,7 @@ public class ResolveTest { assertTrue(getIvyFileInCache( ModuleRevisionId.newInstance("org.apache", "test-classified", "1.0")).exists()); - Map<String, String> cmap = new HashMap<String, String>(); + Map<String, String> cmap = new HashMap<>(); cmap.put("classifier", "asl"); assertTrue(getArchiveFileInCache(ivy, "org.apache", "test-classified", null /* branch */ , "1.0", "test-classified", "jar", "jar", cmap).exists()); @@ -4482,7 +4482,7 @@ public class ResolveTest { assertTrue(getIvyFileInCache( ModuleRevisionId.newInstance("org.apache", "test-classified", "2.0")).exists()); - Map<String, String> cmap = new HashMap<String, String>(); + Map<String, String> cmap = new HashMap<>(); cmap.put("classifier", "asl"); assertTrue(getArchiveFileInCache(ivy, "org.apache", "test-classified", null /* branch */ , "2.0", "test-classified", "jar", "jar", cmap).exists()); @@ -5662,9 +5662,9 @@ public class ResolveTest { assertFalse(report.hasError()); assertEquals( - new HashSet<ModuleRevisionId>(Arrays.asList( - ModuleRevisionId.newInstance("myorg", "modA", "1"), - ModuleRevisionId.newInstance("myorg", "modB", "1"))), report + new HashSet<>(Arrays.asList( + ModuleRevisionId.newInstance("myorg", "modA", "1"), + ModuleRevisionId.newInstance("myorg", "modB", "1"))), report .getConfigurationReport("default").getModuleRevisionIds()); DeliverOptions dopts = new DeliverOptions(); @@ -5711,7 +5711,7 @@ public class ResolveTest { Set<ModuleRevisionId> reportMrids = report.getConfigurationReport("default") .getModuleRevisionIds(); assertEquals( - new HashSet<ModuleRevisionId>(Arrays.asList(modAExpectedRevId, modBExpectedRevId)), + new HashSet<>(Arrays.asList(modAExpectedRevId, modBExpectedRevId)), reportMrids); DeliverOptions dopts = new DeliverOptions(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/core/search/SearchTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/search/SearchTest.java b/test/java/org/apache/ivy/core/search/SearchTest.java index e56f9bd..c16e735 100644 --- a/test/java/org/apache/ivy/core/search/SearchTest.java +++ b/test/java/org/apache/ivy/core/search/SearchTest.java @@ -42,13 +42,13 @@ public class SearchTest { Ivy ivy = Ivy.newInstance(); ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURI().toURL()); - Map<String, Object> otherTokenValues = new HashMap<String, Object>(); + Map<String, Object> otherTokenValues = new HashMap<>(); otherTokenValues.put(IvyPatternHelper.ORGANISATION_KEY, "org.apache"); otherTokenValues.put(IvyPatternHelper.MODULE_KEY, "test-metadata"); String[] revs = ivy.listTokenValues(IvyPatternHelper.REVISION_KEY, otherTokenValues); - assertEquals(new HashSet<String>(Arrays.asList(new String[] {"1.0", "1.1"})), - new HashSet<String>(Arrays.asList(revs))); + assertEquals(new HashSet<>(Arrays.asList(new String[]{"1.0", "1.1"})), + new HashSet<>(Arrays.asList(revs))); } @Test @@ -57,13 +57,13 @@ public class SearchTest { ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURI().toURL()); ((IBiblioResolver) ivy.getSettings().getResolver("m2")).setUseMavenMetadata(false); - Map<String, Object> otherTokenValues = new HashMap<String, Object>(); + Map<String, Object> otherTokenValues = new HashMap<>(); otherTokenValues.put(IvyPatternHelper.ORGANISATION_KEY, "org.apache"); otherTokenValues.put(IvyPatternHelper.MODULE_KEY, "test-metadata"); String[] revs = ivy.listTokenValues(IvyPatternHelper.REVISION_KEY, otherTokenValues); - assertEquals(new HashSet<String>(Arrays.asList(new String[] {"1.0", "1.1", "1.2"})), - new HashSet<String>(Arrays.asList(revs))); + assertEquals(new HashSet<>(Arrays.asList(new String[]{"1.0", "1.1", "1.2"})), + new HashSet<>(Arrays.asList(revs))); } @Test @@ -72,7 +72,7 @@ public class SearchTest { ivy.configure(new File("test/repositories/IVY-1128/ivysettings.xml")); IvySettings settings = ivy.getSettings(); - Map<String, String> extendedAttributes = new HashMap<String, String>(); + Map<String, String> extendedAttributes = new HashMap<>(); extendedAttributes.put("e:att1", "extraatt"); extendedAttributes.put("e:att2", "extraatt2"); ModuleRevisionId criteria = ModuleRevisionId.newInstance("test", "a", "*", http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/core/sort/SortTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/sort/SortTest.java b/test/java/org/apache/ivy/core/sort/SortTest.java index 9dda5df..cf10807 100644 --- a/test/java/org/apache/ivy/core/sort/SortTest.java +++ b/test/java/org/apache/ivy/core/sort/SortTest.java @@ -346,7 +346,7 @@ public class SortTest { private Collection<List<ModuleDescriptor>> getAllLists(ModuleDescriptor a, ModuleDescriptor b, ModuleDescriptor c, ModuleDescriptor d) { final int nbOfList = 24; - Collection<List<ModuleDescriptor>> r = new ArrayList<List<ModuleDescriptor>>(nbOfList); + Collection<List<ModuleDescriptor>> r = new ArrayList<>(nbOfList); r.add(Arrays.asList(new ModuleDescriptor[] {a, b, c, d})); r.add(Arrays.asList(new ModuleDescriptor[] {a, b, d, c})); r.add(Arrays.asList(new ModuleDescriptor[] {a, c, b, d})); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java b/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java index 2bafc34..c1c9c58 100644 --- a/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java +++ b/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java @@ -40,7 +40,7 @@ public class ManifestParserTest { assertEquals("20080101", bundleInfo.getVersion().qualifier()); assertEquals("1.0.0.20080101", bundleInfo.getVersion().toString()); assertEquals(2, bundleInfo.getRequires().size()); - Set<BundleRequirement> expectedRequires = new HashSet<BundleRequirement>(); + Set<BundleRequirement> expectedRequires = new HashSet<>(); expectedRequires.add(new BundleRequirement(BundleInfo.BUNDLE_TYPE, "com.acme.bravo", new VersionRange("2.0.0"), null)); expectedRequires.add(new BundleRequirement(BundleInfo.BUNDLE_TYPE, "com.acme.delta", @@ -61,7 +61,7 @@ public class ManifestParserTest { assertEquals("20080202", bundleInfo.getVersion().qualifier()); assertEquals("2.0.0.20080202", bundleInfo.getVersion().toString()); assertEquals(1, bundleInfo.getRequires().size()); - expectedRequires = new HashSet<BundleRequirement>(); + expectedRequires = new HashSet<>(); expectedRequires.add(new BundleRequirement(BundleInfo.BUNDLE_TYPE, "com.acme.charlie", new VersionRange("3.0.0"), null)); assertEquals(1, bundleInfo.getExports().size()); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java b/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java index c4c8a91..e18cd61 100644 --- a/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java +++ b/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java @@ -327,15 +327,15 @@ public class OBRResolverTest { new ResolveOptions().setConfs(new String[] {conf}).setOutputReport(false)); assertFalse("resolve failed " + resolveReport.getAllProblemMessages(), resolveReport.hasError()); - Set<ModuleRevisionId> actual = new HashSet<ModuleRevisionId>(); + Set<ModuleRevisionId> actual = new HashSet<>(); for (Artifact artifact : resolveReport.getArtifacts()) { actual.add(artifact.getModuleRevisionId()); } - Set<ModuleRevisionId> expected = new HashSet<ModuleRevisionId>(Arrays.asList(expectedMrids)); + Set<ModuleRevisionId> expected = new HashSet<>(Arrays.asList(expectedMrids)); if (expected2Mrids != null) { // in this use case, we have two choices, let's try the second one try { - Set<ModuleRevisionId> expected2 = new HashSet<ModuleRevisionId>( + Set<ModuleRevisionId> expected2 = new HashSet<>( Arrays.asList(expected2Mrids)); assertEquals(expected2, actual); return; // test passed http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java b/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java index db991db..0054656 100644 --- a/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java +++ b/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java @@ -49,7 +49,7 @@ public class OBRXMLWriterTest { @Test public void testWriteWithSource() throws Exception { - List<BundleInfo> bundles = new ArrayList<BundleInfo>(); + List<BundleInfo> bundles = new ArrayList<>(); BundleInfo bundle = new BundleInfo(BUNDLE_1, BUNDLE_VERSION); bundle.addArtifact(new BundleArtifact(false, new URI("file:///test.jar"), null)); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java index 4801175..89aae0f 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java @@ -140,13 +140,13 @@ public class VfsResourceTest { .asList(new String[] {"ivy-1.0.xml", "ivy-1.1.xml", "ivy-1.2.xml", "ivy-1.3.xml"}); for (VfsURI baseVfsURI : helper.createVFSUriSet(testFolder)) { - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); for (String expectedFile : expectedFiles) { String resId = baseVfsURI.toString() + "/" + expectedFile; expected.add(resId); } - List<String> actual = new ArrayList<String>(); + List<String> actual = new ArrayList<>(); VfsResource res = new VfsResource(baseVfsURI.toString(), helper.fsManager); for (String resId : res.getChildren()) { // remove entries ending in .svn http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java index ecbed50..394dfba 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java @@ -76,7 +76,7 @@ public class VfsTestHelper { * @return <class>List</class> of well-formed VFS resource identifiers */ public List<VfsURI> createVFSUriSet(String resource) { - List<VfsURI> set = new ArrayList<VfsURI>(); + List<VfsURI> set = new ArrayList<>(); for (String scheme : VfsURI.SUPPORTED_SCHEMES) { set.add(VfsURI.vfsURIFactory(scheme, resource, ivy)); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/util/ConfiguratorTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/ConfiguratorTest.java b/test/java/org/apache/ivy/util/ConfiguratorTest.java index ba642c0..9a2af55 100644 --- a/test/java/org/apache/ivy/util/ConfiguratorTest.java +++ b/test/java/org/apache/ivy/util/ConfiguratorTest.java @@ -46,9 +46,9 @@ public class ConfiguratorTest { } public static class City { - private final List<Housing> _housings = new ArrayList<Housing>(); + private final List<Housing> _housings = new ArrayList<>(); - private final List<Street> _streets = new ArrayList<Street>(); + private final List<Street> _streets = new ArrayList<>(); private String _name; @@ -80,9 +80,9 @@ public class ConfiguratorTest { public static class Street { private Class<?> _clazz; - private final List<Tree> _trees = new ArrayList<Tree>(); + private final List<Tree> _trees = new ArrayList<>(); - private final List<Person> _walkers = new ArrayList<Person>(); + private final List<Person> _walkers = new ArrayList<>(); public List<Tree> getTrees() { return _trees; @@ -110,7 +110,7 @@ public class ConfiguratorTest { } public static abstract class Housing { - private final List<Room> _rooms = new ArrayList<Room>(); + private final List<Room> _rooms = new ArrayList<>(); private boolean _isEmpty; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/util/MockMessageLogger.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/MockMessageLogger.java b/test/java/org/apache/ivy/util/MockMessageLogger.java index 586ed7a..ce4c6cb 100644 --- a/test/java/org/apache/ivy/util/MockMessageLogger.java +++ b/test/java/org/apache/ivy/util/MockMessageLogger.java @@ -22,11 +22,11 @@ import java.util.List; public class MockMessageLogger extends AbstractMessageLogger { - private final List<String> _endProgress = new ArrayList<String>(); + private final List<String> _endProgress = new ArrayList<>(); - private final List<String> _logs = new ArrayList<String>(); + private final List<String> _logs = new ArrayList<>(); - private final List<String> _rawLogs = new ArrayList<String>(); + private final List<String> _rawLogs = new ArrayList<>(); private int _progressCalls;
