Fixed SONAR issues

Fixed blocker, critical, major & minor SONAR issues.

Issue-ID: SDC-343
Change-Id: I72e5a3a7fa7d7407a92f98f77e4334827f70f926
Signed-off-by: dd4616 <Divesh.Mirchandani@amdocs.com>

10 files changed, 118 insertions, 124 deletions

diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaArtifactType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaArtifactType.java
index 9e353a25df..fd382b7899 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaArtifactType.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaArtifactType.java
@@ -29,9 +29,9 @@ public class ToscaArtifactType {
 
   private static Configuration config = ConfigurationManager.lookup();
 
-  public static String ARTIFACT_TYPE_PREFIX =
+  public static final String ARTIFACT_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_ARTIFACT_TYPE);
 
-  public static String NATIVE_DEPLOYMENT = "tosca.artifacts.Deployment";
+  public static final String NATIVE_DEPLOYMENT = "tosca.artifacts.Deployment";
 
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaCapabilityType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaCapabilityType.java
index b3a0e69c88..33dd9e142c 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaCapabilityType.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaCapabilityType.java
@@ -29,26 +29,26 @@ public class ToscaCapabilityType {
 
   private static Configuration config = ConfigurationManager.lookup();
 
-  public static String CAPABILITY_PREFIX =
+  public static final String CAPABILITY_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_CAPABILITY_TYPE);
 
   //TOSCA native types
-  public static String NATIVE_ROOT = "tosca.capabilities.Root";
-  public static String NATIVE_NODE = "tosca.capabilities.Node";
-  public static String NATIVE_CONTAINER = "tosca.capabilities.Container";
-  public static String NATIVE_COMPUTE = "tosca.capabilities.Compute";
-  public static String NATIVE_NETWORK_BINDABLE = "tosca.capabilities.network.Bindable";
-  public static String NATIVE_SCALABLE = "tosca.capabilities.Scalable";
-  public static String NATIVE_OPERATING_SYSTEM = "tosca.capabilities.OperatingSystem";
-  public static String NATIVE_ENDPOINT_ADMIN = "tosca.capabilities.Endpoint.Admin";
-  public static String NATIVE_ATTACHMENT = "tosca.capabilities.Attachment";
-  public static String NATIVE_NETWORK_LINKABLE = "tosca.capabilities.network.Linkable";
-  public static String NATIVE_NFV_METRIC = "tosca.capabilities.nfv.Metric";
+  public static final String NATIVE_ROOT = "tosca.capabilities.Root";
+  public static final String NATIVE_NODE = "tosca.capabilities.Node";
+  public static final String NATIVE_CONTAINER = "tosca.capabilities.Container";
+  public static final String NATIVE_COMPUTE = "tosca.capabilities.Compute";
+  public static final String NATIVE_NETWORK_BINDABLE = "tosca.capabilities.network.Bindable";
+  public static final String NATIVE_SCALABLE = "tosca.capabilities.Scalable";
+  public static final String NATIVE_OPERATING_SYSTEM = "tosca.capabilities.OperatingSystem";
+  public static final String NATIVE_ENDPOINT_ADMIN = "tosca.capabilities.Endpoint.Admin";
+  public static final String NATIVE_ATTACHMENT = "tosca.capabilities.Attachment";
+  public static final String NATIVE_NETWORK_LINKABLE = "tosca.capabilities.network.Linkable";
+  public static final String NATIVE_NFV_METRIC = "tosca.capabilities.nfv.Metric";
 
   //Additional types
-  public static String METRIC = CAPABILITY_PREFIX + "Metric";
-  public static String METRIC_CEILOMETER = CAPABILITY_PREFIX + "metric.Ceilometer";
-  public static String METRIC_SNMP_TRAP = CAPABILITY_PREFIX + "metric.SnmpTrap";
-  public static String METRIC_SNMP_POLLING = CAPABILITY_PREFIX + "metric.SnmpPolling";
+  public static final String METRIC = CAPABILITY_PREFIX + "Metric";
+  public static final String METRIC_CEILOMETER = CAPABILITY_PREFIX + "metric.Ceilometer";
+  public static final String METRIC_SNMP_TRAP = CAPABILITY_PREFIX + "metric.SnmpTrap";
+  public static final String METRIC_SNMP_POLLING = CAPABILITY_PREFIX + "metric.SnmpPolling";
 
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaDataType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaDataType.java
index 37d1d2c4ba..3d5453ac0d 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaDataType.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaDataType.java
@@ -29,75 +29,75 @@ public class ToscaDataType {
 
   private static Configuration config = ConfigurationManager.lookup();
 
-  public static String DATA_TYPE_PREFIX =
+  public static final String DATA_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_DATA_TYPE);
 
   //TOSCA native types
