From 2f925fb69dfc65bf25870fe89c004a009a73e476 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 4 Apr 2019 17:27:50 +0000 Subject: Add filters on policy objects I just raised this review to shwo where I'm going with the filters. They are not complete yet. Issue-ID: POLICY-1095 Change-Id: I7b602a32bb67159b893f3b3cefea5d88038c4e5f Signed-off-by: liamfallon --- .../authorative/concepts/ToscaPolicyFilter.java | 39 +++++++++++++++++++++- .../concepts/ToscaPolicyTypeFilter.java | 31 ++++++++++++++++- 2 files changed, 68 insertions(+), 2 deletions(-) (limited to 'models-tosca/src/main') diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilter.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilter.java index 496c62677..7781af236 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilter.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilter.java @@ -20,11 +20,48 @@ package org.onap.policy.models.tosca.authorative.concepts; +import java.util.List; +import java.util.stream.Collectors; + +import lombok.Builder; +import lombok.Data; +import lombok.NonNull; + +import org.onap.policy.models.base.PfObjectFiler; + /** * Filter class for searches for {@link ToscaPolicy} instances. + * If any fields are null, they are ignored. * * @author Liam Fallon (liam.fallon@est.tech) */ -public class ToscaPolicyFilter { +@Builder +@Data +public class ToscaPolicyFilter implements PfObjectFiler { + public static final String LATEST_VERSION = "LATEST"; + + // Regular expression + private String name; + + // Regular Expression, set to LATEST_VERRSION to get the latest version + private String version; + + // Regular expression + private String policyTypeName; + + // Regular Expression, set to LATEST_VERRSION to get the latest version + private String policyTypeVersion; + + @Override + public List filter(@NonNull final List originalList) { + // @formatter:off + return originalList.stream() + .filter(p -> name != null && p.getName() .matches(name)) + .filter(p -> version != null && p.getVersion() .matches(version)) + .filter(p -> policyTypeName != null && p.getType() .matches(policyTypeName)) + .filter(p -> policyTypeVersion != null && p.getTypeVersion().matches(policyTypeVersion)) + .collect(Collectors.toList()); + // @formatter:off + } } diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilter.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilter.java index a77e1856b..baa95045c 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilter.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilter.java @@ -20,11 +20,40 @@ package org.onap.policy.models.tosca.authorative.concepts; +import java.util.List; +import java.util.stream.Collectors; + +import lombok.Builder; +import lombok.Data; +import lombok.NonNull; + +import org.onap.policy.models.base.PfObjectFiler; + /** * Filter class for searches for {@link ToscaPolicyType} instances. + * If any fields are null, they are ignored. * * @author Liam Fallon (liam.fallon@est.tech) */ -public class ToscaPolicyTypeFilter { +@Builder +@Data +public class ToscaPolicyTypeFilter implements PfObjectFiler { + public static final String LATEST_VERSION = "LATEST"; + + // Regular expression + private String name; + + // Regular Expression, set to LATEST_VERRSION to get the latest version + private String version; + + @Override + public List filter(@NonNull final List originalList) { + // @formatter:off + return originalList.stream() + .filter(p -> name != null && p.getName() .matches(name)) + .filter(p -> version != null && p.getVersion().matches(version)) + .collect(Collectors.toList()); + // @formatter:off + } } -- cgit 1.2.3-korg