Fix sonar issues in sdc-tosca

Fix Make this "public static PROPERTY_NAME_INVARIANTUUID" field final
Fix This class overrides "equals()" and should therefore also override "hashCode()"

Issue-ID: SDC-1895
Change-Id: I20b4e9c99e7d1d35999d39d8e4a68937e2ca5d82
Signed-off-by: Parshad Patel <pars.patel@samsung.com>

2 files changed, 89 insertions, 81 deletions

diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/Version.java b/src/main/java/org/onap/sdc/tosca/parser/api/Version.java
index c485b18..4b930a9 100644
--- a/src/main/java/org/onap/sdc/tosca/parser/api/Version.java
+++ b/src/main/java/org/onap/sdc/tosca/parser/api/Version.java
@@ -35,6 +35,14 @@ public class Version implements Comparable<Version> {
         return 0;
     }
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((version == null) ? 0 : version.hashCode());
+        return result;
+    }
+
     @Override public boolean equals(Object that) {
         if(this == that)
             return true;
diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java b/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java
index f791520..ec15cce 100644
--- a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java
+++ b/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java
@@ -21,101 +21,101 @@
 package org.onap.sdc.tosca.parser.impl;
 
 public class SdcPropertyNames {
-    public static String PROPERTY_NAME_INVARIANTUUID = "invariantUUID";
-    public static String PROPERTY_NAME_UUID = "UUID";
-    public static String PROPERTY_NAME_CUSTOMIZATIONUUID = "customizationUUID";
-    public static String PROPERTY_NAME_VERSION = "version";
+    public static final String PROPERTY_NAME_INVARIANTUUID = "invariantUUID";
+    public static final String PROPERTY_NAME_UUID = "UUID";
+    public static final String PROPERTY_NAME_CUSTOMIZATIONUUID = "customizationUUID";
+    public static final String PROPERTY_NAME_VERSION = "version";
     
     //Groups metadata
-    public static String PROPERTY_NAME_VFMODULEMODELINVARIANTUUID = "vfModuleModelInvariantUUID";
-    public static String PROPERTY_NAME_VFMODULEMODELUUID = "vfModuleModelUUID";
-    public static String PROPERTY_NAME_VFMODULECUSTOMIZATIONUUID = "vfModuleCustomizationUUID";
-    public static String PROPERTY_NAME_VFMODULEMODELVERSION = "vfModuleModelVersion";
-    public static String PROPERTY_NAME_VFMODULEMODELNAME = "vfModuleModelName";
+    public static final String PROPERTY_NAME_VFMODULEMODELINVARIANTUUID = "vfModuleModelInvariantUUID";
+    public static final String PROPERTY_NAME_VFMODULEMODELUUID = "vfModuleModelUUID";
+    public static final String PROPERTY_NAME_VFMODULECUSTOMIZATIONUUID = "vfModuleCustomizationUUID";
+    public static final String PROPERTY_NAME_VFMODULEMODELVERSION = "vfModuleModelVersion";
+    public static final String PROPERTY_NAME_VFMODULEMODELNAME = "vfModuleModelName";
     
     //Groups properties
-    public static String PROPERTY_NAME_VFMODULETYPE = "vf_module_type";
-    public static String PROPERTY_NAME_VFMODULELABEL = "vf_module_label";
-    public static String PROPERTY_NAME_MINVFMODULEINSTANCES = "min_vf_module_instances";
-    public static String PROPERTY_NAME_MAXVFMODULEINSTANCES = "max_vf_module_instances";
-    public static String PROPERTY_NAME_INITIALCOUNT = "initial_count";
+    public static final String PROPERTY_NAME_VFMODULETYPE = "vf_module_type";
+    public static final String PROPERTY_NAME_VFMODULELABEL = "vf_module_label";
+    public static final String PROPERTY_NAME_MINVFMODULEINSTANCES = "min_vf_module_instances";
+    public static final String PROPERTY_NAME_MAXVFMODULEINSTANCES = "max_vf_module_instances";
+    public static final String PROPERTY_NAME_INITIALCOUNT = "initial_count";
 
     
-    public static String PROPERTY_NAME_DESCRIPTION = "description";
-    public static String PROPERTY_NAME_TYPE = "type";
-    public static String PROPERTY_NAME_CATEGORY = "category";
-    public static String PROPERTY_NAME_SUBCATEGORY = "subcategory";
-    public static String PROPERTY_NAME_RESOURCEVENDOR = "resourceVendor";
-    public static String PROPERTY_NAME_RESOURCEVENDORRELEASE = "resourceVendorRelease";
+    public static final String PROPERTY_NAME_DESCRIPTION = "description";
+    public static final String PROPERTY_NAME_TYPE = "type";
+    public static final String PROPERTY_NAME_CATEGORY = "category";
+    public static final String PROPERTY_NAME_SUBCATEGORY = "subcategory";
+    public static final String PROPERTY_NAME_RESOURCEVENDOR = "resourceVendor";
+    public static final String PROPERTY_NAME_RESOURCEVENDORRELEASE = "resourceVendorRelease";
     //VFC
-    public static String PROPERTY_NAME_NFCCODE = "nfc_code";
-    public static String PROPERTY_NAME_VMTYPETAG = "vm_type_tag";
-    public static String PROPERTY_NAME_VMTYPE = "vm_type";
-    public static String PROPERTY_NAME_VFCNAMING_ECOMPGENERATEDNAMING="vfc_naming#ecomp_generated_naming";
-    public static String PROPERTY_NAME_VFCNAMING_NAMINGPOLICY="vfc_naming#naming_policy";
+    public static final String PROPERTY_NAME_NFCCODE = "nfc_code";
+    public static final String PROPERTY_NAME_VMTYPETAG = "vm_type_tag";
+    public static final String PROPERTY_NAME_VMTYPE = "vm_type";
+    public static final String PROPERTY_NAME_VFCNAMING_ECOMPGENERATEDNAMING="vfc_naming#ecomp_generated_naming";
+    public static final String PROPERTY_NAME_VFCNAMING_NAMINGPOLICY="vfc_naming#naming_policy";
     //VF
-    public static String PROPERTY_NAME_NFTYPE = "nf_type";
-    public static String PROPERTY_NAME_NFROLE = "nf_role";
-    public static String PROPERTY_NAME_NFFUNCTION = "nf_function";
-    public static String PROPERTY_NAME_NFCODE = "nf_code";
-    public static String PROPERTY_NAME_MININSTANCES = "min_instances";
-    public static String PROPERTY_NAME_MAXINSTANCES = "max_instances";
-    public static String PROPERTY_NAME_AVAILABILITYZONEMAXCOUNT = "availability_zone_max_count";
-    public static String PROPERTY_NAME_AVAILABILITYZONECOUNT = "availability_zone_count";
-    public static String PROPERTY_NAME_NAME = "name";
-    public static String PROPERTY_NAME_VNFECOMPNAMING_ECOMPGENERATEDNAMING="vnf_ecomp_naming#ecomp_generated_naming";
-    public static String PROPERTY_NAME_VNFECOMPNAMING_NAMINGPOLICY="vnf_ecomp_naming#naming_policy";
-    public static String PROPERTY_NAME_ECOMPGENERATEDVMASSIGNMENTS = "ecomp_generated_vm_assignments";
+    public static final String PROPERTY_NAME_NFTYPE = "nf_type";
+    public static final String PROPERTY_NAME_NFROLE = "nf_role";
+    public static final String PROPERTY_NAME_NFFUNCTION = "nf_function";
+    public static final String PROPERTY_NAME_NFCODE = "nf_code";
+    public static final String PROPERTY_NAME_MININSTANCES = "min_instances";
+    public static final String PROPERTY_NAME_MAXINSTANCES = "max_instances";
+    public static final String PROPERTY_NAME_AVAILABILITYZONEMAXCOUNT = "availability_zone_max_count";
+    public static final String PROPERTY_NAME_AVAILABILITYZONECOUNT = "availability_zone_count";
+    public static final String PROPERTY_NAME_NAME = "name";
+    public static final String PROPERTY_NAME_VNFECOMPNAMING_ECOMPGENERATEDNAMING="vnf_ecomp_naming#ecomp_generated_naming";
+    public static final String PROPERTY_NAME_VNFECOMPNAMING_NAMINGPOLICY="vnf_ecomp_naming#naming_policy";
+    public static final String PROPERTY_NAME_ECOMPGENERATEDVMASSIGNMENTS = "ecomp_generated_vm_assignments";
     //Service
-    public static String PROPERTY_NAME_SERVICENAMING_DEFAULT_ECOMPGENERATEDNAMING="service_naming#default#ecomp_generated_naming";
-    public static String PROPERTY_NAME_SERVICENAMING_DEFAULT_NAMINGPOLICY="service_naming#default#naming_policy";
+    public static final String PROPERTY_NAME_SERVICENAMING_DEFAULT_ECOMPGENERATEDNAMING="service_naming#default#ecomp_generated_naming";
+    public static final String PROPERTY_NAME_SERVICENAMING_DEFAULT_NAMINGPOLICY="service_naming#default#naming_policy";
     //VL
-    public static String PROPERTY_NAME_NETWORKTYPE="network_type";
-    public static String PROPERTY_NAME_NETWORKROLE="network_role";
-    public static String PROPERTY_NAME_NETWORKROLETAG="network_role_tag";
-    public static String PROPERTY_NAME_NETWORKTECHNOLOGY="network_technology";
-    public static String PROPERTY_NAME_NETWORKSCOPE="network_scope";
-    public static String PROPERTY_NAME_NETWORKECOMPNAMING_ECOMPGENERATEDNAMING="network_ecomp_naming#ecomp_generated_naming";
-    public static String PROPERTY_NAME_NETWORKECOMPNAMING_NAMINGPOLICY="network_ecomp_naming#naming_policy";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_ISSHAREDNETWORK="network_assignments#is_shared_network";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_ISEXTERNALNETWORK="network_assignments#is_external_network";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_ECOMPGENERATEDNETWORKASSIGNMENT="network_assignments#ecomp_generated_network_assignment";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_USEIPV4="network_assignments#ipv4_subnet_default_assignments#use_ipv4";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_IPNETWORKADDRESSPLAN="network_assignments#ipv4_subnet_default_assignments#ip_network_address_plan";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_DHCPENABLED="network_assignments#ipv4_subnet_default_assignments#dhcp_enabled";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_IPVERSION="network_assignments#ipv4_subnet_default_assignments#ip_version";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_CIDRMASK="network_assignments#ipv4_subnet_default_assignments#cidr_mask";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_MINSUBNETSCOUNT="network_assignments#ipv4_subnet_default_assignments#min_subnets_count";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_USEIPV6="network_assignments#ipv6_subnet_default_assignments#use_ipv6";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_IPNETWORKADDRESSPLAN="network_assignments#ipv6_subnet_default_assignments#ip_network_address_plan";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_DHCPENABLED="network_assignments#ipv6_subnet_default_assignments#dhcp_enabled";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_IPVERSION="network_assignments#ipv6_subnet_default_assignments#ip_version";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_CIDRMASK="network_assignments#ipv6_subnet_default_assignments#cidr_mask";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_MINSUBNETSCOUNT="network_assignments#ipv6_subnet_default_assignments#min_subnets_count";
+    public static final String PROPERTY_NAME_NETWORKTYPE="network_type";
+    public static final String PROPERTY_NAME_NETWORKROLE="network_role";
+    public static final String PROPERTY_NAME_NETWORKROLETAG="network_role_tag";
+    public static final String PROPERTY_NAME_NETWORKTECHNOLOGY="network_technology";
+    public static final String PROPERTY_NAME_NETWORKSCOPE="network_scope";
+    public static final String PROPERTY_NAME_NETWORKECOMPNAMING_ECOMPGENERATEDNAMING="network_ecomp_naming#ecomp_generated_naming";
+    public static final String PROPERTY_NAME_NETWORKECOMPNAMING_NAMINGPOLICY="network_ecomp_naming#naming_policy";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_ISSHAREDNETWORK="network_assignments#is_shared_network";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_ISEXTERNALNETWORK="network_assignments#is_external_network";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_ECOMPGENERATEDNETWORKASSIGNMENT="network_assignments#ecomp_generated_network_assignment";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_USEIPV4="network_assignments#ipv4_subnet_default_assignments#use_ipv4";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_IPNETWORKADDRESSPLAN="network_assignments#ipv4_subnet_default_assignments#ip_network_address_plan";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_DHCPENABLED="network_assignments#ipv4_subnet_default_assignments#dhcp_enabled";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_IPVERSION="network_assignments#ipv4_subnet_default_assignments#ip_version";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_CIDRMASK="network_assignments#ipv4_subnet_default_assignments#cidr_mask";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_MINSUBNETSCOUNT="network_assignments#ipv4_subnet_default_assignments#min_subnets_count";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_USEIPV6="network_assignments#ipv6_subnet_default_assignments#use_ipv6";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_IPNETWORKADDRESSPLAN="network_assignments#ipv6_subnet_default_assignments#ip_network_address_plan";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_DHCPENABLED="network_assignments#ipv6_subnet_default_assignments#dhcp_enabled";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_IPVERSION="network_assignments#ipv6_subnet_default_assignments#ip_version";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_CIDRMASK="network_assignments#ipv6_subnet_default_assignments#cidr_mask";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_MINSUBNETSCOUNT="network_assignments#ipv6_subnet_default_assignments#min_subnets_count";
 
-    /*public static String PROPERTY_NAME_NETWORKASSIGNMENTS_PROVIDERNETWORK_ISPROVIDERNETWORK="network_assignments#provider_network#is_provider_network";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_PROVIDERNETWORK_PHYSICALNETWORKNAME="network_assignments#provider_network#physical_network_name";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_PROVIDERNETWORK_NUMA="network_assignments#provider_network#numa";
-    public static String PROPERTY_NAME_NETWORKASSIGNMENTS_PROVIDERNETWORK_PNICINSTANCE="network_assignments#provider_network#pnic_instance";
+    /*public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_PROVIDERNETWORK_ISPROVIDERNETWORK="network_assignments#provider_network#is_provider_network";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_PROVIDERNETWORK_PHYSICALNETWORKNAME="network_assignments#provider_network#physical_network_name";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_PROVIDERNETWORK_NUMA="network_assignments#provider_network#numa";
+    public static final String PROPERTY_NAME_NETWORKASSIGNMENTS_PROVIDERNETWORK_PNICINSTANCE="network_assignments#provider_network#pnic_instance";
     */
     
-    public static String PROPERTY_NAME_PROVIDERNETWORK_ISPROVIDERNETWORK="provider_network#is_provider_network";
-    public static String PROPERTY_NAME_PROVIDERNETWORK_PHYSICALNETWORKNAME="provider_network#physical_network_name";
-    public static String PROPERTY_NAME_PROVIDERNETWORK_NUMA="provider_network#numa";
-    public static String PROPERTY_NAME_PROVIDERNETWORK_PNICINSTANCE="provider_network#pnic_instance";
+    public static final String PROPERTY_NAME_PROVIDERNETWORK_ISPROVIDERNETWORK="provider_network#is_provider_network";
+    public static final String PROPERTY_NAME_PROVIDERNETWORK_PHYSICALNETWORKNAME="provider_network#physical_network_name";
+    public static final String PROPERTY_NAME_PROVIDERNETWORK_NUMA="provider_network#numa";
+    public static final String PROPERTY_NAME_PROVIDERNETWORK_PNICINSTANCE="provider_network#pnic_instance";
     
-    public static String PROPERTY_NAME_NETWORKFLOWS_ISBOUNDTOVPN="network_flows#is_bound_to_vpn";
-    public static String PROPERTY_NAME_NETWORKFLOWS_VPNBINDING="network_flows#vpn_binding";
+    public static final String PROPERTY_NAME_NETWORKFLOWS_ISBOUNDTOVPN="network_flows#is_bound_to_vpn";
+    public static final String PROPERTY_NAME_NETWORKFLOWS_VPNBINDING="network_flows#vpn_binding";
     
     //Policy
-    public static String PROPERTY_NAME_TOPOLOGY_TEMPLATE = "topology_template";
-    public static String PROPERTY_NAME_NODE_TEMPLATES = "node_templates";
-    public static String PROPERTY_NAME_POLICIES = "policies";
-    public static String PROPERTY_NAME_GROUPS = "groups";
-	public static String PROPERTY_NAME_METADATA = "metadata";
-	public static String PROPERTY_NAME_PROPERTIES = "properties";
-	public static String PROPERTY_NAME_TARGETS = "targets";
-	public static String PROPERTY_NAME_MEMBERS = "members";
-	public static String PROPERTY_NAME_CAPABILITIES = "capabilities";
-    public static String PROPERTY_NAME_ENTRY_SCHEMA = "entry_schema";
+    public static final String PROPERTY_NAME_TOPOLOGY_TEMPLATE = "topology_template";
+    public static final String PROPERTY_NAME_NODE_TEMPLATES = "node_templates";
+    public static final String PROPERTY_NAME_POLICIES = "policies";
+    public static final String PROPERTY_NAME_GROUPS = "groups";
+	public static final String PROPERTY_NAME_METADATA = "metadata";
+	public static final String PROPERTY_NAME_PROPERTIES = "properties";
+	public static final String PROPERTY_NAME_TARGETS = "targets";
+	public static final String PROPERTY_NAME_MEMBERS = "members";
+	public static final String PROPERTY_NAME_CAPABILITIES = "capabilities";
+    public static final String PROPERTY_NAME_ENTRY_SCHEMA = "entry_schema";
 }