From 08b5517fa4f3fef87498e51cc2e466877a745ce6 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Thu, 26 Jun 2025 17:00:40 +0100 Subject: [PATCH] Removing duplicated lines in ACM Issue-ID: POLICY-5405 Change-Id: I02a800eb48b2912876c2cf3c0f167880119624ae Signed-off-by: FrancescoFioraEst --- .../intermediary/api/impl/AcElementListenerV1.java | 5 ++-- .../intermediary/api/impl/AcElementListenerV2.java | 5 ++-- .../intermediary/api/impl/AcElementListenerV3.java | 3 +-- .../AutomationCompositionElementListenerV1.java | 5 ++-- .../AutomationCompositionElementListenerV2.java | 27 ++----------------- .../AutomationCompositionElementListenerV3.java | 31 ++-------------------- 6 files changed, 12 insertions(+), 64 deletions(-) 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 9c23ec7fd..eaf67f6fc 100644 --- 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 21b76d1b7..8f4510b0d 100644 --- 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 0d5a6c599..1c6c3a75c 100644 --- 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 @@ package org.onap.policy.clamp.acm.participant.intermediary.api.impl; -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.clamp.acm.participant.intermediary.api.ParticipantIntermediaryApi; @@ -33,7 +32,7 @@ import org.onap.policy.models.base.PfModelException; * Valid since 8.0.1 release. */ public abstract class AcElementListenerV3 extends AcElementListenerV4 - implements AutomationCompositionElementListener, AutomationCompositionElementListenerV3 { + implements AutomationCompositionElementListenerV3 { protected AcElementListenerV3(ParticipantIntermediaryApi intermediaryApi) { super(intermediaryApi); 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 007ba3d80..2aa23a5d6 100644 --- 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 721caa88e..f2676d94d 100644 --- 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 1e5bb564d..003e0f1d3 100644 --- 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; -- 2.16.6