Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
Closes gh-4554
This commit is contained in:
Johnny Lim
2015-11-19 21:39:27 +09:00
committed by Stephane Nicoll
parent 30791599a5
commit efff4a0051
19 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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