diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2019-10-21 12:56:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-21 12:56:25 +0000 |
| commit | 3107498c86304ef114e6799ee430013fc26e1750 (patch) | |
| tree | 62ecf0aeed2947f559c89d51ba9dc12c4abb4a2f /applications/common | |
| parent | 8f6a9a6df2ab7255bddbbdfb9ee03aa5713674d0 (diff) | |
| parent | 9ff68b1ed845e94944f99c32eef209eb63c6469d (diff) | |
Merge "Modified Decision API to accept query parameters and abbreviate Monitor decision results"
Diffstat (limited to 'applications/common')
3 files changed, 7 insertions, 5 deletions
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlApplicationServiceProvider.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlApplicationServiceProvider.java index c3d66255..0b9975f7 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlApplicationServiceProvider.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlApplicationServiceProvider.java @@ -22,10 +22,9 @@ package org.onap.policy.pdp.xacml.application.common; import com.att.research.xacml.api.Response; - import java.nio.file.Path; import java.util.List; - +import java.util.Map; import org.apache.commons.lang3.tuple.Pair; import org.onap.policy.common.endpoints.parameters.RestServerParameters; import org.onap.policy.models.decisions.concepts.DecisionRequest; @@ -103,8 +102,10 @@ public interface XacmlApplicationServiceProvider { * Makes a decision given the incoming request and returns a response. * * @param request Incoming DecisionRequest object + * @param requestQueryParameters Http request query parameters * @return response Responding DecisionResponse object */ - Pair<DecisionResponse, Response> makeDecision(DecisionRequest request); + Pair<DecisionResponse, Response> makeDecision(DecisionRequest request, + Map<String, String[]> requestQueryParameters); } diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java index 17119858..5f639c5c 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java @@ -228,7 +228,8 @@ public abstract class StdXacmlApplicationServiceProvider implements XacmlApplica } @Override - public Pair<DecisionResponse, Response> makeDecision(DecisionRequest request) { + public Pair<DecisionResponse, Response> makeDecision(DecisionRequest request, + Map<String, String[]> requestQueryParams) { // // Convert to a XacmlRequest // diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProviderTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProviderTest.java index 30419daf..6139a528 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProviderTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProviderTest.java @@ -263,7 +263,7 @@ public class StdXacmlApplicationServiceProviderTest { DecisionResponse decresp = mock(DecisionResponse.class); when(trans.convertResponse(resp)).thenReturn(decresp); - Pair<DecisionResponse, Response> result = prov.makeDecision(decreq); + Pair<DecisionResponse, Response> result = prov.makeDecision(decreq, any()); assertSame(decresp, result.getKey()); assertSame(resp, result.getValue()); |