* ============LICENSE_START=======================================================
* aai
* ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ * 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");
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;
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;
*/
public final class AaiManager {
+ // TODO remove this class
+
/** The Constant logger. */
private static final Logger logger = LoggerFactory.getLogger(AaiManager.class);
logger.debug("RestManager.put after");
if (httpDetails == null) {
- logger.info("AAI POST Null Response to {}", url);
+ NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "AAI POST Null Response");
+ logger.debug("AAI POST Null Response to {}", url);
return null;
}
- int httpResponseCode = httpDetails.first;
+ int httpResponseCode = httpDetails.getLeft();
- logger.info(url);
- logger.info("{}", httpResponseCode);
- logger.info(httpDetails.second);
+ NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "Response code: " + httpResponseCode);
+ NetLoggerUtil.getNetworkLogger().debug(httpDetails.getRight());
- if (httpDetails.second != null) {
- String resp = httpDetails.second;
- return new AaiCqResponse(resp);
+ logger.debug(url);
+ logger.debug("{}", httpResponseCode);
+ logger.debug(httpDetails.getRight());
+
+ if (httpDetails.getRight() != null) {
+ return new AaiCqResponse(httpDetails.getRight());
}
return null;
}
NetLoggerUtil.getNetworkLogger().info("[OUT|{}|{}|]", CommInfrastructure.REST, urlGet);
Pair<Integer, String> httpDetailsGet = restManager.get(urlGet, username, password, headers);
if (httpDetailsGet == null) {
- logger.info("AAI GET Null Response to {}", urlGet);
+ NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "AAI POST Null Response");
+ logger.debug("AAI GET Null Response to {}", urlGet);
return null;
}
- int httpResponseCode = httpDetailsGet.first;
+ int httpResponseCode = httpDetailsGet.getLeft();
+
+ NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "Response code: " + httpResponseCode);
+ NetLoggerUtil.getNetworkLogger().debug(httpDetailsGet.getRight());
- logger.info(urlGet);
- logger.info("{}", httpResponseCode);
- logger.info(httpDetailsGet.second);
+ logger.debug(urlGet);
+ logger.debug("{}", httpResponseCode);
+ logger.debug(httpDetailsGet.getRight());
- if (httpResponseCode == 200) {
- String responseGet = httpDetailsGet.second;
- if (responseGet != null) {
- return responseGet;
- }
+ if (httpResponseCode == 200 && httpDetailsGet.getRight() != null) {
+ return httpDetailsGet.getRight();
}
try {
Thread.sleep(1000);
urlGet = url + PNF_URL;
pnfName = URLEncoder.encode(pnfName, StandardCharsets.UTF_8.toString()) + AAI_DEPTH_SUFFIX;
} catch (UnsupportedEncodingException e) {
- logger.error("Failed to encode the pnfName: {} using UTF-8 encoding. {}", pnfName, e);
+ logger.error("Failed to encode the pnfName: {} using UTF-8", pnfName, e);
return null;
}
String responseGet = getStringQuery(urlGet, username, password, requestId, pnfName);