From 1b748ca048fb7e47d11a874acd3148b8c8731448 Mon Sep 17 00:00:00 2001 From: Kaveh Shamsi Date: Wed, 14 Jun 2023 14:34:19 +0200 Subject: [PATCH] Removes duplicate bean definition in ResourceControllerIntegrationTests (#2286) --- .../resource/ResourceControllerIntegrationTests.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 9abcb9d5..e9056f47 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 @@ -122,10 +122,10 @@ public class ResourceControllerIntegrationTests { @Test public void resourceHttpDoesNotExist() throws Exception { when(this.resources.findOne("foo", "default", "master", "doesNotExist.txt")) - .thenThrow(new NoSuchResourceException("Does not exist")); + .thenThrow(new NoSuchResourceException("Does not exist")); ResponseEntity response = new TestRestTemplate() - .getForEntity("http://localhost:" + port + "/foo/default/master/doesNotExist.txt", String.class); + .getForEntity("http://localhost:" + port + "/foo/default/master/doesNotExist.txt", String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); verify(this.resources).findOne("foo", "default", "master", "doesNotExist.txt"); } @@ -195,11 +195,6 @@ public class ResourceControllerIntegrationTests { return repository; } - @Bean - public ResourceControllerAdvice resourceControllerAdvice() { - return new ResourceControllerAdvice(); - } - @Bean public EnvironmentController environmentController() { return new EnvironmentController(environmentRepository());