Merge branch '2.5.x'

philwebb · philwebb · commit c9dc40a465b3 · 2021-09-21T14:44:17.000-07:00
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java
@@ -120,7 +120,7 @@ public void visitStart(CentralDirectoryEndRecord endRecord, RandomAccessData cen
 		int maxSize = endRecord.getNumberOfRecords();
 		this.centralDirectoryData = centralDirectoryData;
 		this.hashCodes = new int[maxSize];
-		this.centralDirectoryOffsets = Offsets.get(endRecord);
+		this.centralDirectoryOffsets = Offsets.from(endRecord);
 		this.positions = new int[maxSize];
 	}
 
@@ -440,7 +440,7 @@ private interface Offsets {
 
 		void swap(int i, int j);
 
-		static Offsets get(CentralDirectoryEndRecord endRecord) {
+		static Offsets from(CentralDirectoryEndRecord endRecord) {
 			int size = endRecord.getNumberOfRecords();
 			return endRecord.isZip64() ? new Zip64Offsets(size) : new ZipOffsets(size);
 		}

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public void visitStart(CentralDirectoryEndRecord endRecord, RandomAccessData cen`
`120`	`120`	`int maxSize = endRecord.getNumberOfRecords();`
`121`	`121`	`this.centralDirectoryData = centralDirectoryData;`
`122`	`122`	`this.hashCodes = new int[maxSize];`
`123`		`- this.centralDirectoryOffsets = Offsets.get(endRecord);`
	`123`	`+ this.centralDirectoryOffsets = Offsets.from(endRecord);`
`124`	`124`	`this.positions = new int[maxSize];`
`125`	`125`	`}`
`126`	`126`
`@@ -440,7 +440,7 @@ private interface Offsets {`
`440`	`440`
`441`	`441`	`void swap(int i, int j);`
`442`	`442`
`443`		`- static Offsets get(CentralDirectoryEndRecord endRecord) {`
	`443`	`+ static Offsets from(CentralDirectoryEndRecord endRecord) {`
`444`	`444`	`int size = endRecord.getNumberOfRecords();`
`445`	`445`	`return endRecord.isZip64() ? new Zip64Offsets(size) : new ZipOffsets(size);`
`446`	`446`	`}`