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

Merge pull request #14172 from izeye:polish-20180823 

* pr/14172:
  Polish
This commit is contained in:
Stephane Nicoll 2018-08-23 11:42:48 +02:00
parent 1b7f713487 9602a32a8d
commit 60eace17d4
16 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java
View File

@ -191,14 +191,11 @@ public class LocalDevToolsAutoConfiguration {
@Override
public void onApplicationEvent(ApplicationEvent event) {
if (event instanceof ContextRefreshedEvent) {
if (event instanceof ContextRefreshedEvent
|| (event instanceof ClassPathChangedEvent
&& !((ClassPathChangedEvent) event).isRestartRequired())) {
this.liveReloadServer.triggerReload();
}
if (event instanceof ClassPathChangedEvent) {
if (!((ClassPathChangedEvent) event).isRestartRequired()) {
this.liveReloadServer.triggerReload();
}
}
}
@Override

4
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -1290,7 +1290,7 @@ To specify a session timeout of 30 seconds, `30`, `PT30S` and `30s` are all equi
read timeout of 500ms can be specified in any of the following form: `500`, `PT0.5S` and
`500ms`.
You can also use any of the supported unit. These are:
You can also use any of the supported units. These are:
* `ns` for nanoseconds
* `us` for microseconds
@ -1331,7 +1331,7 @@ include::{code-examples}/context/properties/bind/AppIoProperties.java[tag=exampl
To specify a buffer size of 10 megabytes, `10` and `10MB` are equivalent. A size threshold
of 256 bytes can be specified as `256` or `256B`.
You can also use any of the supported unit. These are:
You can also use any of the supported units. These are:
* `B` for bytes
* `KB` for kilobytes

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class DataLdapTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class DataMongoTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java
View File

@ -50,8 +50,7 @@ public class DataNeo4jTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
static class Initializer

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java
View File

@ -50,8 +50,7 @@ public class DataRedisTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
static class Initializer

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class JdbcTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class JooqTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/JsonTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class JsonTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class DataJpaTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class RestClientTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class WebFluxTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

3
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestPropertiesIntegrationTests.java
View File

@ -40,8 +40,7 @@ public class WebMvcTestPropertiesIntegrationTests {
@Test
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
assertThat(this.environment.getActiveProfiles()).containsExactly("test");
}
}

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzer.java
View File

@ -86,9 +86,9 @@ class NoSuchMethodFailureAnalyzer extends AbstractFailureAnalyzer<NoSuchMethodEr
private List<URL> findCandidates(String className) {
try {
return Collections.list((NoSuchMethodFailureAnalyzer.class.getClassLoader()
return Collections.list(NoSuchMethodFailureAnalyzer.class.getClassLoader()
.getResources(ClassUtils.convertClassNameToResourcePath(className)
+ ".class")));
+ ".class"));
}
catch (Throwable ex) {
return null;

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/MockDataSizeTypeDescriptor.java
View File

@ -27,7 +27,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
/**
* Create a mock {@link TypeDescriptor} with optional {@link DataUnit} annotation.
* Create a mock {@link TypeDescriptor} with optional {@link DataSizeUnit} annotation.
*
* @author Stephane Nicoll
*/

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzerTests.java
View File

@ -30,7 +30,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
/**
* @author awilkinson
* Tests for {@link NoSuchMethodFailureAnalyzer}.
*
* @author Andy Wilkinson
*/
@RunWith(ModifiedClassPathRunner.class)
@ClassPathOverrides("javax.servlet:servlet-api:2.5")