From b26fee0de9d0a030221f1dcac48a6344665e7c5c Mon Sep 17 00:00:00 2001
From: biniek <lukasz.biniek@nokia.com>
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 <lukasz.biniek@nokia.com>
---
 .../java/org/onap/vid/services/AaiServiceImpl.java |  3 +-
 .../main/java/org/onap/vid/utils/Intersection.java | 61 ++++++++++++++--------
 2 files changed, 40 insertions(+), 24 deletions(-)

(limited to 'vid-app-common/src/main/java/org/onap')

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 c5bee2448..acdf0afb5 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<ServiceInstanceSearchResult> 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 6e0d1fc25..ed1be5c76 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<T> {
-    public List<T> intersectMultipileArray(List<List<T>> lists) {
-        if (lists.size() == 1) {
-            return lists.get(0);
-        } else {
-            List<T> 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<T> intersectTwoArrays(List<T> list1, List<T> list2) {
-
-        List<T> 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 <T> List<T> of(Collection<List<T>> lists) {
+        return lists
+                .stream()
+                .map(elements -> (Set<T>) Sets.newHashSet(elements))
+                .reduce(Sets::intersection)
+                .map(set -> (List<T>) Lists.newArrayList(set))
+                .orElse(Collections.emptyList());
     }
 }
-- 
cgit 1.2.3-korg