Merge branch '3.2.x'

Closes gh-41080
This commit is contained in:
Phillip Webb
2024-06-11 13:32:30 -07:00
42 changed files with 115 additions and 93 deletions

View File

@@ -240,7 +240,7 @@ class NestedJarFileTests {
void getCommentWhenClosedThrowsException() throws IOException {
try (NestedJarFile jar = new NestedJarFile(this.file)) {
jar.close();
assertThatIllegalStateException().isThrownBy(() -> jar.getComment()).withMessage("Zip file closed");
assertThatIllegalStateException().isThrownBy(jar::getComment).withMessage("Zip file closed");
}
}
@@ -269,7 +269,7 @@ class NestedJarFileTests {
void sizeWhenClosedThrowsException() throws Exception {
try (NestedJarFile jar = new NestedJarFile(this.file)) {
jar.close();
assertThatIllegalStateException().isThrownBy(() -> jar.size()).withMessage("Zip file closed");
assertThatIllegalStateException().isThrownBy(jar::size).withMessage("Zip file closed");
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -242,7 +242,7 @@ class JarUrlConnectionTests {
@Test
void getInputStreamWhenNotNestedAndHasNoEntryThrowsException() throws Exception {
JarUrlConnection connection = JarUrlConnection.open(JarUrl.create(this.file));
assertThatIOException().isThrownBy(() -> connection.getInputStream()).withMessage("no entry name specified");
assertThatIOException().isThrownBy(connection::getInputStream).withMessage("no entry name specified");
}
@Test