-  public static String NATIVE_ROOT = "tosca.datatypes.Root";
-  public static String NATIVE_NETWORK_NETWORK_INFO = "tosca.datatypes.network.NetworkInfo";
-  public static String NATIVE_NETWORK_PORT_INFO = "tosca.datatypes.network.PortInfo";
+  public static final String NATIVE_ROOT = "tosca.datatypes.Root";
+  public static final String NATIVE_NETWORK_NETWORK_INFO = "tosca.datatypes.network.NetworkInfo";
+  public static final String NATIVE_NETWORK_PORT_INFO = "tosca.datatypes.network.PortInfo";
 
   //Additional types
-  public static String NOVA_SERVER_PORT_EXTRA_PROPERTIES =
+  public static final String NOVA_SERVER_PORT_EXTRA_PROPERTIES =
       DATA_TYPE_PREFIX + "heat.novaServer.network.PortExtraProperties";
-  public static String NETWORK_ADDRESS_PAIR = DATA_TYPE_PREFIX + "heat.network.AddressPair";
-  public static String NEUTRON_PORT_FIXED_IPS = DATA_TYPE_PREFIX + "heat.neutron.port.FixedIps";
-  public static String CONTRAIL_NETWORK_RULE = DATA_TYPE_PREFIX + "heat.contrail.network.rule.Rule";
-  public static String CONTRAIL_NETWORK_RULE_LIST =
+  public static final String NETWORK_ADDRESS_PAIR = DATA_TYPE_PREFIX + "heat.network.AddressPair";
+  public static final String NEUTRON_PORT_FIXED_IPS = DATA_TYPE_PREFIX + "heat.neutron.port.FixedIps";
+  public static final String CONTRAIL_NETWORK_RULE = DATA_TYPE_PREFIX + "heat.contrail.network.rule.Rule";
+  public static final String CONTRAIL_NETWORK_RULE_LIST =
       DATA_TYPE_PREFIX + "heat.contrail.network.rule.RuleList";
-  public static String CONTRAIL_NETWORK_RULE_PORT_PAIRS =
+  public static final String CONTRAIL_NETWORK_RULE_PORT_PAIRS =
       DATA_TYPE_PREFIX + "heat.contrail.network.rule.PortPairs";
-  public static String CONTRAIL_NETWORK_RULE_VIRTUAL_NETWORK =
+  public static final String CONTRAIL_NETWORK_RULE_VIRTUAL_NETWORK =
       DATA_TYPE_PREFIX + "heat.contrail.network.rule.VirtualNetwork";
-  public static String CONTRAILV2_NETWORK_RULE =
+  public static final String CONTRAILV2_NETWORK_RULE =
       DATA_TYPE_PREFIX + "heat.contrailV2.network.rule.Rule";
-  public static String CONTRAILV2_NETWORK_RULE_LIST =
+  public static final String CONTRAILV2_NETWORK_RULE_LIST =
       DATA_TYPE_PREFIX + "heat.contrailV2.network.rule.RuleList";
-  public static String CONTRAILV2_NETWORK_RULE_SRC_PORT_PAIRS =
+  public static final String CONTRAILV2_NETWORK_RULE_SRC_PORT_PAIRS =
       DATA_TYPE_PREFIX + "heat.contrailV2.network.rule.SrcPortPairs";
-  public static String CONTRAILV2_NETWORK_RULE_DST_PORT_PAIRS =
+  public static final String CONTRAILV2_NETWORK_RULE_DST_PORT_PAIRS =
       DATA_TYPE_PREFIX + "heat.contrailV2.network.rule.DstPortPairs";
