diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyVersionUpdater.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyVersionUpdater.java | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyVersionUpdater.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyVersionUpdater.java index ef2f8cbad9..ac6e89d6a1 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyVersionUpdater.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyVersionUpdater.java @@ -17,10 +17,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.be.components.impl.policy; +import static org.apache.commons.collections.CollectionUtils.isEmpty; +import java.util.List; +import java.util.function.Consumer; import org.openecomp.sdc.be.components.impl.version.OnChangeVersionCommand; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.datatypes.enums.PromoteVersionEnum; @@ -33,30 +35,21 @@ import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder; import org.openecomp.sdc.be.model.utils.GroupUtils; import org.openecomp.sdc.common.log.wrappers.Logger; -import java.util.List; -import java.util.function.Consumer; - -import static org.apache.commons.collections.CollectionUtils.isEmpty; - - /** * A Helper class which handles altering the version of a group */ @org.springframework.stereotype.Component public class PolicyVersionUpdater implements OnChangeVersionCommand { - + private static final Logger log = Logger.getLogger(PolicyVersionUpdater.class); private final ToscaOperationFacade toscaOperationFacade; private final ComponentsUtils componentsUtils; - public PolicyVersionUpdater(ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils) { this.toscaOperationFacade = toscaOperationFacade; this.componentsUtils = componentsUtils; - } - - + @Override public ActionStatus onChangeVersion(Component container) { log.debug("#onChangeVersion - replacing all group members for component instance"); @@ -68,21 +61,16 @@ public class PolicyVersionUpdater implements OnChangeVersionCommand { policies.forEach(policy -> increaseMajorVersion(policy)); } - private void increaseMajorVersion(PolicyDefinition policy) { String version = policy.getVersion(); - String newVersion = GroupUtils.updateVersion(PromoteVersionEnum.MAJOR, policy.getVersion()); - - if(!version.equals(newVersion) ){ + if (!version.equals(newVersion)) { String groupUUID = UniqueIdBuilder.generateUUID(); policy.setPolicyUUID(groupUUID); policy.setVersion(String.valueOf(newVersion)); } + } - } - - private ActionStatus updatePoliciesVersion(Component container, Consumer<List<PolicyDefinition>> updatePoliciesVersion) { List<PolicyDefinition> policies = container.resolvePoliciesList(); if (isEmpty(policies)) { @@ -90,15 +78,11 @@ public class PolicyVersionUpdater implements OnChangeVersionCommand { } updatePoliciesVersion.accept(policies); return updatePolicies(container, policies); - } + } - private ActionStatus updatePolicies(Component policiesContainer, List<PolicyDefinition> policiesToUpdate) { log.debug("#updatePolicies - updating {} policies for container {}", policiesToUpdate.size(), policiesContainer.getUniqueId()); StorageOperationStatus updatePolicyResult = toscaOperationFacade.updatePoliciesOfComponent(policiesContainer.getUniqueId(), policiesToUpdate); return componentsUtils.convertFromStorageResponse(updatePolicyResult, policiesContainer.getComponentType()); } - } - - |