From beae312b9dd19c564bbcba13f034e204fde6f241 Mon Sep 17 00:00:00 2001 From: Sairam Rekapalli Date: Mon, 27 Jan 2020 11:20:18 -0800 Subject: [PATCH] fix(exceptionhandler): Remove exception handler from the controller since we have a generic handler in Kork (#1018) --- .../gate/controllers/ManagedController.java | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/ManagedController.java b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/ManagedController.java index acdb070e7..df038f67b 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/ManagedController.java +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/ManagedController.java @@ -1,6 +1,5 @@ package com.netflix.spinnaker.gate.controllers; -import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import com.netflix.spinnaker.gate.model.manageddelivery.ConstraintState; @@ -15,8 +14,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +23,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -34,8 +30,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import retrofit.RetrofitError; -import retrofit.client.Header; @RequestMapping("/managed") @RestController @@ -177,23 +171,4 @@ void pauseApplication(@PathVariable("application") String application) { void resumeApplication(@PathVariable("application") String application) { keelService.resumeApplication(application); } - - @ExceptionHandler - void passthroughRetrofitErrors(RetrofitError e, HttpServletResponse response) { - try { - response.setStatus(e.getResponse().getStatus()); - response.setHeader( - CONTENT_TYPE, - e.getResponse().getHeaders().stream() - .filter(it -> it.getName().equals(CONTENT_TYPE)) - .map(Header::getValue) - .findFirst() - .orElse("text/plain")); - IOUtils.copy(e.getResponse().getBody().in(), response.getOutputStream()); - } catch (Exception ex) { - log.error( - "Error reading response body when translating exception from downstream keelService: ", - ex); - } - } }