diff options
author | michal.banka <michal.banka@nokia.com> | 2019-07-10 16:14:27 +0200 |
---|---|---|
committer | Tomasz Golabek <tomasz.golabek@nokia.com> | 2019-07-25 10:11:05 +0000 |
commit | d0d5690f13b9c794044bfe6bd7ac87557dd3dcea (patch) | |
tree | 651bf59514a2ec3603e753094e0edae54296dc5c /src/main/java/org/onap/sdc/toscaparser/api/Group.java | |
parent | cad897335db0c7912782482fa71932cc2b4ce421 (diff) |
Fix checkstyle violations in sdc/jtosca
Number of checkstyle violations has decreased from about 8200 to 450.
Change-Id: I31f763d7f51fa66958aab68d094280189c612417
Issue-ID: SDC-2434
Signed-off-by: michal.banka <michal.banka@nokia.com>
Diffstat (limited to 'src/main/java/org/onap/sdc/toscaparser/api/Group.java')
-rw-r--r-- | src/main/java/org/onap/sdc/toscaparser/api/Group.java | 177 |
1 files changed, 89 insertions, 88 deletions
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/Group.java b/src/main/java/org/onap/sdc/toscaparser/api/Group.java index 299ba01..0591d9a 100644 --- a/src/main/java/org/onap/sdc/toscaparser/api/Group.java +++ b/src/main/java/org/onap/sdc/toscaparser/api/Group.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,96 +30,97 @@ import java.util.LinkedHashMap; import java.util.Map; public class Group extends EntityTemplate { - - private static final String TYPE = "type"; - private static final String METADATA = "metadata"; - private static final String DESCRIPTION = "description"; - private static final String PROPERTIES = "properties"; - private static final String MEMBERS = "members"; - private static final String INTERFACES = "interfaces"; - private static final String SECTIONS[] = { - TYPE, METADATA, DESCRIPTION, PROPERTIES, MEMBERS, INTERFACES}; - - private String name; - LinkedHashMap<String,Object> tpl; - ArrayList<NodeTemplate> memberNodes; - LinkedHashMap<String,Object> customDef; - Metadata metaData; - - - public Group(String _name, LinkedHashMap<String, Object> _templates, - ArrayList<NodeTemplate> _memberNodes, - LinkedHashMap<String, Object> _customDef){ - this(_name, _templates, _memberNodes, _customDef, null); - } - - public Group(String _name, LinkedHashMap<String, Object> _templates, - ArrayList<NodeTemplate> _memberNodes, - LinkedHashMap<String, Object> _customDef, NodeTemplate parentNodeTemplate) { - super(_name, _templates, "group_type", _customDef, parentNodeTemplate); - - name = _name; - tpl = _templates; - if(tpl.get(METADATA) != null) { - Object metadataObject = tpl.get(METADATA); - ValidateUtils.validateMap(metadataObject); - metaData = new Metadata((Map<String,Object>)metadataObject); + + private static final String TYPE = "type"; + private static final String METADATA = "metadata"; + private static final String DESCRIPTION = "description"; + private static final String PROPERTIES = "properties"; + private static final String MEMBERS = "members"; + private static final String INTERFACES = "interfaces"; + private static final String[] SECTIONS = { + TYPE, METADATA, DESCRIPTION, PROPERTIES, MEMBERS, INTERFACES}; + + private String name; + private LinkedHashMap<String, Object> tpl; + private ArrayList<NodeTemplate> memberNodes; + private LinkedHashMap<String, Object> customDef; + private Metadata metaData; + + + public Group(String name, LinkedHashMap<String, Object> templates, + ArrayList<NodeTemplate> memberNodes, + LinkedHashMap<String, Object> customDef) { + this(name, templates, memberNodes, customDef, null); + } + + public Group(String name, LinkedHashMap<String, Object> templates, + ArrayList<NodeTemplate> memberNodes, + LinkedHashMap<String, Object> customDef, NodeTemplate parentNodeTemplate) { + super(name, templates, "group_type", customDef, parentNodeTemplate); + + this.name = name; + tpl = templates; + if (tpl.get(METADATA) != null) { + Object metadataObject = tpl.get(METADATA); + ValidateUtils.validateMap(metadataObject); + metaData = new Metadata((Map<String, Object>) metadataObject); } - memberNodes = _memberNodes; - _validateKeys(); + this.memberNodes = memberNodes; + validateKeys(); getCapabilities(); - } - - public Metadata getMetadata() { - return metaData; - } - - public ArrayList<String> getMembers() { - return (ArrayList<String>)entityTpl.get("members"); - } - - public String getDescription() { - return (String)entityTpl.get("description"); - - } - - public ArrayList<NodeTemplate> getMemberNodes() { - return memberNodes; - } - - private void _validateKeys() { - for(String key: entityTpl.keySet()) { - boolean bFound = false; - for(String sect: SECTIONS) { - if(key.equals(sect)) { - bFound = true; - break; - } - } - if(!bFound) { + } + + public Metadata getMetadata() { + return metaData; + } + + public ArrayList<String> getMembers() { + return (ArrayList<String>) entityTpl.get("members"); + } + + public String getDescription() { + return (String) entityTpl.get("description"); + + } + + public ArrayList<NodeTemplate> getMemberNodes() { + return memberNodes; + } + + private void validateKeys() { + for (String key : entityTpl.keySet()) { + boolean bFound = false; + for (String sect : SECTIONS) { + if (key.equals(sect)) { + bFound = true; + break; + } + } + if (!bFound) { ThreadLocalsHolder.getCollector().appendValidationIssue(new JToscaValidationIssue("JE183", String.format( "UnknownFieldError: Groups \"%s\" contains unknown field \"%s\"", - name,key))); - } - } - } - - @Override - public String toString() { - return "Group{" + - "name='" + name + '\'' + - ", tpl=" + tpl + - ", memberNodes=" + memberNodes + - ", customDef=" + customDef + - ", metaData=" + metaData + - '}'; - } - - public int compareTo(Group other){ - if(this.equals(other)) - return 0; - return this.getName().compareTo(other.getName()) == 0 ? this.getType().compareTo(other.getType()) : this.getName().compareTo(other.getName()); - } + name, key))); + } + } + } + + @Override + public String toString() { + return "Group{" + + "name='" + name + '\'' + + ", tpl=" + tpl + + ", memberNodes=" + memberNodes + + ", customDef=" + customDef + + ", metaData=" + metaData + + '}'; + } + + public int compareTo(Group other) { + if (this.equals(other)) { + return 0; + } + return this.getName().compareTo(other.getName()) == 0 ? this.getType().compareTo(other.getType()) : this.getName().compareTo(other.getName()); + } } /*python |