-  public static String CONTRAILV2_NETWORK_RULE_DST_VIRTUAL_NETWORK =
+  public static final String CONTRAILV2_NETWORK_RULE_DST_VIRTUAL_NETWORK =
       DATA_TYPE_PREFIX + "heat.contrailV2.network.rule.DstVirtualNetwork";
-  public static String CONTRAILV2_NETWORK_RULE_SRC_VIRTUAL_NETWORK =
+  public static final String CONTRAILV2_NETWORK_RULE_SRC_VIRTUAL_NETWORK =
       DATA_TYPE_PREFIX + "heat.contrailV2.network.rule.SrcVirtualNetwork";
-  public static String CONTRAILV2_VIRTUAL_MACHINE_INTERFACE_PROPERTIES =
+  public static final String CONTRAILV2_VIRTUAL_MACHINE_INTERFACE_PROPERTIES =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.machine.interface.Properties";
-  public static String CONTRAILV2_NETWORK_RULE_ACTION_LIST =
+  public static final String CONTRAILV2_NETWORK_RULE_ACTION_LIST =
       DATA_TYPE_PREFIX + "heat.contrailV2.network.rule.ActionList";
-  public static String CONTRAILV2_VIRTUAL_NETWORK_IPAM_REF_DATA =
+  public static final String CONTRAILV2_VIRTUAL_NETWORK_IPAM_REF_DATA =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.network.rule.IpamRefData";
-  public static String CONTRAILV2_VIRTUAL_NETWORK_IPAM_REF_DATA_IPAM_SUBNET_LIST =
+  public static final String CONTRAILV2_VIRTUAL_NETWORK_IPAM_REF_DATA_IPAM_SUBNET_LIST =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList";
-  public static String CONTRAILV2_VIRTUAL_NETWORK_IPAM_REF_DATA_IPAM_SUBNET =
+  public static final String CONTRAILV2_VIRTUAL_NETWORK_IPAM_REF_DATA_IPAM_SUBNET =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet";
-  public static String CONTRAILV2_VIRTUAL_NETWORK_POLICY_REF_DATA =
+  public static final String CONTRAILV2_VIRTUAL_NETWORK_POLICY_REF_DATA =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.network.rule.RefData";
-  public static String CONTRAILV2_VIRTUAL_NETWORK_POLICY_REF_DATA_SEQUENCE =
+  public static final String CONTRAILV2_VIRTUAL_NETWORK_POLICY_REF_DATA_SEQUENCE =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.network.rule.RefDataSequence";
-  public static String NOVA_SERVER_NETWORK_ADDRESS_INFO =
+  public static final String NOVA_SERVER_NETWORK_ADDRESS_INFO =
       DATA_TYPE_PREFIX + "heat.novaServer.network.AddressInfo";
-  public static String NEUTRON_SUBNET = DATA_TYPE_PREFIX + "heat.network.neutron.Subnet";
-  public static String NETWORK_ALLOCATION_POOL = DATA_TYPE_PREFIX + "heat.network.AllocationPool";
-  public static String NETWORK_HOST_ROUTE = DATA_TYPE_PREFIX + "heat.network.subnet.HostRoute";
-  public static String SUBSTITUTION_FILTERING =
+  public static final String NEUTRON_SUBNET = DATA_TYPE_PREFIX + "heat.network.neutron.Subnet";
+  public static final String NETWORK_ALLOCATION_POOL = DATA_TYPE_PREFIX + "heat.network.AllocationPool";
+  public static final String NETWORK_HOST_ROUTE = DATA_TYPE_PREFIX + "heat.network.subnet.HostRoute";
+  public static final String SUBSTITUTION_FILTERING =
       DATA_TYPE_PREFIX + "heat.substitution.SubstitutionFiltering";
-  public static String NEUTRON_SECURITY_RULES_RULE =
+  public static final String NEUTRON_SECURITY_RULES_RULE =
       DATA_TYPE_PREFIX + "heat.network.neutron.SecurityRules.Rule";
-  public static String CONTRAIL_STATIC_ROUTE =
+  public static final String CONTRAIL_STATIC_ROUTE =
       DATA_TYPE_PREFIX + "heat.network.contrail.port.StaticRoute";
