From d31d2caf095e77654022f01e075db2e035ef6643 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 4 Apr 2017 15:15:25 -0700 Subject: [PATCH] Collapse packages in repository-s3 (#23907) This commit puts all the classes in the repository-s3 plugin into a single package. In addition to simplifying the plugin, it will make it easier to test as things that should be package private will not be difficult to use inside tests alone. --- .../resources/checkstyle_suppressions.xml | 34 +++++++++---------- plugins/repository-s3/build.gradle | 2 +- .../aws => repositories/s3}/AwsS3Service.java | 4 +-- .../aws => repositories/s3}/AwsSigner.java | 4 +-- .../s3}/DefaultS3OutputStream.java | 6 ++-- .../s3}/InternalAwsS3Service.java | 8 ++--- .../s3}/S3BlobContainer.java | 7 ++-- .../s3}/S3BlobStore.java | 9 ++--- .../s3}/S3OutputStream.java | 6 ++-- .../repositories/s3/S3Repository.java | 9 ++--- .../s3/S3RepositoryPlugin.java | 5 +-- .../s3}/SocketAccess.java | 4 +-- .../s3}/AWSSignersTests.java | 6 ++-- .../s3}/AbstractAwsTestCase.java | 3 +- .../s3/AbstractS3SnapshotRestoreTest.java | 2 -- .../s3}/AmazonS3Wrapper.java | 2 +- .../s3}/AwsS3ServiceImplTests.java | 4 ++- .../s3}/MockAmazonS3.java | 2 +- .../s3}/MockDefaultS3OutputStream.java | 4 ++- .../s3}/S3BlobStoreContainerTests.java | 2 +- .../s3}/S3BlobStoreTests.java | 3 +- .../s3}/S3OutputStreamTests.java | 2 +- .../repositories/s3/S3RepositoryTests.java | 1 - .../aws => repositories/s3}/TestAmazonS3.java | 2 +- .../s3}/TestAwsS3Service.java | 5 ++- 25 files changed, 62 insertions(+), 74 deletions(-) rename plugins/repository-s3/src/main/java/org/elasticsearch/{cloud/aws => repositories/s3}/AwsS3Service.java (98%) rename plugins/repository-s3/src/main/java/org/elasticsearch/{cloud/aws => repositories/s3}/AwsSigner.java (97%) rename plugins/repository-s3/src/main/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/DefaultS3OutputStream.java (97%) rename plugins/repository-s3/src/main/java/org/elasticsearch/{cloud/aws => repositories/s3}/InternalAwsS3Service.java (97%) rename plugins/repository-s3/src/main/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/S3BlobContainer.java (97%) rename plugins/repository-s3/src/main/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/S3BlobStore.java (95%) rename plugins/repository-s3/src/main/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/S3OutputStream.java (92%) rename plugins/repository-s3/src/main/java/org/elasticsearch/{plugin/repository => repositories}/s3/S3RepositoryPlugin.java (96%) rename plugins/repository-s3/src/main/java/org/elasticsearch/{cloud/aws/util => repositories/s3}/SocketAccess.java (96%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws => repositories/s3}/AWSSignersTests.java (95%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws => repositories/s3}/AbstractAwsTestCase.java (96%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws => repositories/s3}/AmazonS3Wrapper.java (99%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws => repositories/s3}/AwsS3ServiceImplTests.java (99%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/MockAmazonS3.java (99%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/MockDefaultS3OutputStream.java (95%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/S3BlobStoreContainerTests.java (97%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/S3BlobStoreTests.java (97%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws/blobstore => repositories/s3}/S3OutputStreamTests.java (99%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws => repositories/s3}/TestAmazonS3.java (99%) rename plugins/repository-s3/src/test/java/org/elasticsearch/{cloud/aws => repositories/s3}/TestAwsS3Service.java (93%) diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml index c95ad03f9ac..ad3051ee785 100644 --- a/buildSrc/src/main/resources/checkstyle_suppressions.xml +++ b/buildSrc/src/main/resources/checkstyle_suppressions.xml @@ -3910,24 +3910,24 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index ce29393bf49..aab56b97c46 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -19,7 +19,7 @@ esplugin { description 'The S3 repository plugin adds S3 repositories' - classname 'org.elasticsearch.plugin.repository.s3.S3RepositoryPlugin' + classname 'org.elasticsearch.repositories.s3.S3RepositoryPlugin' } versions << [ diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/AwsS3Service.java similarity index 98% rename from plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/AwsS3Service.java index 6efc3ec82a0..438c24db283 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/AwsS3Service.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.repositories.s3; import java.util.Locale; import java.util.function.Function; @@ -32,7 +32,7 @@ import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -public interface AwsS3Service extends LifecycleComponent { +interface AwsS3Service extends LifecycleComponent { // Legacy global AWS settings (shared between discovery-ec2 and repository-s3) // Each setting starting with `cloud.aws` also exists in discovery-ec2 project. Don't forget to update diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/AwsSigner.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/AwsSigner.java similarity index 97% rename from plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/AwsSigner.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/AwsSigner.java index c1c36031b5e..61cdb2a7b43 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/AwsSigner.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/AwsSigner.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.repositories.s3; import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.SignerFactory; import org.apache.logging.log4j.Logger; import org.elasticsearch.common.logging.Loggers; -public class AwsSigner { +class AwsSigner { private static final Logger logger = Loggers.getLogger(AwsSigner.class); diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/DefaultS3OutputStream.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/DefaultS3OutputStream.java similarity index 97% rename from plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/DefaultS3OutputStream.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/DefaultS3OutputStream.java index ef9b25b2d1e..7e7f7a689ce 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/DefaultS3OutputStream.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/DefaultS3OutputStream.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import com.amazonaws.AmazonClientException; import com.amazonaws.services.s3.model.AbortMultipartUploadRequest; @@ -61,7 +61,7 @@ import java.util.List; * See http://docs.aws.amazon.com/AmazonS3/latest/dev/qfacts.html * See http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html */ -public class DefaultS3OutputStream extends S3OutputStream { +class DefaultS3OutputStream extends S3OutputStream { private static final ByteSizeValue MULTIPART_MAX_SIZE = new ByteSizeValue(5, ByteSizeUnit.GB); private static final Logger logger = Loggers.getLogger("cloud.aws"); @@ -72,7 +72,7 @@ public class DefaultS3OutputStream extends S3OutputStream { private int multipartChunks; private List multiparts; - public DefaultS3OutputStream(S3BlobStore blobStore, String bucketName, String blobName, int bufferSizeInBytes, int numberOfRetries, boolean serverSideEncryption) { + DefaultS3OutputStream(S3BlobStore blobStore, String bucketName, String blobName, int bufferSizeInBytes, int numberOfRetries, boolean serverSideEncryption) { super(blobStore, bucketName, blobName, bufferSizeInBytes, numberOfRetries, serverSideEncryption); } diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/InternalAwsS3Service.java similarity index 97% rename from plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/InternalAwsS3Service.java index cc5d69d61c7..df8b165435b 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/InternalAwsS3Service.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.repositories.s3; import java.util.HashMap; import java.util.Map; @@ -36,7 +36,6 @@ import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.S3ClientOptions; import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.cloud.aws.util.SocketAccess; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.component.AbstractLifecycleComponent; @@ -45,9 +44,8 @@ import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.repositories.s3.S3Repository; -public class InternalAwsS3Service extends AbstractLifecycleComponent implements AwsS3Service { +class InternalAwsS3Service extends AbstractLifecycleComponent implements AwsS3Service { // pkg private for tests static final Setting CLIENT_NAME = new Setting<>("client", "default", Function.identity()); @@ -57,7 +55,7 @@ public class InternalAwsS3Service extends AbstractLifecycleComponent implements */ private Map, AmazonS3Client> clients = new HashMap<>(); - public InternalAwsS3Service(Settings settings) { + InternalAwsS3Service(Settings settings) { super(settings); } diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobContainer.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java similarity index 97% rename from plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobContainer.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java index 1b942d65082..02d3dfbffd0 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobContainer.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import com.amazonaws.AmazonClientException; import com.amazonaws.services.s3.AmazonS3; @@ -27,7 +27,6 @@ import com.amazonaws.services.s3.model.ObjectListing; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.S3Object; import com.amazonaws.services.s3.model.S3ObjectSummary; -import org.elasticsearch.cloud.aws.util.SocketAccess; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.blobstore.BlobMetaData; import org.elasticsearch.common.blobstore.BlobPath; @@ -46,13 +45,13 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Map; -public class S3BlobContainer extends AbstractBlobContainer { +class S3BlobContainer extends AbstractBlobContainer { protected final S3BlobStore blobStore; protected final String keyPath; - public S3BlobContainer(BlobPath path, S3BlobStore blobStore) { + S3BlobContainer(BlobPath path, S3BlobStore blobStore) { super(path); this.blobStore = blobStore; this.keyPath = path.buildAsString(); diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStore.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java similarity index 95% rename from plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStore.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java index 23f5605035f..9b468d9650a 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStore.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java @@ -17,20 +17,17 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import com.amazonaws.AmazonClientException; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.AmazonS3Exception; import com.amazonaws.services.s3.model.CannedAccessControlList; -import com.amazonaws.services.s3.model.CreateBucketRequest; import com.amazonaws.services.s3.model.DeleteObjectsRequest; import com.amazonaws.services.s3.model.DeleteObjectsRequest.KeyVersion; import com.amazonaws.services.s3.model.ObjectListing; import com.amazonaws.services.s3.model.S3ObjectSummary; import com.amazonaws.services.s3.model.StorageClass; -import org.elasticsearch.cloud.aws.util.SocketAccess; -import org.elasticsearch.common.Nullable; import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobPath; import org.elasticsearch.common.blobstore.BlobStore; @@ -44,7 +41,7 @@ import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Locale; -public class S3BlobStore extends AbstractComponent implements BlobStore { +class S3BlobStore extends AbstractComponent implements BlobStore { private final AmazonS3 client; @@ -60,7 +57,7 @@ public class S3BlobStore extends AbstractComponent implements BlobStore { private final StorageClass storageClass; - public S3BlobStore(Settings settings, AmazonS3 client, String bucket, boolean serverSideEncryption, + S3BlobStore(Settings settings, AmazonS3 client, String bucket, boolean serverSideEncryption, ByteSizeValue bufferSize, int maxRetries, String cannedACL, String storageClass) { super(settings); this.client = client; diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStream.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3OutputStream.java similarity index 92% rename from plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStream.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3OutputStream.java index a1b66ad4e9b..12a91598b94 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStream.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3OutputStream.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; @@ -28,7 +28,7 @@ import java.io.OutputStream; /** * S3OutputStream buffers data before flushing it to an underlying S3OutputStream. */ -public abstract class S3OutputStream extends OutputStream { +abstract class S3OutputStream extends OutputStream { /** * Limit of upload allowed by AWS S3. @@ -48,7 +48,7 @@ public abstract class S3OutputStream extends OutputStream { private int flushCount = 0; - public S3OutputStream(S3BlobStore blobStore, String bucketName, String blobName, int bufferSizeInBytes, int numberOfRetries, boolean serverSideEncryption) { + S3OutputStream(S3BlobStore blobStore, String bucketName, String blobName, int bufferSizeInBytes, int numberOfRetries, boolean serverSideEncryption) { this.blobStore = blobStore; this.bucketName = bucketName; this.blobName = blobName; diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java index ab83f72c676..9d3660898f8 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java @@ -22,10 +22,7 @@ package org.elasticsearch.repositories.s3; import com.amazonaws.ClientConfiguration; import com.amazonaws.Protocol; import com.amazonaws.services.s3.AmazonS3; -import org.elasticsearch.cloud.aws.AwsS3Service; -import org.elasticsearch.cloud.aws.AwsS3Service.CLOUD_S3; -import org.elasticsearch.cloud.aws.InternalAwsS3Service; -import org.elasticsearch.cloud.aws.blobstore.S3BlobStore; +import org.elasticsearch.repositories.s3.AwsS3Service.CLOUD_S3; import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.common.Strings; import org.elasticsearch.common.blobstore.BlobPath; @@ -59,7 +56,7 @@ import java.util.Locale; *
{@code compress}
If set to true metadata files will be stored compressed. Defaults to false.
* */ -public class S3Repository extends BlobStoreRepository { +class S3Repository extends BlobStoreRepository { public static final String TYPE = "s3"; @@ -303,7 +300,7 @@ public class S3Repository extends BlobStoreRepository { /** * Constructs an s3 backed repository */ - public S3Repository(RepositoryMetaData metadata, Settings settings, + S3Repository(RepositoryMetaData metadata, Settings settings, NamedXContentRegistry namedXContentRegistry, AwsS3Service s3Service) throws IOException { super(metadata, settings, namedXContentRegistry); diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/plugin/repository/s3/S3RepositoryPlugin.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java similarity index 96% rename from plugins/repository-s3/src/main/java/org/elasticsearch/plugin/repository/s3/S3RepositoryPlugin.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java index 11e6d6cde5c..91b12fc2794 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/plugin/repository/s3/S3RepositoryPlugin.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.plugin.repository.s3; +package org.elasticsearch.repositories.s3; import java.security.AccessController; import java.security.PrivilegedAction; @@ -28,8 +28,6 @@ import java.util.Map; import com.amazonaws.util.json.Jackson; import org.elasticsearch.SpecialPermission; -import org.elasticsearch.cloud.aws.AwsS3Service; -import org.elasticsearch.cloud.aws.InternalAwsS3Service; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -37,7 +35,6 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.RepositoryPlugin; import org.elasticsearch.repositories.Repository; -import org.elasticsearch.repositories.s3.S3Repository; /** * A plugin to add a repository type that writes to and from the AWS S3. diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/util/SocketAccess.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/SocketAccess.java similarity index 96% rename from plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/util/SocketAccess.java rename to plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/SocketAccess.java index 91a3190d4b9..a0765a8f342 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/util/SocketAccess.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/SocketAccess.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws.util; +package org.elasticsearch.repositories.s3; import org.elasticsearch.SpecialPermission; @@ -33,7 +33,7 @@ import java.security.PrivilegedExceptionAction; * {@link SocketPermission} 'connect' to establish connections. This class wraps the operations requiring access in * {@link AccessController#doPrivileged(PrivilegedAction)} blocks. */ -public final class SocketAccess { +final class SocketAccess { private SocketAccess() {} diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AWSSignersTests.java similarity index 95% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AWSSignersTests.java index 2e13e04f3c7..51e0f5623a9 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AWSSignersTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.repositories.s3; import com.amazonaws.ClientConfiguration; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.plugin.repository.s3.S3RepositoryPlugin; +import org.elasticsearch.repositories.s3.AwsSigner; +import org.elasticsearch.repositories.s3.S3RepositoryPlugin; import org.elasticsearch.test.ESTestCase; import org.junit.BeforeClass; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractAwsTestCase.java similarity index 96% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractAwsTestCase.java index 51b6296e49e..f004145e7ff 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractAwsTestCase.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.repositories.s3; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.env.Environment; -import org.elasticsearch.plugin.repository.s3.S3RepositoryPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ThirdParty; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java index 1bd3341cf37..4d4918d4820 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java @@ -30,8 +30,6 @@ import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRes import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.cloud.aws.AbstractAwsTestCase; -import org.elasticsearch.cloud.aws.AwsS3Service; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.repositories.RepositoryMissingException; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3Wrapper.java similarity index 99% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3Wrapper.java index 23c6755652e..2ce64d5c6fc 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3Wrapper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.repositories.s3; import com.amazonaws.AmazonClientException; import com.amazonaws.AmazonServiceException; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AwsS3ServiceImplTests.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AwsS3ServiceImplTests.java similarity index 99% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AwsS3ServiceImplTests.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AwsS3ServiceImplTests.java index da62cd42e8b..fed7b67eaae 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AwsS3ServiceImplTests.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AwsS3ServiceImplTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.repositories.s3; import com.amazonaws.ClientConfiguration; import com.amazonaws.Protocol; @@ -26,6 +26,8 @@ import com.amazonaws.auth.AWSCredentialsProvider; import org.elasticsearch.common.settings.MockSecureSettings; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.repositories.s3.AwsS3Service; +import org.elasticsearch.repositories.s3.InternalAwsS3Service; import org.elasticsearch.repositories.s3.S3Repository; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/MockAmazonS3.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/MockAmazonS3.java similarity index 99% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/MockAmazonS3.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/MockAmazonS3.java index 8124f693943..3f6ce26232b 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/MockAmazonS3.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/MockAmazonS3.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import com.amazonaws.AmazonClientException; import com.amazonaws.AmazonServiceException; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/MockDefaultS3OutputStream.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/MockDefaultS3OutputStream.java similarity index 95% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/MockDefaultS3OutputStream.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/MockDefaultS3OutputStream.java index cd2450f0e9d..a983185c16f 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/MockDefaultS3OutputStream.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/MockDefaultS3OutputStream.java @@ -17,12 +17,14 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import com.amazonaws.services.s3.model.AmazonS3Exception; import com.amazonaws.services.s3.model.PartETag; import com.carrotsearch.randomizedtesting.RandomizedTest; import org.elasticsearch.common.io.Streams; +import org.elasticsearch.repositories.s3.DefaultS3OutputStream; +import org.elasticsearch.repositories.s3.S3BlobStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStoreContainerTests.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreContainerTests.java similarity index 97% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStoreContainerTests.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreContainerTests.java index 187ce9b23b4..f054967d62f 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStoreContainerTests.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreContainerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import org.elasticsearch.common.blobstore.BlobStore; import org.elasticsearch.common.settings.Settings; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStoreTests.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreTests.java similarity index 97% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStoreTests.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreTests.java index 31e7b2cfb30..17bea5239fe 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStoreTests.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreTests.java @@ -17,11 +17,12 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.StorageClass; import org.elasticsearch.common.blobstore.BlobStoreException; +import org.elasticsearch.repositories.s3.S3BlobStore; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTests.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3OutputStreamTests.java similarity index 99% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTests.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3OutputStreamTests.java index 0518d657e23..8f4c7daea7e 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTests.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3OutputStreamTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws.blobstore; +package org.elasticsearch.repositories.s3; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java index cc9e766aecb..f8c20de634a 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.repositories.s3; import com.amazonaws.services.s3.AbstractAmazonS3; import com.amazonaws.services.s3.AmazonS3; -import org.elasticsearch.cloud.aws.AwsS3Service; import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.settings.SecureString; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAmazonS3.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/TestAmazonS3.java similarity index 99% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAmazonS3.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/TestAmazonS3.java index 33458c0ab7c..b483c168d6d 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAmazonS3.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/TestAmazonS3.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.repositories.s3; import com.amazonaws.AmazonClientException; import com.amazonaws.AmazonServiceException; diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/TestAwsS3Service.java similarity index 93% rename from plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java rename to plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/TestAwsS3Service.java index 554e913c676..c67968899f2 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/TestAwsS3Service.java @@ -16,15 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cloud.aws; + +package org.elasticsearch.repositories.s3; import java.util.IdentityHashMap; import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3Client; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.plugin.repository.s3.S3RepositoryPlugin; public class TestAwsS3Service extends InternalAwsS3Service { public static class TestPlugin extends S3RepositoryPlugin {