From 1dac9ccd123e068cbf5c856dcaf2f9ba408363ff Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Tue, 26 Dec 2023 13:45:42 +0900 Subject: [PATCH] Address Checkstyle violations --- .../java/org/gaul/s3proxy/AliasBlobStore.java | 1 - .../org/gaul/s3proxy/EncryptedBlobStore.java | 4 +- .../org/gaul/s3proxy/EventualBlobStore.java | 1 - src/main/java/org/gaul/s3proxy/Main.java | 2 +- .../java/org/gaul/s3proxy/RegexBlobStore.java | 47 +++++++++++++------ src/main/java/org/gaul/s3proxy/S3Proxy.java | 1 - .../java/org/gaul/s3proxy/S3ProxyHandler.java | 8 ++-- .../s3proxy/crypto/DecryptionInputStream.java | 5 +- .../org/gaul/s3proxy/crypto/Encryption.java | 2 +- .../org/gaul/s3proxy/crypto/PartPadding.java | 2 +- .../org/gaul/s3proxy/AliasBlobStoreTest.java | 1 - .../org/gaul/s3proxy/AwsSdkAnonymousTest.java | 1 - .../java/org/gaul/s3proxy/AwsSdkTest.java | 2 - ...inResourceSharingAllowAllResponseTest.java | 3 -- ...rossOriginResourceSharingResponseTest.java | 3 -- .../s3proxy/EncryptedBlobStoreLiveTest.java | 4 +- .../s3proxy/GlobBlobStoreLocatorTest.java | 1 - .../org/gaul/s3proxy/RegexBlobStoreTest.java | 13 ++--- .../gaul/s3proxy/ShardedBlobStoreTest.java | 1 - src/test/java/org/gaul/s3proxy/TestUtils.java | 1 - 20 files changed, 50 insertions(+), 53 deletions(-) diff --git a/src/main/java/org/gaul/s3proxy/AliasBlobStore.java b/src/main/java/org/gaul/s3proxy/AliasBlobStore.java index 5ecb10c..4ae125b 100644 --- a/src/main/java/org/gaul/s3proxy/AliasBlobStore.java +++ b/src/main/java/org/gaul/s3proxy/AliasBlobStore.java @@ -17,7 +17,6 @@ package org.gaul.s3proxy; import static java.util.Objects.requireNonNull; - import static com.google.common.base.Preconditions.checkArgument; import java.util.HashMap; diff --git a/src/main/java/org/gaul/s3proxy/EncryptedBlobStore.java b/src/main/java/org/gaul/s3proxy/EncryptedBlobStore.java index 9616c6b..0c8147e 100644 --- a/src/main/java/org/gaul/s3proxy/EncryptedBlobStore.java +++ b/src/main/java/org/gaul/s3proxy/EncryptedBlobStore.java @@ -71,7 +71,7 @@ public final class EncryptedBlobStore extends ForwardingBlobStore { private SecretKeySpec secretKey; private EncryptedBlobStore(BlobStore blobStore, Properties properties) - throws IllegalArgumentException { + throws IllegalArgumentException { super(blobStore); String password = properties.getProperty( @@ -92,7 +92,7 @@ public final class EncryptedBlobStore extends ForwardingBlobStore { } private void initStore(String password, String salt) - throws IllegalArgumentException { + throws IllegalArgumentException { try { SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256"); diff --git a/src/main/java/org/gaul/s3proxy/EventualBlobStore.java b/src/main/java/org/gaul/s3proxy/EventualBlobStore.java index cc0ced1..aa82f4f 100644 --- a/src/main/java/org/gaul/s3proxy/EventualBlobStore.java +++ b/src/main/java/org/gaul/s3proxy/EventualBlobStore.java @@ -17,7 +17,6 @@ package org.gaul.s3proxy; import static java.util.Objects.requireNonNull; - import static com.google.common.base.Preconditions.checkArgument; import java.util.Deque; diff --git a/src/main/java/org/gaul/s3proxy/Main.java b/src/main/java/org/gaul/s3proxy/Main.java index ed6d567..82a7731 100644 --- a/src/main/java/org/gaul/s3proxy/Main.java +++ b/src/main/java/org/gaul/s3proxy/Main.java @@ -250,7 +250,7 @@ public final class Main { ImmutableList> regexs = RegexBlobStore.parseRegexs( properties); - if (!regexs.isEmpty()){ + if (!regexs.isEmpty()) { System.err.println("Using regex backend"); blobStore = RegexBlobStore.newRegexBlobStore(blobStore, regexs); } diff --git a/src/main/java/org/gaul/s3proxy/RegexBlobStore.java b/src/main/java/org/gaul/s3proxy/RegexBlobStore.java index 9b64cef..ed89428 100644 --- a/src/main/java/org/gaul/s3proxy/RegexBlobStore.java +++ b/src/main/java/org/gaul/s3proxy/RegexBlobStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2014-2021 Andrew Gaul + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.gaul.s3proxy; import static com.google.common.base.Preconditions.checkArgument; @@ -15,6 +31,8 @@ import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.google.common.collect.ImmutableList; + import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobAccess; @@ -25,8 +43,6 @@ import org.jclouds.blobstore.util.ForwardingBlobStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableList; - /** * This class implements a middleware to apply regex to blob names. * The regex are configured as: @@ -39,37 +55,38 @@ import com.google.common.collect.ImmutableList; * end, * stopping as soon as the first regex matches. */ -public class RegexBlobStore extends ForwardingBlobStore { - private final ImmutableList> regexs; +public final class RegexBlobStore extends ForwardingBlobStore { private static final Logger logger = LoggerFactory.getLogger(RegexBlobStore.class); - static BlobStore newRegexBlobStore(BlobStore delegate, ImmutableList> regexs) { - return new RegexBlobStore(delegate, regexs); - } + private final ImmutableList> regexs; private RegexBlobStore(BlobStore blobStore, ImmutableList> regexs) { super(blobStore); this.regexs = requireNonNull(regexs); } + static BlobStore newRegexBlobStore(BlobStore delegate, ImmutableList> regexs) { + return new RegexBlobStore(delegate, regexs); + } + public static ImmutableList> parseRegexs(Properties properties) { - List> config_regex = new ArrayList<>(); + List> configRegex = new ArrayList<>(); List> regexs = new ArrayList<>(); for (String key : properties.stringPropertyNames()) { if (key.startsWith(S3ProxyConstants.PROPERTY_REGEX_BLOBSTORE)) { - String prop_key = key.substring(S3ProxyConstants.PROPERTY_REGEX_BLOBSTORE.length() + 1); + String propKey = key.substring(S3ProxyConstants.PROPERTY_REGEX_BLOBSTORE.length() + 1); String value = properties.getProperty(key); - config_regex.add(new SimpleEntry<>(prop_key, value)); + configRegex.add(new SimpleEntry<>(propKey, value)); } } - for (Entry entry : config_regex) { + for (Entry entry : configRegex) { String key = entry.getKey(); if (key.startsWith(S3ProxyConstants.PROPERTY_REGEX_BLOBSTORE_MATCH)) { - String regex_name = key.substring(S3ProxyConstants.PROPERTY_REGEX_BLOBSTORE_MATCH.length() + 1); + String regexName = key.substring(S3ProxyConstants.PROPERTY_REGEX_BLOBSTORE_MATCH.length() + 1); String regex = entry.getValue(); Pattern pattern = Pattern.compile(regex); @@ -78,14 +95,14 @@ public class RegexBlobStore extends ForwardingBlobStore { ".", S3ProxyConstants.PROPERTY_REGEX_BLOBSTORE, S3ProxyConstants.PROPERTY_REGEX_BLOBSTORE_REPLACE, - regex_name)); + regexName)); checkArgument( replace != null, "Regex %s has no replace property associated", - regex_name); + regexName); - logger.info("Adding new regex with name {} replaces with {} to {}", regex_name, regex, replace); + logger.info("Adding new regex with name {} replaces with {} to {}", regexName, regex, replace); regexs.add(new SimpleEntry<>(pattern, replace)); } diff --git a/src/main/java/org/gaul/s3proxy/S3Proxy.java b/src/main/java/org/gaul/s3proxy/S3Proxy.java index ae5d6d6..8b419a0 100644 --- a/src/main/java/org/gaul/s3proxy/S3Proxy.java +++ b/src/main/java/org/gaul/s3proxy/S3Proxy.java @@ -17,7 +17,6 @@ package org.gaul.s3proxy; import static java.util.Objects.requireNonNull; - import static com.google.common.base.Preconditions.checkArgument; import java.net.URI; diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java index a8d169a..4d2b90f 100644 --- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java +++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java @@ -859,7 +859,7 @@ public class S3ProxyHandler { throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED); } - private void handleGetContainerAcl(HttpServletRequest request, + private void handleGetContainerAcl(HttpServletRequest request, HttpServletResponse response, BlobStore blobStore, String containerName) throws IOException, S3Exception { if (!blobStore.containerExists(containerName)) { @@ -962,7 +962,7 @@ public class S3ProxyHandler { addCorsResponseHeader(request, response); } - private void handleGetBlobAcl(HttpServletRequest request, + private void handleGetBlobAcl(HttpServletRequest request, HttpServletResponse response, BlobStore blobStore, String containerName, String blobName) throws IOException { BlobAccess access = blobStore.getBlobAccess(containerName, blobName); @@ -1334,7 +1334,7 @@ public class S3ProxyHandler { addCorsResponseHeader(request, response); } - private void handleContainerDelete(HttpServletRequest request, + private void handleContainerDelete(HttpServletRequest request, HttpServletResponse response, BlobStore blobStore, String containerName) throws IOException, S3Exception { if (!blobStore.containerExists(containerName)) { @@ -1564,7 +1564,7 @@ public class S3ProxyHandler { } } - private void handleBlobRemove(HttpServletRequest request, + private void handleBlobRemove(HttpServletRequest request, HttpServletResponse response, BlobStore blobStore, String containerName, String blobName) throws IOException, S3Exception { diff --git a/src/main/java/org/gaul/s3proxy/crypto/DecryptionInputStream.java b/src/main/java/org/gaul/s3proxy/crypto/DecryptionInputStream.java index 02c87cc..87fff9d 100644 --- a/src/main/java/org/gaul/s3proxy/crypto/DecryptionInputStream.java +++ b/src/main/java/org/gaul/s3proxy/crypto/DecryptionInputStream.java @@ -77,9 +77,8 @@ public class DecryptionInputStream extends FilterInputStream { * @throws IOException if cipher fails */ public DecryptionInputStream(InputStream is, SecretKey key, - TreeMap parts, int skipParts, - long skipPartBytes) - throws IOException { + TreeMap parts, int skipParts, + long skipPartBytes) throws IOException { super(is); in = is; this.parts = parts; diff --git a/src/main/java/org/gaul/s3proxy/crypto/Encryption.java b/src/main/java/org/gaul/s3proxy/crypto/Encryption.java index 3aafa3e..c91d66d 100644 --- a/src/main/java/org/gaul/s3proxy/crypto/Encryption.java +++ b/src/main/java/org/gaul/s3proxy/crypto/Encryption.java @@ -33,7 +33,7 @@ public class Encryption { private final int part; public Encryption(SecretKeySpec key, InputStream isRaw, int partNumber) - throws Exception { + throws Exception { iv = generateIV(); Cipher cipher = Cipher.getInstance(Constants.AES_CIPHER); diff --git a/src/main/java/org/gaul/s3proxy/crypto/PartPadding.java b/src/main/java/org/gaul/s3proxy/crypto/PartPadding.java index 983ae27..a15ca8a 100644 --- a/src/main/java/org/gaul/s3proxy/crypto/PartPadding.java +++ b/src/main/java/org/gaul/s3proxy/crypto/PartPadding.java @@ -40,7 +40,7 @@ public class PartPadding { private short version; public static PartPadding readPartPaddingFromBlob(Blob blob) - throws IOException { + throws IOException { PartPadding partPadding = new PartPadding(); InputStream is = blob.getPayload().openStream(); diff --git a/src/test/java/org/gaul/s3proxy/AliasBlobStoreTest.java b/src/test/java/org/gaul/s3proxy/AliasBlobStoreTest.java index 1208456..f156d4e 100644 --- a/src/test/java/org/gaul/s3proxy/AliasBlobStoreTest.java +++ b/src/test/java/org/gaul/s3proxy/AliasBlobStoreTest.java @@ -44,7 +44,6 @@ import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.options.PutOptions; import org.jclouds.io.Payloads; import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/gaul/s3proxy/AwsSdkAnonymousTest.java b/src/test/java/org/gaul/s3proxy/AwsSdkAnonymousTest.java index 4b10ec1..45a4d74 100644 --- a/src/test/java/org/gaul/s3proxy/AwsSdkAnonymousTest.java +++ b/src/test/java/org/gaul/s3proxy/AwsSdkAnonymousTest.java @@ -35,7 +35,6 @@ import com.amazonaws.services.s3.model.S3Object; import com.google.common.io.ByteSource; import org.jclouds.blobstore.BlobStoreContext; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/gaul/s3proxy/AwsSdkTest.java b/src/test/java/org/gaul/s3proxy/AwsSdkTest.java index 3ecf753..dbc358f 100644 --- a/src/test/java/org/gaul/s3proxy/AwsSdkTest.java +++ b/src/test/java/org/gaul/s3proxy/AwsSdkTest.java @@ -96,12 +96,10 @@ import com.google.common.collect.Maps; import com.google.common.io.ByteSource; import org.assertj.core.api.Fail; - import org.jclouds.ContextBuilder; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.rest.HttpClient; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/src/test/java/org/gaul/s3proxy/CrossOriginResourceSharingAllowAllResponseTest.java b/src/test/java/org/gaul/s3proxy/CrossOriginResourceSharingAllowAllResponseTest.java index e48aed6..62d7872 100644 --- a/src/test/java/org/gaul/s3proxy/CrossOriginResourceSharingAllowAllResponseTest.java +++ b/src/test/java/org/gaul/s3proxy/CrossOriginResourceSharingAllowAllResponseTest.java @@ -40,7 +40,6 @@ import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.model.CannedAccessControlList; - import com.google.common.io.ByteSource; import com.google.common.net.HttpHeaders; @@ -59,10 +58,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContextBuilder; - import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/gaul/s3proxy/CrossOriginResourceSharingResponseTest.java b/src/test/java/org/gaul/s3proxy/CrossOriginResourceSharingResponseTest.java index c9d0c83..54dfef3 100644 --- a/src/test/java/org/gaul/s3proxy/CrossOriginResourceSharingResponseTest.java +++ b/src/test/java/org/gaul/s3proxy/CrossOriginResourceSharingResponseTest.java @@ -40,7 +40,6 @@ import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.model.CannedAccessControlList; - import com.google.common.io.ByteSource; import com.google.common.net.HttpHeaders; @@ -59,10 +58,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContextBuilder; - import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java b/src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java index da328a9..6e2ce50 100644 --- a/src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java +++ b/src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java @@ -242,7 +242,7 @@ public final class EncryptedBlobStoreLiveTest extends S3ClientLiveTest { @Override @Test public void testUpdateObjectACL() throws InterruptedException, - ExecutionException, TimeoutException, IOException { + ExecutionException, TimeoutException, IOException { try { super.testUpdateObjectACL(); Fail.failBecauseExceptionWasNotThrown(AWSResponseException.class); @@ -255,7 +255,7 @@ public final class EncryptedBlobStoreLiveTest extends S3ClientLiveTest { @Override @Test public void testPublicWriteOnObject() throws InterruptedException, - ExecutionException, TimeoutException, IOException { + ExecutionException, TimeoutException, IOException { try { super.testPublicWriteOnObject(); Fail.failBecauseExceptionWasNotThrown(AWSResponseException.class); diff --git a/src/test/java/org/gaul/s3proxy/GlobBlobStoreLocatorTest.java b/src/test/java/org/gaul/s3proxy/GlobBlobStoreLocatorTest.java index 3a11f28..e4bb2f2 100644 --- a/src/test/java/org/gaul/s3proxy/GlobBlobStoreLocatorTest.java +++ b/src/test/java/org/gaul/s3proxy/GlobBlobStoreLocatorTest.java @@ -32,7 +32,6 @@ import org.jclouds.ContextBuilder; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; - import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/gaul/s3proxy/RegexBlobStoreTest.java b/src/test/java/org/gaul/s3proxy/RegexBlobStoreTest.java index 9754993..f0dae3a 100644 --- a/src/test/java/org/gaul/s3proxy/RegexBlobStoreTest.java +++ b/src/test/java/org/gaul/s3proxy/RegexBlobStoreTest.java @@ -20,23 +20,17 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.io.InputStream; +import java.util.AbstractMap.SimpleEntry; import java.util.Map; import java.util.Properties; import java.util.Random; import java.util.regex.Pattern; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import com.google.common.collect.ImmutableList; -import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.common.io.ByteSource; import com.google.inject.Module; -import java.util.AbstractMap.SimpleEntry; - import org.assertj.core.api.Assertions; import org.jclouds.ContextBuilder; import org.jclouds.blobstore.BlobStore; @@ -44,6 +38,9 @@ import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public final class RegexBlobStoreTest { private BlobStoreContext context; @@ -134,4 +131,4 @@ public final class RegexBlobStoreTest { private static String createRandomContainerName() { return "container-" + new Random().nextInt(Integer.MAX_VALUE); } -} \ No newline at end of file +} diff --git a/src/test/java/org/gaul/s3proxy/ShardedBlobStoreTest.java b/src/test/java/org/gaul/s3proxy/ShardedBlobStoreTest.java index 1087c8e..942c890 100644 --- a/src/test/java/org/gaul/s3proxy/ShardedBlobStoreTest.java +++ b/src/test/java/org/gaul/s3proxy/ShardedBlobStoreTest.java @@ -35,7 +35,6 @@ import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.options.CopyOptions; import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/gaul/s3proxy/TestUtils.java b/src/test/java/org/gaul/s3proxy/TestUtils.java index e64d038..881640f 100644 --- a/src/test/java/org/gaul/s3proxy/TestUtils.java +++ b/src/test/java/org/gaul/s3proxy/TestUtils.java @@ -34,7 +34,6 @@ import com.google.common.io.Resources; import com.google.inject.Module; import org.eclipse.jetty.util.component.AbstractLifeCycle; - import org.jclouds.Constants; import org.jclouds.ContextBuilder; import org.jclouds.JcloudsVersion;