import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
+import org.openecomp.mso.logger.MsoLogger;
public class ApplicationControllerClient {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+
private static final int ACCEPT_SERIES = 100;
private static final int ERROR_SERIES = 200;
private static final int REJECT_SERIES = 300;
requestObject.getClass().getDeclaredMethod("setActionIdentifiers", ActionIdentifiers.class)
.invoke(requestObject, identifier);
} catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+ LOGGER.debug("Exception:", e);
throw new Exception("Error Building AppC Request: " + e.getMessage());
}
return requestObject;
public class CamundaDBSetup {
private static boolean isDBConfigured = false;
private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+
+ private CamundaDBSetup() {
+ /**
+ * Constructor.
+ */
+ }
+
public static synchronized void configure() throws SQLException {
if (isDBConfigured) {
return;
}
- System.out.println("Configuring the Camunda H2 database for MSO");
+ LOGGER.debug ("Configuring the Camunda H2 database for MSO");
Connection connection = null;
PreparedStatement stmt = null;
isDBConfigured = true;
} catch (SQLException e) {
- System.out.println("CamundaDBSetup caught " + e.getClass().getSimpleName());
+ LOGGER.debug ("CamundaDBSetup caught " + e.getClass().getSimpleName());
LOGGER.debug("SQLException :",e);
} finally {
if (stmt != null) {
private volatile String msoConfigPath = null;
private final ConcurrentHashMap<String, Map<String, String>> propFileCache =
- new ConcurrentHashMap<String, Map<String, String>>();
+ new ConcurrentHashMap<>();
private final Object CACHELOCK = new Object();
private FileWatcherThread fileWatcherThread = null;
// The key is the file name
- private Map<String, TimerTask> timerTaskMap = new HashMap<String, TimerTask>();
+ private Map<String, TimerTask> timerTaskMap = new HashMap<>();
+ /**
+ * Private Constructor.
+ */
+ private PropertyConfiguration() {
+ startUp();
+ }
+
/**
* Singleton holder pattern eliminates locking when accessing the instance
* and still provides for lazy initialization.
* Returns the list of supported files.
*/
public static List<String> supportedFiles() {
- return new ArrayList<String>(SUPPORTED_FILES);
- }
-
- /**
- * Private Constructor.
- */
- private PropertyConfiguration() {
- startUp();
+ return new ArrayList<>(SUPPORTED_FILES);
}
/**
String fileName = file.getName();
LOGGER.debug("Reading " + fileName);
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = new HashMap<>();
Properties newProperties = new Properties();
FileReader reader = null;
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
try {
stream.close();
} catch (Exception e) {
- // Do nothing
+ msoLogger.debug("Exception:", e);
}
}
}
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
try {
xmlStream.close();
} catch (Exception e) {
- // Do nothing
+ msoLogger.debug("Exception ", e);
}
}
}
}
execution.setVariable(theInputVariable, value);
execution.setVariable(theOutputVariable, value);
- System.out.println("ServiceInput - " + execution.getVariable("gServiceInput"));
+ msoLogger.debug ("ServiceInput - " + execution.getVariable("gServiceInput"));
if (msoLogger.isDebugEnabled()) {
msoLogger.debug("Done Executing " + getTaskName());
}
* ONAP - SO\r
* ================================================================================\r
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.\r
* ================================================================================\r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* you may not use this file except in compliance with the License.\r
getStringField(outputVariable, execution, "outputVariable");\r
\r
if (msoLogger.isDebugEnabled()) {\r
- System.out.println("scriptFile = " + theScriptFile\r
+ msoLogger.debug ("scriptFile = " + theScriptFile\r
+ " xmlInputVariables = " + theXmlInputVariables\r
+ " atomicInputVariables = " + theAtomicInputVariables\r
+ "outputVariable = " + theOutputVariable);\r
for (String atomicInputVariable : atomicInputVariableArray) {\r
\r
if (msoLogger.isDebugEnabled()) {\r
- System.out.println("Injecting object variable '"\r
+ msoLogger.debug ("Injecting object variable '"\r
+ atomicInputVariable + "'");\r
}\r
\r
try {\r
xqStream.close();\r
} catch (Exception e) {\r
- // Do nothing\r
+ msoLogger.debug ("Exception:", e);\r
}\r
}\r
}\r
jsonObj = (JSONObject) obj;\r
keys = jsonObj.keys();\r
while (keys.hasNext()) {\r
- key = keys.next().toString();\r
+ key = keys.next();\r
// msoLogger.debug("toXMLString(): key is " + k);\r
curObj = jsonObj.opt(key);\r
if (curObj == null) {\r
return null;\r
} else {\r
if (rawValue instanceof String) {\r
- msoLogger.debug("getJsonValue(): the raw value is a String Object=" + ((String) rawValue).toString());\r
+ msoLogger.debug("getJsonValue(): the raw value is a String Object=" + ((String) rawValue));\r
return (String) rawValue;\r
} else {\r
msoLogger.debug("getJsonValue(): the raw value is NOT a String Object=" + rawValue.toString());\r
return null;\r
} else {\r
if (rawValue instanceof String) {\r
- msoLogger.debug("getJsonNodeValue(): the raw value is a String Object=" + ((String) rawValue).toString());\r
+ msoLogger.debug("getJsonNodeValue(): the raw value is a String Object=" + ((String) rawValue));\r
return (String) rawValue;\r
} else {\r
msoLogger.debug("getJsonNodeValue(): the raw value is NOT a String Object=" + rawValue.toString());\r
* @return boolean field value associated with keys - default is false\r
*/\r
public static boolean getJsonBooleanValue(String jsonStr, String keys) {\r
- String isDebugLogEnabled = "true";\r
try {\r
Object rawValue = getJsonRawValue(jsonStr, keys);\r
if (rawValue == null) {\r
return false;\r
} else {\r
if (rawValue instanceof Boolean) {\r
- msoLogger.debug("getJsonValue(): the raw value is a Boolean Object=" + ((String) rawValue).toString());\r
+ msoLogger.debug("getJsonValue(): the raw value is a Boolean Object=" + ((String) rawValue));\r
return (Boolean) rawValue;\r
} else {\r
msoLogger.debug("getJsonValue(): the raw value is NOT an Boolean Object=" + rawValue.toString());\r
try {\r
if (jsonObj.has(key)) {\r
msoLogger.debug("getJsonValueForKey(): found value for key=" + key);\r
- return ((Integer) jsonObj.get(key));\r
+ return (Integer) jsonObj.get(key);\r
} else {\r
msoLogger.debug("getJsonValueForKey(): iterating over the keys");\r
Iterator <String> itr = jsonObj.keys();\r
* @return String field value associated with key\r
*/\r
public static Boolean getJsonBooleanValueForKey(JSONObject jsonObj, String key) {\r
- String isDebugLogEnabled = "true";\r
Boolean keyValue = false;\r
try {\r
if (jsonObj.has(key)) {\r
msoLogger.debug("getJsonBooleanValueForKey(): found value for key=" + key);\r
- return ((Boolean) jsonObj.get(key));\r
+ return (Boolean) jsonObj.get(key);\r
} else {\r
msoLogger.debug("getJsonBooleanValueForKey(): iterating over the keys");\r
Iterator <String> itr = jsonObj.keys();\r
public Map<String, String> entryArrayToMap(Execution execution, String entryArray) {\r
msoLogger.debug("Started Entry Array To Map Util Method");\r
\r
- Map<String, String> map = new HashMap<String, String>();\r
+ Map<String, String> map = new HashMap<>();\r
\r
//Populate Map\r
String entryListJson = "{ \"entry\":" + entryArray + "}";\r
public Map<String, String> entryArrayToMap(Execution execution, String entryArray, String keyNode, String valueNode) {\r
msoLogger.debug("Started Entry Array To Map Util Method");\r
\r
- Map<String, String> map = new HashMap<String, String>();\r
+ Map<String, String> map = new HashMap<>();\r
//Populate Map\r
String entryListJson = "{ \"entry\":" + entryArray + "}";\r
JSONObject obj = new JSONObject(entryListJson);\r
public List<String> StringArrayToList(Execution execution, String jsonArrayOfStrings) {\r
msoLogger.debug("Started String Array To List Util Method");\r
\r
- List<String> list = new ArrayList<String>();\r
+ List<String> list = new ArrayList<>();\r
//Populate List\r
String stringListJson = "{ \"strings\":" + jsonArrayOfStrings + "}";\r
JSONObject obj = new JSONObject(stringListJson);\r
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
public final class XmlTool {
- private static final Map<String, Integer> ENTITIES = new HashMap<String, Integer>();
+ private static final Map<String, Integer> ENTITIES = new HashMap<>();
private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.BPEL);
static {
ENTITIES.put("amp", new Integer(38));
ENTITIES.put("gt", new Integer(62));
}
+ /**
+ * Instantiation is not allowed.
+ */
+ private XmlTool() {
+ }
+
/**
* Normalizes and formats XML. This method consolidates and moves all namespace
* declarations to the root element. The result will not have an XML prolog or
// return the modified String representation of the XML
return Optional.of(writer.toString().trim());
}
-
- /**
- * Instantiation is not allowed.
- */
- private XmlTool() {
- }
}
* ============LICENSE_START=======================================================
* ONAP - SO
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import java.io.IOException;
import java.io.InputStream;
+import org.openecomp.mso.logger.MsoLogger;
+/**
+ *
+ * File utility class.<br/>
+ * <p>
+ * </p>
+ *
+ * @author
+ * @version ONAP Sep 15, 2017
+ */
public class FileUtil {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+
+ private FileUtil() {
+ /**
+ * Constructor.
+ */
+ }
/**
* Read the specified resource file and return the contents as a String.
*
stream.close();
return new String(bytes);
} catch (IOException e) {
+ LOGGER.debug("Exception:", e);
return "";
}
}
} catch (InterruptedException e1) {
LOGGER.debug("Exception :",e1);
}
- System.out.println("Sending callback response:" + callbackUrl);
+ LOGGER.debug("Sending callback response:" + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
request.body("text/xml", payLoad);
System.err.println(payLoad);
// TODO Auto-generated catch block
LOGGER.debug("Exception :",e1);
}
- System.out.println("Sending callback response to url: " + callbackUrl);
+ LOGGER.debug("Sending callback response to url: " + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
request.body("text/xml", payLoad);
//System.err.println(payLoad);
try {
ClientResponse result = request.post();
- System.out.println("Successfully posted callback? Status: " + result.getStatus());
+ LOGGER.debug("Successfully posted callback? Status: " + result.getStatus());
} catch (Exception e) {
// TODO Auto-generated catch block
- System.out.println("catch error in - request.post() ");
+ LOGGER.debug("catch error in - request.post() ");
LOGGER.debug("Exception :",e);
}
}
// TODO Auto-generated catch block
LOGGER.debug("Exception :",e1);
}
- System.out.println("Sending callback response to url: " + callbackUrl);
+ LOGGER.debug("Sending callback response to url: " + callbackUrl);
ClientRequest request = new ClientRequest(callbackUrl);
request.body("text/xml", payLoad);
//System.out.println("payLoad: " + payLoad);
try {
ClientResponse result = request.post();
- System.out.println("Successfully posted callback? Status: " + result.getStatus());
+ LOGGER.debug("Successfully posted callback? Status: " + result.getStatus());
//System.err.println("Successfully posted callback:" + result.getStatus());
} catch (Exception e) {
// TODO Auto-generated catch block
- System.out.println("catch error in - request.post() ");
+ LOGGER.debug("catch error in - request.post() ");
LOGGER.debug("Exception :",e);
}
}
* ONAP - SO
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import javax.net.ssl.SSLException;
import org.apache.http.conn.ssl.AbstractVerifier;
+import org.openecomp.mso.logger.MsoLogger;
/**
* @version 1.0
*/
public class HostNameVerifier extends AbstractVerifier {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+
public final void verify(
final String host,
final String[] cns,
try {
verify(host, cns, subjectAlts, true);
} catch (SSLException sex) {
-
+ LOGGER.debug("Exception:", sex);
}
}
Code Review / so.git / commitdiff