aboutsummaryrefslogtreecommitdiffstats
path: root/common-be/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'common-be/src/main/java')
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationDataDefinition.java102
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationParamDataDefinition.java (renamed from common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationParamDataDefinition.java)43
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java6
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationDataDefinition.java89
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java15
5 files changed, 140 insertions, 115 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationDataDefinition.java
new file mode 100644
index 0000000000..21c73e3ee8
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationDataDefinition.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openecomp.sdc.be.datatypes.elements;
+
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.DESCRIPTION;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_WORKFLOW_ID;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.TOSCA_RESOURCE_NAME;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.UNIQUE_ID;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_INPUT_PARAMETERS;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_OPERATION_TYPE;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_OUTPUT_PARAMETERS;
+public class InterfaceOperationDataDefinition extends ToscaDataDefinition implements Serializable {
+
+ @JsonCreator
+ public InterfaceOperationDataDefinition() {
+ super();
+ }
+
+ public InterfaceOperationDataDefinition(InterfaceOperationDataDefinition iodd) {
+ super();
+ setUniqueId(iodd.getUniqueId());
+ setInputParams(iodd.getInputParams());
+ setOutputParams(iodd.getOutputParams());
+ setDescription(iodd.getDescription());
+ setToscaResourceName(iodd.getToscaResourceName());
+ setOperationType(iodd.getOperationType());
+ setWorkflowId(iodd.getWorkflowId());
+ }
+
+ public ListDataDefinition<InterfaceOperationParamDataDefinition> getInputParams() {
+ return (ListDataDefinition<InterfaceOperationParamDataDefinition>)
+ getToscaPresentationValue(IO_INPUT_PARAMETERS);
+ }
+ public void setInputParams(ListDataDefinition<InterfaceOperationParamDataDefinition>
+ inputParams) {
+ setToscaPresentationValue(IO_INPUT_PARAMETERS, inputParams);
+ }
+
+ public ListDataDefinition<InterfaceOperationParamDataDefinition> getOutputParams() {
+ return (ListDataDefinition<InterfaceOperationParamDataDefinition>)
+ getToscaPresentationValue(IO_OUTPUT_PARAMETERS);
+ }
+ public void setOutputParams(ListDataDefinition<InterfaceOperationParamDataDefinition>
+ outputParams) {
+ setToscaPresentationValue(IO_OUTPUT_PARAMETERS, outputParams);
+ }
+
+ public String getUniqueId() {
+ return (String) getToscaPresentationValue(UNIQUE_ID);
+ }
+ public void setUniqueId(String uid) {
+ setToscaPresentationValue(UNIQUE_ID, uid);
+ }
+
+ public String getDescription() {
+ return (String) getToscaPresentationValue(DESCRIPTION);
+ }
+ public void setDescription(String description) {
+ setToscaPresentationValue(DESCRIPTION, description);
+ }
+
+ public String getOperationType() {
+ return (String) getToscaPresentationValue(IO_OPERATION_TYPE);
+ }
+ public void setOperationType(String operationType) {
+ setToscaPresentationValue(IO_OPERATION_TYPE, operationType);
+ }
+
+ public String getToscaResourceName() {
+ return (String) getToscaPresentationValue(TOSCA_RESOURCE_NAME);
+ }
+ public void setToscaResourceName(String toscaResourceName) {
+ setToscaPresentationValue(TOSCA_RESOURCE_NAME, toscaResourceName);
+ }
+
+ public String getWorkflowId() {
+ return (String) getToscaPresentationValue(IO_WORKFLOW_ID);
+ }
+ public void setWorkflowId(String workflowId) {
+ setToscaPresentationValue(IO_WORKFLOW_ID, workflowId);
+ }
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationParamDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationParamDataDefinition.java
index 36dd85c336..09dc2a0597 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationParamDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/InterfaceOperationParamDataDefinition.java
@@ -16,40 +16,45 @@
package org.openecomp.sdc.be.datatypes.elements;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_PARAM_ID;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_PARAM_NAME;
-
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-public class WorkflowOperationParamDataDefinition extends ToscaDataDefinition implements Serializable {
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_PARAM_ID;
+import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.IO_PARAM_NAME;
+
+public class InterfaceOperationParamDataDefinition extends ToscaDataDefinition implements Serializable {
- public WorkflowOperationParamDataDefinition() {
+ @JsonCreator
+ public InterfaceOperationParamDataDefinition() {
super();
}
-
-
- public WorkflowOperationParamDataDefinition(WorkflowOperationParamDataDefinition wopdd) {
+ public InterfaceOperationParamDataDefinition(InterfaceOperationParamDataDefinition iopdd) {
super();
- setParamName(wopdd.getParamName());
- setParamID(wopdd.getParamID());
-
+ setParamName(iopdd.getParamName());
+ setParamId(iopdd.getParamId());
}
- public String getParamName() {
- return (String) getToscaPresentationValue(WO_PARAM_NAME);
+ public InterfaceOperationParamDataDefinition(String paramName, String paramId) {
+ super();
+ setParamName(paramName);
+ setParamId(paramId);
}
- public void setParamName(String name) {
- setToscaPresentationValue(WO_PARAM_NAME, name);
+ public String getParamName() {
+ return (String) getToscaPresentationValue(IO_PARAM_NAME);
}
- public String getParamID() {
- return (String) getToscaPresentationValue(WO_PARAM_ID);
+ public void setParamName(String paramName) {
+ setToscaPresentationValue(IO_PARAM_NAME, paramName);
}
- public void setParamID(String name) {
- setToscaPresentationValue(WO_PARAM_ID, name);
+ public String getParamId() {
+ return (String) getToscaPresentationValue(IO_PARAM_ID);
+ }
+ public void setParamId(String paramId) {
+ setToscaPresentationValue(IO_PARAM_ID, paramId);
}
}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java
index e18127dc2e..0228492bb6 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInputDefinition.java
@@ -33,6 +33,12 @@ public class OperationInputDefinition extends InputDataDefinition {
setName(name);
}
+ public OperationInputDefinition(String paramName, String paramId) {
+ super();
+ setName(paramName);
+ setInputId(paramId);
+ }
+
public String getLabel() {
return (String) getToscaPresentationValue(JsonPresentationFields.ARTIFACT_LABEL);
}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationDataDefinition.java
deleted file mode 100644
index 52f5f02a40..0000000000
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/WorkflowOperationDataDefinition.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright © 2016-2018 European Support Limited
- *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openecomp.sdc.be.datatypes.elements;
-
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.DESCRIPTION;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.TOSCA_RESOURCE_NAME;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.UNIQUE_ID;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_INPUT_PARAMETERS;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_OUTPUT_PARAMETERS;
-import static org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields.WO_TYPE;
-
-
-import java.io.Serializable;
-import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-
-public class WorkflowOperationDataDefinition extends ToscaDataDefinition implements Serializable {
-
- public WorkflowOperationDataDefinition() {
- super();
- }
-
- public WorkflowOperationDataDefinition(WorkflowOperationDataDefinition wodd) {
- super();
- setUniqueId(wodd.getUniqueId());
- setInputParams(wodd.getInputParams());
- setOutputParams(wodd.getOutputParams());
- setDescription(wodd.getDescription());
- setToscaResourceName(wodd.getToscaResourceName());
- setType(wodd.getType());
- }
-
- public ListDataDefinition<WorkflowOperationParamDataDefinition> getInputParams() {
- return (ListDataDefinition<WorkflowOperationParamDataDefinition>) getToscaPresentationValue(WO_INPUT_PARAMETERS);
- }
-
- public void setInputParams(ListDataDefinition<WorkflowOperationParamDataDefinition> pathElements) {
- setToscaPresentationValue(WO_INPUT_PARAMETERS, pathElements);
- }
- public ListDataDefinition<WorkflowOperationParamDataDefinition> getOutputParams() {
- return (ListDataDefinition<WorkflowOperationParamDataDefinition>) getToscaPresentationValue(WO_OUTPUT_PARAMETERS);
- }
-
- public void setOutputParams(ListDataDefinition<WorkflowOperationParamDataDefinition> pathElements) {
- setToscaPresentationValue(WO_OUTPUT_PARAMETERS, pathElements);
- }
- public String getUniqueId() {
- return (String) getToscaPresentationValue(UNIQUE_ID);
- }
-
- public void setUniqueId(String uid) {
- setToscaPresentationValue(UNIQUE_ID, uid);
- }
-
- public String getDescription() {
- return (String) getToscaPresentationValue(DESCRIPTION);
- }
-
- public void setDescription(String description) {
- setToscaPresentationValue(DESCRIPTION, description);
- }
- public String getType() {
- return (String) getToscaPresentationValue(WO_TYPE);
- }
-
- public void setType(String description) {
- setToscaPresentationValue(WO_TYPE, description);
- }
- public String getToscaResourceName() {
- return (String) getToscaPresentationValue(TOSCA_RESOURCE_NAME);
- }
-
- public void setToscaResourceName(String toscaResourceName) {
- setToscaPresentationValue(TOSCA_RESOURCE_NAME, toscaResourceName);
- }
-}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
index d0cb48efdd..a08354146b 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
@@ -196,13 +196,14 @@ public enum JsonPresentationFields {
//External Refs
EXTERNAL_REF ("externalRef", null),
-
- //Workflow Operation
- WO_TYPE ("operationType",null),
- WO_INPUT_PARAMETERS ("inputParams",null),
- WO_OUTPUT_PARAMETERS ("outputParams",null),
- WO_PARAM_NAME("paramName", null),
- WO_PARAM_ID("paramId", null),
+
+ //Interface Operation
+ IO_OPERATION_TYPE("operationType",null),
+ IO_INPUT_PARAMETERS("inputParams",null),
+ IO_OUTPUT_PARAMETERS("outputParams",null),
+ IO_PARAM_NAME("paramName", null),
+ IO_PARAM_ID("paramId", null),
+ IO_WORKFLOW_ID("workflowId", null),
//Interface
INTERFACE ("interface", null),