aboutsummaryrefslogtreecommitdiffstats
path: root/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api
diff options
context:
space:
mode:
Diffstat (limited to 'jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api')
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Capability.java38
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/EntityTemplate.java75
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Group.java32
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Metadata.java28
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/NodeTemplate.java32
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Property.java48
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/StatefulEntityTypeFactory.java28
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java67
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/TopologyTemplate.java75
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java63
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplateFactory.java14
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/GroupType.java30
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java27
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/StatefulEntityType.java31
-rw-r--r--jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/parameters/Input.java47
15 files changed, 0 insertions, 635 deletions
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Capability.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Capability.java
deleted file mode 100644
index 1359c36..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Capability.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
-import java.util.List;
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.jython.JyCapability;
-
-import com.google.common.base.MoreObjects;
-
-public class Capability {
-
- private final JyCapability jyCapability;
-
- public Capability(JyCapability jyCapability) {
- this.jyCapability = Objects.requireNonNull(jyCapability);
- }
-
- public String getName() {
- return jyCapability.getJyName();
- }
-
- public List<Property> getProperties() {
- return jyCapability.getJyProperties()
- .stream()
- .map(Property::new)
- .collect(toImmutableList());
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("name", getName())
- .add("properties", getProperties())
- .toString();
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/EntityTemplate.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/EntityTemplate.java
deleted file mode 100644
index 5a928e0..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/EntityTemplate.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.api.elements.StatefulEntityType;
-import org.openecomp.sdc.toscaparser.jython.JyCapability;
-import org.openecomp.sdc.toscaparser.jython.JyEntityTemplate;
-import org.openecomp.sdc.toscaparser.jython.JyProperty;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-
-public abstract class EntityTemplate {
-
- private final JyEntityTemplate jyEntityTemplate;
- private final StatefulEntityType statefulEntityType;
-
- public EntityTemplate(JyEntityTemplate jyEntityTemplate) {
- this.jyEntityTemplate = Objects.requireNonNull(jyEntityTemplate);
- StatefulEntityTypeFactory statefulEntityTypeFactory = new StatefulEntityTypeFactory();
- statefulEntityType = statefulEntityTypeFactory.create(jyEntityTemplate.getJyTypeDefinition());
- }
-
- public String getName() {
- return jyEntityTemplate.getJyName();
- }
-
- public String getDescription() {
- return jyEntityTemplate.getJyDescription();
- }
-
- public StatefulEntityType getTypeDefinition() {
- return statefulEntityType;
- }
-
- public List<Property> getProperties() {
- List<JyProperty> jyProperties = jyEntityTemplate.getJyProperties();
- return jyProperties != null ? jyProperties
- .stream()
- .map(Property::new)
- .collect(toImmutableList()) : new ArrayList<>();
- }
-
- public List<Capability> getCapabilities() {
- List<JyCapability> jyCapabilities = jyEntityTemplate.getJyCapabilities();
- return jyCapabilities != null ? jyCapabilities
- .stream()
- .map(Capability::new)
- .collect(toImmutableList()) : new ArrayList<>();
- }
-
- public List<Map<String, Map<String, Object>>> getRequirements() {
- return jyEntityTemplate.getJyRequirements();
- }
-
- protected ToStringHelper toStringHelper() {
- return MoreObjects.toStringHelper(this)
- .add("name", getName())
- .add("description", getDescription())
- .add("typeDefinition", getTypeDefinition())
- .add("properties", getProperties())
- .add("capabilities", getCapabilities())
- .add("requirements", getRequirements());
- }
-
- @Override
- public String toString() {
- return toStringHelper().toString();
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Group.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Group.java
deleted file mode 100644
index 0fa0d9c..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Group.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import java.util.List;
-
-import org.openecomp.sdc.toscaparser.jython.JyGroup;
-
-import com.google.common.base.MoreObjects.ToStringHelper;
-
-public class Group extends EntityTemplate {
-
- private final JyGroup jyGroup;
-
- public Group(JyGroup jyGroup) {
- super(jyGroup);
- this.jyGroup = jyGroup;
- }
-
- public List<String> getMembers(){
- return jyGroup.getJyMembers();
- }
-
- public Metadata getMetadata(){
- return jyGroup.getJyMetadata() != null ? new Metadata(jyGroup.getJyMetadata()) : null;
- }
-
- @Override
- protected ToStringHelper toStringHelper() {
- return super.toStringHelper()
- .add("members", getMembers())
- .add("metadata", getMetadata());
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Metadata.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Metadata.java
deleted file mode 100644
index 4fa3646..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Metadata.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import java.util.Map;
-
-import com.google.common.base.MoreObjects;
-
-public class Metadata {
-
- private final Map<String, Object> metadataMap;
-
- public Metadata(Map<String, Object> metadataMap) {
- this.metadataMap = metadataMap;
- }
-
- public String getValue(String key) {
- return !isEmpty() ? String.valueOf(this.metadataMap.get(key)) : null;
- }
-
- private boolean isEmpty() {
- return this.metadataMap == null || this.metadataMap.size() == 0;
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("metadataMap", metadataMap).toString();
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/NodeTemplate.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/NodeTemplate.java
deleted file mode 100644
index 3592a69..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/NodeTemplate.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import org.openecomp.sdc.toscaparser.jython.JyNodeTemplate;
-import org.openecomp.sdc.toscaparser.jython.JySubstitutionMappings;
-
-import com.google.common.base.MoreObjects.ToStringHelper;
-
-public class NodeTemplate extends EntityTemplate {
-
- private final JyNodeTemplate jyNodeTemplate;
-
- public NodeTemplate(JyNodeTemplate jyNodeTemplate) {
- super(jyNodeTemplate);
- this.jyNodeTemplate = jyNodeTemplate;
- }
-
- public Metadata getMetadata() {
- return jyNodeTemplate.getJyMetadata() != null ? new Metadata(jyNodeTemplate.getJyMetadata()) : null;
- }
-
- public SubstitutionMappings getSubstitutionMappings(){
- JySubstitutionMappings jySubstitutionMappings = jyNodeTemplate.getJySubstitutionMappings();
- return jySubstitutionMappings != null ? new SubstitutionMappings(jySubstitutionMappings) : null;
- }
-
- @Override
- protected ToStringHelper toStringHelper() {
- return super.toStringHelper()
- .add("metadata", getMetadata())
- .add("substitutionMappings", getSubstitutionMappings());
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Property.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Property.java
deleted file mode 100644
index c52efb6..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/Property.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.jython.JyProperty;
-import org.openecomp.sdc.toscaparser.utils.PythonUtils;
-
-import com.google.common.base.MoreObjects;
-
-public class Property {
-
- private final JyProperty jyProperty;
-
- public Property(JyProperty jyProperty) {
- this.jyProperty = Objects.requireNonNull(jyProperty);
- }
-
- public String getName() {
- return jyProperty.getJyName();
- }
-
- public Object getValue() {
- return PythonUtils.cast(jyProperty.getJyValue(), jyProperty.getJyValueClassName());
- }
-
- public String getType() {
- return jyProperty.getJyType();
- }
-
- public boolean isRequired() {
- return jyProperty.isJyRequired();
- }
-
- public String getDescription() {
- return jyProperty.getJyDescription();
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("name", getName())
- .add("type", getType())
- .add("required", isRequired())
- .add("description", getDescription())
- .add("value", getValue())
- .toString();
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/StatefulEntityTypeFactory.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/StatefulEntityTypeFactory.java
deleted file mode 100644
index 554450a..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/StatefulEntityTypeFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import org.openecomp.sdc.toscaparser.api.elements.GroupType;
-import org.openecomp.sdc.toscaparser.api.elements.NodeType;
-import org.openecomp.sdc.toscaparser.api.elements.StatefulEntityType;
-import org.openecomp.sdc.toscaparser.jython.elements.JyGroupType;
-import org.openecomp.sdc.toscaparser.jython.elements.JyNodeType;
-import org.openecomp.sdc.toscaparser.jython.elements.JyStatefulEntityType;
-
-public class StatefulEntityTypeFactory {
-
- public StatefulEntityType create(JyStatefulEntityType jyStatefulEntityType) {
- String jyClassName = jyStatefulEntityType.getJyClassName();
- StatefulEntityType statefulEntityType;
- switch (jyClassName) {
- case "NodeType":
- statefulEntityType = new NodeType((JyNodeType) jyStatefulEntityType);
- break;
- case "GroupType":
- statefulEntityType = new GroupType((JyGroupType) jyStatefulEntityType);
- break;
- default:
- throw new UnsupportedOperationException(jyClassName + " is not supported!");
- }
-
- return statefulEntityType;
- }
-} \ No newline at end of file
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java
deleted file mode 100644
index e962a4a..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.api.elements.NodeType;
-import org.openecomp.sdc.toscaparser.api.parameters.Input;
-import org.openecomp.sdc.toscaparser.jython.JyGroup;
-import org.openecomp.sdc.toscaparser.jython.JyNodeTemplate;
-import org.openecomp.sdc.toscaparser.jython.JySubstitutionMappings;
-import org.openecomp.sdc.toscaparser.jython.parameters.JyInput;
-
-import com.google.common.base.MoreObjects;
-
-public class SubstitutionMappings {
-
- private final JySubstitutionMappings jySubstitutionMappings;
-
- public SubstitutionMappings(JySubstitutionMappings jySubstitutionMappings) {
- this.jySubstitutionMappings = Objects.requireNonNull(jySubstitutionMappings);
- }
-
- public List<NodeTemplate> getNodeTemplates() {
- List<JyNodeTemplate> jyNodeTemplates = jySubstitutionMappings.getJyNodeTemplates();
- return jyNodeTemplates != null ? jyNodeTemplates
- .stream()
- .map(NodeTemplate::new)
- .collect(toImmutableList()) : new ArrayList<>();
- }
-
- public List<Group> getGroups() {
- List<JyGroup> jyGroups = jySubstitutionMappings.getJyGroups();
- return jyGroups != null ? jyGroups
- .stream()
- .map(Group::new)
- .collect(toImmutableList()) : new ArrayList<>();
- }
-
- public List<Input> getInputs() {
- List<JyInput> jyInputs = jySubstitutionMappings.getJyInputs();
- return jyInputs != null ? jyInputs
- .stream()
- .map(Input::new)
- .collect(toImmutableList()) : new ArrayList<>();
- }
-
- public NodeType getNodeDefinition() {
- return new NodeType(jySubstitutionMappings.getJyNodeDefinition());
- }
-
- public Metadata getMetadata(){
- return jySubstitutionMappings.getJyMetadata() != null ? new Metadata(jySubstitutionMappings.getJyMetadata()) : null;
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("nodeTemplates", getNodeTemplates())
- .add("inputs", getInputs())
- .add("nodeDefinition", getNodeDefinition())
- .add("metadata", getMetadata())
- .toString();
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/TopologyTemplate.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/TopologyTemplate.java
deleted file mode 100644
index 0d0dd10..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/TopologyTemplate.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.api.parameters.Input;
-import org.openecomp.sdc.toscaparser.jython.JyGroup;
-import org.openecomp.sdc.toscaparser.jython.JyNodeTemplate;
-import org.openecomp.sdc.toscaparser.jython.JySubstitutionMappings;
-import org.openecomp.sdc.toscaparser.jython.JyTopologyTemplate;
-import org.openecomp.sdc.toscaparser.jython.parameters.JyInput;
-
-import com.google.common.base.MoreObjects;
-
-public class TopologyTemplate {
-
- private final JyTopologyTemplate jyTopologyTemplate;
-
- public TopologyTemplate(JyTopologyTemplate jyTopologyTemplate) {
- this.jyTopologyTemplate = Objects.requireNonNull(jyTopologyTemplate);
- }
-
- public String getDescription() {
- return jyTopologyTemplate.getJyDescription();
- }
-
- public List<NodeTemplate> getNodeTemplates() {
- List<JyNodeTemplate> jyNodeTemplates = jyTopologyTemplate.getJyNodeTemplates();
- return jyNodeTemplates != null ? jyNodeTemplates
- .stream()
- .map(NodeTemplate::new)
- .collect(toImmutableList()) : new ArrayList<>();
- }
-
- public List<Input> getInputs() {
- List<JyInput> jyInputs = jyTopologyTemplate.getJyInputs();
- return jyInputs != null ? jyInputs
- .stream()
- .map(Input::new)
- .collect(toImmutableList()) : new ArrayList<>();
- }
-
- public List<Group> getGroups() {
- List<JyGroup> jyGroups = jyTopologyTemplate.getJyGroups();
- return jyGroups != null ? jyGroups
- .stream()
- .map(Group::new)
- .collect(toImmutableList()) : new ArrayList<>();
- }
-
- public SubstitutionMappings getSubstitutionMappings() {
- JySubstitutionMappings jySubstitutionMappings = jyTopologyTemplate.getJySubstitutionMappings();
- return jySubstitutionMappings != null ? new SubstitutionMappings(jySubstitutionMappings) : null;
- }
-
- public Metadata getMetadata() {
- return jyTopologyTemplate.getJyMetadata();
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("description", getDescription())
- .add("inputs", getInputs())
- .add("nodeTemplates", getNodeTemplates())
- .add("groups", getGroups())
- .add("substitutionMappings", getSubstitutionMappings())
- .add("metadata", getMetadata())
- .toString();
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java
deleted file mode 100644
index 0aaafff..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
-import java.util.List;
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.api.parameters.Input;
-import org.openecomp.sdc.toscaparser.jython.JyToscaTemplate;
-
-import com.google.common.base.MoreObjects;
-
-public class ToscaTemplate {
-
- private final JyToscaTemplate jyToscaTemplate;
- private final TopologyTemplate topologyTemplate;
-
- public ToscaTemplate(JyToscaTemplate jyToscaTemplate, TopologyTemplate topologyTemplate) {
- this.jyToscaTemplate = Objects.requireNonNull(jyToscaTemplate);
- this.topologyTemplate = Objects.requireNonNull(topologyTemplate);
- }
-
- public String getVersion() {
- return jyToscaTemplate.getJyVersion();
- }
-
- public Metadata getMetadata() {
- return jyToscaTemplate.getJyMetadata() != null ? new Metadata(jyToscaTemplate.getJyMetadata()) : null;
- }
-
- public String getDescription() {
- return jyToscaTemplate.getJyDescription();
- }
-
- public TopologyTemplate getTopologyTemplate() {
- return topologyTemplate;
- }
-
- public List<NodeTemplate> getNodeTemplates() {
- return topologyTemplate.getNodeTemplates();
- }
-
- public List<TopologyTemplate> getNestedTopologyTemplates() {
- return jyToscaTemplate.getJyNestedTopologyTemplates()
- .stream()
- .map(TopologyTemplate::new)
- .collect(toImmutableList());
- }
-
- public List<Input> getInputs() {
- return topologyTemplate.getInputs();
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("version", getVersion())
- .add("description", getDescription())
- .add("topologyTemplate", topologyTemplate)
- .add("nestedTopologyTemplates", getNestedTopologyTemplates())
- .toString();
- }
-} \ No newline at end of file
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplateFactory.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplateFactory.java
deleted file mode 100644
index 553c56b..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplateFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.openecomp.sdc.toscaparser.api;
-
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.jython.JyToscaTemplate;
-
-public class ToscaTemplateFactory {
-
- public ToscaTemplate create(JyToscaTemplate jyToscaTemplate) {
- Objects.requireNonNull(jyToscaTemplate);
- TopologyTemplate topologyTemplate = new TopologyTemplate(jyToscaTemplate.getJyTopologyTemplate());
- return new ToscaTemplate(jyToscaTemplate, topologyTemplate);
- }
-} \ No newline at end of file
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/GroupType.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/GroupType.java
deleted file mode 100644
index 8e0bedf..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/GroupType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.openecomp.sdc.toscaparser.api.elements;
-
-import org.openecomp.sdc.toscaparser.jython.elements.JyGroupType;
-
-import com.google.common.base.MoreObjects.ToStringHelper;
-
-public class GroupType extends StatefulEntityType {
-
- private final JyGroupType jyGroupType;
-
- public GroupType(JyGroupType jyGroupType) {
- super(jyGroupType);
- this.jyGroupType = jyGroupType;
- }
-
- public String getVersion() {
- return jyGroupType.getJyVersion();
- }
-
- public String getDescription() {
- return jyGroupType.getJyDescription();
- }
-
- @Override
- protected ToStringHelper toStringHelper() {
- return super.toStringHelper()
- .add("version", getVersion())
- .add("description", getDescription());
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java
deleted file mode 100644
index 69bd9ba..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.openecomp.sdc.toscaparser.api.elements;
-
-import java.util.List;
-
-import org.openecomp.sdc.toscaparser.jython.elements.JyNodeType;
-
-import com.google.common.base.MoreObjects.ToStringHelper;
-
-public class NodeType extends StatefulEntityType {
-
- private final JyNodeType jyNodeType;
-
- public NodeType(JyNodeType jyNodeType) {
- super(jyNodeType);
- this.jyNodeType = jyNodeType;
- }
-
- public List<?> getRequirements() {
- return jyNodeType.getJyRequirements();
- }
-
- @Override
- protected ToStringHelper toStringHelper() {
- return super.toStringHelper()
- .add("requirements", getRequirements());
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/StatefulEntityType.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/StatefulEntityType.java
deleted file mode 100644
index 32661b5..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/elements/StatefulEntityType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.openecomp.sdc.toscaparser.api.elements;
-
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.jython.elements.JyStatefulEntityType;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-
-public abstract class StatefulEntityType {
-
- private final JyStatefulEntityType jyStatefulEntityType;
-
- public StatefulEntityType(JyStatefulEntityType jyStatefulEntityType) {
- this.jyStatefulEntityType = Objects.requireNonNull(jyStatefulEntityType);
- }
-
- public String getType() {
- return jyStatefulEntityType.getJyType();
- }
-
- protected ToStringHelper toStringHelper() {
- return MoreObjects.toStringHelper(this)
- .add("type", getType());
- }
-
- @Override
- public String toString() {
- return toStringHelper().toString();
- }
-}
diff --git a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/parameters/Input.java b/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/parameters/Input.java
deleted file mode 100644
index 2339bb4..0000000
--- a/jython-tosca-parser/src/main/java/org/openecomp/sdc/toscaparser/api/parameters/Input.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.openecomp.sdc.toscaparser.api.parameters;
-
-import java.util.Objects;
-
-import org.openecomp.sdc.toscaparser.jython.parameters.JyInput;
-
-import com.google.common.base.MoreObjects;
-
-public class Input {
-
- private final JyInput jyInput;
-
- public Input(JyInput jyInput) {
- this.jyInput = Objects.requireNonNull(jyInput);
- }
-
- public String getName() {
- return jyInput.getJyName();
- }
-
- public String getType() {
- return jyInput.getJyType();
- }
-
- public boolean isRequired() {
- return jyInput.isJyRequired();
- }
-
- public String getDescription() {
- return jyInput.getJyDescription();
- }
-
- public Object getDefault() {
- return jyInput.getJyDefault();
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("name", getName())
- .add("type", getType())
- .add("required", isRequired())
- .add("description", getDescription())
- .add("default", getDefault())
- .toString();
- }
-}