diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java index adf927178f..e2d5f546da 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java @@ -7,9 +7,9 @@ * 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. @@ -17,9 +17,14 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.be.components.impl.policy; +import static java.util.Collections.emptyList; +import static org.apache.commons.collections.CollectionUtils.isEmpty; + +import java.util.List; +import java.util.Map; +import java.util.function.UnaryOperator; import org.apache.commons.collections.MapUtils; import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType; import org.openecomp.sdc.be.datatypes.enums.PromoteVersionEnum; @@ -27,13 +32,6 @@ import org.openecomp.sdc.be.model.PolicyDefinition; import org.openecomp.sdc.be.model.utils.GroupUtils; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.Map; -import java.util.function.UnaryOperator; - -import static java.util.Collections.emptyList; -import static org.apache.commons.collections.CollectionUtils.isEmpty; - /** * A Helper class which handles altering the targets state of a policy */ @@ -41,7 +39,7 @@ import static org.apache.commons.collections.CollectionUtils.isEmpty; public class PolicyTargetsUpdater { public void removeTarget(List<PolicyDefinition> policies, String targetId, PolicyTargetType targetType) { - policies.forEach(policy ->removePolicyTarget(policy, targetId, targetType)); + policies.forEach(policy -> removePolicyTarget(policy, targetId, targetType)); } public void replaceTarget(List<PolicyDefinition> policies, String oldTargetId, String newTargetId, PolicyTargetType targetType) { @@ -62,21 +60,19 @@ public class PolicyTargetsUpdater { if (isEmpty(policyTargets)) { return; } - policyTargets.remove(targetId); policy.setVersion(GroupUtils.updateVersion(PromoteVersionEnum.MINOR, policy.getVersion())); } private List<String> getTargetsList(PolicyDefinition policyDefinition, PolicyTargetType targetType) { Map<PolicyTargetType, List<String>> targets = policyDefinition.getTargets(); - if(MapUtils.isEmpty(targets) || isEmpty(targets.get(targetType))) { + if (MapUtils.isEmpty(targets) || isEmpty(targets.get(targetType))) { return emptyList(); } return targets.get(targetType); } private UnaryOperator<String> prevInstanceIdByNewInstanceId(String prevInstanceId, String newInstanceId) { - return instId -> instId.equals(prevInstanceId) ? newInstanceId: instId; + return instId -> instId.equals(prevInstanceId) ? newInstanceId : instId; } - } |