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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-12-01 12:13:02 +01:00
parent a4770f90dc 5560af735c
commit bd2415463c
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ import org.springframework.validation.beanvalidation.MethodValidationPostProcess
import static org.assertj.core.api.Assertions.assertThat;
/**
* Test for {{@link ValidationAutoConfiguration} when no JSR-303 provider is available.
* Test for {@link ValidationAutoConfiguration} when no JSR-303 provider is available.
*
* @author Stephane Nicoll
*/

5
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java Normal file → Executable file
View File

@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Map.Entry;
import java.util.Set;
@@ -141,9 +142,7 @@ public class RestartServer {
ClassLoader classLoader = this.classLoader;
while (classLoader != null) {
if (classLoader instanceof URLClassLoader) {
for (URL url : ((URLClassLoader) classLoader).getURLs()) {
urls.add(url);
}
Collections.addAll(urls, ((URLClassLoader) classLoader).getURLs());
}
classLoader = classLoader.getParent();
}

7
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java Normal file → Executable file
View File

@@ -536,11 +536,8 @@ public class PropertiesLauncher extends Launcher {
return builder.toString();
}
private static Object capitalize(String str) {
StringBuilder sb = new StringBuilder(str.length());
sb.append(Character.toUpperCase(str.charAt(0)));
sb.append(str.substring(1));
return sb.toString();
private static String capitalize(String str) {
return Character.toUpperCase(str.charAt(0)) + str.substring(1);
}
private void log(String message) {

4
spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java Normal file → Executable file
View File

@@ -183,9 +183,7 @@ public class ConfigurationWarningsApplicationContextInitializer
private void addPackages(Set<String> packages, String[] values) {
if (values != null) {
for (String value : values) {
packages.add(value);
}
Collections.addAll(packages, values);
}
}

2
spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java
View File

@@ -162,7 +162,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
}
/**
* Configure the application. Normally all you would need to do it add sources (e.g.
* Configure the application. Normally all you would need to do is add sources (e.g.
* config classes) because other settings have sensible defaults. You might choose
* (for instance) to add default command line arguments, or set an active Spring
* profile.