Polish

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfiguration.java

@@ -40,14 +40,17 @@ import com.zaxxer.hikari.HikariDataSource;
  * 
  * @author Dave Syer
  * @see DataSourceAutoConfiguration
+ * @since 1.1.0
  */
 @Configuration
 public class HikariDataSourceConfiguration extends AbstractDataSourceConfiguration {
 
 	private String dataSourceClassName;
+
 	private String username;
 
 	private HikariDataSource pool;
+
 	private Properties hikari = new Properties();
 
 	@Bean(destroyMethod = "shutdown")

spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java

@@ -16,9 +16,6 @@
 
 package sample.simple;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +23,9 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests for {@link SampleSimpleApplication}.
  * 
@@ -40,9 +40,9 @@ public class SpringTestSampleSimpleApplicationTests {
 
 	@Test
 	public void testContextLoads() throws Exception {
-		assertNotNull(ctx);
-		assertTrue(ctx.containsBean("helloWorldService"));
-		assertTrue(ctx.containsBean("sampleSimpleApplication"));
+		assertNotNull(this.ctx);
+		assertTrue(this.ctx.containsBean("helloWorldService"));
+		assertTrue(this.ctx.containsBean("sampleSimpleApplication"));
 	}
 
 }

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java

@@ -101,19 +101,19 @@ public abstract class ExecutableArchiveLauncher extends Launcher {
 	}
 
 	private static ClassLoader getDefaultClassLoader() {
-		ClassLoader cl = null;
+		ClassLoader classloader = null;
 		try {
-			cl = Thread.currentThread().getContextClassLoader();
+			classloader = Thread.currentThread().getContextClassLoader();
 		}
 		catch (Throwable ex) {
 			// Cannot access thread context ClassLoader - falling back to system class
 			// loader...
 		}
-		if (cl == null) {
+		if (classloader == null) {
 			// No thread context class loader -> use class loader of this class.
-			cl = ExecutableArchiveLauncher.class.getClassLoader();
+			classloader = ExecutableArchiveLauncher.class.getClassLoader();
 		}
-		return cl;
+		return classloader;
 	}
 
 }

spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

@@ -459,7 +459,6 @@ public class SpringApplication {
 	 * content from the Environment (banner.location and banner.charset). The defaults are
 	 * banner.location=classpath:banner.txt, banner.charest=UTF-8. If the banner file does
 	 * not exist or cannot be printed, a simple default is created.
-	 * 
 	 * @see #setShowBanner(boolean)
 	 * @see #printBanner()
 	 */
@@ -476,9 +475,9 @@ public class SpringApplication {
 								Charset.forName("UTF-8"))));
 				return;
 			}
-			catch (Exception e) {
-				System.out.println("Banner not printable: " + resource + " ("
-						+ e.getClass() + ": '" + e.getMessage() + "')");
+			catch (Exception ex) {
+				this.log.warn("Banner not printable: " + resource + " (" + ex.getClass()
+						+ ": '" + ex.getMessage() + "')", ex);
 			}
 		}
 		printBanner();
@@ -488,6 +487,7 @@ public class SpringApplication {
 	 * Print a simple banner message to the console. Subclasses can override this method
 	 * to provide additional or alternative banners.
 	 * @see #setShowBanner(boolean)
+	 * @see #printBanner(Environment)
 	 */
 	protected void printBanner() {
 		Banner.write(System.out);