This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-10093 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 47e2ea6daf655d03ac46b2a7c05c5dfac7be6c09 Author: Rishabh Kumar <[email protected]> AuthorDate: Thu Jun 8 16:00:51 2023 +0530 OAK-10093 : fixed code smells suggested by SONAR --- .../jackrabbit/oak/blob/cloud/s3/S3Backend.java | 12 +++++----- .../oak/blob/cloud/s3/S3RequestDecorator.java | 26 +++++++++------------- .../jackrabbit/oak/blob/cloud/s3/TestS3Ds.java | 2 ++ 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java index 6b145eb0fa..37f28d36ce 100644 --- a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java +++ b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java @@ -1167,22 +1167,22 @@ public class S3Backend extends AbstractSharedBackend { private long lastModified; private String bucket; private boolean isMeta; - private final S3RequestDecorator s3RequestDecorator; + private final S3RequestDecorator s3ReqDecorator; public S3DataRecord(AbstractSharedBackend backend, AmazonS3Client s3service, String bucket, - DataIdentifier key, long lastModified, long length, final S3RequestDecorator s3RequestDecorator) { - this(backend, s3service, bucket, key, lastModified, length, false, s3RequestDecorator); + DataIdentifier key, long lastModified, long length, final S3RequestDecorator s3ReqDecorator) { + this(backend, s3service, bucket, key, lastModified, length, false, s3ReqDecorator); } public S3DataRecord(AbstractSharedBackend backend, AmazonS3Client s3service, String bucket, - DataIdentifier key, long lastModified, long length, boolean isMeta, final S3RequestDecorator s3RequestDecorator) { + DataIdentifier key, long lastModified, long length, boolean isMeta, final S3RequestDecorator s3ReqDecorator) { super(backend, key); this.s3service = s3service; this.lastModified = lastModified; this.length = length; this.bucket = bucket; this.isMeta = isMeta; - this.s3RequestDecorator = s3RequestDecorator; + this.s3ReqDecorator = s3ReqDecorator; } @Override @@ -1204,7 +1204,7 @@ public class S3Backend extends AbstractSharedBackend { LOG_STREAMS_DOWNLOAD.debug("Binary downloaded from S3 - identifier={}", id, new Exception()); } } - return s3service.getObject(s3RequestDecorator.decorate(new GetObjectRequest(bucket, id))).getObjectContent(); + return s3service.getObject(s3ReqDecorator.decorate(new GetObjectRequest(bucket, id))).getObjectContent(); } @Override diff --git a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java index 46b6e5aa79..92f74fbc0c 100644 --- a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java +++ b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java @@ -17,9 +17,6 @@ package org.apache.jackrabbit.oak.blob.cloud.s3; -import java.util.Properties; - -import com.amazonaws.HttpMethod; import com.amazonaws.services.s3.model.CopyObjectRequest; import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest; import com.amazonaws.services.s3.model.GetObjectMetadataRequest; @@ -31,9 +28,12 @@ import com.amazonaws.services.s3.model.SSEAlgorithm; import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams; import com.amazonaws.services.s3.model.SSECustomerKey; +import java.util.Properties; + import static com.amazonaws.HttpMethod.GET; import static com.amazonaws.services.s3.model.SSEAlgorithm.AES256; import static com.amazonaws.util.StringUtils.hasValue; +import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION_SSE_C; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION_SSE_KMS; @@ -71,6 +71,8 @@ public class S3RequestDecorator { } break; } + default: + break; } } } @@ -79,12 +81,8 @@ public class S3RequestDecorator { * Set encryption in {@link GetObjectMetadataRequest} */ public GetObjectMetadataRequest decorate(final GetObjectMetadataRequest request) { - switch (getDataEncryption()) { - case SSE_C: - request.withSSECustomerKey(sseCustomerKey); - break; - case NONE: - break; + if (requireNonNull(getDataEncryption()) == DataEncryption.SSE_C) { + request.withSSECustomerKey(sseCustomerKey); } return request; } @@ -93,12 +91,8 @@ public class S3RequestDecorator { * Set encryption in {@link GetObjectRequest} */ public GetObjectRequest decorate(final GetObjectRequest request) { - switch (getDataEncryption()) { - case SSE_C: - request.withSSECustomerKey(sseCustomerKey); - break; - case NONE: - break; + if (requireNonNull(getDataEncryption()) == DataEncryption.SSE_C) { + request.withSSECustomerKey(sseCustomerKey); } return request; } @@ -190,6 +184,8 @@ public class S3RequestDecorator { case SSE_C: request = request.withSSECustomerKey(sseCustomerKey); break; + default: + break; } return request; } diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java index 940ff24618..49d2309fbd 100644 --- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java +++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java @@ -281,6 +281,8 @@ public class TestS3Ds extends AbstractDataStoreTest { putreq.addHeader(new BasicHeader(SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY, keyId)); putreq.addHeader(new BasicHeader(SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY_MD5, md5AsBase64(decode(keyId)))); break; + default: + break; } putreq.setEntity(new InputStreamEntity(inputstream , length));
