diff --git a/aQute.libg/test/aQute/lib/io/LineSeparatorBufferedReaderTest.java b/aQute.libg/test/aQute/lib/io/LineSeparatorBufferedReaderTest.java index fab2443447..a9bde9b693 100644 --- a/aQute.libg/test/aQute/lib/io/LineSeparatorBufferedReaderTest.java +++ b/aQute.libg/test/aQute/lib/io/LineSeparatorBufferedReaderTest.java @@ -14,56 +14,61 @@ class LineSeparatorBufferedReaderTest { void empty() throws Exception { String testString = ""; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isNull(); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isNull(); + } } @Test void no_eol() throws Exception { String testString = "foo=bar"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isEqualTo("foo=bar"); - assertThat(reader.lineSeparator()).isEqualTo(""); - assertThat(reader.lineSeparator()).isEqualTo(""); - assertThat(reader.readLine()).isNull(); - assertThat(reader.lineSeparator()).isEqualTo(""); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isEqualTo("foo=bar"); + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.readLine()).isNull(); + assertThat(reader.lineSeparator()).isEqualTo(""); + } } @Test void lf() throws Exception { String testString = "foo=bar\n"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isEqualTo("foo=bar"); - assertThat(reader.lineSeparator()).isEqualTo("\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - assertThat(reader.readLine()).isNull(); - assertThat(reader.lineSeparator()).isEqualTo(""); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isEqualTo("foo=bar"); + assertThat(reader.lineSeparator()).isEqualTo("\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.readLine()).isNull(); + assertThat(reader.lineSeparator()).isEqualTo(""); + } } @Test void cr() throws Exception { String testString = "foo=bar\r"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isEqualTo("foo=bar"); - assertThat(reader.lineSeparator()).isEqualTo("\r"); - assertThat(reader.lineSeparator()).isEqualTo(""); - assertThat(reader.readLine()).isNull(); - assertThat(reader.lineSeparator()).isEqualTo(""); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isEqualTo("foo=bar"); + assertThat(reader.lineSeparator()).isEqualTo("\r"); + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.readLine()).isNull(); + assertThat(reader.lineSeparator()).isEqualTo(""); + } } @Test void crlf() throws Exception { String testString = "foo=bar\r\n"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isEqualTo("foo=bar"); - assertThat(reader.lineSeparator()).isEqualTo("\r\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - assertThat(reader.readLine()).isNull(); - assertThat(reader.lineSeparator()).isEqualTo(""); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isEqualTo("foo=bar"); + assertThat(reader.lineSeparator()).isEqualTo("\r\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.readLine()).isNull(); + assertThat(reader.lineSeparator()).isEqualTo(""); + } } @ValueSource(booleans = {true, false}) @@ -71,35 +76,36 @@ void crlf() throws Exception { void mixed_eol(boolean lineSeparator) throws Exception { String testString = "\nfoo1=bar\r\nfoo2=bar\nfoo3=bar\rfoo4=bar"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isEqualTo(""); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isEqualTo("foo1=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isEqualTo("foo2=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isEqualTo("foo3=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isEqualTo("foo4=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo(""); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isNull(); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo(""); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isEqualTo(""); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isEqualTo("foo1=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isEqualTo("foo2=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isEqualTo("foo3=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isEqualTo("foo4=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isNull(); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo(""); + } } } @@ -108,32 +114,33 @@ void mixed_eol(boolean lineSeparator) throws Exception { void skip(boolean lineSeparator) throws Exception { String testString = "\nfoo1=bar\r\nfoo2=bar\nfoo3=bar\rfoo4=bar"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isEqualTo(""); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isEqualTo("foo1=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - String skipString = "foo2=bar\n"; - assertThat(reader.skip(skipString.length())).isEqualTo(skipString.length()); - assertThat(reader.readLine()).isEqualTo("foo3=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isEqualTo("foo4=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo(""); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isNull(); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo(""); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isEqualTo(""); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isEqualTo("foo1=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + String skipString = "foo2=bar\n"; + assertThat(reader.skip(skipString.length())).isEqualTo(skipString.length()); + assertThat(reader.readLine()).isEqualTo("foo3=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isEqualTo("foo4=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isNull(); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo(""); + } } } @@ -142,53 +149,54 @@ void skip(boolean lineSeparator) throws Exception { void mark(boolean lineSeparator) throws Exception { String testString = "\nfoo1=bar\r\nfoo2=bar\nfoo3=bar\rfoo4=bar"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isEqualTo(""); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isEqualTo("foo1=bar"); - reader.mark(200); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r\n"); - } - reader.reset(); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - reader.mark(200); - assertThat(reader.readLine()).isEqualTo("foo2=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - reader.reset(); - assertThat(reader.readLine()).isEqualTo("foo2=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\n"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isEqualTo("foo3=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r"); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - reader.mark(200); - assertThat(reader.readLine()).isEqualTo("foo4=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo(""); - assertThat(reader.lineSeparator()).isEqualTo(""); - } - reader.reset(); - assertThat(reader.readLine()).isEqualTo("foo4=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo(""); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isEqualTo(""); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isEqualTo("foo1=bar"); + reader.mark(200); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r\n"); + } + reader.reset(); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + reader.mark(200); + assertThat(reader.readLine()).isEqualTo("foo2=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + reader.reset(); + assertThat(reader.readLine()).isEqualTo("foo2=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\n"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isEqualTo("foo3=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r"); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + reader.mark(200); + assertThat(reader.readLine()).isEqualTo("foo4=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + reader.reset(); + assertThat(reader.readLine()).isEqualTo("foo4=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo(""); + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isNull(); assertThat(reader.lineSeparator()).isEqualTo(""); } - assertThat(reader.readLine()).isNull(); - assertThat(reader.lineSeparator()).isEqualTo(""); } @ValueSource(booleans = {true, false}) @@ -196,39 +204,41 @@ void mark(boolean lineSeparator) throws Exception { void newlines(boolean lineSeparator) throws Exception { String testString = "\n\r\n\n\rfoo=bar"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.readLine()).isEqualTo(""); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\n"); - } - assertThat(reader.readLine()).isEqualTo(""); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r\n"); - } - assertThat(reader.readLine()).isEqualTo(""); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\n"); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.readLine()).isEqualTo(""); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\n"); + } + assertThat(reader.readLine()).isEqualTo(""); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r\n"); + } + assertThat(reader.readLine()).isEqualTo(""); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\n"); + } + assertThat(reader.readLine()).isEqualTo(""); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r"); + } + assertThat(reader.readLine()).isEqualTo("foo=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo(""); + } + assertThat(reader.readLine()).isNull(); } - assertThat(reader.readLine()).isEqualTo(""); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r"); - } - assertThat(reader.readLine()).isEqualTo("foo=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo(""); - } - assertThat(reader.readLine()).isNull(); } @Test void read_single() throws Exception { String testString = "\nfoo1=bar\r\n"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - for (char c : testString.toCharArray()) { - assertThat(reader.read()).isEqualTo(c); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + for (char c : testString.toCharArray()) { + assertThat(reader.read()).isEqualTo(c); + } + assertThat(reader.read()).isEqualTo(-1); } - assertThat(reader.read()).isEqualTo(-1); } @ValueSource(booleans = {true, false}) @@ -236,28 +246,30 @@ void read_single() throws Exception { void read_single_pushback(boolean lineSeparator) throws Exception { String testString = "\nfoo1=bar\rfoo2=bar"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.read()).isEqualTo('\n'); - assertThat(reader.readLine()).isEqualTo("foo1=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r"); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.read()).isEqualTo('\n'); + assertThat(reader.readLine()).isEqualTo("foo1=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r"); + } + String remainder = "foo2=bar"; + for (char c : remainder.toCharArray()) { + assertThat(reader.read()).isEqualTo(c); + } + assertThat(reader.read()).isEqualTo(-1); } - String remainder = "foo2=bar"; - for (char c : remainder.toCharArray()) { - assertThat(reader.read()).isEqualTo(c); - } - assertThat(reader.read()).isEqualTo(-1); } @Test void read_array() throws Exception { String testString = "\nfoo1=bar\r\n"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - char[] cbuf = new char[200]; - assertThat(reader.read(cbuf)).isEqualTo(testString.length()); - assertThat(cbuf).startsWith(testString.toCharArray()); - assertThat(reader.read(cbuf)).isEqualTo(-1); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + char[] cbuf = new char[200]; + assertThat(reader.read(cbuf)).isEqualTo(testString.length()); + assertThat(cbuf).startsWith(testString.toCharArray()); + assertThat(reader.read(cbuf)).isEqualTo(-1); + } } @ValueSource(booleans = {true, false}) @@ -265,35 +277,37 @@ void read_array() throws Exception { void read_array_pushback(boolean lineSeparator) throws Exception { String testString = "\nfoo1=bar\rfoo2=bar"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.read()).isEqualTo('\n'); - assertThat(reader.readLine()).isEqualTo("foo1=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r"); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.read()).isEqualTo('\n'); + assertThat(reader.readLine()).isEqualTo("foo1=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r"); + } + char[] cbuf = new char[200]; + String remainder = "foo2=bar"; + for (int remaining; (remaining = remainder.length()) > 0;) { + int length = reader.read(cbuf); + assertThat(length).isBetween(1, remaining); + assertThat(cbuf).startsWith(remainder.substring(0, length) + .toCharArray()); + remainder = remainder.substring(length); + } + assertThat(reader.read(cbuf)).isEqualTo(-1); } - char[] cbuf = new char[200]; - String remainder = "foo2=bar"; - for (int remaining; (remaining = remainder.length()) > 0;) { - int length = reader.read(cbuf); - assertThat(length).isBetween(1, remaining); - assertThat(cbuf).startsWith(remainder.substring(0, length) - .toCharArray()); - remainder = remainder.substring(length); - } - assertThat(reader.read(cbuf)).isEqualTo(-1); } @Test void read_charbuffer() throws Exception { String testString = "\nfoo1=bar\r\n"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - CharBuffer cbuf = CharBuffer.allocate(200); - assertThat(reader.read(cbuf)).isEqualTo(testString.length()); - cbuf.flip(); - assertThat(cbuf.toString()).isEqualTo(testString); - cbuf.clear(); - assertThat(reader.read(cbuf)).isEqualTo(-1); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + CharBuffer cbuf = CharBuffer.allocate(200); + assertThat(reader.read(cbuf)).isEqualTo(testString.length()); + cbuf.flip(); + assertThat(cbuf.toString()).isEqualTo(testString); + cbuf.clear(); + assertThat(reader.read(cbuf)).isEqualTo(-1); + } } @ValueSource(booleans = {true, false}) @@ -301,22 +315,23 @@ void read_charbuffer() throws Exception { void read_charbuffer_pushback(boolean lineSeparator) throws Exception { String testString = "\nfoo1=bar\rfoo2=bar"; StringReader stringReader = new StringReader(testString); - LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader); - assertThat(reader.read()).isEqualTo('\n'); - assertThat(reader.readLine()).isEqualTo("foo1=bar"); - if (lineSeparator) { - assertThat(reader.lineSeparator()).isEqualTo("\r"); - } - CharBuffer cbuf = CharBuffer.allocate(200); - String remainder = "foo2=bar"; - for (int remaining; (remaining = remainder.length()) > 0;) { - int length = reader.read(cbuf); - cbuf.flip(); - assertThat(length).isBetween(1, remaining); - assertThat(cbuf.toString()).isEqualTo(remainder.substring(0, length)); - remainder = remainder.substring(length); - cbuf.clear(); + try (LineSeparatorBufferedReader reader = new LineSeparatorBufferedReader(stringReader)) { + assertThat(reader.read()).isEqualTo('\n'); + assertThat(reader.readLine()).isEqualTo("foo1=bar"); + if (lineSeparator) { + assertThat(reader.lineSeparator()).isEqualTo("\r"); + } + CharBuffer cbuf = CharBuffer.allocate(200); + String remainder = "foo2=bar"; + for (int remaining; (remaining = remainder.length()) > 0;) { + int length = reader.read(cbuf); + cbuf.flip(); + assertThat(length).isBetween(1, remaining); + assertThat(cbuf.toString()).isEqualTo(remainder.substring(0, length)); + remainder = remainder.substring(length); + cbuf.clear(); + } + assertThat(reader.read(cbuf)).isEqualTo(-1); } - assertThat(reader.read(cbuf)).isEqualTo(-1); } } diff --git a/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/ListsTest.java b/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/ListsTest.java index 04d8ef4373..6365b0df7c 100644 --- a/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/ListsTest.java +++ b/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/ListsTest.java @@ -513,17 +513,18 @@ public void serialization() throws Exception { try (ObjectOutputStream oos = new ObjectOutputStream(bos)) { oos.writeObject(list); } - ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer())); - @SuppressWarnings("unchecked") - List deser = (List) ois.readObject(); - - assertThat(deser).isEqualTo(list) - .isNotSameAs(list) - .containsExactlyElementsOf(list); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.add("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("e1")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + try (ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer()))) { + @SuppressWarnings("unchecked") + List deser = (List) ois.readObject(); + + assertThat(deser).isEqualTo(list) + .isNotSameAs(list) + .containsExactlyElementsOf(list); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.add("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("e1")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + } } @Test @@ -533,14 +534,15 @@ public void serialization_zero() throws Exception { try (ObjectOutputStream oos = new ObjectOutputStream(bos)) { oos.writeObject(list); } - ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer())); - @SuppressWarnings("unchecked") - List deser = (List) ois.readObject(); - - assertThat(deser).isSameAs(list); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.add("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + try (ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer()))) { + @SuppressWarnings("unchecked") + List deser = (List) ois.readObject(); + + assertThat(deser).isSameAs(list); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.add("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + } } @Test diff --git a/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/MapsTest.java b/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/MapsTest.java index 99fc790262..33b12f76bb 100644 --- a/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/MapsTest.java +++ b/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/MapsTest.java @@ -823,17 +823,18 @@ public void serialization() throws Exception { try (ObjectOutputStream oos = new ObjectOutputStream(bos)) { oos.writeObject(map); } - ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer())); - @SuppressWarnings("unchecked") - Map deser = (Map) ois.readObject(); - - assertThat(deser).isEqualTo(map) - .isNotSameAs(map) - .containsExactlyEntriesOf(map); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.put("a", "b")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("k1")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + try (ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer()))) { + @SuppressWarnings("unchecked") + Map deser = (Map) ois.readObject(); + + assertThat(deser).isEqualTo(map) + .isNotSameAs(map) + .containsExactlyEntriesOf(map); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.put("a", "b")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("k1")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + } } @Test @@ -843,14 +844,15 @@ public void serialization_zero() throws Exception { try (ObjectOutputStream oos = new ObjectOutputStream(bos)) { oos.writeObject(map); } - ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer())); - @SuppressWarnings("unchecked") - Map deser = (Map) ois.readObject(); - - assertThat(deser).isSameAs(map); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.put("a", "b")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + try (ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer()))) { + @SuppressWarnings("unchecked") + Map deser = (Map) ois.readObject(); + + assertThat(deser).isSameAs(map); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.put("a", "b")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + } } } diff --git a/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/SetsTest.java b/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/SetsTest.java index 4bc817d399..e9f260e7e2 100644 --- a/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/SetsTest.java +++ b/biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/SetsTest.java @@ -330,17 +330,18 @@ public void serialization() throws Exception { try (ObjectOutputStream oos = new ObjectOutputStream(bos)) { oos.writeObject(set); } - ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer())); - @SuppressWarnings("unchecked") - Set deser = (Set) ois.readObject(); - - assertThat(deser).isEqualTo(set) - .isNotSameAs(set) - .containsExactlyElementsOf(set); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.add("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("e1")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + try (ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer()))) { + @SuppressWarnings("unchecked") + Set deser = (Set) ois.readObject(); + + assertThat(deser).isEqualTo(set) + .isNotSameAs(set) + .containsExactlyElementsOf(set); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.add("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("e1")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + } } @Test @@ -350,14 +351,15 @@ public void serialization_zero() throws Exception { try (ObjectOutputStream oos = new ObjectOutputStream(bos)) { oos.writeObject(set); } - ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer())); - @SuppressWarnings("unchecked") - Set deser = (Set) ois.readObject(); - - assertThat(deser).isSameAs(set); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.add("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + try (ObjectInputStream ois = new ObjectInputStream(new ByteBufferInputStream(bos.toByteBuffer()))) { + @SuppressWarnings("unchecked") + Set deser = (Set) ois.readObject(); + + assertThat(deser).isSameAs(set); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.add("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.remove("a")); + assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> deser.clear()); + } } @Test diff --git a/biz.aQute.bndall.tests/test/biz/aQute/test/launchpad/LaunchpadWorkspace.java b/biz.aQute.bndall.tests/test/biz/aQute/test/launchpad/LaunchpadWorkspace.java index b796063883..b6723cef8c 100644 --- a/biz.aQute.bndall.tests/test/biz/aQute/test/launchpad/LaunchpadWorkspace.java +++ b/biz.aQute.bndall.tests/test/biz/aQute/test/launchpad/LaunchpadWorkspace.java @@ -8,6 +8,7 @@ public class LaunchpadWorkspace { @SuppressWarnings("unused") private static Workspace ws; + @SuppressWarnings("resource") static LaunchpadBuilder builder = new LaunchpadBuilder().runfw("org.apache.felix.framework;version=@5"); static { diff --git a/biz.aQute.bndlib.tests/test/test/BndEditModelTest.java b/biz.aQute.bndlib.tests/test/test/BndEditModelTest.java index 761514db89..89ebecfc43 100644 --- a/biz.aQute.bndlib.tests/test/test/BndEditModelTest.java +++ b/biz.aQute.bndlib.tests/test/test/BndEditModelTest.java @@ -217,16 +217,17 @@ public void testGetPropertiesWithFileReplace() throws Exception { @Test public void testGetPropertiesWithWorkspaceMacros() throws Exception { - Workspace ws = new Workspace(new File("testresources/ws")); - Project project = ws.getProject("p1"); - BndEditModel model = new BndEditModel(project); - model.setGenericString("ws", "${workspace}"); - model.setGenericString("pro", "${project}"); - Processor p = model.getProperties(); + try (Workspace ws = new Workspace(new File("testresources/ws"))) { + Project project = ws.getProject("p1"); + BndEditModel model = new BndEditModel(project); + model.setGenericString("ws", "${workspace}"); + model.setGenericString("pro", "${project}"); + Processor p = model.getProperties(); - assertThat(p.getProperty("ws")).isEqualTo(getPortablePath(ws.getBase())); + assertThat(p.getProperty("ws")).isEqualTo(getPortablePath(ws.getBase())); - assertThat(p.getProperty("pro")).isEqualTo(getPortablePath(project.getBase())); + assertThat(p.getProperty("pro")).isEqualTo(getPortablePath(project.getBase())); + } } @Test diff --git a/biz.aQute.bndlib/src/aQute/bnd/connection/settings/SettingsParser.java b/biz.aQute.bndlib/src/aQute/bnd/connection/settings/SettingsParser.java index d15c94cc75..53b35ae115 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/connection/settings/SettingsParser.java +++ b/biz.aQute.bndlib/src/aQute/bnd/connection/settings/SettingsParser.java @@ -8,6 +8,7 @@ public class SettingsParser extends XPathParser { final SettingsDTO settings = new SettingsDTO(); + @SuppressWarnings("resource") private final Macro replacer = new Processor().getReplacer(); /* diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java index 6220a28e33..98f08888ba 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java @@ -1389,7 +1389,9 @@ private boolean addAll(Jar to, Jar sub, Instruction filter, String destination, return dupl; } - @SuppressWarnings("deprecation") + @SuppressWarnings({ + "deprecation", "resource" + }) private void copy(Jar jar, String path, File from, Instructions preprocess, Map extra) throws Exception { if (doNotCopy(from)) diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java index 769d2f91ff..667891e664 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java @@ -261,7 +261,7 @@ public Jar(String string, File file) throws IOException { } - private Jar buildFromDirectory(final Path baseDir, final Pattern doNotCopy) throws IOException { + private void buildFromDirectory(final Path baseDir, final Pattern doNotCopy) throws IOException { Files.walkFileTree(baseDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor() { @Override @@ -292,7 +292,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO return FileVisitResult.CONTINUE; } }); - return this; } private Jar buildFromZip(File file) throws IOException { diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java index bfb5c11d77..17fd5a1060 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java @@ -18,6 +18,7 @@ public class BeforeAfterTest { static final String org_apache_felix_framework = "org.apache.felix.framework;version='[6.0.5,7)'"; static final String org_apache_felix_scr = "org.apache.felix.scr;version='[2.1.12,2.1.13)'"; + @SuppressWarnings("resource") static LaunchpadBuilder builder = new LaunchpadBuilder().runfw(org_apache_felix_framework) .bundles("assertj-core") .bundles("net.bytebuddy.byte-buddy") diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java index d42316a62c..f2638d0760 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java @@ -21,6 +21,7 @@ public class FO { static File tmp = new File("generated/snapshot"); + @SuppressWarnings("resource") static LaunchpadBuilder builder = new LaunchpadBuilder().snapshot() .set("snapshot.dir", tmp.getAbsolutePath()) .runfw("org.apache.felix.framework;version='[7.0.5,7.0.5]'") diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java index 5a5de77941..d2b5ea3d28 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java @@ -22,6 +22,7 @@ public class LaunchpadConfigurationTest { static File tmp = new File("generated/snapshot"); + @SuppressWarnings("resource") static LaunchpadBuilder builder = new LaunchpadBuilder().snapshot() .set("snapshot.dir", tmp.getAbsolutePath()) .bndrun("runsystempackages.bndrun") diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java index 21adb329ff..4f87fdd3c4 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java @@ -22,6 +22,7 @@ public class LaunchpadRunnerBasicTest { static File tmp = new File("generated/snapshot"); + @SuppressWarnings("resource") static LaunchpadBuilder builder = new LaunchpadBuilder().snapshot() .set("snapshot.dir", tmp.getAbsolutePath()) .bndrun("runsystempackages.bndrun") diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/Manual.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/Manual.java index 2ba8756d16..b55b56c1c7 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/Manual.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/Manual.java @@ -25,6 +25,7 @@ public class Manual { static final String org_apache_felix_scr = "org.apache.felix.scr;version='[2.1.12,2.1.13)'"; static final String org_apache_felix_log = "org.apache.felix.log;version='[1.2.0,1.2.1)'"; static final String org_apache_felix_configadmin = "org.apache.felix.configadmin;version='[1.9.10,1.9.11)'"; + @SuppressWarnings("resource") LaunchpadBuilder builder = new LaunchpadBuilder().runfw(org_apache_felix_framework); @Service diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/WorkspaceTest.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/WorkspaceTest.java index 02f66d9402..1516b035f6 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/WorkspaceTest.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/WorkspaceTest.java @@ -16,6 +16,7 @@ * consider for the plugins. */ public class WorkspaceTest { + @SuppressWarnings("resource") static LaunchpadBuilder builder = new LaunchpadBuilder().bndrun("workspace.bndrun"); /** diff --git a/biz.aQute.launchpad/test/aQute/launchpad/JunitRuleTest.java b/biz.aQute.launchpad/test/aQute/launchpad/JunitRuleTest.java index a61df62572..e56f0d7353 100644 --- a/biz.aQute.launchpad/test/aQute/launchpad/JunitRuleTest.java +++ b/biz.aQute.launchpad/test/aQute/launchpad/JunitRuleTest.java @@ -9,6 +9,7 @@ public class JunitRuleTest { + @SuppressWarnings("resource") static LaunchpadBuilder builder = new LaunchpadBuilder().runfw("org.apache.felix.framework"); @Rule diff --git a/biz.aQute.tester.test/test/aQute/tester/bundle/engine/test/BundleEngineTest.java b/biz.aQute.tester.test/test/aQute/tester/bundle/engine/test/BundleEngineTest.java index 5b1e86c00f..8b5c9f2b96 100644 --- a/biz.aQute.tester.test/test/aQute/tester/bundle/engine/test/BundleEngineTest.java +++ b/biz.aQute.tester.test/test/aQute/tester/bundle/engine/test/BundleEngineTest.java @@ -81,6 +81,7 @@ @SuppressWarnings("restriction") public class BundleEngineTest { + @SuppressWarnings("resource") private LaunchpadBuilder builder = new LaunchpadBuilder().bndrun("bundleenginetest.bndrun") .excludeExport("aQute.tester.bundle.engine") .excludeExport("aQute.tester.bundle.engine.discovery") diff --git a/bndtools.core/src/bndtools/wizards/bndfile/BndRunFileWizard.java b/bndtools.core/src/bndtools/wizards/bndfile/BndRunFileWizard.java index 5441eb3a59..fae667fd37 100644 --- a/bndtools.core/src/bndtools/wizards/bndfile/BndRunFileWizard.java +++ b/bndtools.core/src/bndtools/wizards/bndfile/BndRunFileWizard.java @@ -105,6 +105,7 @@ public boolean performFinish() { } } + @SuppressWarnings("resource") @Override public void init(IWorkbench workbench, IStructuredSelection selection) { this.workbench = workbench;