From f7da60fabf647665d61f142a0d6ba9a9fc940106 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Fri, 19 Jun 2020 15:30:59 +0100 Subject: 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 --- .../main/java/org/onap/policy/aai/AaiManager.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'models-interactions/model-impl/aai/src/main/java') diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java index 81aea9f98..76817dfc6 100644 --- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java +++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java @@ -3,7 +3,7 @@ * aai * ================================================================================ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; +import org.apache.commons.lang3.tuple.Pair; import org.json.JSONArray; import org.json.JSONObject; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; @@ -37,7 +38,6 @@ import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.rest.RestManager; -import org.onap.policy.rest.RestManager.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -154,17 +154,17 @@ public final class AaiManager { return null; } - int httpResponseCode = httpDetails.first; + int httpResponseCode = httpDetails.getLeft(); NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "Response code: " + httpResponseCode); - NetLoggerUtil.getNetworkLogger().debug(httpDetails.second); + NetLoggerUtil.getNetworkLogger().debug(httpDetails.getRight()); logger.debug(url); logger.debug("{}", httpResponseCode); - logger.debug(httpDetails.second); + logger.debug(httpDetails.getRight()); - if (httpDetails.second != null) { - return new AaiCqResponse(httpDetails.second); + if (httpDetails.getRight() != null) { + return new AaiCqResponse(httpDetails.getRight()); } return null; } @@ -197,17 +197,17 @@ public final class AaiManager { return null; } - int httpResponseCode = httpDetailsGet.first; + int httpResponseCode = httpDetailsGet.getLeft(); NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "Response code: " + httpResponseCode); - NetLoggerUtil.getNetworkLogger().debug(httpDetailsGet.second); + NetLoggerUtil.getNetworkLogger().debug(httpDetailsGet.getRight()); logger.debug(urlGet); logger.debug("{}", httpResponseCode); - logger.debug(httpDetailsGet.second); + logger.debug(httpDetailsGet.getRight()); - if (httpResponseCode == 200 && httpDetailsGet.second != null) { - return httpDetailsGet.second; + if (httpResponseCode == 200 && httpDetailsGet.getRight() != null) { + return httpDetailsGet.getRight(); } try { Thread.sleep(1000); -- cgit 1.2.3-korg