Merge branch '1.5.x'

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java

@@ -209,7 +209,7 @@ class JsonReader {
 			StringBuilder out = new StringBuilder();
 			InputStreamReader reader = new InputStreamReader(in, charset);
 			char[] buffer = new char[BUFFER_SIZE];
-			int bytesRead = -1;
+			int bytesRead;
 			while ((bytesRead = reader.read(buffer)) != -1) {
 				out.append(buffer, 0, bytesRead);
 			}

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java

@@ -86,7 +86,7 @@ public class DefaultLaunchScript implements LaunchScript {
 	private void copy(InputStream inputStream, OutputStream outputStream)
 			throws IOException {
 		byte[] buffer = new byte[BUFFER_SIZE];
-		int bytesRead = -1;
+		int bytesRead;
 		while ((bytesRead = inputStream.read(buffer)) != -1) {
 			outputStream.write(buffer, 0, bytesRead);
 		}

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java

@@ -300,7 +300,7 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
 		@Override
 		public void write(OutputStream outputStream) throws IOException {
 			byte[] buffer = new byte[BUFFER_SIZE];
-			int bytesRead = -1;
+			int bytesRead;
 			while ((bytesRead = this.inputStream.read(buffer)) != -1) {
 				outputStream.write(buffer, 0, bytesRead);
 			}
@@ -383,7 +383,7 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
 
 		private void load(InputStream inputStream) throws IOException {
 			byte[] buffer = new byte[BUFFER_SIZE];
-			int bytesRead = -1;
+			int bytesRead;
 			while ((bytesRead = inputStream.read(buffer)) != -1) {
 				this.crc.update(buffer, 0, bytesRead);
 				this.size += bytesRead;

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java

@@ -95,7 +95,7 @@ public class TestJarFile {
 	}
 
 	private void copy(InputStream in, OutputStream out) throws IOException {
-		int bytesRead = -1;
+		int bytesRead;
 		while ((bytesRead = in.read(this.buffer)) != -1) {
 			out.write(this.buffer, 0, bytesRead);
 		}

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java

@@ -149,7 +149,7 @@ public class JarFileArchive implements Archive {
 				ResourceAccess.ONCE);
 				OutputStream outputStream = new FileOutputStream(file)) {
 			byte[] buffer = new byte[BUFFER_SIZE];
-			int bytesRead = -1;
+			int bytesRead;
 			while ((bytesRead = inputStream.read(buffer)) != -1) {
 				outputStream.write(buffer, 0, bytesRead);
 			}