diff options
| author |   ITSERVICES\rb7147 <rb7147@att.com> | 2017-04-25 11:46:00 -0400 |
|---|---|---|
| committer | ITSERVICES\rb7147 <rb7147@att.com> | 2017-05-03 09:58:17 -0400 |
| commit | e0addf5b588a1244f9679becd90999dfcb4c3a94 (patch) | |
| tree | 1212772d6366730266ff0e093c874b07aa716c29 /ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api | |
| parent | 39fb0f30472777e4b60d6a7ac8aa4eb9773961ff (diff) | |
Policy 1707 commit to LF
Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>
Diffstat (limited to 'ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api')
3 files changed, 6 insertions, 4 deletions
diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPAPPolicy.java b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPAPPolicy.java index c18ad230f..79ee08e2e 100644 --- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPAPPolicy.java +++ b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPAPPolicy.java @@ -80,7 +80,7 @@ public interface EcompPAPPolicy { public String getDeleteCondition(); public String getDictionaryType(); public String getDictionary(); - public Map<String, String> getDictionaryFields(); + public String getDictionaryFields(); public String getRiskLevel(); public String getGuard(); diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDP.java b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDP.java index f00dd7ac5..ecb21aa09 100644 --- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDP.java +++ b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDP.java @@ -19,14 +19,12 @@ */ package org.openecomp.policy.xacml.api.pap; -import java.util.Set; - import org.openecomp.policy.xacml.std.pap.StdPDP; import com.att.research.xacml.api.pap.PDP; import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonTypeInfo; /* * The following allows us to use Jackson to convert sub-types of this type into JSON and back to objects. diff --git a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDPGroup.java b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDPGroup.java index a64b4b6dc..4aa7cbf64 100644 --- a/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDPGroup.java +++ b/ECOMP-XACML/src/main/java/org/openecomp/policy/xacml/api/pap/EcompPDPGroup.java @@ -3,9 +3,13 @@ package org.openecomp.policy.xacml.api.pap; import java.util.Set; import com.att.research.xacml.api.pap.PDPGroup; +import com.att.research.xacml.api.pap.PDPPolicy; public interface EcompPDPGroup extends PDPGroup { public Set<EcompPDP> getEcompPdps(); + public Set<PDPPolicy> getSelectedPolicies(); + + public String getOperation(); } |