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

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-04-30 16:45:30 +02:00
parent 284fe969e0 83b9d3ca71
commit 335ca62239
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

@ -239,7 +239,7 @@ link:spring-boot-project/spring-boot-tools/spring-boot-maven-plugin[Maven] plugi
=== spring-boot-devtools === spring-boot-devtools
The spring-boot-devtools module provides additional development-time features such as automatic retarts, The spring-boot-devtools module provides additional development-time features such as automatic restarts,
for a smoother application development experience. Developer tools are automatically disabled when for a smoother application development experience. Developer tools are automatically disabled when
running a fully packaged application. running a fully packaged application.

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
View File

@ -57,9 +57,9 @@ public class RandomAccessDataFile implements RandomAccessData {
* @param length the length of the section * @param length the length of the section
*/ */
private RandomAccessDataFile(FileAccess fileAccess, long offset, long length) { private RandomAccessDataFile(FileAccess fileAccess, long offset, long length) {
this.fileAccess = fileAccess;
this.offset = offset; this.offset = offset;
this.length = length; this.length = length;
this.fileAccess = fileAccess;
} }
/** /**
@ -120,7 +120,7 @@ public class RandomAccessDataFile implements RandomAccessData {
} }
/** /**
* {@link RandomAccessDataInputStream} implementation for the * {@link InputStream} implementation for the
* {@link RandomAccessDataFile}. * {@link RandomAccessDataFile}.
*/ */
private class DataInputStream extends InputStream { private class DataInputStream extends InputStream {

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

@ -679,22 +679,22 @@ public class MapBinderTests {
public static class ExampleCustomNoDefaultConstructorBean { public static class ExampleCustomNoDefaultConstructorBean {
private MyCustomNoDefaultConstructorList items = new MyCustomNoDefaultConstructorList( private MyCustomNoDefaultConstructorMap items = new MyCustomNoDefaultConstructorMap(
Collections.singletonMap("foo", "bar")); Collections.singletonMap("foo", "bar"));
public MyCustomNoDefaultConstructorList getItems() { public MyCustomNoDefaultConstructorMap getItems() {
return this.items; return this.items;
} }
public void setItems(MyCustomNoDefaultConstructorList items) { public void setItems(MyCustomNoDefaultConstructorMap items) {
this.items = items; this.items = items;
} }
} }
public static class MyCustomNoDefaultConstructorList extends HashMap<String, String> { public static class MyCustomNoDefaultConstructorMap extends HashMap<String, String> {
public MyCustomNoDefaultConstructorList(Map<String, String> items) { public MyCustomNoDefaultConstructorMap(Map<String, String> items) {
putAll(items); putAll(items);
} }
@ -702,20 +702,20 @@ public class MapBinderTests {
public static class ExampleCustomWithDefaultConstructorBean { public static class ExampleCustomWithDefaultConstructorBean {
private MyCustomWithDefaultConstructorList items = new MyCustomWithDefaultConstructorList(); private MyCustomWithDefaultConstructorMap items = new MyCustomWithDefaultConstructorMap();
public MyCustomWithDefaultConstructorList getItems() { public MyCustomWithDefaultConstructorMap getItems() {
return this.items; return this.items;
} }
public void setItems(MyCustomWithDefaultConstructorList items) { public void setItems(MyCustomWithDefaultConstructorMap items) {
this.items.clear(); this.items.clear();
this.items.putAll(items); this.items.putAll(items);
} }
} }
public static class MyCustomWithDefaultConstructorList public static class MyCustomWithDefaultConstructorMap
extends HashMap<String, String> { extends HashMap<String, String> {
} }