Merge "Made network.log output more verbose."

4 files changed, 8 insertions, 9 deletions

diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java
index b24cc3906..0703b7611 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java
@@ -115,7 +115,7 @@ public class PolicyGuardXacmlHelper {
 					.toString().getBytes()), urlEntry.restURL,
 					urlEntry.authorization, urlEntry.clientAuth,
 					urlEntry.environment);
-			netLogger.info("[IN|{}{}|]{}{}", "GUARD", urlEntry.restURL, System.lineSeparator(), response);
+			netLogger.info("[IN|{}|{}|]{}{}", "GUARD", urlEntry.restURL, System.lineSeparator(), response);
 		} catch (Exception e) {
 			logger.error("Error in sending RESTful request: ", e);
 		}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
index e22fe00e3..c92ea775b 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
@@ -62,7 +62,7 @@ public final class AAIManager {
 		if (httpDetails.b != null) {
 			try {
 				AAINQResponse response = Serialization.gsonPretty.fromJson(httpDetails.b, AAINQResponse.class);
-				netLogger.info("[IN|{}|{}|]{}{}", "AAI", url, System.lineSeparator(), response.toString());
+				netLogger.info("[IN|{}|{}|]{}{}", "AAI", url, System.lineSeparator(), httpDetails.b);
 				return response;
 			} catch (JsonSyntaxException e) {
 				logger.error("postQuery threw: ", e);
@@ -99,7 +99,7 @@ public final class AAIManager {
 			if (httpDetailsGet.a == 200) {
 				try {
 					responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, AAIGETVserverResponse.class);
-					netLogger.info("[IN|{}|{}|]{}{}", "AAI", urlGet, System.lineSeparator(), responseGet.toString());
+					netLogger.info("[IN|{}|{}|]{}{}", "AAI", urlGet, System.lineSeparator(), httpDetailsGet.b);
 					return responseGet;
 				} catch (JsonSyntaxException e) {
 					logger.error("postQuery threw: ", e);
@@ -140,7 +140,7 @@ public final class AAIManager {
 			if (httpDetailsGet.a == 200) {
 				try {
 					responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, AAIGETVnfResponse.class);
-					netLogger.info("[IN|{}|{}|]{}{}", "AAI", urlGet, System.lineSeparator(), responseGet.toString());
+					netLogger.info("[IN|{}|{}|]{}{}", "AAI", urlGet, System.lineSeparator(), httpDetailsGet.b);
 					return responseGet;
 				} catch (JsonSyntaxException e) {
 					logger.error("postQuery threw: ", e);
@@ -182,7 +182,7 @@ public final class AAIManager {
 			if (httpDetailsGet.a == 200) {
 				try {
 					responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, AAIGETVnfResponse.class);
-					netLogger.info("[IN|{}|{}|]{}{}", "AAI", urlGet, System.lineSeparator(), responseGet.toString());
+					netLogger.info("[IN|{}|{}|]{}{}", "AAI", urlGet, System.lineSeparator(), httpDetailsGet.b);
 					return responseGet;
 				} catch (JsonSyntaxException e) {
 					logger.error("postQuery threw: ", e);
diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java
index 1caa045e4..6d78b64c3 100644
--- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java
@@ -86,7 +86,7 @@ public final class SOManager {
 					
 					Pair<Integer, String> httpDetailsGet = RESTManager.get(urlGet, username, password, headers);
 					responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, SOResponse.class);
-					netLogger.info("[IN|{}|{}|]{}{}", "SO", urlGet, System.lineSeparator(), responseGet.toString());
+					netLogger.info("[IN|{}|{}|]{}{}", "SO", urlGet, System.lineSeparator(), httpDetailsGet.b);
                     
 					body = Serialization.gsonPretty.toJson(responseGet);
 					logger.debug("***** Response to get:");
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
index 2ef9b3aac..ebc3ad6cb 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
@@ -94,8 +94,7 @@ public final class VFCManager implements Runnable {
         if (httpDetails.a == 202) {
             try {
                 VFCResponse response = Serialization.gsonPretty.fromJson(httpDetails.b, VFCResponse.class);
-                netLogger.info("[IN|{}|{}|]{}{}", "VFC", vfcUrl, System.lineSeparator(), response.toString());
-
+                netLogger.info("[IN|{}|{}|]{}{}", "VFC", vfcUrl, System.lineSeparator(), httpDetails.b);
                 String body = Serialization.gsonPretty.toJson(response);
                 logger.debug("Response to VFC Heal post:");
                 logger.debug(body);
@@ -111,7 +110,7 @@ public final class VFCManager implements Runnable {
                     netLogger.info("[OUT|{}|{}|]", "VFC", urlGet);
                     Pair<Integer, String> httpDetailsGet = RESTManager.get(urlGet, username, password, headers);
                     responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, VFCResponse.class);
-                    netLogger.info("[IN|{}|{}|]{}{}", "VFC", urlGet, System.lineSeparator(), responseGet.toString());
+                    netLogger.info("[IN|{}|{}|]{}{}", "VFC", urlGet, System.lineSeparator(), httpDetailsGet.b);
                     responseGet.requestId = vfcRequest.requestId.toString();
                     body = Serialization.gsonPretty.toJson(responseGet);
                     logger.debug("Response to VFC Heal get:");