Merge pull request spring-projects#4554 from izeye/polish-20151119

snicoll · snicoll · commit 31d7ebc96e68 · 2015-11-20T11:02:23.000+01:00
* pr/4554:
  Polish
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfigurationTests.java
@@ -46,7 +46,7 @@ public void close() {
 	}
 
 	@Test
-	public void propertyPlaceholderse() throws Exception {
+	public void propertyPlaceholders() throws Exception {
 		this.context.register(PropertyPlaceholderAutoConfiguration.class,
 				PlaceholderConfig.class);
 		EnvironmentTestUtils.addEnvironment(this.context, "foo:two");
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
@@ -147,7 +147,7 @@ public void customizeTomcatWithCustomizer() throws Exception {
 	@Test
 	public void testAccidentalMultipleServerPropertiesBeans() throws Exception {
 		this.context = new AnnotationConfigEmbeddedWebApplicationContext();
-		this.context.register(Config.class, MutiServerPropertiesBeanConfig.class,
+		this.context.register(Config.class, MultiServerPropertiesBeanConfig.class,
 				ServerPropertiesAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class);
 		this.thrown.expect(ApplicationContextException.class);
@@ -222,7 +222,7 @@ public void customize(ConfigurableEmbeddedServletContainer container) {
 	}
 
 	@Configuration
-	protected static class MutiServerPropertiesBeanConfig {
+	protected static class MultiServerPropertiesBeanConfig {
 
 		@Bean
 		public ServerProperties serverPropertiesOne() {
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java
@@ -192,7 +192,7 @@ public TomcatEmbeddedServletContainerFactory tomcat() {
 		}
 
 		@Bean
-		public TomcatWebSocketContainerCustomizer tomcatCuztomiser() {
+		public TomcatWebSocketContainerCustomizer tomcatCustomizer() {
 			return new TomcatWebSocketContainerCustomizer();
 		}
 
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
@@ -48,7 +48,7 @@ public InitCommand() {
 
 	public InitCommand(InitOptionHandler handler) {
 		super("init",
-				"Initialize a new project using Spring " + "Initialzr (start.spring.io)",
+				"Initialize a new project using Spring " + "Initializr (start.spring.io)",
 				handler);
 	}
 
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
@@ -38,7 +38,7 @@ class ServiceCapabilitiesReportGenerator {
 
 	/**
 	 * Creates an instance using the specified {@link InitializrService}.
-	 * @param initializrService the initialzr service
+	 * @param initializrService the initializr service
 	 */
 	ServiceCapabilitiesReportGenerator(InitializrService initializrService) {
 		this.initializrService = initializrService;
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java
@@ -21,7 +21,7 @@
 import org.fusesource.jansi.AnsiRenderer.Code;
 
 /**
- * Simple utitliy class to build an ANSI string when supported by the {@link Terminal}.
+ * Simple utility class to build an ANSI string when supported by the {@link Terminal}.
  *
  * @author Phillip Webb
  */
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
@@ -59,10 +59,10 @@ public CommandCompleter(ConsoleReader consoleReader,
 			for (OptionHelp optionHelp : command.getOptionsHelp()) {
 				options.addAll(optionHelp.getOptions());
 			}
-			AggregateCompleter arguementCompleters = new AggregateCompleter(
+			AggregateCompleter argumentCompleters = new AggregateCompleter(
 					new StringsCompleter(options), new FileNameCompleter());
 			ArgumentCompleter argumentCompleter = new ArgumentCompleter(argumentDelimiter,
-					arguementCompleters);
+					argumentCompleters);
 			argumentCompleter.setStrict(false);
 			this.commandCompleters.put(command.getName(), argumentCompleter);
 		}
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
@@ -175,7 +175,7 @@ private AnsiString ansi(String text, Code... codes) {
 	}
 
 	/**
-	 * Final handle an interrup signal (CTRL-C).
+	 * Final handle an interrupt signal (CTRL-C).
 	 */
 	protected void handleSigInt() {
 		if (this.commandRunner.handleSigInt()) {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java
@@ -92,9 +92,9 @@ public DependencyCustomizer ifAnyMissingClasses(final String... classNames) {
 		return new DependencyCustomizer(this) {
 			@Override
 			protected boolean canAdd() {
-				for (String classname : classNames) {
+				for (String className : classNames) {
 					try {
-						DependencyCustomizer.this.loader.loadClass(classname);
+						DependencyCustomizer.this.loader.loadClass(className);
 					}
 					catch (Exception ex) {
 						return true;
@@ -115,9 +115,9 @@ public DependencyCustomizer ifAllMissingClasses(final String... classNames) {
 		return new DependencyCustomizer(this) {
 			@Override
 			protected boolean canAdd() {
-				for (String classname : classNames) {
+				for (String className : classNames) {
 					try {
-						DependencyCustomizer.this.loader.loadClass(classname);
+						DependencyCustomizer.this.loader.loadClass(className);
 						return false;
 					}
 					catch (Exception ex) {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java
@@ -56,10 +56,10 @@ public void apply(GroovyClassLoader loader, GroovyCompilerConfiguration configur
 			GeneratorContext generatorContext, SourceUnit source, ClassNode classNode)
 					throws CompilationFailedException {
 		if (!AstUtils.hasAtLeastOneAnnotation(classNode, "RunWith")) {
-			AnnotationNode runwith = new AnnotationNode(ClassHelper.make("RunWith"));
-			runwith.addMember("value",
+			AnnotationNode runWith = new AnnotationNode(ClassHelper.make("RunWith"));
+			runWith.addMember("value",
 					new ClassExpression(ClassHelper.make("SpringJUnit4ClassRunner")));
-			classNode.addAnnotation(runwith);
+			classNode.addAnnotation(runWith);
 		}
 	}
 
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java
@@ -30,7 +30,7 @@
 import org.codehaus.groovy.control.CompilationFailedException;
 
 /**
- * Helpful utilties for working with Groovy {@link Template}s.
+ * Helpful utilities for working with Groovy {@link Template}s.
  *
  * @author Dave Syer
  */
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java
@@ -130,8 +130,8 @@ public HttpRestartServer remoteRestartHttpRestartServer(
 		}
 
 		@Bean
-		@ConditionalOnMissingBean(name = "remoteRestartHanderMapper")
-		public UrlHandlerMapper remoteRestartHanderMapper(HttpRestartServer server) {
+		@ConditionalOnMissingBean(name = "remoteRestartHandlerMapper")
+		public UrlHandlerMapper remoteRestartHandlerMapper(HttpRestartServer server) {
 			String url = (this.serverProperties.getContextPath() == null ? ""
 					: this.serverProperties.getContextPath())
 					+ this.properties.getRemote().getContextPath() + "/restart";
@@ -155,8 +155,8 @@ static class RemoteDebugTunnelConfiguration {
 		private ServerProperties serverProperties;
 
 		@Bean
-		@ConditionalOnMissingBean(name = "remoteDebugHanderMapper")
-		public UrlHandlerMapper remoteDebugHanderMapper(
+		@ConditionalOnMissingBean(name = "remoteDebugHandlerMapper")
+		public UrlHandlerMapper remoteDebugHandlerMapper(
 				@Qualifier("remoteDebugHttpTunnelServer") HttpTunnelServer server) {
 			String url = (this.serverProperties.getContextPath() == null ? ""
 					: this.serverProperties.getContextPath())
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
@@ -240,7 +240,7 @@ public synchronized void stop() {
 
 	/**
 	 * Stop monitoring the source folders.
-	 * @param remainingScans the number of scans remaming
+	 * @param remainingScans the number of remaining scans
 	 */
 	synchronized void stopAfter(int remainingScans) {
 		Thread thread = this.watchThread;
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java
@@ -113,7 +113,7 @@ else if (frame.getType() == Frame.Type.CLOSE) {
 				throw new ConnectionClosedException();
 			}
 			else if (frame.getType() == Frame.Type.TEXT) {
-				logger.debug("Recieved LiveReload text frame " + frame);
+				logger.debug("Received LiveReload text frame " + frame);
 			}
 			else {
 				throw new IOException("Unexpected Frame Type " + frame.getType());
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapper.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapper.java
@@ -30,7 +30,7 @@ public class UrlHandlerMapper implements HandlerMapper {
 
 	private final String requestUri;
 
-	private final Handler hander;
+	private final Handler handler;
 
 	/**
 	 * Create a new {@link UrlHandlerMapper}.
@@ -41,13 +41,13 @@ public UrlHandlerMapper(String url, Handler handler) {
 		Assert.hasLength(url, "URL must not be empty");
 		Assert.isTrue(url.startsWith("/"), "URL must start with '/'");
 		this.requestUri = url;
-		this.hander = handler;
+		this.handler = handler;
 	}
 
 	@Override
 	public Handler getHandler(ServerHttpRequest request) {
 		if (this.requestUri.equals(request.getURI().getPath())) {
-			return this.hander;
+			return this.handler;
 		}
 		return null;
 	}
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java
@@ -158,11 +158,11 @@ public void run() {
 					}
 					catch (IOException ex) {
 						logger.trace("Unexpected connection error", ex);
-						closeQuitely();
+						closeQuietly();
 					}
 				}
 
-				private void closeQuitely() {
+				private void closeQuietly() {
 					try {
 						close();
 					}
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
@@ -92,15 +92,15 @@ public void thymeleafCacheIsFalse() throws Exception {
 	}
 
 	@Test
-	public void defaultPropertyCanBeOverridenFromCommandLine() throws Exception {
+	public void defaultPropertyCanBeOverriddenFromCommandLine() throws Exception {
 		this.context = initializeAndRun(Config.class, "--spring.thymeleaf.cache=true");
 		TemplateResolver resolver = this.context.getBean(TemplateResolver.class);
 		resolver.initialize();
 		assertThat(resolver.isCacheable(), equalTo(true));
 	}
 
 	@Test
-	public void defaultPropertyCanBeOverridenFromUserHomeProperties() throws Exception {
+	public void defaultPropertyCanBeOverriddenFromUserHomeProperties() throws Exception {
 		String userHome = System.getProperty("user.home");
 		System.setProperty("user.home",
 				new File("src/test/resources/user-home").getAbsolutePath());
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java
@@ -153,7 +153,7 @@ public void disableRestart() throws Exception {
 		loadContext("spring.devtools.remote.secret:supersecret",
 				"spring.devtools.remote.restart.enabled:false");
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
-		this.context.getBean("remoteRestartHanderMapper");
+		this.context.getBean("remoteRestartHandlerMapper");
 	}
 
 	@Test
@@ -193,7 +193,7 @@ public void disableRemoteDebug() throws Exception {
 		loadContext("spring.devtools.remote.secret:supersecret",
 				"spring.devtools.remote.debug.enabled:false");
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
-		this.context.getBean("remoteDebugHanderMapper");
+		this.context.getBean("remoteDebugHandlerMapper");
 	}
 
 	@Test
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java
@@ -223,7 +223,7 @@ public void neverMoreThanTwoHttpConnections() throws Exception {
 	}
 
 	@Test
-	public void requestRecievedOutOfOrder() throws Exception {
+	public void requestReceivedOutOfOrder() throws Exception {
 		MockHttpConnection h1 = new MockHttpConnection();
 		MockHttpConnection h2 = new MockHttpConnection("1+2", 1);
 		MockHttpConnection h3 = new MockHttpConnection("+3", 2);

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void close() {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Test`
`49`		`- public void propertyPlaceholderse() throws Exception {`
	`49`	`+ public void propertyPlaceholders() throws Exception {`
`50`	`50`	`this.context.register(PropertyPlaceholderAutoConfiguration.class,`
`51`	`51`	`PlaceholderConfig.class);`
`52`	`52`	`EnvironmentTestUtils.addEnvironment(this.context, "foo:two");`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public TomcatEmbeddedServletContainerFactory tomcat() {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`@Bean`
`195`		`- public TomcatWebSocketContainerCustomizer tomcatCuztomiser() {`
	`195`	`+ public TomcatWebSocketContainerCustomizer tomcatCustomizer() {`
`196`	`196`	`return new TomcatWebSocketContainerCustomizer();`
`197`	`197`	`}`
`198`	`198`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public InitCommand() {`
`48`	`48`
`49`	`49`	`public InitCommand(InitOptionHandler handler) {`
`50`	`50`	`super("init",`
`51`		`- "Initialize a new project using Spring " + "Initialzr (start.spring.io)",`
	`51`	`+ "Initialize a new project using Spring " + "Initializr (start.spring.io)",`
`52`	`52`	`handler);`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`import org.fusesource.jansi.AnsiRenderer.Code;`
`22`	`22`
`23`	`23`	`/**`
`24`		`- * Simple utitliy class to build an ANSI string when supported by the {@link Terminal}.`
	`24`	`+ * Simple utility class to build an ANSI string when supported by the {@link Terminal}.`
`25`	`25`	`*`
`26`	`26`	`* @author Phillip Webb`
`27`	`27`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,10 @@ public CommandCompleter(ConsoleReader consoleReader,`
`59`	`59`	`for (OptionHelp optionHelp : command.getOptionsHelp()) {`
`60`	`60`	`options.addAll(optionHelp.getOptions());`
`61`	`61`	`}`
`62`		`- AggregateCompleter arguementCompleters = new AggregateCompleter(`
	`62`	`+ AggregateCompleter argumentCompleters = new AggregateCompleter(`
`63`	`63`	`new StringsCompleter(options), new FileNameCompleter());`
`64`	`64`	`ArgumentCompleter argumentCompleter = new ArgumentCompleter(argumentDelimiter,`
`65`		`- arguementCompleters);`
	`65`	`+ argumentCompleters);`
`66`	`66`	`argumentCompleter.setStrict(false);`
`67`	`67`	`this.commandCompleters.put(command.getName(), argumentCompleter);`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ private AnsiString ansi(String text, Code... codes) {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`/**`
`178`		`- * Final handle an interrup signal (CTRL-C).`
	`178`	`+ * Final handle an interrupt signal (CTRL-C).`
`179`	`179`	`*/`
`180`	`180`	`protected void handleSigInt() {`
`181`	`181`	`if (this.commandRunner.handleSigInt()) {`
Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,10 @@ public void apply(GroovyClassLoader loader, GroovyCompilerConfiguration configur`
`56`	`56`	`GeneratorContext generatorContext, SourceUnit source, ClassNode classNode)`
`57`	`57`	`throws CompilationFailedException {`
`58`	`58`	`if (!AstUtils.hasAtLeastOneAnnotation(classNode, "RunWith")) {`
`59`		`- AnnotationNode runwith = new AnnotationNode(ClassHelper.make("RunWith"));`
`60`		`- runwith.addMember("value",`
	`59`	`+ AnnotationNode runWith = new AnnotationNode(ClassHelper.make("RunWith"));`
	`60`	`+ runWith.addMember("value",`
`61`	`61`	`new ClassExpression(ClassHelper.make("SpringJUnit4ClassRunner")));`
`62`		`- classNode.addAnnotation(runwith);`
	`62`	`+ classNode.addAnnotation(runWith);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`