Interface is formatted using extended notation when no implementation added at VFC level

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I4e6e6d61b851fe2efaa47c9f8fad0cb546f2fcb7
Issue-ID: SDC-4255

2 files changed, 6 insertions, 72 deletions

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationImplementation.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationImplementation.java
index 2364ff4e3b..6ce1c4d762 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationImplementation.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationImplementation.java
@@ -16,46 +16,13 @@
 
 package org.openecomp.sdc.be.datatypes.elements;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
+import lombok.Data;
 
+@Data
 public class OperationImplementation {
 
     private String primary;
     private List<String> dependencies;
 
-    public String getPrimary() {
-        return primary;
-    }
-
-    public void setPrimary(String primary) {
-        this.primary = primary;
-    }
-
-    public List<String> getDependencies() {
-        return dependencies;
-    }
-
-    public void setDependencies(List<String> dependencies) {
-        this.dependencies = dependencies;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof OperationImplementation)) {
-            return false;
-        }
-        OperationImplementation that = (OperationImplementation) o;
-        return Objects.equals(primary, that.primary)
-                && Objects.equals(new HashSet<>(dependencies), new HashSet<>(that.dependencies));
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(primary, dependencies);
-    }
 }
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInstance.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInstance.java
index 80c86d8d78..1da482936b 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInstance.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/OperationInstance.java
@@ -17,45 +17,12 @@
 package org.openecomp.sdc.be.datatypes.elements;
 
 import java.util.Map;
-import java.util.Objects;
+import lombok.Data;
+
+@Data
+public class OperationInstance {
 
-public class OperationInstance/* extends Operation*/ {
     private OperationImplementation implementation;
     private Map<String, Object> inputs;
 
-
-    public OperationImplementation getImplementation() {
-        return implementation;
-    }
-
-    public void setImplementation(OperationImplementation implementation) {
-        this.implementation = implementation;
-    }
-
-    public Map<String, Object> getInputs() {
-        return inputs;
-    }
-
-    public void setInputs(Map<String, Object> inputs) {
-        this.inputs = inputs;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof OperationInstance)) {
-            return false;
-        }
-        OperationInstance that = (OperationInstance) o;
-        return Objects.equals(implementation, that.implementation)
-                && Objects.equals(inputs, that.inputs);
-    }
-
-    @Override
-    public int hashCode() {
-
-        return Objects.hash(implementation, inputs);
-    }
 }