-  public static String CONTRAIL_ADDRESS_PAIR =
+  public static final String CONTRAIL_ADDRESS_PAIR =
       DATA_TYPE_PREFIX + "heat.network.contrail.AddressPair";
-  public static String CONTRAIL_INTERFACE_DATA =
+  public static final String CONTRAIL_INTERFACE_DATA =
       DATA_TYPE_PREFIX + "heat.network.contrail.InterfaceData";
-  public static String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_PROPERTIES =
+  public static final String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_PROPERTIES =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.machine.subInterface.Properties";
-  public static String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_MAC_ADDRESS =
+  public static final String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_MAC_ADDRESS =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.machine.subInterface.MacAddress";
-  public static String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_ADDRESS_PAIRS =
+  public static final String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_ADDRESS_PAIRS =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.machine.subInterface.AddressPairs";
-  public static String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_ADDRESS_PAIR =
+  public static final String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_ADDRESS_PAIR =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.machine.subInterface.AddressPair";
-  public static String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_ADDRESS_PAIR_IP =
+  public static final String CONTRAILV2_VIRTUAL_MACHINE_SUB_INTERFACE_ADDRESS_PAIR_IP =
       DATA_TYPE_PREFIX + "heat.contrailV2.virtual.machine.subInterface.AddressPairIp";
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaGroupType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaGroupType.java
index c2070c34f4..a4a083b5c7 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaGroupType.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaGroupType.java
@@ -28,14 +28,14 @@ public class ToscaGroupType {
 
   private static Configuration config = ConfigurationManager.lookup();
 
-  public static String GROUP_TYPE_PREFIX =
+  public static final String GROUP_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_GROUP_TYPE);
 
   //TOSCA native types
-  public static String NATIVE_ROOT = "tosca.groups.Root";
+  public static final String NATIVE_ROOT = "tosca.groups.Root";
 
   //Additional types
-  public static String HEAT_STACK = GROUP_TYPE_PREFIX + "heat.HeatStack";
+  public static final String HEAT_STACK = GROUP_TYPE_PREFIX + "heat.HeatStack";
 
 
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java
index 745f77f7f5..d8e090261c 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java
@@ -29,64 +29,64 @@ public class ToscaNodeType {
 
   private static Configuration config = ConfigurationManager.lookup();
 
-  public static String VFC_NODE_TYPE_PREFIX =
+  public static final String VFC_NODE_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_NODE_TYPE_VFC);
-  public static String CP_NODE_TYPE_PREFIX =
+  public static final String CP_NODE_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_NODE_TYPE_CP);
-  public static String NETWORK_NODE_TYPE_PREFIX =
+  public static final String NETWORK_NODE_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_NODE_TYPE_NETWORK);
-  public static String ABSTRACT_NODE_TYPE_PREFIX =
+  public static final String ABSTRACT_NODE_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_NODE_TYPE_ABSTARCT);
-  public static String RULE_NODE_TYPE_PREFIX =
+  public static final String RULE_NODE_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_NODE_TYPE_RULE);
-  public static String NODE_TYPE_PREFIX =
+  public static final String NODE_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX);
 
   //TOSCA native types
-  public static String NATIVE_COMPUTE = "tosca.nodes.Compute";
-  public static String NATIVE_ROOT = "tosca.nodes.Root";
-  public static String NATIVE_BLOCK_STORAGE = "tosca.nodes.BlockStorage";
-  public static String NATIVE_NETWORK = "tosca.nodes.network.Network";
-  public static String NATIVE_NETWORK_PORT = "tosca.nodes.network.Port";
+  public static final String NATIVE_COMPUTE = "tosca.nodes.Compute";
+  public static final String NATIVE_ROOT = "tosca.nodes.Root";
+  public static final String NATIVE_BLOCK_STORAGE = "tosca.nodes.BlockStorage";
+  public static final String NATIVE_NETWORK = "tosca.nodes.network.Network";
+  public static final String NATIVE_NETWORK_PORT = "tosca.nodes.network.Port";
 
   //Additional types
