From dd5bc2b03cd29c55454888ba2c9c70157e5f2a38 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 22 Mar 2023 20:05:39 -0400 Subject: [PATCH] Put ExceptionHandler into a ResourceControllerAdvice to allow overriding behavior (#2243) Fixes #2192 Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> --- .../server/resource/ResourceController.java | 8 ---- .../resource/ResourceControllerAdvice.java | 37 +++++++++++++++++++ 2 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceControllerAdvice.java diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java index 877fe92b..e6780ba3 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java @@ -29,17 +29,14 @@ import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.encryption.ResourceEncryptor; import org.springframework.cloud.config.server.environment.EnvironmentRepository; import org.springframework.core.io.Resource; -import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; -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.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.util.UrlPathHelper; @@ -215,9 +212,4 @@ public class ResourceController { return false; } - @ExceptionHandler(NoSuchResourceException.class) - @ResponseStatus(HttpStatus.NOT_FOUND) - public void notFound(NoSuchResourceException e) { - } - } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceControllerAdvice.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceControllerAdvice.java new file mode 100644 index 00000000..056e8188 --- /dev/null +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceControllerAdvice.java @@ -0,0 +1,37 @@ +/* + * Copyright 2018-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.config.server.resource; + +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * @author Ryan Baxter + */ +@RestControllerAdvice(basePackages = { "org.springframework.cloud.config.server.resource" }) +@Order +class ResourceControllerAdvice { + + @ExceptionHandler(NoSuchResourceException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + void notFound(NoSuchResourceException e) { + } + +}