Apply eclipse-formatter conventions

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/CrshProperties.java

@@ -66,7 +66,6 @@ public class CrshProperties {
 
 	private Telnet telnet = new Telnet();
 
-
 	public String getAuth() {
 		return this.auth;
 	}
@@ -100,24 +99,25 @@ public class CrshProperties {
 	}
 
 	public Properties mergeProperties(Properties properties) {
-		properties = ssh.mergeProperties(properties);
-		properties = telnet.mergeProperties(properties);
+		properties = this.ssh.mergeProperties(properties);
+		properties = this.telnet.mergeProperties(properties);
 
-		properties.put(CRASH_AUTH, auth);
-		if (authenticationProperties != null) {
-			properties = authenticationProperties.mergeProperties(properties);
+		properties.put(CRASH_AUTH, this.auth);
+		if (this.authenticationProperties != null) {
+			properties = this.authenticationProperties.mergeProperties(properties);
 		}
 
 		if (this.commandRefreshInterval > 0) {
-			properties.put(CRASH_VFS_REFRESH_PERIOD, String.valueOf(this.commandRefreshInterval));
+			properties.put(CRASH_VFS_REFRESH_PERIOD,
+					String.valueOf(this.commandRefreshInterval));
 		}
 
 		// special handling for disabling Ssh and Telnet support
 		List<String> dp = new ArrayList<String>(Arrays.asList(this.disabledPlugins));
-		if (!ssh.isEnabled()) {
+		if (!this.ssh.isEnabled()) {
 			dp.add("org.crsh.ssh.SSHPlugin");
 		}
-		if (!telnet.isEnabled()) {
+		if (!this.telnet.isEnabled()) {
 			dp.add("org.crsh.telnet.TelnetPlugin");
 		}
 		this.disabledPlugins = dp.toArray(new String[dp.size()]);
@@ -130,7 +130,8 @@ public class CrshProperties {
 		this.auth = auth;
 	}
 
-	public void setAuthenticationProperties(AuthenticationProperties authenticationProperties) {
+	public void setAuthenticationProperties(
+			AuthenticationProperties authenticationProperties) {
 		Assert.notNull(authenticationProperties);
 		this.authenticationProperties = authenticationProperties;
 	}
@@ -164,17 +165,14 @@ public class CrshProperties {
 		this.telnet = telnet;
 	}
 
-	
 	public interface AuthenticationProperties extends PropertiesProvider {
 	}
 
-	
 	@ConfigurationProperties(name = "shell.auth.jaas", ignoreUnknownFields = false)
 	public static class JaasAuthenticationProperties implements AuthenticationProperties {
 
 		private String domain = "my-domain";
 
-		
 		@Override
 		public Properties mergeProperties(Properties properties) {
 			properties.put(CRASH_AUTH_JAAS_DOMAIN, this.domain);
@@ -188,13 +186,11 @@ public class CrshProperties {
 
 	}
 
-
 	@ConfigurationProperties(name = "shell.auth.key", ignoreUnknownFields = false)
 	public static class KeyAuthenticationProperties implements AuthenticationProperties {
 
 		private String path;
 
-		
 		@Override
 		public Properties mergeProperties(Properties properties) {
 			if (this.path != null) {
@@ -210,17 +206,16 @@ public class CrshProperties {
 
 	}
 
-	
 	public interface PropertiesProvider {
 		Properties mergeProperties(Properties properties);
 	}
 
-	
 	@ConfigurationProperties(name = "shell.auth.simple", ignoreUnknownFields = false)
-	public static class SimpleAuthenticationProperties implements AuthenticationProperties {
-
-		private static Log logger = LogFactory.getLog(SimpleAuthenticationProperties.class);
+	public static class SimpleAuthenticationProperties implements
+			AuthenticationProperties {
 
+		private static Log logger = LogFactory
+				.getLog(SimpleAuthenticationProperties.class);
 
 		private String username = "user";
 
@@ -228,7 +223,6 @@ public class CrshProperties {
 
 		private boolean defaultPassword = true;
 
-
 		public boolean isDefaultPassword() {
 			return this.defaultPassword;
 		}
@@ -244,7 +238,8 @@ public class CrshProperties {
 		}
 
 		public void setPassword(String password) {
-			if (password.startsWith("${") && password.endsWith("}")	|| !StringUtils.hasLength(password)) {
+			if (password.startsWith("${") && password.endsWith("}")
+					|| !StringUtils.hasLength(password)) {
 				return;
 			}
 			this.password = password;
@@ -258,17 +253,17 @@ public class CrshProperties {
 
 	}
 
-
 	@ConfigurationProperties(name = "shell.auth.spring", ignoreUnknownFields = false)
-	public static class SpringAuthenticationProperties implements AuthenticationProperties {
+	public static class SpringAuthenticationProperties implements
+			AuthenticationProperties {
 
 		private String[] roles = new String[] { "ROLE_ADMIN" };
 
-		
 		@Override
 		public Properties mergeProperties(Properties properties) {
 			if (this.roles != null) {
-				properties.put(CRASH_AUTH_SPRING_ROLES, StringUtils.arrayToCommaDelimitedString(this.roles));
+				properties.put(CRASH_AUTH_SPRING_ROLES,
+						StringUtils.arrayToCommaDelimitedString(this.roles));
 			}
 			return properties;
 		}
@@ -280,7 +275,6 @@ public class CrshProperties {
 
 	}
 
-	
 	public static class Ssh implements PropertiesProvider {
 
 		private boolean enabled = true;
@@ -289,7 +283,6 @@ public class CrshProperties {
 
 		private String port = "2000";
 
-		
 		public boolean isEnabled() {
 			return this.enabled;
 		}
@@ -321,14 +314,12 @@ public class CrshProperties {
 
 	}
 
-	
 	public static class Telnet implements PropertiesProvider {
 
 		private boolean enabled = false;
 
 		private String port = "5000";
 
-		
 		public boolean isEnabled() {
 			return this.enabled;
 		}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java

@@ -16,13 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -56,6 +49,13 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * Tests for {@link CrshAutoConfiguration}.
  * 
@@ -77,7 +77,8 @@ public class CrshAutoConfigurationTests {
 	@Test
 	public void testDisabledPlugins() throws Exception {
 		MockEnvironment env = new MockEnvironment();
-		env.setProperty("shell.disabled_plugins", "GroovyREPL, termIOHandler, org.crsh.auth.AuthenticationPlugin");
+		env.setProperty("shell.disabled_plugins",
+				"GroovyREPL, termIOHandler, org.crsh.auth.AuthenticationPlugin");
 		this.context = new AnnotationConfigWebApplicationContext();
 		this.context.setEnvironment(env);
 		this.context.register(CrshAutoConfiguration.class);
@@ -132,7 +133,8 @@ public class CrshAutoConfigurationTests {
 
 		PluginLifeCycle lifeCycle = this.context.getBean(PluginLifeCycle.class);
 
-		assertEquals(lifeCycle.getConfig().getProperty("crash.ssh.keypath"), "~/.ssh/id.pem");
+		assertEquals(lifeCycle.getConfig().getProperty("crash.ssh.keypath"),
+				"~/.ssh/id.pem");
 	}
 
 	@Test
@@ -144,7 +146,8 @@ public class CrshAutoConfigurationTests {
 		PluginLifeCycle lifeCycle = this.context.getBean(PluginLifeCycle.class);
 
 		int count = 0;
-		Iterator<Resource> resources = lifeCycle.getContext().loadResources("login", ResourceKind.LIFECYCLE).iterator();
+		Iterator<Resource> resources = lifeCycle.getContext()
+				.loadResources("login", ResourceKind.LIFECYCLE).iterator();
 		while (resources.hasNext()) {
 			count++;
 			resources.next();
@@ -152,7 +155,8 @@ public class CrshAutoConfigurationTests {
 		assertEquals(1, count);
 
 		count = 0;
-		resources = lifeCycle.getContext().loadResources("help.java", ResourceKind.COMMAND).iterator();
+		resources = lifeCycle.getContext()
+				.loadResources("help.java", ResourceKind.COMMAND).iterator();
 		while (resources.hasNext()) {
 			count++;
 			resources.next();
@@ -172,7 +176,8 @@ public class CrshAutoConfigurationTests {
 		PluginContext pluginContext = lifeCycle.getContext();
 
 		int count = 0;
-		Iterator<AuthenticationPlugin> plugins = pluginContext.getPlugins(AuthenticationPlugin.class).iterator();
+		Iterator<AuthenticationPlugin> plugins = pluginContext.getPlugins(
+				AuthenticationPlugin.class).iterator();
 		while (plugins.hasNext()) {
 			count++;
 			plugins.next();
@@ -194,7 +199,8 @@ public class CrshAutoConfigurationTests {
 
 		PluginLifeCycle lifeCycle = this.context.getBean(PluginLifeCycle.class);
 		assertEquals(lifeCycle.getConfig().get("crash.auth"), "jaas");
-		assertEquals(lifeCycle.getConfig().get("crash.auth.jaas.domain"), "my-test-domain");
+		assertEquals(lifeCycle.getConfig().get("crash.auth.jaas.domain"),
+				"my-test-domain");
 	}
 
 	@Test
@@ -233,7 +239,8 @@ public class CrshAutoConfigurationTests {
 		AuthenticationPlugin<String> authenticationPlugin = null;
 		String authentication = lifeCycle.getConfig().getProperty("crash.auth");
 		assertNotNull(authentication);
-		for (AuthenticationPlugin plugin : lifeCycle.getContext().getPlugins(AuthenticationPlugin.class)) {
+		for (AuthenticationPlugin plugin : lifeCycle.getContext().getPlugins(
+				AuthenticationPlugin.class)) {
 			if (authentication.equals(plugin.getName())) {
 				authenticationPlugin = plugin;
 				break;
@@ -272,7 +279,8 @@ public class CrshAutoConfigurationTests {
 		AuthenticationPlugin<String> authenticationPlugin = null;
 		String authentication = lifeCycle.getConfig().getProperty("crash.auth");
 		assertNotNull(authentication);
-		for (AuthenticationPlugin plugin : lifeCycle.getContext().getPlugins(AuthenticationPlugin.class)) {
+		for (AuthenticationPlugin plugin : lifeCycle.getContext().getPlugins(
+				AuthenticationPlugin.class)) {
 			if (authentication.equals(plugin.getName())) {
 				authenticationPlugin = plugin;
 				break;
@@ -308,10 +316,15 @@ public class CrshAutoConfigurationTests {
 			return new AuthenticationManager() {
 
 				@Override
-				public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-					if (authentication.getName().equals(USERNAME) && authentication.getCredentials().equals(PASSWORD)) {
-						authentication = new UsernamePasswordAuthenticationToken(authentication.getPrincipal(),
-								authentication.getCredentials(), Collections.singleton(new SimpleGrantedAuthority("ROLE_ADMIN")));
+				public Authentication authenticate(Authentication authentication)
+						throws AuthenticationException {
+					if (authentication.getName().equals(USERNAME)
+							&& authentication.getCredentials().equals(PASSWORD)) {
+						authentication = new UsernamePasswordAuthenticationToken(
+								authentication.getPrincipal(),
+								authentication.getCredentials(),
+								Collections.singleton(new SimpleGrantedAuthority(
+										"ROLE_ADMIN")));
 					}
 					else {
 						throw new BadCredentialsException("Invalid username and password");

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/properties/CrshPropertiesTests.java

@@ -16,12 +16,6 @@
 
 package org.springframework.boot.actuate.properties;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,6 +31,12 @@ import org.springframework.boot.actuate.properties.CrshProperties.SpringAuthenti
 import org.springframework.boot.bind.RelaxedDataBinder;
 import org.springframework.core.convert.support.DefaultConversionService;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests for {@link CrshProperties}.
  * 
@@ -48,7 +48,8 @@ public class CrshPropertiesTests {
 	public void testBindingAuth() {
 		CrshProperties props = new CrshProperties();
 		RelaxedDataBinder binder = new RelaxedDataBinder(props, "shell");
-		binder.bind(new MutablePropertyValues(Collections.singletonMap("shell.auth", "spring")));
+		binder.bind(new MutablePropertyValues(Collections.singletonMap("shell.auth",
+				"spring")));
 		assertFalse(binder.getBindingResult().hasErrors());
 		assertEquals("spring", props.getAuth());
 	}
@@ -67,7 +68,8 @@ public class CrshPropertiesTests {
 		CrshProperties props = new CrshProperties();
 		RelaxedDataBinder binder = new RelaxedDataBinder(props, "shell");
 		binder.setConversionService(new DefaultConversionService());
-		binder.bind(new MutablePropertyValues(Collections.singletonMap("shell.command_refresh_interval", "1")));
+		binder.bind(new MutablePropertyValues(Collections.singletonMap(
+				"shell.command_refresh_interval", "1")));
 		assertFalse(binder.getBindingResult().hasErrors());
 		assertEquals(1, props.getCommandRefreshInterval());
 	}
@@ -77,11 +79,12 @@ public class CrshPropertiesTests {
 		CrshProperties props = new CrshProperties();
 		RelaxedDataBinder binder = new RelaxedDataBinder(props, "shell");
 		binder.setConversionService(new DefaultConversionService());
-		binder.bind(new MutablePropertyValues(Collections.singletonMap("shell.command_path_patterns",
-				"pattern1, pattern2")));
+		binder.bind(new MutablePropertyValues(Collections.singletonMap(
+				"shell.command_path_patterns", "pattern1, pattern2")));
 		assertFalse(binder.getBindingResult().hasErrors());
 		assertEquals(2, props.getCommandPathPatterns().length);
-		Assert.assertArrayEquals(new String[] { "pattern1", "pattern2" }, props.getCommandPathPatterns());
+		Assert.assertArrayEquals(new String[] { "pattern1", "pattern2" },
+				props.getCommandPathPatterns());
 	}
 
 	@Test
@@ -89,11 +92,12 @@ public class CrshPropertiesTests {
 		CrshProperties props = new CrshProperties();
 		RelaxedDataBinder binder = new RelaxedDataBinder(props, "shell");
 		binder.setConversionService(new DefaultConversionService());
-		binder.bind(new MutablePropertyValues(Collections.singletonMap("shell.config_path_patterns",
-				"pattern1, pattern2")));
+		binder.bind(new MutablePropertyValues(Collections.singletonMap(
+				"shell.config_path_patterns", "pattern1, pattern2")));
 		assertFalse(binder.getBindingResult().hasErrors());
 		assertEquals(2, props.getConfigPathPatterns().length);
-		Assert.assertArrayEquals(new String[] { "pattern1", "pattern2" }, props.getConfigPathPatterns());
+		Assert.assertArrayEquals(new String[] { "pattern1", "pattern2" },
+				props.getConfigPathPatterns());
 	}
 
 	@Test
@@ -101,11 +105,12 @@ public class CrshPropertiesTests {
 		CrshProperties props = new CrshProperties();
 		RelaxedDataBinder binder = new RelaxedDataBinder(props, "shell");
 		binder.setConversionService(new DefaultConversionService());
-		binder.bind(new MutablePropertyValues(Collections.singletonMap("shell.disabled_plugins",
-				"pattern1, pattern2")));
+		binder.bind(new MutablePropertyValues(Collections.singletonMap(
+				"shell.disabled_plugins", "pattern1, pattern2")));
 		assertFalse(binder.getBindingResult().hasErrors());
 		assertEquals(2, props.getDisabledPlugins().length);
-		assertArrayEquals(new String[] { "pattern1", "pattern2" }, props.getDisabledPlugins());
+		assertArrayEquals(new String[] { "pattern1", "pattern2" },
+				props.getDisabledPlugins());
 	}
 
 	@Test
@@ -269,7 +274,8 @@ public class CrshPropertiesTests {
 	public void testBindingSpring() {
 		SpringAuthenticationProperties props = new SpringAuthenticationProperties();
 		RelaxedDataBinder binder = new RelaxedDataBinder(props, "shell.auth.spring");
-		binder.bind(new MutablePropertyValues(Collections.singletonMap("shell.auth.spring.roles", "role1, role2")));
+		binder.bind(new MutablePropertyValues(Collections.singletonMap(
+				"shell.auth.spring.roles", "role1, role2")));
 		assertFalse(binder.getBindingResult().hasErrors());
 
 		Properties p = new Properties();
@@ -278,5 +284,4 @@ public class CrshPropertiesTests {
 		assertEquals("role1, role2", p.get(CrshProperties.CRASH_AUTH_SPRING_ROLES));
 	}
 
-	
 }

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java

@@ -16,11 +16,6 @@
 
 package org.springframework.boot.autoconfigure.jdbc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -47,6 +42,10 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.util.ClassUtils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for {@link DataSourceAutoConfiguration}.