Clean up of Pair classes - models

Removed Pair class from policy-models and replaced with Aoache Common
Pair class

Issue-ID: POLICY-2202
Change-Id: I786467ac02ecb2d433dba94deba45785be3dcf23
Signed-off-by: waynedunican <wayne.dunican@est.tech>

1 files changed, 8 insertions, 8 deletions

diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
index 17f8a58f3..64d60ba1e 100644
--- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
+++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017-2019 Intel Corp. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * Modifications Copyright (C) 2018-2019 AT&T Corporation. All rights reserved.
  * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd.
  * ================================================================================
@@ -24,11 +24,11 @@ package org.onap.policy.vfc;
 import com.google.gson.JsonSyntaxException;
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.commons.lang3.tuple.Pair;
 import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
 import org.onap.policy.rest.RestManager;
-import org.onap.policy.rest.RestManager.Pair;
 import org.onap.policy.vfc.util.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -117,7 +117,7 @@ public final class VfcManager implements Runnable {
             return;
         }
 
-        if (httpDetails.first != 202) {
+        if (httpDetails.getLeft() != 202) {
             logger.warn("VFC Heal Restcall failed");
             return;
         }
@@ -144,8 +144,8 @@ public final class VfcManager implements Runnable {
      */
     private void handleVfcResponse(Map<String, String> headers, Pair<Integer, String> httpDetails, String vfcUrl)
             throws InterruptedException {
-        VfcResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, VfcResponse.class);
-        NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, vfcUrl, httpDetails.second);
+        VfcResponse response = Serialization.gsonPretty.fromJson(httpDetails.getRight(), VfcResponse.class);
+        NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, vfcUrl, httpDetails.getRight());
         String body = Serialization.gsonPretty.toJson(response);
         logger.debug("Response to VFC Heal post:");
         logger.debug(body);
@@ -159,15 +159,15 @@ public final class VfcManager implements Runnable {
         while (attemptsLeft-- > 0) {
             NetLoggerUtil.getNetworkLogger().info("[OUT|{}|{}|]", "VFC", urlGet);
             Pair<Integer, String> httpDetailsGet = restManager.get(urlGet, username, password, headers);
-            responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.second, VfcResponse.class);
-            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, vfcUrl, httpDetailsGet.second);
+            responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.getRight(), VfcResponse.class);
+            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, vfcUrl, httpDetailsGet.getRight());
             responseGet.setRequestId(vfcRequest.getRequestId().toString());
             body = Serialization.gsonPretty.toJson(responseGet);
             logger.debug("Response to VFC Heal get:");
             logger.debug(body);
 
             String responseStatus = responseGet.getResponseDescriptor().getStatus();
-            if (httpDetailsGet.first == 200
+            if (httpDetailsGet.getLeft() == 200
                     && ("finished".equalsIgnoreCase(responseStatus) || "error".equalsIgnoreCase(responseStatus))) {
                 logger.debug("VFC Heal Status {}", responseGet.getResponseDescriptor().getStatus());
                 this.callback.onResponse(responseGet);