diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2021-02-19 14:07:05 +0100 |
|---|---|---|
| committer |   Liam Fallon <liam.fallon@est.tech> | 2021-02-25 09:11:37 +0000 |
| commit | a5680599587c9e571f11651660700c16beb7e4ce (patch) | |
| tree | d25e3c1f0356241995189d8dc58c7028784597e3 /src/main/java/org | |
| parent | 19f16ce2d6c58e5b603dc99c760820341563bebe (diff) | |
Update clamp to 6.0.1
- Update to 6.0.1 so that images can be released next week
- Fix classNotFound due to update of policy models libs from 2.3.5 to 2.4.0 (ToscaPolicyIdentifier renamed to ToscaConceptIddentifier and ToscaPolicyTypeIdentifier deleted)
Issue-ID: POLICY-3084
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ic2d3e6eb25f125ba472c77f0683081214680fafb
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
(cherry picked from commit eeaef28f78a23881e2f5cf0380fa1ad34472435d)
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java index 1d6d21977..768872750 100644 --- a/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java +++ b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupsAnalyzer.java @@ -33,7 +33,7 @@ import org.onap.policy.models.pdp.concepts.PdpGroup; import org.onap.policy.models.pdp.concepts.PdpGroups; import org.onap.policy.models.pdp.concepts.PdpSubGroup; import org.onap.policy.models.pdp.enums.PdpState; -import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier; +import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; /** * This is an utility class to do searching in pdp groups and create json object describing the result. @@ -118,12 +118,12 @@ public class PdpGroupsAnalyzer { JsonObject assignedPdpGroups = new JsonObject(); pdpGroupInfo.add(ASSIGNED_PDP_GROUPS_INFO, assignedPdpGroups); - ToscaPolicyIdentifier toscaPolicyIdentifier = new ToscaPolicyIdentifier(policyName, version); + ToscaConceptIdentifier toscaConceptIdentifier = new ToscaConceptIdentifier(policyName, version); pdpGroups.getGroups().stream().anyMatch(pdpGroup -> pdpGroup.getPdpSubgroups().stream().anyMatch( pdpSubGroup -> { if (pdpSubGroup.getPolicies() != null && pdpSubGroup.getPolicies() - .contains(toscaPolicyIdentifier)) { + .contains(toscaConceptIdentifier)) { assignedPdpGroups.addProperty("pdpGroup", pdpGroup.getName()); assignedPdpGroups.addProperty("pdpSubGroup", pdpSubGroup.getPdpType()); return true; |