root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #4554 from izeye/polish-20151119 

* pr/4554:
  Polish
This commit is contained in:
Stephane Nicoll 2015-11-20 11:02:23 +01:00
parent 30791599a5 efff4a0051
commit 31d7ebc96e
19 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfigurationTests.java
View File

@ -46,7 +46,7 @@ public class PropertyPlaceholderAutoConfigurationTests {
}
@Test
public void propertyPlaceholderse() throws Exception {
public void propertyPlaceholders() throws Exception {
this.context.register(PropertyPlaceholderAutoConfiguration.class,
PlaceholderConfig.class);
EnvironmentTestUtils.addEnvironment(this.context, "foo:two");

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
View File

@ -147,7 +147,7 @@ public class ServerPropertiesAutoConfigurationTests {
@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 class ServerPropertiesAutoConfigurationTests {
}
@Configuration
protected static class MutiServerPropertiesBeanConfig {
protected static class MultiServerPropertiesBeanConfig {
@Bean
public ServerProperties serverPropertiesOne() {

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java
View File

@ -192,7 +192,7 @@ public class WebSocketMessagingAutoConfigurationTests {
}
@Bean
public TomcatWebSocketContainerCustomizer tomcatCuztomiser() {
public TomcatWebSocketContainerCustomizer tomcatCustomizer() {
return new TomcatWebSocketContainerCustomizer();
}

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
View File

@ -48,7 +48,7 @@ public class InitCommand extends OptionParsingCommand {
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);
}

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
View File

@ -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;

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java
View File

@ -21,7 +21,7 @@ import org.fusesource.jansi.Ansi;
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
*/

4
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
View File

@ -59,10 +59,10 @@ public class CommandCompleter extends StringsCompleter {
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);
}

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
View File

@ -175,7 +175,7 @@ public class Shell {
}
/**
* Final handle an interrup signal (CTRL-C).
* Final handle an interrupt signal (CTRL-C).
*/
protected void handleSigInt() {
if (this.commandRunner.handleSigInt()) {

8
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java
View File

@ -92,9 +92,9 @@ public class DependencyCustomizer {
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 class DependencyCustomizer {
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) {

6
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java
View File

@ -56,10 +56,10 @@ public class SpringTestCompilerAutoConfiguration extends CompilerAutoConfigurati
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);
}
}

2
spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java
View File

@ -30,7 +30,7 @@ import groovy.text.TemplateEngine;
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
*/

8
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java
View File

@ -130,8 +130,8 @@ public class RemoteDevToolsAutoConfiguration {
}
@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 @@ public class RemoteDevToolsAutoConfiguration {
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())

2
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
View File

@ -240,7 +240,7 @@ public class FileSystemWatcher {
/**
* 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;

2
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java
View File

@ -113,7 +113,7 @@ class Connection {
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());

6
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapper.java
View File

@ -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 class UrlHandlerMapper implements HandlerMapper {
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;
}

4
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java
View File

@ -158,11 +158,11 @@ public class HttpTunnelConnection implements TunnelConnection {
}
catch (IOException ex) {
logger.trace("Unexpected connection error", ex);
closeQuitely();
closeQuietly();
}
}
private void closeQuitely() {
private void closeQuietly() {
try {
close();
}

4
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
View File

@ -92,7 +92,7 @@ public class LocalDevToolsAutoConfigurationTests {
}
@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();
@ -100,7 +100,7 @@ public class LocalDevToolsAutoConfigurationTests {
}
@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());

4
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java
View File

@ -153,7 +153,7 @@ public class RemoteDevToolsAutoConfigurationTests {
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 class RemoteDevToolsAutoConfigurationTests {
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

2
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java
View File

@ -223,7 +223,7 @@ public class HttpTunnelServerTests {
}
@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);