Removing duplicated lines in ACM

Issue-ID: POLICY-5405
Change-Id: I02a800eb48b2912876c2cf3c0f167880119624ae
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV1.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV1.java
index 9c23ec7..eaf67f6 100644 (file)
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV1.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV1.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2024-2025 Nordix Foundation.
+ *  Copyright (C) 2024-2025 OpenInfra Foundation Europe. 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.
@@ -26,7 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionElementDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.InstanceElementDto;
@@ -46,7 +45,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
  * Valid since 7.1.0 release.
  */
 public abstract class AcElementListenerV1 extends AcElementListenerV2
-        implements AutomationCompositionElementListener, AutomationCompositionElementListenerV1 {
+        implements AutomationCompositionElementListenerV1 {
 
     protected AcElementListenerV1(ParticipantIntermediaryApi intermediaryApi) {
         super(intermediaryApi);

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV2.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV2.java
index 21b76d1..8f4510b 100644 (file)
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV2.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV2.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2024-2025 Nordix Foundation.
+ *  Copyright (C) 2024-2025 OpenInfra Foundation Europe. 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.
@@ -21,7 +21,6 @@
 package org.onap.policy.clamp.acm.participant.intermediary.api.impl;
 
 import jakarta.ws.rs.core.Response;
-import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionElementDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.InstanceElementDto;
@@ -37,7 +36,7 @@ import org.onap.policy.models.base.PfModelException;
  * Valid since 7.1.1 release.
  */
 public abstract class AcElementListenerV2 extends AcElementListenerV3
-        implements AutomationCompositionElementListener, AutomationCompositionElementListenerV2 {
+        implements AutomationCompositionElementListenerV2 {
 
     protected static final String NOT_SUPPORTED = "not supported!";
 

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV3.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV3.java
index 0d5a6c5..1c6c3a7 100644 (file)
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV3.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV3.java
@@ -20,7 +20,6 @@
 \r
 package org.onap.policy.clamp.acm.participant.intermediary.api.impl;\r
 \r
-import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;\r
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionElementDto;\r
 import org.onap.policy.clamp.acm.participant.intermediary.api.InstanceElementDto;\r
 import org.onap.policy.clamp.acm.participant.intermediary.api.ParticipantIntermediaryApi;\r
@@ -33,7 +32,7 @@ import org.onap.policy.models.base.PfModelException;
  * Valid since 8.0.1 release.\r
  */\r
 public abstract class AcElementListenerV3 extends AcElementListenerV4\r
-        implements AutomationCompositionElementListener, AutomationCompositionElementListenerV3 {\r
+        implements AutomationCompositionElementListenerV3 {\r
 \r
     protected AcElementListenerV3(ParticipantIntermediaryApi intermediaryApi) {\r
         super(intermediaryApi);\r

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV1.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV1.java
index 007ba3d..2aa23a5 100644 (file)
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV1.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV1.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2024 Nordix Foundation.
+ *  Copyright (C) 2024-2025 OpenInfra Foundation Europe. 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.
@@ -23,11 +23,12 @@ package org.onap.policy.clamp.acm.participant.intermediary.api.impl;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;
 import org.onap.policy.clamp.models.acm.concepts.AcElementDeploy;
 import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElementDefinition;
 import org.onap.policy.models.base.PfModelException;
 
-public interface AutomationCompositionElementListenerV1 {
+public interface AutomationCompositionElementListenerV1 extends AutomationCompositionElementListener {
 
     void undeploy(UUID automationCompositionId, UUID automationCompositionElementId) throws PfModelException;
 

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV2.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV2.java
index 721caa8..f2676d9 100644 (file)
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV2.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV2.java
@@ -20,39 +20,16 @@
 
 package org.onap.policy.clamp.acm.participant.intermediary.api.impl;
 
-import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionDto;
+import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionElementDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.InstanceElementDto;
 import org.onap.policy.models.base.PfModelException;
 
-public interface AutomationCompositionElementListenerV2 {
-
-    void deploy(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void undeploy(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void lock(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void unlock(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void delete(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void update(CompositionElementDto compositionElement, InstanceElementDto instanceElement,
-            InstanceElementDto instanceElementUpdated) throws PfModelException;
-
-    void prime(CompositionDto composition) throws PfModelException;
-
-    void deprime(CompositionDto composition) throws PfModelException;
+public interface AutomationCompositionElementListenerV2 extends AutomationCompositionElementListener {
 
     void migrate(CompositionElementDto compositionElement, CompositionElementDto compositionElementTarget,
             InstanceElementDto instanceElement, InstanceElementDto instanceElementMigrate) throws PfModelException;
 
-    void migratePrecheck(CompositionElementDto compositionElement, CompositionElementDto compositionElementTarget,
-            InstanceElementDto instanceElement, InstanceElementDto instanceElementMigrate) throws PfModelException;
-
-    void review(CompositionElementDto compositionElement, InstanceElementDto instanceElement)
-            throws PfModelException;
-
     void prepare(CompositionElementDto compositionElement, InstanceElementDto instanceElement)
             throws PfModelException;
 }

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV3.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV3.java
index 1e5bb56..003e0f1 100644 (file)
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV3.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AutomationCompositionElementListenerV3.java
@@ -20,39 +20,12 @@
 
 package org.onap.policy.clamp.acm.participant.intermediary.api.impl;
 
-import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionDto;
+import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionElementDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.InstanceElementDto;
 import org.onap.policy.models.base.PfModelException;
 
-public interface AutomationCompositionElementListenerV3 {
-
-    void deploy(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void undeploy(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void lock(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void unlock(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void delete(CompositionElementDto compositionElement, InstanceElementDto instanceElement) throws PfModelException;
-
-    void update(CompositionElementDto compositionElement, InstanceElementDto instanceElement,
-            InstanceElementDto instanceElementUpdated) throws PfModelException;
-
-    void prime(CompositionDto composition) throws PfModelException;
-
-    void deprime(CompositionDto composition) throws PfModelException;
-
-    void migrate(CompositionElementDto compositionElement, CompositionElementDto compositionElementTarget,
-            InstanceElementDto instanceElement, InstanceElementDto instanceElementMigrate,
-            int nextStage) throws PfModelException;
-
-    void migratePrecheck(CompositionElementDto compositionElement, CompositionElementDto compositionElementTarget,
-            InstanceElementDto instanceElement, InstanceElementDto instanceElementMigrate) throws PfModelException;
-
-    void review(CompositionElementDto compositionElement, InstanceElementDto instanceElement)
-        throws PfModelException;
+public interface AutomationCompositionElementListenerV3 extends AutomationCompositionElementListener {
 
     void prepare(CompositionElementDto compositionElement, InstanceElementDto instanceElement)
         throws PfModelException;