* 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 java.util.ArrayList;
import java.util.Set;
import org.openecomp.mso.db.catalog.beans.HeatTemplateParam;
+import org.openecomp.mso.logger.MsoLogger;
public class MsoHeatEnvironmentEntry {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+
private Set<MsoHeatEnvironmentParameter> parameters = null;
private Set<MsoHeatEnvironmentResource> resources = null;
private StringBuilder rawEntry = null;
private void processRawEntry() {
try {
- if (this.rawEntry == null || this.rawEntry.equals(""))
+ if (this.rawEntry == null || "".equals(this.rawEntry))
return;
byte[] b = this.rawEntry.toString().getBytes();
MsoYamlEditorWithEnvt yaml = new MsoYamlEditorWithEnvt(b);
this.resourceRegistryEntryRaw = sb;
}
} catch (Exception e) {
+ LOGGER.debug("Exception:", e);
this.valid = false;
this.errorString = e.getMessage();
//e.printStackTrace();
public void addParameter(MsoHeatEnvironmentParameter hep) {
if (this.parameters == null) {
- this.parameters = new HashSet<MsoHeatEnvironmentParameter>();
+ this.parameters = new HashSet<>();
}
this.parameters.add(hep);
}
public void addResource(MsoHeatEnvironmentResource her) {
if (this.resources == null) {
- this.resources = new HashSet<MsoHeatEnvironmentResource>();
+ this.resources = new HashSet<>();
}
this.resources.add(her);
}
* 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.
package org.openecomp.mso.openstack.utils;
-
+import org.openecomp.mso.logger.MsoLogger;
public class MsoHeatEnvironmentResource {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+
private String name;
private String value;
try {
result = this.name.hashCode();
} catch (Exception e) {
- // in case it's null - return zero
+ LOGGER.debug("Exception:", e);
}
return result;
}
// token will be used until it expires.
//
// The cache key is "tenantId:cloudId"
- private static Map <String, HeatCacheEntry> heatClientCache = new HashMap <String, HeatCacheEntry> ();
+ private static Map <String, HeatCacheEntry> heatClientCache = new HashMap <> ();
// Fetch cloud configuration each time (may be cached in CloudConfig class)
protected CloudConfig cloudConfig;
- private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
protected MsoJavaProperties msoProps = null;
if (haveFiles && haveHeatFiles) {
// Let's do this here - not in the bean
LOGGER.debug ("Found files AND heatFiles - combine and add!");
- Map <String, Object> combinedFiles = new HashMap <String, Object> ();
+ Map <String, Object> combinedFiles = new HashMap <> ();
for (String keyString : files.keySet ()) {
combinedFiles.put (keyString, files.get (keyString));
}
}
} // end while !deleted
- StringBuilder errorContextMessage = null;
+ StringBuilder errorContextMessage;
if (createTimedOut) {
errorContextMessage = new StringBuilder("Stack Creation Timeout");
} else {
String canonicalName = heatStack.getStackName () + "/" + heatStack.getId ();
try {
- OpenStackRequest <Void> request = heatClient.getStacks ().deleteByName (canonicalName);
+ OpenStackRequest <Void> request = null;
+ if(null != heatClient) {
+ request = heatClient.getStacks ().deleteByName (canonicalName);
+ }
+ else {
+ LOGGER.debug ("Heat Client is NULL" );
+ }
+
executeAndRecordOpenstackRequest (request, msoProps);
} catch (OpenStackResponseException e) {
if (e.getStatus () == 404) {
OpenStackRequest <Stacks> request = heatClient.getStacks ().list ();
Stacks stacks = executeAndRecordOpenstackRequest (request, msoProps);
- List <StackInfo> stackList = new ArrayList <StackInfo> ();
+ List <StackInfo> stackList = new ArrayList <> ();
// Not sure if returns an empty list or null if no stacks exist
if (stacks != null) {
if (e.getStatus () == 404) {
// Not sure if this can happen, but return an empty list
LOGGER.debug ("queryAllStacks - stack not found: ");
- return new ArrayList <StackInfo> ();
+ return new ArrayList <> ();
} else {
// Convert the OpenStackResponseException to an MsoOpenstackException
throw heatExceptionToMsoException (e, QUERY_ALL_STACKS);
HeatTemplate heatTemplate) throws IllegalArgumentException {
// Check that required parameters have been supplied for this template type
String missingParams = null;
- List <String> paramList = new ArrayList <String> ();
+ List <String> paramList = new ArrayList <> ();
// TODO: Enhance DB to support defaults for Heat Template parameters
}
// Remove any extraneous parameters (don't throw an error)
- Map <String, Object> updatedParams = new HashMap <String, Object> ();
- List <String> extraParams = new ArrayList <String> ();
+ Map <String, Object> updatedParams = new HashMap <> ();
+ List <String> extraParams = new ArrayList <> ();
for (String key : inputParams.keySet ()) {
if (!paramList.contains (key)) {
// This is not a valid parameter for this template
* This may be useful if cached credentials get out of sync.
*/
public static void heatCacheReset () {
- heatClientCache = new HashMap <String, HeatCacheEntry> ();
+ heatClientCache = new HashMap <> ();
}
public Map<String, Object> queryStackForOutputs(String cloudSiteId,
sb.append("(outputs is empty)");
return sb;
}
- Map<String, Object> outputs = new HashMap<String,Object>();
+ Map<String, Object> outputs = new HashMap<>();
for (Output outputItem : outputList) {
outputs.put(outputItem.getOutputKey(), outputItem.getOutputValue());
}
} else {
cdl3 = cdl2;
}
- ArrayList<String> list = new ArrayList<String>(Arrays.asList(cdl3.split(",")));
+ ArrayList<String> list = new ArrayList<>(Arrays.asList(cdl3.split(",")));
return list;
}
* @return HashMap<String, Object> of the inputs, cleaned and converted
*/
public HashMap<String, Object> convertInputMap(Map<String, String> inputs, HeatTemplate template) {
- HashMap<String, Object> newInputs = new HashMap<String, Object>();
- HashMap<String, HeatTemplateParam> params = new HashMap<String, HeatTemplateParam>();
- HashMap<String, HeatTemplateParam> paramAliases = new HashMap<String, HeatTemplateParam>();
+ HashMap<String, Object> newInputs = new HashMap<>();
+ HashMap<String, HeatTemplateParam> params = new HashMap<>();
+ HashMap<String, HeatTemplateParam> paramAliases = new HashMap<>();
if (inputs == null) {
LOGGER.debug("convertInputMap - inputs is null - nothing to do here");
for (HeatTemplateParam htp : template.getParameters()) {
LOGGER.debug("Adding " + htp.getParamName());
params.put(htp.getParamName(), htp);
- if (htp.getParamAlias() != null && !htp.getParamAlias().equals("")) {
+ if (htp.getParamAlias() != null && !"".equals(htp.getParamAlias())) {
LOGGER.debug("\tFound ALIAS " + htp.getParamName() + "->" + htp.getParamAlias());
paramAliases.put(htp.getParamAlias(), htp);
}
}
}
String type = params.get(key).getParamType();
- if (type == null || type.equals("")) {
+ if (type == null || "".equals(type)) {
LOGGER.debug("**PARAM_TYPE is null/empty for " + key + ", will default to string");
type = "string";
}
LOGGER.debug("Parameter: " + key + " is of type " + type);
- if (type.equalsIgnoreCase("string")) {
+ if ("string".equalsIgnoreCase(type)) {
// Easiest!
String str = inputs.get(key);
if (alias)
newInputs.put(realName, str);
else
newInputs.put(key, str);
- } else if (type.equalsIgnoreCase("number")) {
- String integerString = inputs.get(key).toString();
+ } else if ("number".equalsIgnoreCase(type)) {
+ String integerString = inputs.get(key);
Integer anInteger = null;
try {
anInteger = Integer.parseInt(integerString);
else
newInputs.put(key, integerString);
}
- } else if (type.equalsIgnoreCase("json")) {
- String jsonString = inputs.get(key).toString();
+ } else if ("json".equalsIgnoreCase(type)) {
+ String jsonString = inputs.get(key);
JsonNode jsonNode = null;
try {
jsonNode = new ObjectMapper().readTree(jsonString);
else
newInputs.put(key, jsonString);
}
- } else if (type.equalsIgnoreCase("comma_delimited_list")) {
- String commaSeparated = inputs.get(key).toString();
+ } else if ("comma_delimited_list".equalsIgnoreCase(type)) {
+ String commaSeparated = inputs.get(key);
try {
ArrayList<String> anArrayList = this.convertCdlToArrayList(commaSeparated);
if (alias)
else
newInputs.put(key, commaSeparated);
}
- } else if (type.equalsIgnoreCase("boolean")) {
- String booleanString = inputs.get(key).toString();
+ } else if ("boolean".equalsIgnoreCase(type)) {
+ String booleanString = inputs.get(key);
Boolean aBool = new Boolean(booleanString);
if (alias)
newInputs.put(realName, aBool);
import org.yaml.snakeyaml.Yaml;
+import org.openecomp.mso.logger.MsoLogger;
public class MsoYamlEditorWithEnvt {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+
private Map <String, Object> yml;
private Yaml yaml = new Yaml ();
private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
try {
resourceMap = (Map<String,Object>) yml.get("parameters");
} catch (Exception e) {
+ LOGGER.debug("Exception:", e);
return paramSet;
}
if (resourceMap == null) {
try {
value = JSON_MAPPER.writeValueAsString(obj);
} catch (Exception e) {
+ LOGGER.debug("Exception:", e);
value = "_BAD_JSON_MAPPING";
}
} else {
}
public synchronized Set <MsoHeatEnvironmentResource> getResourceListFromEnvt() {
try {
- Set<MsoHeatEnvironmentResource> resourceList = new HashSet<MsoHeatEnvironmentResource>();
+ Set<MsoHeatEnvironmentResource> resourceList = new HashSet<>();
@SuppressWarnings("unchecked")
Map<String, Object> resourceMap = (Map<String,Object>) yml.get("resource_registry");
Iterator<Entry <String,Object>> it = resourceMap.entrySet().iterator();
}
return resourceList;
} catch (Exception e) {
-
+ LOGGER.debug("Exception:", e);
}
return null;
}
public synchronized Set <HeatTemplateParam> getParameterList () {
- Set <HeatTemplateParam> paramSet = new HashSet <HeatTemplateParam> ();
+ Set <HeatTemplateParam> paramSet = new HashSet <> ();
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
Iterator <Entry <String, Object>> it = resourceMap.entrySet ().iterator ();
try {
value = resourceEntry.get ("default");
} catch (java.lang.ClassCastException cce) {
+ LOGGER.debug("Exception:", cce);
// This exception only - the value is an integer. For what we're doing
// here - we don't care - so set value to something - and it will
// get marked as not being required - which is correct.
* 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 org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
+import org.openecomp.mso.logger.MsoLogger;
/**
* Everything that is common between all Network Requests.
*/
public abstract class NetworkRequestCommon {
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
private Boolean skipAAI = false;
private String messageId;
private String notificationUrl;
}
public boolean isSynchronous() {
- return notificationUrl == null || (notificationUrl != null && notificationUrl.isEmpty());
+ return notificationUrl == null || (notificationUrl.isEmpty());
}
public String toJsonString() {
mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
jsonString = mapper.writeValueAsString(this);
} catch (Exception e) {
- // ignore
+ LOGGER.debug("Exception:", e);
}
return jsonString;
}
marshaller.marshal(this, bs);
return bs.toString();
} catch (Exception e) {
- // Shouldn't happen...
- e.printStackTrace();
+ LOGGER.debug("Exception:", e);
return "";
}
}
* 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 org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
-
+import org.openecomp.mso.logger.MsoLogger;
/**
* Everything that is common between all Volume Group Responses, except for QueryVolumeGroupResponse.
*/
public abstract class NetworkResponseCommon {
private String messageId;
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
public NetworkResponseCommon() {
messageId = null;
mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
jsonString = mapper.writeValueAsString(this);
} catch (Exception e) {
- // ignore
+ LOGGER.debug("Exception:", e);
}
return jsonString;
}
marshaller.marshal(this, bs);
return bs.toString();
} catch (Exception e) {
- // Shouldn't happen...
- e.printStackTrace();
+ LOGGER.debug("Exception:", e);
return "";
}
}
* 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 org.codehaus.jackson.map.ObjectMapper;
import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.openecomp.mso.logger.MsoLogger;
@XmlRootElement(name = "queryNetworkResponse")
@NoJackson
private List<String> routeTargets;
private Map<String, String> subnetIdMap;
private Map<String, String> networkOutputs;
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
public QueryNetworkResponse() {
super();
ObjectMapper mapper = new ObjectMapper();
jsonString = mapper.writeValueAsString(this);
}
- catch (Exception e) {}
+ catch (Exception e) {
+ LOGGER.debug("Exception:", e);
+ }
return jsonString;
}
}
import javax.xml.bind.annotation.XmlRootElement;
import org.jboss.resteasy.annotations.providers.NoJackson;
import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.openecomp.mso.logger.MsoLogger;
@JsonRootName("updateNetworkRequest")
@XmlRootElement(name = "updateNetworkRequest")
private ProviderVlanNetwork providerVlanNetwork;
private ContrailNetwork contrailNetwork;
private Boolean backout = true;
- private Map<String,String> networkParams = new HashMap<String, String>();
+ private Map<String,String> networkParams = new HashMap<>();
private MsoRequest msoRequest = new MsoRequest();
-
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+
public UpdateNetworkRequest() {
super();
}
try {
this.networkTechnology = NetworkTechnology.valueOf(networkTechnology.toUpperCase());
} catch (IllegalArgumentException e) {
- // ignore
+ 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 java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.openecomp.mso.logger.MsoLogger;
// NOTE: the JAXB (XML) annotations are required with JBoss AS7 and RESTEasy,
// even though we are using JSON exclusively. The @NoJackson annotation
@NoJackson
public class SDNCEvent implements Serializable {
private static final long serialVersionUID = 1L;
+
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
// Event type
private String eventType;
mapper.setSerializationInclusion(Inclusion.NON_NULL);
return mapper.writeValueAsString(this);
} catch (IOException e) {
- e.printStackTrace();
+ LOGGER.debug("Exception:", e);
throw new UnsupportedOperationException("Cannot convert "
+ getClass().getSimpleName() + " to JSON", e);
}
import javax.xml.bind.annotation.XmlElement;
import java.io.IOException;
import java.io.Serializable;
+import org.openecomp.mso.logger.MsoLogger;
/**
* Base class for all SDNC adapter requests.
*/
public abstract class SDNCRequestCommon implements Serializable {
private static final long serialVersionUID = 1L;
+
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
// Endpoint on which BPMN can receive notifications from the SDNC adapter.
private String bpNotificationUrl;
mapper.setSerializationInclusion(Inclusion.NON_NULL);
return mapper.writeValueAsString(this);
} catch (IOException e) {
- e.printStackTrace();
+ LOGGER.debug("Exception:", e);
throw new UnsupportedOperationException("Cannot convert "
+ getClass().getSimpleName() + " to JSON", 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.xml.bind.annotation.XmlElement;
import java.io.IOException;
import java.io.Serializable;
+import org.openecomp.mso.logger.MsoLogger;
/**
* Base class for all SDNC adapter responses, including errors.
*/
public abstract class SDNCResponseCommon implements Serializable {
private static final long serialVersionUID = 1L;
+
+ private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
// Identifies the MSO transaction with SDNC.
private String sdncRequestId;
mapper.setSerializationInclusion(Inclusion.NON_NULL);
return mapper.writeValueAsString(this);
} catch (IOException e) {
- e.printStackTrace();
+ LOGGER.debug("Exception:", e);
throw new UnsupportedOperationException("Cannot convert "
+ getClass().getSimpleName() + " to JSON", 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.
}
public boolean isSynchronous() {
- return notificationUrl == null || (notificationUrl != null && notificationUrl.isEmpty());
+ return notificationUrl == null || notificationUrl.isEmpty();
}
// getMessageId, setMessageId, toJsonString, toJsonString are all defined in VfResponseCommon.
* 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.
jsonString = mapper.writeValueAsString(this);
}
catch (Exception e) {
+ LOGGER.debug("Exception:", e);
LOGGER.debug ("jsonString exception:"+e.getMessage());
jsonString = "invalid"; //throws instead?
}
* 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.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import java.io.ByteArrayOutputStream;
+import org.openecomp.mso.logger.MsoLogger;
public abstract class CatalogQueryExceptionCommon {
private String messageId;
+ protected static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
public CatalogQueryExceptionCommon() { messageId = null; }
public CatalogQueryExceptionCommon(String messageId) { this.messageId = messageId; }
jsonString = mapper.writeValueAsString(this);
return jsonString;
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.debug ("Exception:", e);
return "";
}
}
marshaller.marshal(this, bs);
return bs.toString();
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.debug ("Exception:", e);
return "";
}
}
* 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.
LOGGER.debug ("QueryVfModules jsonString: "+jsonString);
}
catch (Exception e) {
+ LOGGER.debug ("Exception:", e);
LOGGER.debug ("QueryVfModules jsonString exception:"+e.getMessage());
}
return jsonString;
Code Review / so.git / commitdiff