aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordc443y <dc443y@att.com>2022-07-06 14:25:55 -0500
committerdc443y <dc443y@att.com>2022-07-06 16:36:50 -0500
commit059f49336041cc4a2ca5cb61d70cc0b76bac07f1 (patch)
tree6fcf9a1a5b82c0d4d30fda1ae98c00ce7c3757f2
parent8cd2711cf5dcc52d88c62ea3f8b1ac7483af801b (diff)
Fix Raw XACML Decision API Serialization
Issue-ID: POLICY-4274 Signed-off-by: dc443y <dc443y@att.com> Change-Id: I0d367d35e7ec52c7587ec75194b654cc41303868 Signed-off-by: dc443y <dc443y@att.com>
-rw-r--r--main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlJsonMessageBodyHandler.java4
-rw-r--r--main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlXmlMessageBodyHandler.java4
-rw-r--r--main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java8
3 files changed, 8 insertions, 8 deletions
diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlJsonMessageBodyHandler.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlJsonMessageBodyHandler.java
index a6d9952e..58ed5f76 100644
--- a/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlJsonMessageBodyHandler.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlJsonMessageBodyHandler.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020-2022 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -98,6 +98,6 @@ public class XacmlJsonMessageBodyHandler implements MessageBodyReader<Request>,
return false;
}
return ("xacml+json".equals(mediaType.getSubtype()))
- && (type == Request.class || type == Response.class);
+ && (Request.class.isAssignableFrom(type) || Response.class.isAssignableFrom(type));
}
}
diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlXmlMessageBodyHandler.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlXmlMessageBodyHandler.java
index 4ddfbe26..5ec17634 100644
--- a/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlXmlMessageBodyHandler.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlXmlMessageBodyHandler.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020-2022 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -98,6 +98,6 @@ public class XacmlXmlMessageBodyHandler implements MessageBodyReader<Request>, M
}
return ("xacml+xml".equals(mediaType.getSubtype()))
- && (type == Request.class || type == Response.class);
+ && (Request.class.isAssignableFrom(type) || Response.class.isAssignableFrom(type));
}
}
diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java
index fb7d7179..b369ad31 100644
--- a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java
+++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2022 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -201,11 +201,11 @@ public class TestDecision {
String responseFromXmlRequest = getNativeDecision(xmlRequestAsString, APPLICATION_XACML_XML);
LOGGER.info("Response from xml request {}", responseFromXmlRequest);
- assertThat(responseFromXmlRequest).contains("NOTAPPLICABLE");
+ assertThat(responseFromXmlRequest).contains("<Response xmlns=").contains("NotApplicable");
String responseFromJsonRequest = getNativeDecision(jsonRequestAsString, APPLICATION_XACML_JSON);
LOGGER.info("Response from json request {}", responseFromJsonRequest);
- assertThat(responseFromJsonRequest).contains("NOTAPPLICABLE");
+ assertThat(responseFromJsonRequest).contains("\"Response\":").contains("NotApplicable");
}
private static Main startXacmlPdpService(File params) throws PolicyXacmlPdpException {
@@ -228,7 +228,7 @@ public class TestDecision {
private String getNativeDecision(String request, String mediaType) {
Entity<String> entityRequest = Entity.entity(request, mediaType);
- Response response = client.post("/xacml", entityRequest, Collections.emptyMap());
+ Response response = client.post("/xacml", entityRequest, Map.of("Accept", mediaType));
assertEquals(200, response.getStatus());