From e261899e98173e2cc901668d14ef05008dfc9fda Mon Sep 17 00:00:00 2001
From: rathnapandi <rathnapandi.n@gmail.com>
Date: Wed, 6 Dec 2023 21:33:51 -0700
Subject: [PATCH] - Fix integration test

---
 .../adapter/apis/APIManagerAPIAccessAdapter.java    | 13 +++++--------
 .../apis/APIManagerAPIAccessAdapterTest.java        | 12 ++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapter.java b/modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapter.java
index ecff43559..97463d379 100644
--- a/modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapter.java
+++ b/modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapter.java
@@ -195,8 +195,7 @@ public void populateApiId(APIAccess apiAccess) throws AppException {
 
     public void createAPIAccess(APIAccess apiAccess, AbstractEntity parentEntity, Type type) throws AppException {
         List<APIAccess> existingAPIAccess = getAPIAccess(parentEntity, type);
-        if (existingAPIAccess != null &&
-            existingAPIAccess.stream().anyMatch(existingAPIAccessElement -> existingAPIAccessElement.getApiId().equals(apiAccess.getApiId()))) {
+        if (existingAPIAccess != null && existingAPIAccess.contains(apiAccess)) {
             apiAccess.setId(existingAPIAccess.get(0).getId());
             return;
         }
@@ -283,16 +282,14 @@ public void removeClientOrganization(List<Organization> removingActualOrgs, Stri
     }
 
     public List<APIAccess> getMissingAPIAccesses(List<APIAccess> apiAccess, List<APIAccess> otherApiAccess) {
+        List<APIAccess> missingAccess = new ArrayList<>();
         if (otherApiAccess == null) otherApiAccess = new ArrayList<>();
         if (apiAccess == null) apiAccess = new ArrayList<>();
-        List<APIAccess> missingAccess = new ArrayList<>();
         for (APIAccess access : apiAccess) {
-            for (APIAccess otherAccess : otherApiAccess) {
-                if (access.getApiId().equals(otherAccess.getApiId())) {
-                    break;
-                }
-                missingAccess.add(access);
+            if (otherApiAccess.contains(access)) {
+                continue;
             }
+            missingAccess.add(access);
         }
         return missingAccess;
     }
diff --git a/modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapterTest.java b/modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapterTest.java
index 69a67c75f..f3b1b5fba 100644
--- a/modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapterTest.java
+++ b/modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapterTest.java
@@ -188,28 +188,28 @@ public void getMissingAPIAccessesWithDuplicates(){
     public void getMissingAPIAccessesWithUnique(){
         List<APIAccess> apiAccesses = new ArrayList<>();
         APIAccess apiAccess = new APIAccess();
-        apiAccess.setApiId("1235");
+        apiAccess.setApiName("1235");
         apiAccesses.add(apiAccess);
         List<APIAccess> otherApiAccess = new ArrayList<>();
         APIAccess apiAccess2 = new APIAccess();
-        apiAccess2.setApiId("12345");
+        apiAccess2.setApiName("12345");
         otherApiAccess.add(apiAccess2);
         List<APIAccess> missingApiAccesses = apiManagerAPIAccessAdapter.getMissingAPIAccesses(apiAccesses, otherApiAccess);
-        Assert.assertEquals("1235",missingApiAccesses.get(0).getApiId());
+        Assert.assertEquals("1235",missingApiAccesses.get(0).getApiName());
     }
 
     @Test
     public void getMissingAPIAccessesWithUniqueReverse(){
         List<APIAccess> apiAccesses = new ArrayList<>();
         APIAccess apiAccess = new APIAccess();
-        apiAccess.setApiId("1235");
+        apiAccess.setApiName("1235");
         apiAccesses.add(apiAccess);
         List<APIAccess> otherApiAccess = new ArrayList<>();
         APIAccess apiAccess2 = new APIAccess();
-        apiAccess2.setApiId("12345");
+        apiAccess2.setApiName("12345");
         otherApiAccess.add(apiAccess2);
         List<APIAccess> missingApiAccesses = apiManagerAPIAccessAdapter.getMissingAPIAccesses(otherApiAccess, apiAccesses);
-        Assert.assertEquals("12345",missingApiAccesses.get(0).getApiId());
+        Assert.assertEquals("12345",missingApiAccesses.get(0).getApiName());
     }