diff options
author | Ryan D. Brooks | 2015-09-28 18:49:18 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2015-09-28 18:49:18 +0000 |
commit | 071fcbc5cca4e22e650bb459701f5fc9be701013 (patch) | |
tree | ac629d866ecfea675bc4e134c68315440282d560 /plugins/org.eclipse.osee.framework.skynet.core.test | |
parent | b4f6f62b0d3af365b67a3786dbb24c97fa638536 (diff) | |
download | org.eclipse.osee-071fcbc5cca4e22e650bb459701f5fc9be701013.tar.gz org.eclipse.osee-071fcbc5cca4e22e650bb459701f5fc9be701013.tar.xz org.eclipse.osee-071fcbc5cca4e22e650bb459701f5fc9be701013.zip |
refactor: Use type inference when invoking a generic constructor
Change-Id: I5afeb235038dcf1dd0496930d15d6b42aeb46fec
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core.test')
14 files changed, 52 insertions, 52 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java index c3835011900..366ebd41bf6 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidArtifactTest.java @@ -59,7 +59,7 @@ public class EventBasicGuidArtifactTest { Assert.assertNotSame(eventArt1, eventArt2); - Set<EventBasicGuidArtifact> toAdd = new HashSet<EventBasicGuidArtifact>(); + Set<EventBasicGuidArtifact> toAdd = new HashSet<>(); toAdd.add(eventArt2); toAdd.add(eventArt1); Assert.assertEquals(2, toAdd.size()); @@ -67,7 +67,7 @@ public class EventBasicGuidArtifactTest { toAdd.add(eventArt1); Assert.assertEquals(2, toAdd.size()); - Set<EventBasicGuidArtifact> eventArts = new HashSet<EventBasicGuidArtifact>(); + Set<EventBasicGuidArtifact> eventArts = new HashSet<>(); eventArts.add(eventArt2); eventArts.addAll(toAdd); Assert.assertEquals(2, toAdd.size()); @@ -106,7 +106,7 @@ public class EventBasicGuidArtifactTest { Assert.assertNotSame(eventArt1, eventArt2); - Set<IBasicGuidArtifact> toAdd = new HashSet<IBasicGuidArtifact>(); + Set<IBasicGuidArtifact> toAdd = new HashSet<>(); toAdd.add(eventArt2); toAdd.add(eventArt1); Assert.assertEquals(2, toAdd.size()); @@ -114,7 +114,7 @@ public class EventBasicGuidArtifactTest { toAdd.add(eventArt1); Assert.assertEquals(2, toAdd.size()); - Set<IBasicGuidArtifact> eventArts = new HashSet<IBasicGuidArtifact>(); + Set<IBasicGuidArtifact> eventArts = new HashSet<>(); eventArts.add(eventArt2); eventArts.addAll(toAdd); Assert.assertEquals(2, toAdd.size()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java index b500967f05a..c71d2deba0e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventBasicGuidRelationTest.java @@ -84,7 +84,7 @@ public class EventBasicGuidRelationTest { Assert.assertNotSame(eventRel1, eventRel2); - Set<EventBasicGuidRelation> toAdd = new HashSet<EventBasicGuidRelation>(); + Set<EventBasicGuidRelation> toAdd = new HashSet<>(); toAdd.add(eventRel2); toAdd.add(eventRel1); Assert.assertEquals(2, toAdd.size()); @@ -92,7 +92,7 @@ public class EventBasicGuidRelationTest { toAdd.add(eventRel1); Assert.assertEquals(2, toAdd.size()); - Set<EventBasicGuidRelation> eventArts = new HashSet<EventBasicGuidRelation>(); + Set<EventBasicGuidRelation> eventArts = new HashSet<>(); eventArts.add(eventRel2); eventArts.addAll(toAdd); Assert.assertEquals(2, toAdd.size()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java index 527051cd273..f7cda9c026a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/EventChangeTypeBasicGuidArtifactTest.java @@ -59,7 +59,7 @@ public class EventChangeTypeBasicGuidArtifactTest { Assert.assertNotSame(eventArt1, eventArt2); - Set<EventBasicGuidArtifact> toAdd = new HashSet<EventBasicGuidArtifact>(); + Set<EventBasicGuidArtifact> toAdd = new HashSet<>(); toAdd.add(eventArt2); toAdd.add(eventArt1); Assert.assertEquals(2, toAdd.size()); @@ -67,7 +67,7 @@ public class EventChangeTypeBasicGuidArtifactTest { toAdd.add(eventArt1); Assert.assertEquals(2, toAdd.size()); - Set<EventBasicGuidArtifact> eventArts = new HashSet<EventBasicGuidArtifact>(); + Set<EventBasicGuidArtifact> eventArts = new HashSet<>(); eventArts.add(eventArt2); eventArts.addAll(toAdd); Assert.assertEquals(2, toAdd.size()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactTypeEventFilterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactTypeEventFilterTest.java index 904deac56bf..0796da406a6 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactTypeEventFilterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/ArtifactTypeEventFilterTest.java @@ -82,7 +82,7 @@ public class ArtifactTypeEventFilterTest { new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create()); - List<IBasicGuidRelation> relations = new ArrayList<IBasicGuidRelation>(); + List<IBasicGuidRelation> relations = new ArrayList<>(); EventBasicGuidRelation relation = new EventBasicGuidRelation(RelationEventType.Added, Lib.generateUuid(), CoreRelationTypes.SupportingInfo_SupportedBy.getGuid(), 234, 123, 55, guidArtA, 66, guidArtB); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java index bbfb2da88f9..a0824ebd21f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java @@ -50,7 +50,7 @@ public class BranchUuidEventFilterTest { EventBasicGuidArtifact guidArtB = new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create()); - List<IBasicGuidArtifact> arts = new ArrayList<IBasicGuidArtifact>(); + List<IBasicGuidArtifact> arts = new ArrayList<>(); arts.add(guidArtB); arts.add(guidArtA); @@ -77,7 +77,7 @@ public class BranchUuidEventFilterTest { new EventBasicGuidArtifact(EventModType.Added, Lib.generateUuid(), CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create()); - List<IBasicGuidRelation> relations = new ArrayList<IBasicGuidRelation>(); + List<IBasicGuidRelation> relations = new ArrayList<>(); EventBasicGuidRelation relation = new EventBasicGuidRelation(RelationEventType.Added, Lib.generateUuid(), CoreRelationTypes.SupportingInfo_SupportedBy.getGuid(), 234, 123, 55, guidArtA, 66, guidArtB); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java index e57e6d8a6c2..e347d14d7d0 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/ArtifactExtractorTest.java @@ -74,7 +74,7 @@ public class ArtifactExtractorTest { } private List<TestData> getFileTestData() { - List<TestData> testDatas = new ArrayList<TestData>(); + List<TestData> testDatas = new ArrayList<>(); String separator = propertyStore.get("list.entry.separator"); String[] tests = propertyStore.getArray("fileTestData"); Assert.assertNotNull(tests); @@ -136,7 +136,7 @@ public class ArtifactExtractorTest { } private List<ParseTestData> getParseTestData() { - List<ParseTestData> testDatas = new ArrayList<ParseTestData>(); + List<ParseTestData> testDatas = new ArrayList<>(); String separator = propertyStore.get("list.entry.separator"); String[] tests = propertyStore.getArray("parseTestData"); Assert.assertNotNull(tests); @@ -173,7 +173,7 @@ public class ArtifactExtractorTest { @Parameters public static Collection<Object[]> data() { - Collection<Object[]> data = new ArrayList<Object[]>(); + Collection<Object[]> data = new ArrayList<>(); data.add(new Object[] {new ExcelArtifactExtractor(), "ExcelArtifactExtractorTest.xml"}); data.add(new Object[] {new NativeDocumentExtractor(), "NativeDocumentExtractorTest.xml"}); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java index ab5b51ffdab..5b889189fc7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/OutlineResolutionAndNumberTest.java @@ -97,7 +97,7 @@ public final class OutlineResolutionAndNumberTest { @Test public void testNextSetGeneration_NonZeroBased() { Set<String> nextPossibleSet = outlineResolution.generateNextSet(new ReqNumbering("1.")); - Set<String> expected = new HashSet<String>(Arrays.asList("2.0", "1.1", "1.0.1")); + Set<String> expected = new HashSet<>(Arrays.asList("2.0", "1.1", "1.0.1")); addDotEndingSet(expected); expected.removeAll(nextPossibleSet); Assert.assertTrue(expected.isEmpty()); @@ -106,7 +106,7 @@ public final class OutlineResolutionAndNumberTest { @Test public void testNextSetGeneration_ZeroBased() { Set<String> nextPossibleSet = outlineResolution.generateNextSet(new ReqNumbering("1.0")); - Set<String> expected = new HashSet<String>(Arrays.asList("2.0", "1.1", "1.0.1")); + Set<String> expected = new HashSet<>(Arrays.asList("2.0", "1.1", "1.0.1")); addDotEndingSet(expected); expected.removeAll(nextPossibleSet); Assert.assertTrue(expected.isEmpty()); @@ -115,7 +115,7 @@ public final class OutlineResolutionAndNumberTest { @Test public void testNextSetGeneration_ZeroExtendedBased() { Set<String> nextPossibleSet = outlineResolution.generateNextSet(new ReqNumbering("1.0.1")); - Set<String> expected = new HashSet<String>(Arrays.asList("2.0", "1.1", "1.0.2")); + Set<String> expected = new HashSet<>(Arrays.asList("2.0", "1.1", "1.0.2")); addDotEndingSet(expected); expected.removeAll(nextPossibleSet); Assert.assertTrue(expected.isEmpty()); @@ -124,7 +124,7 @@ public final class OutlineResolutionAndNumberTest { @Test public void testNextSetGeneration_DoubleDigitZeroBased() { Set<String> nextPossibleSet = outlineResolution.generateNextSet(new ReqNumbering("1.0.10")); - Set<String> expected = new HashSet<String>(Arrays.asList("2.0", "1.1", "1.0.11", "1.0.10.1", "1.0.10.0.1")); + Set<String> expected = new HashSet<>(Arrays.asList("2.0", "1.1", "1.0.11", "1.0.10.1", "1.0.10.0.1")); addDotEndingSet(expected); expected.removeAll(nextPossibleSet); Assert.assertTrue(expected.isEmpty()); @@ -133,7 +133,7 @@ public final class OutlineResolutionAndNumberTest { @Test public void testNextSetGeneration_DoubleDigitHigherBased() { Set<String> nextPossibleSet = outlineResolution.generateNextSet(new ReqNumbering("1.23")); - Set<String> expected = new HashSet<String>(Arrays.asList("2.0", "1.24", "1.23.1", "1.23.0.1")); + Set<String> expected = new HashSet<>(Arrays.asList("2.0", "1.24", "1.23.1", "1.23.0.1")); addDotEndingSet(expected); expected.removeAll(nextPossibleSet); Assert.assertTrue(expected.isEmpty()); @@ -156,7 +156,7 @@ public final class OutlineResolutionAndNumberTest { } private void addDotEndingSet(Set<String> inputSet) { - Set<String> dotEnding = new HashSet<String>(inputSet.size()); + Set<String> dotEnding = new HashSet<>(inputSet.size()); for (String item : inputSet) { dotEnding.add(item + "."); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java index 4b7eaabce79..e8a9cc2bea2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java @@ -164,7 +164,7 @@ public class RelationTypeSideSorterTest { public void test10AddItem() throws OseeCoreException { IArtifact itemToAdd = createArtifact("Item to Add", GUID.create()); - List<IArtifact> startingArtifacts = new ArrayList<IArtifact>(); + List<IArtifact> startingArtifacts = new ArrayList<>(); List<String> startingOrder = orderData.getOrderList(sorter.getRelationType(), sorter.getSide()); for (int index = 0; index < startingOrder.size(); index++) { String artifactGuid = startingOrder.get(index); @@ -177,7 +177,7 @@ public class RelationTypeSideSorterTest { for (IRelationSorterId sorterId : sorterProvider.getAllRelationOrderIds()) { IRelationSorter relationSorter = sorterProvider.getRelationOrder(sorterId.getGuid()); - List<IArtifact> itemsToOrder = new ArrayList<IArtifact>(startingArtifacts); + List<IArtifact> itemsToOrder = new ArrayList<>(startingArtifacts); itemsToOrder.add(itemToAdd); if (RelationOrderBaseTypes.USER_DEFINED != sorterId) { relationSorter.sort(itemsToOrder, null); @@ -225,13 +225,13 @@ public class RelationTypeSideSorterTest { RelationOrderData data1 = new RelationOrderData(accessor, art1); RelationOrderData data2 = new RelationOrderData(accessor, art2); - List<Object[]> expected1 = new ArrayList<Object[]>(); - List<Object[]> expected2 = new ArrayList<Object[]>(); + List<Object[]> expected1 = new ArrayList<>(); + List<Object[]> expected2 = new ArrayList<>(); addData(cache, data1, expected1); addData(cache, data2, expected2); - Collection<Object[]> data = new ArrayList<Object[]>(); + Collection<Object[]> data = new ArrayList<>(); data.add(new Object[] {provider, relationType1, RelationSide.SIDE_A, data1, expected1}); data.add(new Object[] {provider, relationType2, RelationSide.SIDE_B, data2, expected2}); return data; @@ -283,7 +283,7 @@ public class RelationTypeSideSorterTest { } private static void addData(RelationOrderData orderData, List<Object[]> expectedData, RelationType relationType, RelationSide side, String relationOrderIdGuid, String... guids) { - List<String> artGuids = new ArrayList<String>(); + List<String> artGuids = new ArrayList<>(); if (guids != null && guids.length > 0) { artGuids.addAll(Arrays.asList(guids)); } @@ -296,7 +296,7 @@ public class RelationTypeSideSorterTest { public MockArtifactWithRelations(int uniqueId, String name, String guid, Branch branch, IArtifactType artifactType) { super(uniqueId, name, guid, branch, DataFactory.fromToken(artifactType)); - this.relatedItemsMap = new HashMap<IRelationType, List<? extends IArtifact>>(); + this.relatedItemsMap = new HashMap<>(); } @Override diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java index c6338ca4c7e..6e3b393bde3 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java @@ -87,7 +87,7 @@ public class RelationOrderDataTest { data.load(); Assert.assertTrue(accessor.wasLoadCalled()); - List<Object[]> expected = new ArrayList<Object[]>(); + List<Object[]> expected = new ArrayList<>(); addData(data, expected, relationType1, RelationSide.SIDE_A, // RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC.getGuid(), "1", "2", "3"); checkData(data, expected); @@ -103,7 +103,7 @@ public class RelationOrderDataTest { @Test public void testAddOrderList() { - List<Object[]> expected = new ArrayList<Object[]>(); + List<Object[]> expected = new ArrayList<>(); addData(expected); data.clear(); Assert.assertFalse(data.hasEntries()); @@ -113,7 +113,7 @@ public class RelationOrderDataTest { @Test public void testGetCurrentSorterGuid() throws OseeCoreException { - List<Object[]> expected = new ArrayList<Object[]>(); + List<Object[]> expected = new ArrayList<>(); addData(expected); try { data.getCurrentSorterGuid(relationType1, null); @@ -146,7 +146,7 @@ public class RelationOrderDataTest { @Test public void testGetOrderList() throws OseeCoreException { - List<Object[]> expected = new ArrayList<Object[]>(); + List<Object[]> expected = new ArrayList<>(); addData(expected); try { @@ -182,7 +182,7 @@ public class RelationOrderDataTest { @Test public void testRemoveFromList() throws OseeCoreException { - List<Object[]> expected = new ArrayList<Object[]>(); + List<Object[]> expected = new ArrayList<>(); addData(expected); // Remove item that does not exist @@ -204,7 +204,7 @@ public class RelationOrderDataTest { @Test public void testStore() throws OseeCoreException { - List<Object[]> expected = new ArrayList<Object[]>(); + List<Object[]> expected = new ArrayList<>(); addData(expected); accessor.clearStoreCalled(); @@ -260,7 +260,7 @@ public class RelationOrderDataTest { } private void addData(RelationOrderData orderData, List<Object[]> expectedData, RelationType relationType, RelationSide side, String relationOrderIdGuid, String... guids) { - List<String> artGuids = new ArrayList<String>(); + List<String> artGuids = new ArrayList<>(); if (guids != null && guids.length > 0) { artGuids.addAll(Arrays.asList(guids)); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java index 8bc87e57de9..fa159f8cb91 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergerTest.java @@ -25,11 +25,11 @@ import org.junit.Test; public class RelationOrderMergerTest { @Test public void testCursorAlgorithmSuccess() { - RelationOrderMerger<String> merger = new RelationOrderMerger<String>(); - Collection<String> mergedSet = new HashSet<String>(); + RelationOrderMerger<String> merger = new RelationOrderMerger<>(); + Collection<String> mergedSet = new HashSet<>(); Collections.addAll(mergedSet, new String[] {"Red", "Yellow", "Blue", "Purple", "Green", "Brown", "Black"}); - List<String> leftOrder = new ArrayList<String>(); + List<String> leftOrder = new ArrayList<>(); leftOrder.add("Orange"); leftOrder.add("Red"); leftOrder.add("Yellow"); @@ -37,7 +37,7 @@ public class RelationOrderMergerTest { leftOrder.add("Black"); leftOrder.add("Green"); - List<String> rightOrder = new ArrayList<String>(); + List<String> rightOrder = new ArrayList<>(); rightOrder.add("Red"); rightOrder.add("Yellow"); rightOrder.add("Purple"); @@ -58,17 +58,17 @@ public class RelationOrderMergerTest { @Test public void testCursorAlgorithmFailure() { - RelationOrderMerger<String> merger = new RelationOrderMerger<String>(); - Collection<String> mergedSet = new HashSet<String>(); + RelationOrderMerger<String> merger = new RelationOrderMerger<>(); + Collection<String> mergedSet = new HashSet<>(); Collections.addAll(mergedSet, new String[] {"Red", "Yellow", "Green"}); - List<String> leftOrder = new ArrayList<String>(); + List<String> leftOrder = new ArrayList<>(); leftOrder.add("Orange"); leftOrder.add("Yellow"); leftOrder.add("Red"); leftOrder.add("Green"); - List<String> rightOrder = new ArrayList<String>(); + List<String> rightOrder = new ArrayList<>(); rightOrder.add("Red"); rightOrder.add("Yellow"); rightOrder.add("Purple"); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java index 32dc1f405ab..60c138d8a9e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java @@ -72,7 +72,7 @@ public class RelationOrderParserTest { Assert.assertTrue(data.hasEntries()); Assert.assertEquals(1, data.size()); - List<Object[]> expectedData = new ArrayList<Object[]>(); + List<Object[]> expectedData = new ArrayList<>(); addData(expectedData, "Default Hierarchical", RelationSide.SIDE_B, "AAT0xogoMjMBhARkBZQA", "AAABDEJ_mIQBf8VXVtGqvA", "AAABDEJ_nMkBf8VXVXptpg", "AAABDEJ_oQ8Bf8VXLX7U_g"); @@ -102,7 +102,7 @@ public class RelationOrderParserTest { Assert.assertTrue(data.hasEntries()); Assert.assertEquals(2, data.size()); - List<Object[]> expectedData = new ArrayList<Object[]>(); + List<Object[]> expectedData = new ArrayList<>(); addData(expectedData, "Default Hierarchical", RelationSide.SIDE_B, "AAT0xogoMjMBhARkBZQA", "AAABDEJ_mIQBf8VXVtGqvA", "AAABDEJ_oQ8Bf8VXLX7U_g"); addData(expectedData, "Some Type", RelationSide.SIDE_A, "AAABDEJ_mIQBf8VXVtGqvA", "AAABDEJ_mIQXf8VXVtGqvA", @@ -123,7 +123,7 @@ public class RelationOrderParserTest { Assert.assertTrue(data.hasEntries()); Assert.assertEquals(1, data.size()); - List<Object[]> expectedData = new ArrayList<Object[]>(); + List<Object[]> expectedData = new ArrayList<>(); addData(expectedData, "X", RelationSide.SIDE_B, "AAT0xogoMjMBhARkBZQA"); checkData(data, expectedData); Assert.assertEquals(oneEntryEmptyList, parser.toXml(data)); @@ -177,7 +177,7 @@ public class RelationOrderParserTest { } private void addData(List<Object[]> expectedData, String relationType, RelationSide side, String relationOrderIdGuid, String... guids) { - List<String> artGuids = new ArrayList<String>(); + List<String> artGuids = new ArrayList<>(); if (guids != null && guids.length > 0) { artGuids.addAll(Arrays.asList(guids)); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java index b7297488cac..e467fd90ced 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java @@ -60,7 +60,7 @@ public class RelationSorterTest { @Test public void testSort() { - List<IArtifact> actualToOrder = new ArrayList<IArtifact>(); + List<IArtifact> actualToOrder = new ArrayList<>(); actualToOrder.addAll(itemsToOrder); sorter.sort(actualToOrder, currentItems); @@ -73,7 +73,7 @@ public class RelationSorterTest { @Parameters public static Collection<Object[]> data() { - Collection<Object[]> data = new ArrayList<Object[]>(); + Collection<Object[]> data = new ArrayList<>(); data.add(createUnorderedSortTest("4", "2", "1", "5")); data.add(createUnorderedSortTest("$", "a", "!", "2")); data.add(createLexicographicalTest(SortMode.ASCENDING, "1", "2", "3", "4")); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorCacheTest.java index 40642d17f02..6b6dbea6f11 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorCacheTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorCacheTest.java @@ -28,7 +28,7 @@ public class TxMonitorCacheTest { Object key1 = new Object(); Object key2 = new Object(); - TxMonitorCache<Object> cache = new TxMonitorCache<Object>(); + TxMonitorCache<Object> cache = new TxMonitorCache<>(); MonitoredTx tx1 = createTx(); MonitoredTx tx2 = createTx(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java index 140fb461a1b..81584d126ff 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java @@ -45,8 +45,8 @@ public class TxMonitorImplTest { tx1 = createTx(); tx2 = createTx(); - txCache = new TxMonitorCache<Object>(); - txMonitor = new TxMonitorImpl<Object>(txCache); + txCache = new TxMonitorCache<>(); + txMonitor = new TxMonitorImpl<>(txCache); } @Test(expected = OseeStateException.class) @@ -185,7 +185,7 @@ public class TxMonitorImplTest { private final String uuid; private TxState txState; private boolean rolledBack; - private final Set<Object> data = new HashSet<Object>(); + private final Set<Object> data = new HashSet<>(); public MockMonitoredTx(String uuid, TxState txState) { this.uuid = uuid; |