Skip to content

Removes duplicate bean definition in ResourceControllerIntegrationTests #2286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanjbaxter merged 1 commit into from
Jun 14, 2023
+2 −7
Merged

Removes duplicate bean definition in ResourceControllerIntegrationTests #2286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .../org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ public void resourceHttp() throws Exception {
@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<String> 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");
}
Expand Down Expand Up @@ -195,11 +195,6 @@ public ResourceRepository resourceRepository() {
return repository;
}

@Bean
public ResourceControllerAdvice resourceControllerAdvice() {
return new ResourceControllerAdvice();
}

@Bean
public EnvironmentController environmentController() {
return new EnvironmentController(environmentRepository());
Expand Down