Polishing

Author: jhoeller

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java

@@ -160,16 +160,12 @@ public void afterPropertiesSet() {
 		// 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 @@ private boolean hasTargetConnection() {
 		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 @@ private Connection getTargetConnection(Method operation) throws SQLException {
 
 			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() + "'");
 				}
 			}
 

spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java

@@ -34,6 +34,8 @@
 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 void readServerSentEventsWithMultipleChunks() {
 
 	@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 void decodeFullContentAsString() {
 
 	@Test
 	public void readError() {
-
 		Flux<DataBuffer> body =
 				Flux.just(stringBuffer("data:foo\ndata:bar\n\ndata:baz\n\n"))
 						.concatWith(Flux.error(new RuntimeException()));
@@ -191,5 +188,4 @@ public void readError() {
 				.verify();
 	}
 
-
 }

spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageWriterTests.java

@@ -41,21 +41,20 @@
 
 /**
  * Unit tests for {@link ServerSentEventHttpMessageWriter}.
+ *
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
  */
 public class ServerSentEventHttpMessageWriterTests extends AbstractDataBufferAllocatingTestCase {
 
 	private static final Map<String, Object> 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 void canWrite() {
 
 	@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 void writePojo() {
 
 	@Test  // SPR-14899
 	public void writePojoWithPrettyPrint() {
-
 		ObjectMapper mapper = Jackson2ObjectMapperBuilder.json().indentOutput(true).build();
 		this.messageWriter = new ServerSentEventHttpMessageWriter(new Jackson2JsonEncoder(mapper));
 
@@ -172,8 +169,8 @@ private <T> void testWrite(Publisher<T> source, MockServerHttpResponse response,
 		testWrite(source, MediaType.TEXT_EVENT_STREAM, response, clazz);
 	}
 
-	private <T> void testWrite(Publisher<T> source, MediaType mediaType, MockServerHttpResponse response,
-			Class<T> clazz) {
+	private <T> void testWrite(
+			Publisher<T> source, MediaType mediaType, MockServerHttpResponse response, Class<T> clazz) {
 
 		this.messageWriter.write(source, forClass(clazz), mediaType, response, HINTS)
 				.block(Duration.ofMillis(5000));