feat(policy): Send back the policy failure payload to the consumer an…

…d respect its content-type Closes gravitee-io/issues#531
gravitee-io · Apr 9, 2017 · 3656903 · 3656903
1 parent 51347fd
commit 3656903
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/...ateway-handlers-api/src/main/java/io/gravitee/gateway/handlers/api/ApiReactorHandler.java b/...ateway-handlers-api/src/main/java/io/gravitee/gateway/handlers/api/ApiReactorHandler.java
@@ -193,11 +193,16 @@ private void sendPolicyFailure(PolicyResult policyResult, Response response) {
 
         if (policyResult.message() != null) {
             try {
-                String contentAsJson = mapper.writeValueAsString(new PolicyResultAsJson(policyResult));
-                Buffer buf = Buffer.buffer(contentAsJson);
-                response.headers().set(HttpHeaders.CONTENT_LENGTH, Integer.toString(buf.length()));
+                Buffer payload;
+                if (policyResult.contentType().equalsIgnoreCase(MediaType.APPLICATION_JSON)) {
+                    payload = Buffer.buffer(policyResult.message());
+                } else {
+                    String contentAsJson = mapper.writeValueAsString(new PolicyResultAsJson(policyResult));
+                    payload = Buffer.buffer(contentAsJson);
+                }
+                response.headers().set(HttpHeaders.CONTENT_LENGTH, Integer.toString(payload.length()));
                 response.headers().set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
-                response.write(buf);
+                response.write(payload);
             } catch (JsonProcessingException jpe) {
                 logger.error("Unable to transform a policy result into a json payload", jpe);
             }

diff --git a/...tee-gateway-policy/src/main/java/io/gravitee/gateway/policy/impl/SuccessPolicyResult.java b/...tee-gateway-policy/src/main/java/io/gravitee/gateway/policy/impl/SuccessPolicyResult.java
@@ -36,4 +36,9 @@ public int httpStatusCode() {
     public String message() {
         return null;
     }
+
+    @Override
+    public String contentType() {
+        return null;
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -154,7 +154,7 @@
         <gravitee-plugin-core.version>1.0.0</gravitee-plugin-core.version>
         <gravitee-plugin-policy.version>1.0.0</gravitee-plugin-policy.version>
         <gravitee-plugin-resource.version>1.0.0</gravitee-plugin-resource.version>
-        <gravitee-policy-api.version>1.0.0</gravitee-policy-api.version>
+        <gravitee-policy-api.version>1.1.0-SNAPSHOT</gravitee-policy-api.version>
         <gravitee-gateway-api.version>1.3.0</gravitee-gateway-api.version>
         <gravitee-reporter-api.version>1.3.0</gravitee-reporter-api.version>
         <vertx.version>3.4.1</vertx.version>