From 63e70ee9d85c2686d2dd0f35b2357a14ab8b6b4a Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:22:08 -0400
Subject: [PATCH] Fixing merge

---
 .../server/resource/ResourceControllerAdvice.java    | 12 ++++++++++++
 .../resource/ResourceControllerIntegrationTests.java |  5 +++++
 2 files changed, 17 insertions(+)

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
index 056e8188..ca55fcd8 100644
--- 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
@@ -16,6 +16,10 @@
 
 package org.springframework.cloud.config.server.resource;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.cloud.config.server.environment.NoSuchLabelException;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -29,9 +33,17 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 @Order
 class ResourceControllerAdvice {
 
+	private static Log logger = LogFactory.getLog(ResourceControllerAdvice.class);
+
 	@ExceptionHandler(NoSuchResourceException.class)
 	@ResponseStatus(HttpStatus.NOT_FOUND)
 	void notFound(NoSuchResourceException e) {
 	}
 
+	@ExceptionHandler(NoSuchLabelException.class)
+	@ResponseStatus(HttpStatus.NOT_FOUND)
+	void noSuchLabel(NoSuchLabelException e) {
+		logger.debug("Error when fetching resource", e);
+	}
+
 }
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java
index 6c84fcdf..436b58ee 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java
@@ -194,6 +194,11 @@ public class ResourceControllerIntegrationTests {
 			return new ResourceController(resourceRepository(), environmentRepository(), resourceEncryptorMap);
 		}
 
+		@Bean
+		public ResourceControllerAdvice resourceControllerAdvice() {
+			return new ResourceControllerAdvice();
+		}
+
 	}
 
 }