From b26fee0de9d0a030221f1dcac48a6344665e7c5c Mon Sep 17 00:00:00 2001 From: biniek Date: Fri, 7 Dec 2018 17:50:35 +0100 Subject: Refactor of Intersection class Change-Id: Ida73b13b1e235951f01888ac0cbf344565976e0f Issue-ID: VID-364 Signed-off-by: biniek --- .gitignore | 5 + .../java/org/onap/vid/services/AaiServiceImpl.java | 3 +- .../main/java/org/onap/vid/utils/Intersection.java | 61 +++++--- .../org/onap/vid/testUtils/IntersectionTest.java | 155 +++++++++++---------- 4 files changed, 126 insertions(+), 98 deletions(-) diff --git a/.gitignore b/.gitignore index 978c4cbd..fd4dc01b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ deliveries/target/ /vid-automation/.settings/org.eclipse.jdt.core.prefs /vid-automation/.settings/org.eclipse.m2e.core.prefs /vid-ext-services-simulator/.gitignore +.idea/ +epsdk-app-onap/overlays/ +vid-app-common/overlays/ +vid-ext-services-simulator/target/ + diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java index c5bee244..acdf0afb 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java @@ -235,8 +235,7 @@ public class AaiServiceImpl implements AaiService { resultList.add(getServicesByProjectNames(projects, roleValidator)); } if (!resultList.isEmpty()) { - Intersection intersection = new Intersection<>(); - serviceInstancesSearchResults.serviceInstances = intersection.intersectMultipileArray(resultList); + serviceInstancesSearchResults.serviceInstances = Intersection.of(resultList); } return new AaiResponse<>(serviceInstancesSearchResults, null, HttpStatus.SC_OK); diff --git a/vid-app-common/src/main/java/org/onap/vid/utils/Intersection.java b/vid-app-common/src/main/java/org/onap/vid/utils/Intersection.java index 6e0d1fc2..ed1be5c7 100644 --- a/vid-app-common/src/main/java/org/onap/vid/utils/Intersection.java +++ b/vid-app-common/src/main/java/org/onap/vid/utils/Intersection.java @@ -1,31 +1,48 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.onap.vid.utils; -import java.util.List; -import java.util.stream.Collectors; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; -/** - * Created by moriya1 on 10/10/2017. - */ -public class Intersection { - public List intersectMultipileArray(List> lists) { - if (lists.size() == 1) { - return lists.get(0); - } else { - List intersectResult = intersectTwoArrays(lists.get(0),lists.get(1)); +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Set; - lists.remove(0); - lists.remove(0); - lists.add(0,intersectResult); - return intersectMultipileArray(lists); - } +public class Intersection { + private Intersection() { } - public List intersectTwoArrays(List list1, List list2) { - - List intersect = list1.stream() - .filter(list2::contains) - .collect(Collectors.toList()); - return intersect; + /** + * Returns intersection of given lists. Treats those lists as sets, ignores repetitions. + */ + public static List of(Collection> lists) { + return lists + .stream() + .map(elements -> (Set) Sets.newHashSet(elements)) + .reduce(Sets::intersection) + .map(set -> (List) Lists.newArrayList(set)) + .orElse(Collections.emptyList()); } } diff --git a/vid-app-common/src/test/java/org/onap/vid/testUtils/IntersectionTest.java b/vid-app-common/src/test/java/org/onap/vid/testUtils/IntersectionTest.java index c766d26f..dcccab00 100644 --- a/vid-app-common/src/test/java/org/onap/vid/testUtils/IntersectionTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/testUtils/IntersectionTest.java @@ -1,101 +1,108 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.onap.vid.testUtils; -import org.junit.Assert; import org.junit.Test; import org.onap.vid.utils.Intersection; -import java.util.ArrayList; import java.util.List; -/** - * Created by moriya1 on 10/10/2017. - */ +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.util.Lists.emptyList; +import static org.assertj.core.util.Lists.list; + public class IntersectionTest { @Test - public void testFourArrays(){ - List l1 = new ArrayList(); - l1.add("1"); - l1.add("2"); - - List l2 = new ArrayList(); - l2.add("2"); - l2.add("3"); - - List l3 = new ArrayList(); - l3.add("2"); - l3.add("4"); - - List l4 = new ArrayList(); - l4.add("2"); - l4.add("5"); - - List> all = new ArrayList<>(); - all.add(l1); - all.add(l2); - all.add(l3); - all.add(l4); - Intersection m = new Intersection<>(); - List ans = m.intersectMultipileArray(all); - Assert.assertEquals(1,ans.size()); - Assert.assertEquals(ans.get(0),"2"); + public void testFourArrays() { + // given + List> input = list( + list("1", "2"), + list("2", "3"), + list("2", "4"), + list("2", "5") + ); + // when + List output = Intersection.of(input); + // then + assertThat(output).containsExactlyInAnyOrder("2"); } - - @Test - public void testTwoArrays(){ - List l1 = new ArrayList(); - l1.add("1"); - l1.add("2"); - - List l2 = new ArrayList(); - l2.add("2"); - l2.add("3"); - - List> all = new ArrayList<>(); - all.add(l1); - all.add(l2); - Intersection m = new Intersection<>(); - List l3 = m.intersectMultipileArray(all); - Assert.assertEquals(l3.size(),1); - Assert.assertEquals(l3.get(0),"2"); + public void testTwoArrays() { + // given + List> input = list( + list("1", "2"), + list("2", "3") + ); + // when + List output = Intersection.of(input); + // then + assertThat(output).containsExactlyInAnyOrder("2"); } @Test - public void testNoIntersection(){ - List l1 = new ArrayList(); - l1.add("1"); - l1.add("2"); - - List l2 = new ArrayList(); - l2.add("3"); - l2.add("4"); + public void testNoIntersection() { + // given + List> input = list( + list("1", "2"), + list("3", "4") + ); + // when + List output = Intersection.of(input); + // then + assertThat(output).isEmpty(); - List> all = new ArrayList<>(); - all.add(l1); - all.add(l2); - Intersection m = new Intersection<>(); - List l3 = m.intersectMultipileArray(all); - Assert.assertEquals(l3.size(),0); + } + @Test + public void testOneArray() { + // given + List> input = list(list("1", "2")); + // when + List output = Intersection.of(input); + // then + assertThat(output).containsExactlyInAnyOrder("1", "2"); } @Test - public void testOneArrays(){ - List l1 = new ArrayList(); - l1.add("1"); - l1.add("2"); - List> all = new ArrayList<>(); - all.add(l1); - Intersection m = new Intersection<>(); - List l3 = m.intersectMultipileArray(all); - Assert.assertEquals(l3.size(),2); - Assert.assertEquals(l3.get(0),"1"); - Assert.assertEquals(l3.get(1),"2"); + public void testEmptyInput() { + // when + List output = Intersection.of(emptyList()); + // then + assertThat(output).isEmpty(); + } + @Test + public void shouldIgnoreRepetitions() { + // when + List output = Intersection.of(list( + list("1", "1"), + list("1", "1") + )); + // then + assertThat(output).containsExactly("1"); } } -- cgit 1.2.3-korg