-  public static String NOVA_SERVER = VFC_NODE_TYPE_PREFIX + "heat.nova.Server";
-  public static String CINDER_VOLUME = VFC_NODE_TYPE_PREFIX + "heat.cinder.Volume";
-  public static String COMPUTE = VFC_NODE_TYPE_PREFIX + "Compute";
-  public static String CONTRAIL_COMPUTE = VFC_NODE_TYPE_PREFIX + "heat.contrail.Compute";
+  public static final String NOVA_SERVER = VFC_NODE_TYPE_PREFIX + "heat.nova.Server";
+  public static final String CINDER_VOLUME = VFC_NODE_TYPE_PREFIX + "heat.cinder.Volume";
+  public static final String COMPUTE = VFC_NODE_TYPE_PREFIX + "Compute";
+  public static final String CONTRAIL_COMPUTE = VFC_NODE_TYPE_PREFIX + "heat.contrail.Compute";
 
-  public static String NEUTRON_SECURITY_RULES =
+  public static final String NEUTRON_SECURITY_RULES =
       RULE_NODE_TYPE_PREFIX + "heat.network.neutron.SecurityRules";
-  public static String CONTRAILV2_NETWORK_RULE =
+  public static final String CONTRAILV2_NETWORK_RULE =
       RULE_NODE_TYPE_PREFIX + "heat.network.contrailV2.NetworkRules";
-  public static String CONTRAIL_NETWORK_RULE =
+  public static final String CONTRAIL_NETWORK_RULE =
       RULE_NODE_TYPE_PREFIX + "heat.network.contrail.NetworkRules";
 
-  public static String NEUTRON_NET = NETWORK_NODE_TYPE_PREFIX + "heat.network.neutron.Net";
-  public static String CONTRAILV2_VIRTUAL_NETWORK =
+  public static final String NEUTRON_NET = NETWORK_NODE_TYPE_PREFIX + "heat.network.neutron.Net";
+  public static final String CONTRAILV2_VIRTUAL_NETWORK =
       NETWORK_NODE_TYPE_PREFIX + "heat.network.contrailV2.VirtualNetwork";
-  public static String CONTRAIL_VIRTUAL_NETWORK =
+  public static final String CONTRAIL_VIRTUAL_NETWORK =
       NETWORK_NODE_TYPE_PREFIX + "heat.network.contrail.VirtualNetwork";
-  public static String NETWORK = NETWORK_NODE_TYPE_PREFIX + "network.Network";
+  public static final String NETWORK = NETWORK_NODE_TYPE_PREFIX + "network.Network";
 
-  public static String NEUTRON_PORT = CP_NODE_TYPE_PREFIX + "heat.network.neutron.Port";
-  public static String CONTRAILV2_VIRTUAL_MACHINE_INTERFACE =
+  public static final String NEUTRON_PORT = CP_NODE_TYPE_PREFIX + "heat.network.neutron.Port";
+  public static final String CONTRAILV2_VIRTUAL_MACHINE_INTERFACE =
       CP_NODE_TYPE_PREFIX + "heat.contrailV2.VirtualMachineInterface";
-  public static String CONTRAIL_PORT = CP_NODE_TYPE_PREFIX + "heat.network.contrail.Port";
-  public static String NETWORK_PORT = CP_NODE_TYPE_PREFIX + "network.Port";
-  public static String NETWORK_SUB_INTERFACE = CP_NODE_TYPE_PREFIX + "network.SubInterface";
-  public static String CONTRAILV2_VLAN_SUB_INTERFACE = CP_NODE_TYPE_PREFIX
+  public static final String CONTRAIL_PORT = CP_NODE_TYPE_PREFIX + "heat.network.contrail.Port";
+  public static final String NETWORK_PORT = CP_NODE_TYPE_PREFIX + "network.Port";
+  public static final String NETWORK_SUB_INTERFACE = CP_NODE_TYPE_PREFIX + "network.SubInterface";
+  public static final String CONTRAILV2_VLAN_SUB_INTERFACE = CP_NODE_TYPE_PREFIX
       + "heat.network.contrailV2.VLANSubInterface";
 
