From 36582b71676428a30810f206729d9a21cbd87f1a Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 7 Nov 2022 22:10:37 +0000 Subject: Interface is formatted using extended notation when no implementation added at VFC level Signed-off-by: Vasyl Razinkov Change-Id: I4e6e6d61b851fe2efaa47c9f8fad0cb546f2fcb7 Issue-ID: SDC-4255 --- .../java/org/openecomp/sdc/be/model/Operation.java | 2 - .../openecomp/sdc/be/model/OperationInstance.java | 63 ---------------------- .../sdc/be/model/OperationInstanceTest.java | 34 ------------ 3 files changed, 99 deletions(-) delete mode 100644 catalog-model/src/main/java/org/openecomp/sdc/be/model/OperationInstance.java delete mode 100644 catalog-model/src/test/java/org/openecomp/sdc/be/model/OperationInstanceTest.java (limited to 'catalog-model') 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 180f82cfff..92c7c5972d 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 @@ -38,8 +38,6 @@ public class Operation extends OperationDataDefinition implements IOperationPara *

* Jackson DeSerialization workaround constructor to create an operation with no arguments. *

- * - * @param emptyString The empty string provided by jackson. */ public Operation() { super(); diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/OperationInstance.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/OperationInstance.java deleted file mode 100644 index 8a3f83f3ee..0000000000 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/OperationInstance.java +++ /dev/null @@ -1,63 +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.model; - -import java.util.Map; -import java.util.Objects; -import org.openecomp.sdc.be.datatypes.elements.OperationImplementation; - -public class OperationInstance/* extends Operation*/ { - - private OperationImplementation implementation; - private Map inputs; - - - public OperationImplementation getImplementation() { - return implementation; - } - - public void setImplementation(OperationImplementation implementation) { - this.implementation = implementation; - } - - public Map getInputs() { - return inputs; - } - - public void setInputs(Map 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); - } -} - diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/OperationInstanceTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/OperationInstanceTest.java deleted file mode 100644 index 199f26500a..0000000000 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/OperationInstanceTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 Nokia. All rights reserved. - * ================================================================================ - * 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. - * ============LICENSE_END========================================================= - */ -package org.openecomp.sdc.be.model; - -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEquals; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.junit.Assert.assertThat; - -import org.junit.Test; - -public class OperationInstanceTest { - @Test - public void shouldHaveValidGettersAndSetters() { - assertThat(OperationInstance.class, hasValidGettersAndSetters()); - assertThat(OperationInstance.class, hasValidBeanEquals()); - } -} \ No newline at end of file -- cgit 1.2.3-korg