Correctly handle InvalidProtocolBufferException in controllers

Author: jlisam

plugin/src/main/shell/protoc-gen-flit

@@ -15,7 +15,7 @@
 # The quiet flag is required otherwise the tooling will dump output to stdout which will break the
 # plugin output and generation will fail.
 # -----------------------------------------------------------------------------
-DIR=$(dirname $(readlink -f "$0"))
+DIR=$(dirname "$0")
 
 JAR=$(ls -c ${DIR}/plugin-*-all.jar | head -1)
 java ${FLIT_JAVA_OPTS} -jar $JAR $@

runtime/spring/src/main/java/com/flit/runtime/spring/FlitExceptionHandler.java

@@ -2,6 +2,10 @@
 
 import com.flit.runtime.ErrorCode;
 import com.flit.runtime.FlitException;
+import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
@@ -11,15 +15,11 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-
 @ControllerAdvice
 @Component
 public class FlitExceptionHandler extends ResponseEntityExceptionHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FlitExceptionHandler.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(FlitExceptionHandler.class);
 
 
     @ExceptionHandler(Exception.class)
@@ -40,6 +40,21 @@ public ResponseEntity<?> handleException(HttpServletRequest request, Exception e
             .body(response);
     }
 
+    @ExceptionHandler(InvalidProtocolBufferException.class)
+    public ResponseEntity<?> handlehandleInvalidProtocolBufferException(HttpServletRequest request, Exception e) {
+      LOGGER.error("InvalidProtocolBufferException: request = {}, method = {}, msg= {}",
+          request.getRequestURI(), request.getMethod(), e.getMessage(), e);
+
+      Map<String, Object> response = new HashMap<>();
+      response.put("code", ErrorCode.INVALID_ARGUMENT);
+      response.put("msg", e.getMessage());
+
+      return ResponseEntity
+          .status(ErrorCode.INVALID_ARGUMENT.getHttpStatus())
+          .contentType(MediaType.APPLICATION_JSON)
+          .body(response);
+    }
+
     @ExceptionHandler(FlitException.class)
     public ResponseEntity<?> handleFlitException(HttpServletRequest request, FlitException e) {