-  public static String ABSTRACT_SUBSTITUTE = ABSTRACT_NODE_TYPE_PREFIX + "AbstractSubstitute";
-  public static String VFC_ABSTRACT_SUBSTITUTE = ABSTRACT_NODE_TYPE_PREFIX + "VFC";
-  public static String CONTRAIL_ABSTRACT_SUBSTITUTE =
+  public static final String ABSTRACT_SUBSTITUTE = ABSTRACT_NODE_TYPE_PREFIX + "AbstractSubstitute";
+  public static final String VFC_ABSTRACT_SUBSTITUTE = ABSTRACT_NODE_TYPE_PREFIX + "VFC";
+  public static final String CONTRAIL_ABSTRACT_SUBSTITUTE =
       ABSTRACT_NODE_TYPE_PREFIX + "contrail.AbstractSubstitute";
-  public static String COMPLEX_VFC_NODE_TYPE = ABSTRACT_NODE_TYPE_PREFIX + "ComplexVFC";
+  public static final String COMPLEX_VFC_NODE_TYPE = ABSTRACT_NODE_TYPE_PREFIX + "ComplexVFC";
   //Questionnaire to Tosca Types
-  public static String VNF_CONFIG_NODE_TYPE = ABSTRACT_NODE_TYPE_PREFIX + "VnfConfiguration";
-  public static String MULTIFLAVOR_VFC_NODE_TYPE = ABSTRACT_NODE_TYPE_PREFIX + "MultiFlavorVFC";
-  public static String MULTIDEPLOYMENTFLAVOR_NODE_TYPE = ABSTRACT_NODE_TYPE_PREFIX
+  public static final String VNF_CONFIG_NODE_TYPE = ABSTRACT_NODE_TYPE_PREFIX + "VnfConfiguration";
+  public static final String MULTIFLAVOR_VFC_NODE_TYPE = ABSTRACT_NODE_TYPE_PREFIX + "MultiFlavorVFC";
+  public static final String MULTIDEPLOYMENTFLAVOR_NODE_TYPE = ABSTRACT_NODE_TYPE_PREFIX
       + "MultiDeploymentFlavor.CVFC";
 }
 
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaPolicyType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaPolicyType.java
index ed0232929b..ad24e260b1 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaPolicyType.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaPolicyType.java
@@ -28,13 +28,13 @@ public class ToscaPolicyType {
 
   private static Configuration config = ConfigurationManager.lookup();
 
-  public static String POLICY_TYPE_PREFIX =
+  public static final String POLICY_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_POLICY_TYPE);
 
   //TOSCA native types
-  public static String NATIVE_PLACEMENT = "tosca.policy.placement";
+  public static final String NATIVE_PLACEMENT = "tosca.policy.placement";
 
   //Additional types
-  public static String PLACEMENT_ANTILOCATE = POLICY_TYPE_PREFIX + "placement.Antilocate";
-  public static String PLACEMENT_COLOCATE = POLICY_TYPE_PREFIX + "placement.Colocate";
+  public static final String PLACEMENT_ANTILOCATE = POLICY_TYPE_PREFIX + "placement.Antilocate";
+  public static final String PLACEMENT_COLOCATE = POLICY_TYPE_PREFIX + "placement.Colocate";
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaRelationshipType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaRelationshipType.java
index f1ef5ab234..0fcdc3a590 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaRelationshipType.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaRelationshipType.java
@@ -28,16 +28,16 @@ public class ToscaRelationshipType {
 
   private static Configuration config = ConfigurationManager.lookup();
 
-  public static String RELATIONSHIP_TYPE_PREFIX =
+  public static final String RELATIONSHIP_TYPE_PREFIX =
       config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_RELATIONSHIP_TYPE);
 
-  public static String NATIVE_ROOT = "tosca.relationships.Root";
-  public static String NATIVE_ATTACHES_TO = "tosca.relationships.AttachesTo";
-  public static String NATIVE_DEPENDS_ON = "tosca.relationships.DependsOn";
-  public static String NATIVE_NETWORK_LINK_TO = "tosca.relationships.network.LinksTo";
-  public static String NATIVE_NETWORK_BINDS_TO = "tosca.relationships.network.BindsTo";
-  public static String CINDER_VOLUME_ATTACHES_TO =
+  public static final String NATIVE_ROOT = "tosca.relationships.Root";
+  public static final String NATIVE_ATTACHES_TO = "tosca.relationships.AttachesTo";
+  public static final String NATIVE_DEPENDS_ON = "tosca.relationships.DependsOn";
+  public static final String NATIVE_NETWORK_LINK_TO = "tosca.relationships.network.LinksTo";
+  public static final String NATIVE_NETWORK_BINDS_TO = "tosca.relationships.network.BindsTo";
+  public static final String CINDER_VOLUME_ATTACHES_TO =
       RELATIONSHIP_TYPE_PREFIX + "VolumeAttachesTo";
