summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnusen, Drew (dm741q) <dm741q@att.com>2017-08-16 15:21:15 -0500
committerMagnusen, Drew (dm741q) <dm741q@att.com>2017-08-18 14:40:18 -0500
commit6d7e231986b84cf6646e46beba7e7e05699bffe6 (patch)
treee08ebda96bc5797d64dd66e667303cf55ad87491
parent5ae90a9bf72d2d6dbb163c3dbea5474b657be7e7 (diff)
Code cleanup to resolve critical sonar issues
Code cleanup mostly involed directing the output of exception messages to the correct logger stream. Issue-ID: [POLICY-115] Change-Id: I2042bac3d3b0991a2ebed33421a73f1aa300c7c1 Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopLogger.java14
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopPublisher.java11
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java13
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java7
-rw-r--r--controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java7
-rw-r--r--controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java38
-rw-r--r--controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java13
-rw-r--r--controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardYamlToXacml.java9
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java7
-rw-r--r--controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java10
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java2
-rw-r--r--controlloop/common/model-impl/mso/src/main/java/org/onap/policy/mso/MSOManager.java8
-rw-r--r--controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java9
-rw-r--r--pom.xml8
14 files changed, 104 insertions, 52 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopLogger.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopLogger.java
index 4495f2a71..bb23983ce 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopLogger.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopLogger.java
@@ -22,6 +22,10 @@ package org.onap.policy.controlloop;
import java.lang.reflect.Constructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
public interface ControlLoopLogger {
public void info(String... parameters);
@@ -32,13 +36,17 @@ public interface ControlLoopLogger {
public static class Factory {
- public ControlLoopLogger buildLogger(String className) {
+ private static final Logger logger = LoggerFactory.getLogger(Factory.class);
+
+
+ public ControlLoopLogger buildLogger(String className) throws ControlLoopException {
+
try {
Constructor<?> constr = Class.forName(className).getConstructor();
return (ControlLoopLogger) constr.newInstance();
} catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("Cannot load class " + className);
+ logger.error("buildLogger threw: ", e);
+ throw new ControlLoopException("Cannot load class " + className);
}
}
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopPublisher.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopPublisher.java
index 3ed6f8d58..9272e2887 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopPublisher.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ControlLoopPublisher.java
@@ -22,19 +22,24 @@ package org.onap.policy.controlloop;
import java.lang.reflect.Constructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public interface ControlLoopPublisher {
public void publish(Object object);
public static class Factory {
+ private static final Logger logger = LoggerFactory.getLogger(Factory.class);
- public ControlLoopPublisher buildLogger(String className) {
+
+ public ControlLoopPublisher buildLogger(String className) throws ControlLoopException {
try {
Constructor<?> constr = Class.forName(className).getConstructor();
return (ControlLoopPublisher) constr.newInstance();
} catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("Cannot load class " + className);
+ logger.error("ControlLoopPublisher.buildLogger threw: ", e);
+ throw new ControlLoopException("Cannot load class " + className);
}
}
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index d1d2cefd2..3feab7d7c 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -33,7 +33,6 @@ import org.onap.policy.controlloop.ControlLoopNotificationType;
import org.onap.policy.controlloop.ControlLoopOperation;
import org.onap.policy.controlloop.VirtualControlLoopEvent;
import org.onap.policy.controlloop.VirtualControlLoopNotification;
-
import org.onap.policy.controlloop.ControlLoopException;
import org.onap.policy.controlloop.policy.FinalResult;
import org.onap.policy.controlloop.policy.Policy;
@@ -43,12 +42,16 @@ import org.onap.policy.guard.LockCallback;
import org.onap.policy.guard.PolicyGuard;
import org.onap.policy.guard.PolicyGuard.LockResult;
import org.onap.policy.guard.TargetLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ControlLoopEventManager implements LockCallback, Serializable {
/**
*
*/
+ private static final Logger logger = LoggerFactory.getLogger(ControlLoopEventManager.class);
+
private static final long serialVersionUID = -1216568161322872641L;
public final String closedLoopControlName;
public final UUID requestID;
@@ -62,11 +65,11 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
private FinalResult controlLoopTimedOut = null;
private boolean isActivated = false;
- private LinkedList<ControlLoopOperation> controlLoopHistory = new LinkedList<ControlLoopOperation>();
+ private LinkedList<ControlLoopOperation> controlLoopHistory = new LinkedList<>();
private ControlLoopOperationManager currentOperation = null;
private TargetLock targetLock = null;
- private static Collection<String> requiredAAIKeys = new ArrayList<String>();
+ private static Collection<String> requiredAAIKeys = new ArrayList<>();
static {
requiredAAIKeys.add("AICVServerSelfLink");
requiredAAIKeys.add("AICIdentity");
@@ -148,6 +151,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
//
this.isActivated = true;
} catch (ControlLoopException e) {
+ logger.error("{}: activate threw: ",this, e);
notification.notification = ControlLoopNotificationType.REJECTED;
notification.message = e.getMessage();
}
@@ -183,6 +187,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
yamlSpecification = decodedYaml;
}
} catch (UnsupportedEncodingException e) {
+ logger.error("{}: activate threw: ",this, e);
}
//
// Parse the YAML specification
@@ -203,6 +208,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
//
this.isActivated = true;
} catch (ControlLoopException e) {
+ logger.error("{}: activate threw: ",this, e);
notification.notification = ControlLoopNotificationType.REJECTED;
notification.message = e.getMessage();
}
@@ -467,6 +473,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
return NEW_EVENT_STATUS.SYNTAX_ERROR;
}
} catch (ControlLoopException e) {
+ logger.error("{}: onNewEvent threw: ",this, e);
return NEW_EVENT_STATUS.SYNTAX_ERROR;
}
}
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
index ff7b2c74d..f552cc549 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
@@ -30,15 +30,15 @@ import javax.persistence.Persistence;
import org.onap.policy.appc.Response;
import org.onap.policy.appc.ResponseCode;
-
import org.onap.policy.controlloop.ControlLoopEvent;
import org.onap.policy.controlloop.ControlLoopOperation;
import org.onap.policy.controlloop.VirtualControlLoopEvent;
-
import org.onap.policy.controlloop.ControlLoopException;
import org.onap.policy.controlloop.policy.Policy;
import org.onap.policy.controlloop.policy.PolicyResult;
import org.onap.policy.controlloop.actor.appc.APPCActorServiceProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ControlLoopOperationManager implements Serializable {
@@ -47,6 +47,7 @@ public class ControlLoopOperationManager implements Serializable {
*
*/
private static final long serialVersionUID = -3773199283624595410L;
+ private static final Logger logger = LoggerFactory.getLogger(ControlLoopOperationManager.class);
@Override
public String toString() {
@@ -449,7 +450,7 @@ public class ControlLoopOperationManager implements Serializable {
try{
em = Persistence.createEntityManagerFactory("OperationsHistoryPU").createEntityManager();//emf.createEntityManager();
}catch(Exception e){
- System.err.println("Test thread got Exception " + e.getLocalizedMessage() + " Can't write to Operations History DB.");
+ logger.error("storeOperationInDataBase threw: ", e);
return;
}
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java
index dbef0c433..53e972941 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java
@@ -23,13 +23,17 @@ package org.onap.policy.guard;
import com.att.research.xacml.api.DataTypeException;
import com.att.research.xacml.api.pdp.PDPEngine;
import com.att.research.xacml.std.annotations.RequestParser;
+
import java.util.UUID;
import org.drools.core.WorkingMemory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CallGuardTask implements Runnable {
+ private static final Logger logger = LoggerFactory.getLogger(CallGuardTask.class);
WorkingMemory workingMemory;
PDPEngine embeddedPdpEngine;
String restfulPdpUrl;
@@ -59,8 +63,7 @@ public class CallGuardTask implements Runnable {
try {
request = RequestParser.parseRequest(xacmlReq);
} catch (IllegalArgumentException | IllegalAccessException | DataTypeException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("CallGuardTask.run threw: ", e);
}
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java
index 8f3928cdd..57deee5f1 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java
@@ -47,15 +47,16 @@ import com.att.research.xacml.api.Attribute;
import com.att.research.xacml.api.AttributeValue;
import com.att.research.xacml.api.Identifier;
import com.att.research.xacml.std.datatypes.DataTypes;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PIPEngineGetHistory extends StdConfigurableEngine{
- private Log logger = LogFactory.getLog(this.getClass());
+ private static final Logger logger = LoggerFactory.getLogger(PIPEngineGetHistory.class);
//private static EntityManager em;
public static final String DEFAULT_DESCRIPTION = "PIP for retrieving Operations History from DB";
@@ -88,7 +89,7 @@ public class PIPEngineGetHistory extends StdConfigurableEngine{
try {
attributeValue = DataTypes.DT_INTEGER.createAttributeValue(value);
} catch (Exception ex) {
- this.logger.error("Failed to convert " + value + " to an AttributeValue<Boolean>", ex);
+ this.logger.error("Failed to convert {} to an AttributeValue<Boolean>",value, ex);
}
if (attributeValue != null) {
stdPIPResponse.addAttribute(new StdMutableAttribute(category, attributeId, attributeValue, pipRequest.getIssuer()/*this.getIssuer()*/, false));
@@ -193,7 +194,7 @@ public class PIPEngineGetHistory extends StdConfigurableEngine{
pipResponse = null;
}
} catch (PIPException ex) {
- System.out.println("PIPException getting subject-id attribute: " + ex.getMessage());
+ logger.error("getAttribute threw: ", ex);
}
return pipResponse;
}
@@ -295,29 +296,28 @@ public class PIPEngineGetHistory extends StdConfigurableEngine{
try{
em = Persistence.createEntityManagerFactory("OperationsHistoryPU").createEntityManager();
}catch(Exception e){
- System.err.println("PIP thread got Exception " + e.getLocalizedMessage() + " Can't connect to Operations History DB.");
+ logger.error("getCountFromDB threw: ", e);
return -1;
}
- String sql = "select count(*) as count from operationshistory10 where outcome<>'Failure_Guard' and actor='"
- + actor
- + "' and operation='"
- + operation
- + "' and target='"
- + target
- + "' "
- + "and endtime between date_sub(now(),interval "
- + timeWindow
- + ") and now()";
-
- Query nq = em.createNativeQuery(sql);
+ String sql = "select count(*) as count from operationshistory10 where outcome<>'Failure_Guard'"
+ + " and actor=:actor"
+ + " and operation=:operation"
+ + " and target=:target"
+ + " and endtime between date_sub(now(),interval :timeWindow) and now()";
+
+ Query nq = em.createNativeQuery(sql);
+ nq = nq.setParameter("actor", actor);
+ nq = nq.setParameter("operation", operation);
+ nq = nq.setParameter("target", target);
+ nq = nq.setParameter("timeWindow", timeWindow);
int ret = -1;
try{
ret = ((Number)nq.getSingleResult()).intValue();
}
catch(NoResultException | NonUniqueResultException ex){
- System.err.println("PIP thread got Exception " + ex.getLocalizedMessage());
+ logger.error("getCountFromDB threw: ", ex);
return -1;
}
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 20d50fd3b..c0ed80086 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
@@ -30,6 +30,8 @@ import java.util.UUID;
import org.apache.commons.io.IOUtils;
import org.apache.http.entity.ContentType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.att.research.xacml.api.Attribute;
import com.att.research.xacml.api.AttributeCategory;
@@ -44,7 +46,7 @@ import com.att.research.xacml.std.json.JSONResponse;
public class PolicyGuardXacmlHelper {
-
+ private static final Logger logger = LoggerFactory.getLogger(PolicyGuardXacmlHelper.class);
public static com.att.research.xacml.api.Response callPDP(PDPEngine xacmlEmbeddedPdpEngine, String restfulPdpUrl, com.att.research.xacml.api.Request request, boolean isREST) {
//
@@ -133,19 +135,20 @@ public class PolicyGuardXacmlHelper {
contentType.getMimeType().equalsIgnoreCase("application/xacml+xml") ) {
response = (com.att.research.xacml.api.Response) DOMResponse.load(connection.getInputStream());
} else {
- System.err.println("unknown content-type: " + contentType);
+ logger.error("{}: unknown content-type: ", contentType);
}
} catch (Exception e) {
String message = "Parsing Content-Type: " + connection.getContentType() + ", error=" + e.getMessage();
- System.err.println(message);
+ logger.error("{}: callRESTfulPDP threw: ", message);
}
} else {
- System.err.println(connection.getResponseCode() + " " + connection.getResponseMessage());
+ logger.error("unknown content-type: {} {}", connection.getResponseCode(), connection.getResponseMessage() );
}
} catch (Exception e) {
- System.err.println(e);
+
+ logger.error("callRESTfulPDP threw: ", e);
}
return response;
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardYamlToXacml.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardYamlToXacml.java
index 4d952b58e..21584f0b5 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardYamlToXacml.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardYamlToXacml.java
@@ -30,11 +30,14 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.onap.policy.controlloop.policy.guard.ControlLoopGuard;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PolicyGuardYamlToXacml {
+ private static final Logger logger = LoggerFactory.getLogger(PolicyGuardYamlToXacml.class);
public static void fromYamlToXacml(String yamlFile, String xacmlTemplate, String xacmlPolicyOutput){
@@ -67,8 +70,7 @@ public class PolicyGuardYamlToXacml {
Files.write(Paths.get(xacmlPolicyOutput), xacmlPolicyContent.getBytes());
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("fromYamlToXacml threw: ", e);
}
}
@@ -198,8 +200,7 @@ public class PolicyGuardYamlToXacml {
Files.write(Paths.get(xacmlPolicyOutput), xacmlPolicyContent.getBytes());
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("fromYamlToXacmlBlacklist threw: ", e);
}
}
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java
index e02021a43..b079122e4 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199Manager.java
@@ -28,10 +28,13 @@ import org.onap.policy.aai.AAIGETResponse;
import org.onap.policy.aai.util.Serialization;
import org.onap.policy.rest.RESTManager;
import org.onap.policy.rest.RESTManager.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.JsonSyntaxException;
public final class AAINQF199Manager {
+ private static final Logger logger = LoggerFactory.getLogger(AAINQF199Manager.class);
public static AAINQF199Response postQuery(String url, String username, String password, AAINQF199Request request, UUID requestID) {
@@ -57,7 +60,7 @@ public final class AAINQF199Manager {
AAINQF199Response response = Serialization.gsonPretty.fromJson(httpDetails.b, AAINQF199Response.class);
return response;
} catch (JsonSyntaxException e) {
- System.err.println("Failed to deserialize into AAIResponse" + e.getLocalizedMessage());
+ logger.error("postQuery threw: ", e);
}
}
@@ -93,7 +96,7 @@ public final class AAINQF199Manager {
responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, AAIGETResponse.class);
return responseGet;
} catch (JsonSyntaxException e) {
- System.err.println("Failed to deserialize into AAIResponse" + e.getLocalizedMessage());
+ logger.error("getQuery threw: ", e);
}
}
try {
diff --git a/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java b/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java
index 8a801c32b..be7a66ada 100644
--- a/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java
+++ b/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java
@@ -25,6 +25,9 @@ import java.time.Instant;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
@@ -37,16 +40,17 @@ import com.google.gson.JsonSerializer;
public final class Serialization {
- public static DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx");
+ public static final DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx");
public static class gsonUTCAdapter implements JsonSerializer<ZonedDateTime>, JsonDeserializer<ZonedDateTime> {
-
+ private static final Logger logger = LoggerFactory.getLogger(gsonUTCAdapter.class);
+
public ZonedDateTime deserialize(JsonElement element, Type type, JsonDeserializationContext context)
throws JsonParseException {
try {
return ZonedDateTime.parse(element.getAsString(), format);
} catch (Exception e) {
- System.err.println(e);
+ logger.error("deserialize threw: ", e);
}
return null;
}
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java
index a45947733..9e6d1afc0 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java
@@ -73,7 +73,7 @@ public final class Serialization {
}
public static class gsonUTCAdapter implements JsonSerializer<ZonedDateTime>, JsonDeserializer<ZonedDateTime> {
- public static DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx");
+ public static final DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx");
public ZonedDateTime deserialize(JsonElement element, Type type, JsonDeserializationContext context)
throws JsonParseException {
diff --git a/controlloop/common/model-impl/mso/src/main/java/org/onap/policy/mso/MSOManager.java b/controlloop/common/model-impl/mso/src/main/java/org/onap/policy/mso/MSOManager.java
index 79725901a..81d43ef76 100644
--- a/controlloop/common/model-impl/mso/src/main/java/org/onap/policy/mso/MSOManager.java
+++ b/controlloop/common/model-impl/mso/src/main/java/org/onap/policy/mso/MSOManager.java
@@ -26,11 +26,15 @@ import java.util.Map;
import org.onap.policy.mso.util.Serialization;
import org.onap.policy.rest.RESTManager;
import org.onap.policy.rest.RESTManager.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.JsonSyntaxException;
public final class MSOManager {
+ private static final Logger logger = LoggerFactory.getLogger(MSOManager.class);
+
public static MSOResponse createModuleInstance(String url, String urlBase, String username, String password, MSORequest request) {
//
@@ -87,9 +91,9 @@ public final class MSOManager {
System.out.println("***** ######## VF Module Creation timeout. Status: ("+responseGet.request.requestStatus.requestState+")");
return responseGet;
} catch (JsonSyntaxException e) {
- System.err.println("Failed to deserialize into MSOResponse" + e.getLocalizedMessage());
+ logger.error("Failed to deserialize into MSOResponse: ", e);
} catch (InterruptedException e) {
- System.err.println("Interrupted exception: " + e.getLocalizedMessage());
+ logger.error("Interrupted exception: ", e);
}
}
diff --git a/controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java b/controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java
index e42ab1693..8c79d2ad3 100644
--- a/controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java
+++ b/controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java
@@ -34,9 +34,13 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class RESTManager {
+ private static final Logger logger = LoggerFactory.getLogger(RESTManager.class);
+
public static class Pair<A, B> {
public final A a;
public final B b;
@@ -81,7 +85,8 @@ public final class RESTManager {
return new Pair<Integer, String>(response.getStatusLine().getStatusCode(), returnBody);
} catch (IOException e) {
- System.err.println("Failed to POST to " + url + e.getLocalizedMessage());
+ logger.error("Failed to POST to {}",url,e);
+
return null;
}
@@ -108,7 +113,7 @@ public final class RESTManager {
return new Pair<Integer, String>(response.getStatusLine().getStatusCode(), returnBody);
} catch (IOException e) {
- System.err.println("Failed to GET to " + url + e.getLocalizedMessage());
+ logger.error("Failed to GET to {}",url,e);
return null;
}
}
diff --git a/pom.xml b/pom.xml
index 35d341050..294d91f9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,4 +276,12 @@
</plugin>
</plugins>
</reporting>
+ <dependencies>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>