From 700e84d56afcdf66c06b1980782be54d9e57fa3e Mon Sep 17 00:00:00 2001
From: shrek2000 <orenkle@amdocs.com>
Date: Mon, 12 Mar 2018 15:35:54 +0200
Subject: Interface workflow data model

Data Model for Interface workflow operation task

Change-Id: Idb28f83a878db3aadeaafe165b6b03bd1fb5fa44
Issue-ID: SDC-1052
Signed-off-by: shrek2000 <orenkle@amdocs.com>
---
 .../org/openecomp/sdc/be/model/InterfaceDefinition.java   | 12 ++++++------
 .../main/java/org/openecomp/sdc/be/model/Operation.java   | 15 +++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'catalog-model/src/main/java/org')

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/InterfaceDefinition.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/InterfaceDefinition.java
index 78b5a82468..d5dfbc28e3 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/InterfaceDefinition.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/InterfaceDefinition.java
@@ -70,18 +70,18 @@ public class InterfaceDefinition extends InterfaceDataDefinition implements IOpe
     @JsonIgnore
     public Map<String, Operation> getOperationsMap() {
         Map<String, Operation> convertedOperation = getOperations().entrySet()
-                                                                   .stream()
-                                                                   .collect(Collectors.toMap(e -> e.getKey(), e -> new Operation(e
-                                                                           .getValue())));
+            .stream()
+            .collect(Collectors.toMap(e -> e.getKey(), e -> new Operation(e
+                .getValue())));
         return convertedOperation;
     }
 
     @JsonIgnore
     public void setOperationsMap(Map<String, Operation> operations) {
         Map<String, OperationDataDefinition> convertedOperation = operations.entrySet()
-                                                                            .stream()
-                                                                            .collect(Collectors.toMap(e -> e.getKey(), e -> new OperationDataDefinition(e
-                                                                                    .getValue())));
+            .stream()
+            .collect(Collectors.toMap(e -> e.getKey(), e -> new OperationDataDefinition(e
+                .getValue())));
         setOperations(convertedOperation);
     }
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Operation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Operation.java
index 4347cd45fc..066cd67fec 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Operation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Operation.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.
@@ -20,15 +20,14 @@
 
 package org.openecomp.sdc.be.model;
 
-import java.util.Map;
-
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition;
 
 /**
  * Defines an operation available to manage particular aspects of the Node Type.
- * 
+ *
  * @author esofer
  */
 public class Operation extends OperationDataDefinition implements IOperationParameter {
@@ -42,7 +41,7 @@ public class Operation extends OperationDataDefinition implements IOperationPara
 	 * Jackson DeSerialization workaround constructor to create an operation
 	 * with no arguments.
 	 * </p>
-	 * 
+	 *
 	 * @param emptyString
 	 *            The empty string provided by jackson.
 	 */
@@ -55,7 +54,7 @@ public class Operation extends OperationDataDefinition implements IOperationPara
 	}
 
 	public Operation(ArtifactDataDefinition implementation, String description,
-			Map<String, PropertyDataDefinition> inputs) {
+		ListDataDefinition<OperationInputDefinition> inputs) {
 		super(description);
 		setImplementation(implementation);
 		setInputs(inputs);
-- 
cgit 1.2.3-korg