[pinot] branch master updated: Fix controller error response field names (#7757)

[jackie]

This is an automated email from the ASF dual-hosted git repository.

jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new b313a67  Fix controller error response field names (#7757)
b313a67 is described below

commit b313a67f70c18428d5b85fe25e23e8af63325cd1
Author: Mark Needham <m.h.need...@gmail.com>
AuthorDate: Fri Nov 12 21:21:13 2021 +0000

    Fix controller error response field names (#7757)
    
    Return {code: '', error: ''} instead of {_code: '', _error: ''} for 
controller error response. So the right topper red dot will show the correct 
error message.
---
 .../api/resources/WebApplicationExceptionMapper.java           | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git 
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/WebApplicationExceptionMapper.java
 
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/WebApplicationExceptionMapper.java
index 725c6ca..a20bd52 100644
--- 
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/WebApplicationExceptionMapper.java
+++ 
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/WebApplicationExceptionMapper.java
@@ -20,13 +20,11 @@ package org.apache.pinot.controller.api.resources;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
-import org.apache.pinot.spi.utils.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,12 +43,8 @@ public class WebApplicationExceptionMapper implements 
ExceptionMapper<Throwable>
     }
 
     ErrorInfo einfo = new ErrorInfo(status, t.getMessage());
-    try {
-      return 
Response.status(status).entity(JsonUtils.objectToString(einfo)).type(MediaType.APPLICATION_JSON).build();
-    } catch (JsonProcessingException e) {
-      String err = String.format("{\"status\":%d, \"error\":%s}", einfo._code, 
einfo._error);
-      return 
Response.status(status).entity(err).type(MediaType.APPLICATION_JSON).build();
-    }
+    String err = String.format("{\"code\":%d, \"error\":\"%s\"}", einfo._code, 
einfo._error);
+    return 
Response.status(status).entity(err).type(MediaType.APPLICATION_JSON).build();
   }
 
   public static class ErrorInfo {

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org