-  public static String ATTACHES_TO = RELATIONSHIP_TYPE_PREFIX + "AttachesTo";
+  public static final String ATTACHES_TO = RELATIONSHIP_TYPE_PREFIX + "AttachesTo";
 
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Old1610ServiceTemplate.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Old1610ServiceTemplate.java
index 2ee7bca5bc..c4aa4ec6aa 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Old1610ServiceTemplate.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/model/Old1610ServiceTemplate.java
@@ -1,19 +1,5 @@
 package org.openecomp.sdc.tosca.datatypes.model;
 
-import org.openecomp.sdc.tosca.datatypes.model.ArtifactType;
-import org.openecomp.sdc.tosca.datatypes.model.CapabilityType;
-import org.openecomp.sdc.tosca.datatypes.model.DataType;
-import org.openecomp.sdc.tosca.datatypes.model.GroupType;
-import org.openecomp.sdc.tosca.datatypes.model.Import;
-import org.openecomp.sdc.tosca.datatypes.model.InterfaceType;
-import org.openecomp.sdc.tosca.datatypes.model.NodeType;
-import org.openecomp.sdc.tosca.datatypes.model.PolicyType;
-import org.openecomp.sdc.tosca.datatypes.model.RelationshipType;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
-import org.openecomp.sdc.tosca.datatypes.model.Template;
-import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate;
-
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java
index df2459368e..0effd40519 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/DataModelUtil.java
@@ -25,6 +25,8 @@ import org.apache.commons.collections4.MapUtils;
 import org.openecomp.core.utilities.CommonMethods;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
 import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
 import org.openecomp.sdc.logging.types.LoggerConstants;
@@ -84,6 +86,7 @@ public class DataModelUtil {
    */
 
   private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
+  private static final Logger logger = LoggerFactory.getLogger(DataModelUtil.class);
 
   /**
    * Add substitution mapping.
@@ -1442,9 +1445,11 @@ public class DataModelUtil {
       ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream);
       clonedObjectValue = objectInputStream.readObject();
     } catch (NotSerializableException ex) {
-      return getClonedObject(obj, obj.getClass());
+        logger.debug(ex.getMessage(), ex);
+        return getClonedObject(obj, obj.getClass());
     } catch (IOException | ClassNotFoundException ex) {
-      return null;
+        logger.debug(ex.getMessage(), ex);
+        return null;
     }
     return clonedObjectValue;
   }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java
index 9a3ed8e73f..fb7010358b 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImpl.java
@@ -25,6 +25,8 @@ import org.openecomp.core.utilities.file.FileContentHandler;
 import org.openecomp.core.utilities.file.FileUtils;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
 import org.openecomp.sdc.logging.types.LoggerConstants;
 import org.openecomp.sdc.logging.types.LoggerErrorCode;
@@ -64,6 +66,7 @@ public class ToscaFileOutputServiceCsarImpl implements ToscaFileOutputService {
   private static final String META_FILE_DELIMITER = ":";
   private static final String SPACE = " ";
   private static final String FILE_SEPARATOR = File.separator;
+  private static final Logger logger = LoggerFactory.getLogger(ToscaFileOutputServiceCsarImpl.class);
 
 
   @Override
@@ -146,7 +149,7 @@ public class ToscaFileOutputServiceCsarImpl implements ToscaFileOutputService {
         try {
           zos.closeEntry();
         } catch (IOException ignore) {
-          //do nothing
+            logger.debug(ignore.getMessage(), ignore);
         }
       }
     }
@@ -169,7 +172,7 @@ public class ToscaFileOutputServiceCsarImpl implements ToscaFileOutputService {
         try {
           zos.closeEntry();
         } catch (IOException ignore) {
-          //do nothing
+            logger.debug(ignore.getMessage(), ignore);
         }
       }
     }