Author: tilman
Date: Mon Apr 7 09:20:30 2025
New Revision: 1924892
URL: http://svn.apache.org/viewvc?rev=1924892&view=rev
Log:
PDFBOX-5660: Sonar fix
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSStream.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElementTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java?rev=1924892&r1=1924891&r2=1924892&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java Mon
Apr 7 09:20:30 2025
@@ -169,8 +169,8 @@ public class PDPage implements COSObject
return Collections.emptyList();
}
return resourcesDictionary.getValues().stream() //
- .filter(f -> f instanceof COSObject) //
- .map(f -> (COSObject) f) //
+ .filter(COSObject.class::isInstance) //
+ .map(COSObject.class::cast) //
.filter(COSObject::isDereferenced) //
.collect(Collectors.toList());
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSStream.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSStream.java?rev=1924892&r1=1924891&r2=1924892&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSStream.java
(original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSStream.java
Mon Apr 7 09:20:30 2025
@@ -168,7 +168,7 @@ class TestCOSStream
try (COSStream stream = new COSStream())
{
assertFalse(stream.hasData());
- Assertions.assertThrows(IOException.class, () ->
stream.createInputStream(),
+ Assertions.assertThrows(IOException.class,
stream::createInputStream,
"createInputStream should have thrown an IOException");
byte[] testString = "This is a test string to be used as input for
TestCOSStream"
@@ -201,17 +201,21 @@ class TestCOSStream
private void validateEncoded(COSStream stream, byte[] expected) throws
IOException
{
- InputStream in = stream.createRawInputStream();
- byte[] decoded = in.readAllBytes();
- stream.close();
- assertTrue(Arrays.equals(expected, decoded), "Encoded data doesn't
match input");
+ try (stream)
+ {
+ InputStream in = stream.createRawInputStream();
+ byte[] decoded = in.readAllBytes();
+ assertTrue(Arrays.equals(expected, decoded), "Encoded data doesn't
match input");
+ }
}
private void validateDecoded(COSStream stream, byte[] expected) throws
IOException
{
- InputStream in = stream.createInputStream();
- byte[] encoded = in.readAllBytes();
- stream.close();
- assertTrue(Arrays.equals(expected, encoded), "Decoded data doesn't
match input");
+ try (stream)
+ {
+ InputStream in = stream.createInputStream();
+ byte[] encoded = in.readAllBytes();
+ assertTrue(Arrays.equals(expected, encoded), "Decoded data doesn't
match input");
+ }
}
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?rev=1924892&r1=1924891&r2=1924892&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Mon Apr 7 09:20:30 2025
@@ -1343,7 +1343,7 @@ class PDFMergerUtilityTest
annotations = doc.getPage(1).getAnnotations();
assertEquals(1, annotations.size());
PDAnnotationLink link = (PDAnnotationLink) annotations.get(0);
- assertThrows(IOException.class, () -> link.getDestination());
+ assertThrows(IOException.class, link::getDestination);
}
}
@@ -1389,9 +1389,10 @@ class PDFMergerUtilityTest
ByteArrayOutputStream baos = new ByteArrayOutputStream();
dstDoc.save(baos);
- PDDocument reloadedDoc = Loader.loadPDF(baos.toByteArray());
- assertNotNull(reloadedDoc.getDocumentCatalog().getMetadata());
- reloadedDoc.close();
+ try (PDDocument reloadedDoc =
Loader.loadPDF(baos.toByteArray()))
+ {
+
assertNotNull(reloadedDoc.getDocumentCatalog().getMetadata());
+ }
}
// Check that source document is unchanged
annotations = doc.getPage(0).getAnnotations();
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java?rev=1924892&r1=1924891&r2=1924892&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java
Mon Apr 7 09:20:30 2025
@@ -252,31 +252,18 @@ class TestPDPageContentStream
Assertions.assertThrows(IllegalStateException.class,
() -> contentStream.lineTo(1, 1));
Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.stroke());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.closeAndStroke());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.closeAndFillAndStroke());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.closeAndFillAndStrokeEvenOdd());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.fill());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.fillAndStroke());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.fillAndStrokeEvenOdd());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.fillEvenOdd());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.fill());
- Assertions.assertThrows(IllegalStateException.class,
() -> contentStream.shadingFill(new PDShadingType1(new
COSDictionary())));
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.closePath());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.clip());
- Assertions.assertThrows(IllegalStateException.class,
- () -> contentStream.clipEvenOdd());
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::stroke);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::closeAndStroke);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::closeAndFillAndStroke);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::closeAndFillAndStrokeEvenOdd);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::fill);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::fillAndStroke);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::fillAndStrokeEvenOdd);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::fillEvenOdd);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::closePath);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::clip);
+ Assertions.assertThrows(IllegalStateException.class,
contentStream::clipEvenOdd);
// J
contentStream.setLineCapStyle(0);
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElementTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElementTest.java?rev=1924892&r1=1924891&r2=1924892&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElementTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElementTest.java
Mon Apr 7 09:20:30 2025
@@ -61,7 +61,7 @@ class PDStructureElementTest
// collect attributes and check their count.
assertEquals(117, attributeSet.size());
- int cnt = attributeSet.stream().map(attributes ->
attributes.size()).reduce(0, Integer::sum);
+ int cnt = attributeSet.stream().map(Revisions::size).reduce(0,
Integer::sum);
assertEquals(111, cnt); // this one was 105 before PDFBOX-4197 was
fixed
assertEquals(0, classSet.size());
}
@@ -86,7 +86,7 @@ class PDStructureElementTest
// collect attributes and check their count.
assertEquals(72, attributeSet.size());
- int cnt = attributeSet.stream().map(attributes ->
attributes.size()).reduce(0, Integer::sum);
+ int cnt = attributeSet.stream().map(Revisions::size).reduce(0,
Integer::sum);
assertEquals(45, cnt);
assertEquals(10, classSet.size());
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java?rev=1924892&r1=1924891&r2=1924892&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java
Mon Apr 7 09:20:30 2025
@@ -58,7 +58,7 @@ class PDOutlineItemIteratorTest
void removeUnsupported()
{
PDOutlineItemIterator pdOutlineItemIterator = new
PDOutlineItemIterator(new PDOutlineItem());
- assertThrows(UnsupportedOperationException.class, () ->
pdOutlineItemIterator.remove());
+ assertThrows(UnsupportedOperationException.class,
pdOutlineItemIterator::remove);
}
@Test
