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

This commit is contained in:
Andy Wilkinson 2022-02-10 16:01:18 +00:00
parent 4c3289395a e582a13221
commit 52ed7f74a0
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -180,6 +180,11 @@ public class RandomAccessDataFile implements RandomAccessData {
return (n <= 0) ? 0 : moveOn(cap(n)); return (n <= 0) ? 0 : moveOn(cap(n));
} }
@Override
public int available() throws IOException {
return (int) RandomAccessDataFile.this.length - this.position;
}
/** /**
* Cap the specified value such that it cannot exceed the number of bytes * Cap the specified value such that it cannot exceed the number of bytes
* remaining. * remaining.

11
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -199,6 +199,15 @@ class RandomAccessDataFileTests {
assertThat(amountSkipped).isEqualTo(0L); assertThat(amountSkipped).isEqualTo(0L);
} }
@Test
void inputStreamAvailable() throws Exception {
assertThat(this.inputStream.available()).isEqualTo(256);
this.inputStream.skip(56);
assertThat(this.inputStream.available()).isEqualTo(200);
this.inputStream.skip(200);
assertThat(this.inputStream.available()).isEqualTo(0);
}
@Test @Test
void subsectionNegativeOffset() { void subsectionNegativeOffset() {
assertThatExceptionOfType(IndexOutOfBoundsException.class).isThrownBy(() -> this.file.getSubsection(-1, 1)); assertThatExceptionOfType(IndexOutOfBoundsException.class).isThrownBy(() -> this.file.getSubsection(-1, 1));