From 51f7a3e40fe520ba596d0dac1b5aa1f260966375 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 17 Sep 2018 14:26:56 +0200 Subject: [PATCH] Polishing --- .../LazyConnectionDataSourceProxy.java | 16 ++++++---------- .../ServerSentEventHttpMessageReaderTests.java | 14 +++++--------- .../ServerSentEventHttpMessageWriterTests.java | 9 +++------ 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java index 3b7bc688a5..0c2447a4c0 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java @@ -160,16 +160,12 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { // via a Connection from the target DataSource, if possible. if (this.defaultAutoCommit == null || this.defaultTransactionIsolation == null) { try { - Connection con = obtainTargetDataSource().getConnection(); - try { + try (Connection con = obtainTargetDataSource().getConnection()) { checkDefaultConnectionProperties(con); } - finally { - con.close(); - } } catch (SQLException ex) { - logger.info("Could not retrieve default auto-commit and transaction isolation settings", ex); + logger.debug("Could not retrieve default auto-commit and transaction isolation settings", ex); } } } @@ -411,8 +407,8 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { private Connection getTargetConnection(Method operation) throws SQLException { if (this.target == null) { // No target Connection held -> fetch one. - if (logger.isDebugEnabled()) { - logger.debug("Connecting to database for operation '" + operation.getName() + "'"); + if (logger.isTraceEnabled()) { + logger.trace("Connecting to database for operation '" + operation.getName() + "'"); } // Fetch physical Connection from DataSource. @@ -444,8 +440,8 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { else { // Target Connection already held -> return it. - if (logger.isDebugEnabled()) { - logger.debug("Using existing database connection for operation '" + operation.getName() + "'"); + if (logger.isTraceEnabled()) { + logger.trace("Using existing database connection for operation '" + operation.getName() + "'"); } } diff --git a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java index 5b50fab7d1..9afbc7cbea 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java @@ -34,6 +34,8 @@ import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest; import static org.junit.Assert.*; /** + * Unit tests for {@link ServerSentEventHttpMessageReader}. + * * @author Sebastien Deleuze */ public class ServerSentEventHttpMessageReaderTests extends AbstractDataBufferAllocatingTestCase { @@ -44,17 +46,14 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractDataBufferAll @Test public void cantRead() { - assertFalse(messageReader.canRead(ResolvableType.forClass(Object.class), - new MediaType("foo", "bar"))); + assertFalse(messageReader.canRead(ResolvableType.forClass(Object.class), new MediaType("foo", "bar"))); assertFalse(messageReader.canRead(ResolvableType.forClass(Object.class), null)); } @Test public void canRead() { - assertTrue(messageReader.canRead(ResolvableType.forClass(Object.class), - new MediaType("text", "event-stream"))); - assertTrue(messageReader.canRead(ResolvableType.forClass(ServerSentEvent.class), - new MediaType("foo", "bar"))); + assertTrue(messageReader.canRead(ResolvableType.forClass(Object.class), new MediaType("text", "event-stream"))); + assertTrue(messageReader.canRead(ResolvableType.forClass(ServerSentEvent.class), new MediaType("foo", "bar"))); } @Test @@ -120,7 +119,6 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractDataBufferAll @Test public void readString() { - MockServerHttpRequest request = MockServerHttpRequest.post("/") .body(Mono.just(stringBuffer("data:foo\ndata:bar\n\ndata:baz\n\n"))); @@ -173,7 +171,6 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractDataBufferAll @Test public void readError() { - Flux body = Flux.just(stringBuffer("data:foo\ndata:bar\n\ndata:baz\n\n")) .concatWith(Flux.error(new RuntimeException())); @@ -191,5 +188,4 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractDataBufferAll .verify(); } - } diff --git a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageWriterTests.java index f7f1195ccd..6e39291365 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageWriterTests.java @@ -41,6 +41,7 @@ import static org.springframework.core.ResolvableType.*; /** * Unit tests for {@link ServerSentEventHttpMessageWriter}. + * * @author Sebastien Deleuze * @author Rossen Stoyanchev */ @@ -48,14 +49,12 @@ public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAll private static final Map HINTS = Collections.emptyMap(); - private ServerSentEventHttpMessageWriter messageWriter = new ServerSentEventHttpMessageWriter(new Jackson2JsonEncoder()); @Test public void canWrite() { - assertTrue(this.messageWriter.canWrite(forClass(Object.class), null)); assertFalse(this.messageWriter.canWrite(forClass(Object.class), new MediaType("foo", "bar"))); @@ -69,7 +68,6 @@ public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAll @Test public void writeServerSentEvent() { - ServerSentEvent event = ServerSentEvent.builder().data("bar").id("c42").event("foo") .comment("bla\nbla bla\nbla bla bla").retry(Duration.ofMillis(123L)).build(); @@ -134,7 +132,6 @@ public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAll @Test // SPR-14899 public void writePojoWithPrettyPrint() { - ObjectMapper mapper = Jackson2ObjectMapperBuilder.json().indentOutput(true).build(); this.messageWriter = new ServerSentEventHttpMessageWriter(new Jackson2JsonEncoder(mapper)); @@ -172,8 +169,8 @@ public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAll testWrite(source, MediaType.TEXT_EVENT_STREAM, response, clazz); } - private void testWrite(Publisher source, MediaType mediaType, MockServerHttpResponse response, - Class clazz) { + private void testWrite( + Publisher source, MediaType mediaType, MockServerHttpResponse response, Class clazz) { this.messageWriter.write(source, forClass(clazz), mediaType, response, HINTS) .block(Duration.ofMillis(5000));