From a8480d1fec5b5696be04eb887f4cbed6b56238be Mon Sep 17 00:00:00 2001 From: mojahidi Date: Thu, 19 Jul 2018 12:35:31 +0530 Subject: Add support for workflowId and workflowVersionId Enhance operation data model and APIs to support workflowId and workflowVersionId Change-Id: Ib8772027a3e0147ae0bb59811a9b31fe46975ac6 Issue-ID: SDC-1535 Signed-off-by: mojahidi --- .../java/org/openecomp/sdc/be/model/Resource.java | 11 ----------- .../org/openecomp/sdc/be/model/ResourceTest.java | 22 ---------------------- 2 files changed, 33 deletions(-) (limited to 'catalog-model') diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java index e15f1159ba..766cae4432 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java @@ -47,8 +47,6 @@ public class Resource extends Component { private List defaultCapabilities; - private Map interfaceOperations; - public Resource() { super(new ResourceMetadataDefinition()); this.getComponentMetadataDefinition().getMetadataDataDefinition().setComponentType(ComponentTypeEnum.RESOURCE); @@ -152,14 +150,6 @@ public class Resource extends Component { .setLicenseType(licenseType); } - public Map getInterfaceOperations() { - return interfaceOperations; - } - - public void setInterfaceOperations(Map interfaceOperations) { - this.interfaceOperations = interfaceOperations; - } - @Override public int hashCode() { final int prime = 31; @@ -214,7 +204,6 @@ public class Resource extends Component { return false; } else if (!properties.equals(other.properties)) return false; - return super.equals(obj); } diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceTest.java index cf4ee08043..2ecb4b444c 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ResourceTest.java @@ -221,28 +221,6 @@ public class ResourceTest extends ModelConfDependentTest{ } - @Test - public void testGetInterfaceOperations() throws Exception { - Resource testSubject; - Map result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getInterfaceOperations(); - } - - - @Test - public void testSetInterfaceOperations() throws Exception { - Resource testSubject; - Map interfaceOperations = null; - - // default test - testSubject = createTestSubject(); - testSubject.setInterfaceOperations(interfaceOperations); - } - - @Test public void testHashCode() throws Exception { Resource testSubject; -- cgit 1.2.3-korg