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 branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-11 14:24:13 +02:00
parent b88a20fabb 846e43ff85
commit b0433d66c1
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ShowDetails.java
View File

@ -38,6 +38,6 @@ public enum ShowDetails {
/** /**
* Always show details in the response. * Always show details in the response.
*/ */
ALWAYS; ALWAYS
} }

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpoint.java
View File

@ -277,7 +277,7 @@ public class ScheduledTasksEndpoint {
private enum TaskType { private enum TaskType {
CRON, FIXED_DELAY, FIXED_RATE; CRON, FIXED_DELAY, FIXED_RATE
} }

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/RepositoryType.java
View File

@ -42,6 +42,6 @@ public enum RepositoryType {
/** /**
* Enables reactive repositories. * Enables reactive repositories.
*/ */
REACTIVE; REACTIVE
} }

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/ZipHeaderPeekInputStreamTests.java
View File

@ -36,7 +36,7 @@ public class ZipHeaderPeekInputStreamTests {
public void hasZipHeaderReturnsTrueWhenStreamStartsWithZipHeader() public void hasZipHeaderReturnsTrueWhenStreamStartsWithZipHeader()
throws IOException { throws IOException {
try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream( try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(
new ByteArrayInputStream(new byte[] { 0x50, 0x4b, 0x03, 0x04, 5, 6 }));) { new ByteArrayInputStream(new byte[] { 0x50, 0x4b, 0x03, 0x04, 5, 6 }))) {
assertThat(in.hasZipHeader()).isTrue(); assertThat(in.hasZipHeader()).isTrue();
} }
} }

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java
View File

@ -203,7 +203,7 @@ public class BindFailureAnalyzerTests {
enum Fruit { enum Fruit {
APPLE, BANANA, ORANGE; APPLE, BANANA, ORANGE
} }