From 7ba50a812dd0d8a80a4eab730e06435b182a0e77 Mon Sep 17 00:00:00 2001 From: "Bala.FA" Date: Tue, 6 Jul 2021 17:13:40 +0530 Subject: [PATCH] address review comment Signed-off-by: Bala.FA --- api/src/main/java/io/minio/S3Base.java | 34 ++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/api/src/main/java/io/minio/S3Base.java b/api/src/main/java/io/minio/S3Base.java index 2f2932af6..f6a74eda1 100644 --- a/api/src/main/java/io/minio/S3Base.java +++ b/api/src/main/java/io/minio/S3Base.java @@ -1098,6 +1098,18 @@ protected void populateResult() }; } + private PartReader newPartReader(Object data, long objectSize, long partSize, int partCount) { + if (data instanceof RandomAccessFile) { + return new PartReader((RandomAccessFile) data, objectSize, partSize, partCount); + } + + if (data instanceof InputStream) { + return new PartReader((InputStream) data, objectSize, partSize, partCount); + } + + return null; + } + /** Execute put object. */ protected ObjectWriteResponse putObject( PutObjectBaseArgs args, @@ -1116,12 +1128,8 @@ protected ObjectWriteResponse putObject( String uploadId = null; Part[] parts = null; - PartReader partReader = null; - if (data instanceof RandomAccessFile) { - partReader = new PartReader((RandomAccessFile) data, objectSize, partSize, partCount); - } else if (data instanceof InputStream) { - partReader = new PartReader((InputStream) data, objectSize, partSize, partCount); - } else { + PartReader partReader = newPartReader(data, objectSize, partSize, partCount); + if (partReader == null) { throw new IllegalArgumentException("data must be RandomAccessFile or InputStream"); } @@ -1959,12 +1967,7 @@ protected ObjectWriteResponse putObject( "data must be InputStream, RandomAccessFile, byte[] or String"); } - PartReader partReader = null; - if (data instanceof RandomAccessFile) { - partReader = new PartReader((RandomAccessFile) data, length, length, 1); - } else if (data instanceof InputStream) { - partReader = new PartReader((InputStream) data, length, length, 1); - } + PartReader partReader = newPartReader(data, length, length, 1); if (partReader != null) { return putObject( @@ -2212,12 +2215,7 @@ protected UploadPartResponse uploadPart( "data must be InputStream, RandomAccessFile, byte[] or String"); } - PartReader partReader = null; - if (data instanceof RandomAccessFile) { - partReader = new PartReader((RandomAccessFile) data, length, length, 1); - } else if (data instanceof InputStream) { - partReader = new PartReader((InputStream) data, length, length, 1); - } + PartReader partReader = newPartReader(data, length, length, 1); if (partReader != null) { return uploadPart(