Fixing merge

2023-03-22 20:22:08 -04:00
parent fab9ceb0e5
commit 63e70ee9d8
2 changed files with 17 additions and 0 deletions
--- 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();
+		}
+
 	}

 }