diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-01-10 12:42:59 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-01-10 12:42:59 +0000 |
commit | 659874df80409170e57b6dd6197eb3a81eb3468e (patch) | |
tree | 08e79fd57aa0ed299586fd88f69f87a5a2f5ded1 /vid-app-common/src/main/java/org/onap/vid/model/VNF.java | |
parent | 143784a849ece4fc35cc290e33f829b72bf1fc79 (diff) | |
parent | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (diff) |
Merge "Merge from ECOMP's repository"
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/model/VNF.java')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/model/VNF.java | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/VNF.java b/vid-app-common/src/main/java/org/onap/vid/model/VNF.java index 9da88870c..76e43d280 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/VNF.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/VNF.java @@ -20,42 +20,27 @@ package org.onap.vid.model; -import java.util.Map; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; +import org.onap.vid.asdc.beans.tosca.NodeTemplate; + import java.util.HashMap; -import java.util.Map.Entry; +import java.util.Map; import java.util.regex.Pattern; -import org.onap.vid.asdc.beans.tosca.NodeTemplate; -import org.onap.vid.controllers.VidController; -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.onap.vid.asdc.beans.tosca.Group; -import org.onap.vid.asdc.beans.tosca.Input; - /** * The Class VNF. */ public class VNF extends Node { - - /** The Constant LOG. */ - private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(VNF.class); - - /** The Constant dateFormat. */ - final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS"); - /** The pattern used to normalize VNF names */ - final static Pattern COMPONENT_INSTANCE_NAME_DELIMETER_PATTERN = Pattern.compile("[\\.\\-]+"); + static final Pattern COMPONENT_INSTANCE_NAME_DELIMETER_PATTERN = Pattern.compile("[\\.\\-]+"); /** The model customization name. */ private String modelCustomizationName; /** The vf modules. */ - private Map<String, VfModule> vfModules = new HashMap<String, VfModule>(); + private Map<String, VfModule> vfModules = new HashMap<>(); /** The volume groups. */ - private Map<String, VolumeGroup> volumeGroups = new HashMap<String, VolumeGroup>(); + private Map<String, VolumeGroup> volumeGroups = new HashMap<>(); private Map<String, VfcInstanceGroup> vfcInstanceGroups = new HashMap<>(); @@ -160,7 +145,7 @@ public class VNF extends Node { catch (Exception ex ) { return (normalizedName); } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if ( splitArr != null ) { for (String splitElement : splitArr) { sb.append(splitElement); |