From 9c07c95e34bbc24022cb49efa584234f4067534a Mon Sep 17 00:00:00 2001 From: Hailong Zhang Date: Wed, 4 Sep 2019 15:40:25 +0800 Subject: modify Sonar Issue Issue-ID: VNFSDK-462 Signed-off-by: Hailong Zhang Change-Id: I010d99d82c1ac8919907cf70ea4f8893e0a4b06d --- .../org/onap/cvc/csar/cc/VTPValidateCSARBase.java | 4 +- .../cvc/csar/cc/sol001/VTPValidateCSARR09467.java | 4 +- .../cvc/csar/cc/sol001/VTPValidateCSARR32155.java | 6 +- .../cvc/csar/cc/sol001/VTPValidateCSARR35851.java | 14 +-- .../cvc/csar/cc/sol001/VTPValidateCSARR54356.java | 99 +++++++++++----------- .../cvc/csar/cc/sol001/VTPValidateCSARR67895.java | 6 +- .../cvc/csar/cc/sol001/VTPValidateCSARR95321.java | 6 +- 7 files changed, 72 insertions(+), 67 deletions(-) (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/cc') diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java index 6e67df9..3fee188 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java @@ -32,11 +32,13 @@ import java.util.List; public abstract class VTPValidateCSARBase extends OnapCommand { protected static final Logger LOG = LoggerFactory.getLogger(VTPValidateCSARBase.class); + protected List errors = new ArrayList<>(); + protected abstract void validateCSAR(CSARArchive csar) throws Exception; protected abstract String getVnfReqsNo(); - protected List errors = new ArrayList<>(); + @Override protected void run() throws OnapCommandException { diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR09467.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR09467.java index 407d872..4ffe003 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR09467.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR09467.java @@ -56,12 +56,12 @@ public class VTPValidateCSARR09467 extends VTPValidateCSARBase { Map node = (Map) nodeO; if (node.containsKey("type")) { String type = (String)node.get("type"); - if (type.equalsIgnoreCase("tosca.nodes.nfv.VDU.Compute")) { + if ("tosca.nodes.nfv.VDU.Compute".equalsIgnoreCase(type)) { computeExist = true; } - if (type.equalsIgnoreCase("tosca.nodes.nfv.VDU.VirtualStorage")) { + if ("tosca.nodes.nfv.VDU.VirtualStorage".equalsIgnoreCase(type)) { storageExist = true; } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR32155.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR32155.java index c5f6319..12fcf28 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR32155.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR32155.java @@ -43,7 +43,7 @@ public class VTPValidateCSARR32155 extends VTPValidateCSARBase { yaml = (Map) yaml.get("topology_template"); Map yamlTmpls = (Map) yaml.get("node_templates"); - boolean vlExist[] = new boolean[2]; + boolean []vlExist = new boolean[2]; for (Object node0 : yamlTmpls.values()) { @@ -52,12 +52,12 @@ public class VTPValidateCSARR32155 extends VTPValidateCSARBase { if (node.containsKey("type")) { String type = (String) node.get("type"); - if (type.equalsIgnoreCase("tosca.nodes.nfv.VnfVirtualLinkDesc")) { + if ("tosca.nodes.nfv.VnfVirtualLinkDesc".equalsIgnoreCase(type)) { vlExist[0] = true; } - if (type.equalsIgnoreCase("tosca.capabilities.nfv.VirtualLinkable")) { + if ("tosca.capabilities.nfv.VirtualLinkable".equalsIgnoreCase(type)) { vlExist[1] = true; } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java index f25afd7..52582a6 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java @@ -28,10 +28,12 @@ import org.yaml.snakeyaml.Yaml; @OnapCommandSchema(schema = "vtp-validate-csar-r35851.yaml") public class VTPValidateCSARR35851 extends VTPValidateCSARBase { + private static final String SET_CODE = "0x1000"; + public static class CSARErrorEntryMissingDefinitionYamlVnfVirtualLink extends CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamlVnfVirtualLink(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode(SET_CODE); } } @@ -39,14 +41,14 @@ public class VTPValidateCSARR35851 extends VTPValidateCSARBase { public static class CSARErrorEntryMissingDefinitionYamlVduCp extends CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamlVduCp(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode(SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamlVnfExtCp extends CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamlVnfExtCp(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode(SET_CODE); } } @@ -63,17 +65,17 @@ public class VTPValidateCSARR35851 extends VTPValidateCSARBase { Map node = (Map) nodeO; if (node.containsKey("type")) { String type = (String)node.get("type"); - if (type.equalsIgnoreCase("tosca.nodes.nfv.VnfVirtualLink")) { + if ("tosca.nodes.nfv.VnfVirtualLink".equalsIgnoreCase(type)) { vlExist[0] = true; } - if (type.equalsIgnoreCase("tosca.nodes.nfv.VduCp")) { + if ("tosca.nodes.nfv.VduCp".equalsIgnoreCase(type)) { vlExist[1] = true; } - if (type.equalsIgnoreCase("tosca.nodes.nfv.VnfExtCp")) { + if ("tosca.nodes.nfv.VnfExtCp".equalsIgnoreCase(type)) { vlExist[2] = true; } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR54356.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR54356.java index eaf9ad9..334d4ff 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR54356.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR54356.java @@ -26,171 +26,172 @@ import java.util.Map; @OnapCommandSchema(schema = "vtp-validate-csar-r54356.yaml") public class VTPValidateCSARR54356 extends VTPValidateCSARBase { + private static final String SET_CODE = "0x1000"; public static class CSARErrorEntryMissingDefinitionYamldatatypesL3AddressData extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesL3AddressData(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesAddressData extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesAddressData(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVirtualNetworkInterfaceRequirements extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVirtualNetworkInterfaceRequirements(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesConnectivityType extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesConnectivityType(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesRequestedAdditionalCapability extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesRequestedAdditionalCapability(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVirtualMemory extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVirtualMemory(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVirtualCpu extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVirtualCpu(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVirtualCpuPinning extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVirtualCpuPinning(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVnfcConfigurableProperties extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVnfcConfigurableProperties(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVduProfile extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVduProfile(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVlProfile extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVlProfile(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesInstantiationLevel extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesInstantiationLevel(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVduLevel extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVduLevel(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesScaleInfo extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesScaleInfo(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesinjectFile extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesinjectFile(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesScalingAspect extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesScalingAspect(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesLinkBitRateRequirements extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesLinkBitRateRequirements(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesQos extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesQos(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesCpProtocolData extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesCpProtocolData(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVnfConfigurableProperties extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVnfConfigurableProperties(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVnfAdditionalConfigurableProperties extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVnfAdditionalConfigurableProperties(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVnfInfoModifiableAttributes extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVnfInfoModifiableAttributes(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVnfInfoModifiableAttributesExtensions extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVnfInfoModifiableAttributesExtensions(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } public static class CSARErrorEntryMissingDefinitionYamldatatypesVnfInfoModifiableAttributesMetadata extends CSARArchive.CSARErrorEntryMissing { public CSARErrorEntryMissingDefinitionYamldatatypesVnfInfoModifiableAttributesMetadata(String defYaml, String entry) { super(entry, defYaml); - this.setCode("0x1000"); + this.setCode( SET_CODE); } } @@ -201,125 +202,125 @@ public class VTPValidateCSARR54356 extends VTPValidateCSARBase { yaml = (Map) yaml.get("topology_template"); Map nodeTmpls = (Map) yaml.get("node_templates"); - boolean vlExist[] = new boolean[30]; + boolean []vlExist = new boolean[30]; for (Object nodeO : nodeTmpls.values()) { Map node = (Map) nodeO; if (node.containsKey("type")) { String type = (String) node.get("type"); - if (type.equalsIgnoreCase("tosca.datatypes.nfv.L3AddressData")) { + if ("tosca.datatypes.nfv.L3AddressData".equalsIgnoreCase(type)) { vlExist[0] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.AddressData")) { + if ("tosca.datatypes.nfv.AddressData".equalsIgnoreCase(type)) { vlExist[1] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements")) { + if ("tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements".equalsIgnoreCase(type)) { vlExist[2] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.ConnectivityType")) { + if ("tosca.datatypes.nfv.ConnectivityType".equalsIgnoreCase(type)) { vlExist[3] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.RequestedAdditionalCapability")) { + if ("tosca.datatypes.nfv.RequestedAdditionalCapability".equalsIgnoreCase(type)) { vlExist[4] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VirtualMemory")) { + if ("tosca.datatypes.nfv.VirtualMemory".equalsIgnoreCase(type)) { vlExist[5] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VirtualCpu")) { + if ("tosca.datatypes.nfv.VirtualCpu".equalsIgnoreCase(type)) { vlExist[6] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VirtualCpuPinning")) { + if ("tosca.datatypes.nfv.VirtualCpuPinning".equalsIgnoreCase(type)) { vlExist[7] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VnfcConfigurableProperties")) { + if ("tosca.datatypes.nfv.VnfcConfigurableProperties".equalsIgnoreCase(type)) { vlExist[8] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VduProfile")) { + if ("tosca.datatypes.nfv.VduProfile".equalsIgnoreCase(type)) { vlExist[9] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VlProfile")) { + if ("tosca.datatypes.nfv.VlProfile".equalsIgnoreCase(type)) { vlExist[10] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.InstantiationLevel")) { + if ("tosca.datatypes.nfv.InstantiationLevel".equalsIgnoreCase(type)) { vlExist[11] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VduLevel")) { + if ("tosca.datatypes.nfv.VduLevel".equalsIgnoreCase(type)) { vlExist[12] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.ScaleInfo")) { + if ("tosca.datatypes.nfv.ScaleInfo".equalsIgnoreCase(type)) { vlExist[13] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.injectFile")) { + if ("tosca.datatypes.nfv.injectFile".equalsIgnoreCase(type)) { vlExist[14] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.ScalingAspect")) { + if ("tosca.datatypes.nfv.ScalingAspect".equalsIgnoreCase(type)) { vlExist[15] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.LinkBitRateRequirements")) { + if ("tosca.datatypes.nfv.LinkBitRateRequirements".equalsIgnoreCase(type)) { vlExist[16] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.Qos")) { + if ("tosca.datatypes.nfv.Qos".equalsIgnoreCase(type)) { vlExist[17] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.CpProtocolData")) { + if ("tosca.datatypes.nfv.CpProtocolData".equalsIgnoreCase(type)) { vlExist[18] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VnfConfigurableProperties")) { + if ("tosca.datatypes.nfv.VnfConfigurableProperties".equalsIgnoreCase(type)) { vlExist[19] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VnfAdditionalConfigurableProperties")) { + if ("tosca.datatypes.nfv.VnfAdditionalConfigurableProperties".equalsIgnoreCase(type)) { vlExist[20] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VnfInfoModifiableAttributes")) { + if ("tosca.datatypes.nfv.VnfInfoModifiableAttributes".equalsIgnoreCase(type)) { vlExist[21] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions")) { + if ("tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions".equalsIgnoreCase(type)) { vlExist[22] = true; } - if (type.equalsIgnoreCase("tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata")) { + if ("tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata".equalsIgnoreCase(type)) { vlExist[23] = true; } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR67895.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR67895.java index c6075bc..19cb518 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR67895.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR67895.java @@ -48,18 +48,18 @@ public class VTPValidateCSARR67895 extends VTPValidateCSARBase { yaml = (Map) yaml.get("topology_template"); Map nodeTmpls = (Map) yaml.get("node_templates"); - boolean vlExist[] = new boolean[2]; + boolean []vlExist = new boolean[2]; for (Object nodeO : nodeTmpls.values()) { Map node = (Map) nodeO; if (node.containsKey("type")) { String type = (String) node.get("type"); - if (type.equalsIgnoreCase("tosca.capabilities.nfv.VirtualBindable")) { + if ("tosca.capabilities.nfv.VirtualBindable".equalsIgnoreCase(type)) { vlExist[0] = true; } - if (type.equalsIgnoreCase("tosca.capabilities.nfv.VirtualLinkable")) { + if ("tosca.capabilities.nfv.VirtualLinkable".equalsIgnoreCase(type)) { vlExist[1] = true; } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR95321.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR95321.java index c7daafe..47eed83 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR95321.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR95321.java @@ -49,18 +49,18 @@ public class VTPValidateCSARR95321 extends VTPValidateCSARBase { yaml = (Map) yaml.get("topology_template"); Map nodeTmpls = (Map) yaml.get("node_templates"); - boolean vlExist[] = new boolean[2]; + boolean []vlExist = new boolean[2]; for (Object nodeO : nodeTmpls.values()) { Map node = (Map) nodeO; if (node.containsKey("type")) { String type = (String) node.get("type"); - if (type.equalsIgnoreCase("tosca.relationships.nfv.VirtualBindsTo")) { + if ("tosca.relationships.nfv.VirtualBindsTo".equalsIgnoreCase(type)) { vlExist[0] = true; } - if (type.equalsIgnoreCase("tosca.relationships.nfv.VirtualLinksTo")) { + if ("tosca.relationships.nfv.VirtualLinksTo".equalsIgnoreCase(type)) { vlExist[1] = true; } -- cgit 1.2.3-korg