Author: tilman
Date: Sat Sep 2 10:37:44 2023
New Revision: 1912052
URL: http://svn.apache.org/viewvc?rev=1912052&view=rev
Log:
PDFBOX-5669: use JDK 11 built-in methods, as suggested by Axel Howind
Modified:
pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java
Modified:
pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java?rev=1912052&r1=1912051&r2=1912052&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java
(original)
+++
pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java
Sat Sep 2 10:37:44 2023
@@ -41,8 +41,6 @@ import javax.net.ssl.SSLServerSocketFact
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
-import org.apache.pdfbox.io.IOUtils;
-
/**
* Copied from
*
http://svn.apache.org/repos/asf/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/client/MockHttpServer.java
@@ -335,8 +333,7 @@ public class MockHttpServer extends Thre
return;
}
int contentLen = Integer.parseInt(contentLength);
- byte[] bytes = new byte[contentLen];
- IOUtils.populateBuffer(is, bytes);
+ byte[] bytes = is.readNBytes(contentLen);
requestContent.write(bytes);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1912052&r1=1912051&r2=1912052&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Sat Sep 2 10:37:44 2023
@@ -406,7 +406,7 @@ public abstract class SecurityHandler<T_
if (decrypt)
{
// read IV from stream
- int ivSize = (int) IOUtils.populateBuffer(data, iv);
+ int ivSize = data.readNBytes(iv, 0, iv.length);
if (ivSize == 0)
{
return false;
@@ -515,10 +515,11 @@ public abstract class SecurityHandler<T_
// PDFBOX-3229 check case where metadata is not encrypted despite
/EncryptMetadata missing
try (InputStream is = stream.createRawInputStream())
{
- buf = new byte[10];
- long isResult = IOUtils.populateBuffer(is, buf);
+ int nBytes = 10;
+ buf = is.readNBytes(nBytes);
+ int isResult = buf.length;
- if (Long.compare(isResult, buf.length) != 0)
+ if (buf.length != nBytes)
{
LOG.debug("Tried reading " + buf.length + " bytes but only
" + isResult + " bytes read");
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java?rev=1912052&r1=1912051&r2=1912052&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java
Sat Sep 2 10:37:44 2023
@@ -35,7 +35,6 @@ import org.apache.commons.logging.LogFac
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.filter.DecodeOptions;
-import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
import org.apache.pdfbox.pdmodel.graphics.color.PDIndexed;
@@ -98,7 +97,7 @@ final class SampledImageReader
for (int y = 0; y < height; y++)
{
int x = 0;
- int readLen = (int) IOUtils.populateBuffer(iis, buff);
+ int readLen = iis.readNBytes(buff, 0, buff.length);
for (int r = 0; r < rowLen && r < readLen; r++)
{
int byteValue = buff[r];
@@ -421,7 +420,7 @@ final class SampledImageReader
final byte[] buff = new byte[stride];
for (int y = 0; y < starty + scanHeight; y++)
{
- int read = (int) IOUtils.populateBuffer(iis, buff);
+ int read = iis.readNBytes(buff, 0, buff.length);
if (y >= starty && y % currentSubsampling == 0)
{
int x = startx;
@@ -498,8 +497,8 @@ final class SampledImageReader
if (startx == 0 && starty == 0 && scanWidth == width && scanHeight
== height && currentSubsampling == 1)
{
// we just need to copy all sample data, then convert to RGB
image.
- long inputResult = IOUtils.populateBuffer(input, bank);
- if (Long.compare(inputResult, (long) width * height *
numComponents) != 0)
+ int inputResult = input.readNBytes(bank, 0, bank.length);
+ if (inputResult != (long) width * height * numComponents)
{
LOG.debug("Tried reading " + (long) width * height *
numComponents + " bytes but only " + inputResult + " bytes read");
}
@@ -515,7 +514,7 @@ final class SampledImageReader
int i = 0;
for (int y = 0; y < starty + scanHeight; ++y)
{
- long inputResult = IOUtils.populateBuffer(input, tempBytes);
+ int inputResult = input.readNBytes(tempBytes, 0,
tempBytes.length);
if (Long.compare(inputResult, tempBytes.length) != 0)
{
