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

Polish

Browse Source 
Closes gh-15873
This commit is contained in:
Johnny Lim
2019-02-08 10:08:54 +09:00
committed by Stephane Nicoll
parent 7bdcee5e3d
commit 885c28891b
7 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java
View File

@@ -152,9 +152,7 @@ public class SslServerCustomizer implements NettyServerCustomizer {
if (resource == null) {
return null;
}
else {
return loadStore(type, provider, resource, password);
}
return loadStore(type, provider, resource, password);
}
private KeyStore loadStore(String type, String provider, String resource,

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/SslBuilderCustomizer.java
View File

@@ -182,9 +182,7 @@ class SslBuilderCustomizer implements UndertowBuilderCustomizer {
if (resource == null) {
return null;
}
else {
return loadStore(type, provider, resource, password);
}
return loadStore(type, provider, resource, password);
}
private KeyStore loadStore(String type, String provider, String resource,

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java
View File

@@ -450,8 +450,8 @@ public class CollectionBinderTests {
MockConfigurationPropertySource source = new MockConfigurationPropertySource();
source.put("foo.values[0]", "foo-bar,bar-baz");
this.sources.add(source);
BeanWithEnumsetCollection result = this.binder
.bind("foo", Bindable.of(BeanWithEnumsetCollection.class)).get();
BeanWithEnumSetCollection result = this.binder
.bind("foo", Bindable.of(BeanWithEnumSetCollection.class)).get();
assertThat(result.getValues().get(0)).containsExactly(ExampleEnum.FOO_BAR,
ExampleEnum.BAR_BAZ);
}
@@ -574,7 +574,7 @@ public class CollectionBinderTests {
}
public static class BeanWithEnumsetCollection {
public static class BeanWithEnumSetCollection {
private List<EnumSet<ExampleEnum>> values;

3
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/SslServerCustomizerTests.java
View File

@@ -82,8 +82,7 @@ public class SslServerCustomizerTests {
}
@Test
public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException()
throws Exception {
public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException() {
Ssl ssl = new Ssl();
SslServerCustomizer customizer = new SslServerCustomizer(null, ssl, null, null);
assertThatExceptionOfType(Exception.class)