Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use AutoClosables with try-with-resources

Browse Source 
Closes gh-33538
This commit is contained in:
Moritz Halbritter
2022-12-16 15:43:15 +01:00
parent 725337f976
commit f36e2ecb7b
16 changed files with 121 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View File

@@ -178,11 +178,15 @@ class RabbitAutoConfigurationTests {
com.rabbitmq.client.ConnectionFactory rcf = mock(com.rabbitmq.client.ConnectionFactory.class);
given(rcf.newConnection(isNull(), eq(addresses), anyString())).willReturn(mock(Connection.class));
ReflectionTestUtils.setField(connectionFactory, "rabbitConnectionFactory", rcf);
connectionFactory.createConnection();
then(rcf).should().newConnection(isNull(), eq(addresses), eq("test#0"));
try (org.springframework.amqp.rabbit.connection.Connection connection = connectionFactory
.createConnection()) {
then(rcf).should().newConnection(isNull(), eq(addresses), eq("test#0"));
}
connectionFactory.resetConnection();
connectionFactory.createConnection();
then(rcf).should().newConnection(isNull(), eq(addresses), eq("test#1"));
try (org.springframework.amqp.rabbit.connection.Connection connection = connectionFactory
.createConnection()) {
then(rcf).should().newConnection(isNull(), eq(addresses), eq("test#1"));
}
});
}

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java
View File

@@ -205,8 +205,9 @@ class MultipartAutoConfigurationTests {
HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
ClientHttpRequest request = requestFactory.createRequest(
new URI("http://localhost:" + this.context.getWebServer().getPort() + "/"), HttpMethod.GET);
ClientHttpResponse response = request.execute();
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
try (ClientHttpResponse response = request.execute()) {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
}
}
private void verifyServletWorks() {