hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject hadoop git commit: HADOOP-13239 Deprecate s3:// in branch-2
Date Wed, 29 Jun 2016 13:10:06 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 8a121dc3b -> 70a45e312


HADOOP-13239 Deprecate s3:// in branch-2


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/70a45e31
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/70a45e31
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/70a45e31

Branch: refs/heads/branch-2
Commit: 70a45e3122e7b24c7e0bd06bdead5ffd3af99108
Parents: 8a121dc
Author: Steve Loughran <stevel@apache.org>
Authored: Wed Jun 29 13:16:10 2016 +0100
Committer: Steve Loughran <stevel@apache.org>
Committed: Wed Jun 29 13:16:26 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/fs/s3/Block.java  |  1 +
 .../org/apache/hadoop/fs/s3/FileSystemStore.java  |  1 +
 .../main/java/org/apache/hadoop/fs/s3/INode.java  |  1 +
 .../hadoop/fs/s3/Jets3tFileSystemStore.java       |  1 +
 .../org/apache/hadoop/fs/s3/MigrationTool.java    |  1 +
 .../org/apache/hadoop/fs/s3/S3Credentials.java    |  1 +
 .../java/org/apache/hadoop/fs/s3/S3Exception.java |  1 +
 .../org/apache/hadoop/fs/s3/S3FileSystem.java     | 18 ++++++++++++++++++
 .../hadoop/fs/s3/S3FileSystemConfigKeys.java      |  1 +
 .../hadoop/fs/s3/S3FileSystemException.java       |  1 +
 .../org/apache/hadoop/fs/s3/S3InputStream.java    |  1 +
 .../org/apache/hadoop/fs/s3/S3OutputStream.java   |  1 +
 .../hadoop/fs/s3/VersionMismatchException.java    |  1 +
 .../apache/hadoop/fs/contract/s3/S3Contract.java  |  1 +
 .../fs/contract/s3/TestS3ContractCreate.java      |  1 +
 .../fs/contract/s3/TestS3ContractDelete.java      |  1 +
 .../fs/contract/s3/TestS3ContractMkdir.java       |  1 +
 .../hadoop/fs/contract/s3/TestS3ContractOpen.java |  1 +
 .../fs/contract/s3/TestS3ContractRename.java      |  1 +
 .../fs/contract/s3/TestS3ContractRootDir.java     |  1 +
 .../hadoop/fs/contract/s3/TestS3ContractSeek.java |  1 +
 .../hadoop/fs/s3/InMemoryFileSystemStore.java     |  1 +
 .../fs/s3/Jets3tS3FileSystemContractTest.java     |  1 +
 .../fs/s3/S3FileSystemContractBaseTest.java       |  1 +
 .../apache/hadoop/fs/s3/S3InMemoryFileSystem.java |  1 +
 .../java/org/apache/hadoop/fs/s3/TestINode.java   |  1 +
 .../fs/s3/TestInMemoryS3FileSystemContract.java   |  1 +
 .../apache/hadoop/fs/s3/TestS3Credentials.java    |  1 +
 .../org/apache/hadoop/fs/s3/TestS3FileSystem.java |  1 +
 .../hadoop/fs/s3/TestS3InMemoryFileSystem.java    |  1 +
 30 files changed, 47 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Block.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Block.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Block.java
index 6926f17..d09350d 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Block.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Block.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.classification.InterfaceStability;
  */
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
+@Deprecated
 public class Block {
   private long id;
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/FileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/FileSystemStore.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/FileSystemStore.java
index 3c7ed60..0646a76 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/FileSystemStore.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/FileSystemStore.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.fs.Path;
  */
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
+@Deprecated
 public interface FileSystemStore {
   
   void initialize(URI uri, Configuration conf) throws IOException;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/INode.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/INode.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/INode.java
index 5d08b77..0e14c4f 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/INode.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/INode.java
@@ -35,6 +35,7 @@ import org.apache.hadoop.io.IOUtils;
  */
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
+@Deprecated
 public class INode {
 	
   enum FileType {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
index e5387f3..27e8a8e3 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
@@ -50,6 +50,7 @@ import org.jets3t.service.security.AWSCredentials;
 
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
+@Deprecated
 class Jets3tFileSystemStore implements FileSystemStore {
   
   private static final String FILE_SYSTEM_NAME = "fs";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
index 429c272..7b42f9d 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
@@ -52,6 +52,7 @@ import org.jets3t.service.security.AWSCredentials;
  */
 @InterfaceAudience.Public
 @InterfaceStability.Unstable
+@Deprecated
 public class MigrationTool extends Configured implements Tool {
   
   private S3Service s3Service;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
index 3951a08..24d4be2 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.fs.s3native.S3xLoginHelper;
  */
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
+@Deprecated
 public class S3Credentials {
   
   private String accessKey;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Exception.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Exception.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Exception.java
index 4f07c4e..9363ace 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Exception.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Exception.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.classification.InterfaceStability;
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
+@Deprecated
 public class S3Exception extends IOException {
 
   private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystem.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystem.java
index 3f83f43..b681555 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystem.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystem.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.ParentNotDirectoryException;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.s3a.S3AFileSystem;
 import org.apache.hadoop.fs.s3native.NativeS3FileSystem;
 import org.apache.hadoop.fs.s3native.S3xLoginHelper;
 import org.apache.hadoop.io.retry.RetryPolicies;
@@ -50,11 +51,15 @@ import org.apache.hadoop.util.Progressable;
  * <a href="http://aws.amazon.com/s3">Amazon S3</a>.
  *
  * @see NativeS3FileSystem
+ * @deprecated Use {@link NativeS3FileSystem} and {@link S3AFileSystem} instead.
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
+@Deprecated
 public class S3FileSystem extends FileSystem {
 
+  private static boolean hasWarnedDeprecation = false;
+
   private URI uri;
 
   private FileSystemStore store;
@@ -62,14 +67,27 @@ public class S3FileSystem extends FileSystem {
   private Path workingDir;
 
   public S3FileSystem() {
+    warnDeprecation();
     // set store in initialize()
   }
 
   public S3FileSystem(FileSystemStore store) {
+    warnDeprecation();
     this.store = store;
   }
 
   /**
+   * This is to warn the first time in a JVM that an S3FileSystem is created.
+   */
+  private static synchronized void warnDeprecation() {
+    if (!hasWarnedDeprecation) {
+      System.err.println("S3FileSystem is deprecated and will be removed in " +
+          "future releases. Use NativeS3FileSystem or S3AFileSystem instead.");
+      hasWarnedDeprecation = true;
+    }
+  }
+
+  /**
    * Return the protocol scheme for the FileSystem.
    *
    * @return <code>s3</code>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
index 8172a46..0e3001e 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeys;
  */
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
+@Deprecated
 public class S3FileSystemConfigKeys extends CommonConfigurationKeys {
   public static final String  S3_BLOCK_SIZE_KEY = "s3.blocksize";
   public static final long    S3_BLOCK_SIZE_DEFAULT = 64*1024*1024;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
index cc1b463..665cfb4 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
@@ -27,6 +27,7 @@ import org.apache.hadoop.classification.InterfaceStability;
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
+@Deprecated
 public class S3FileSystemException extends IOException {
   private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3InputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3InputStream.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3InputStream.java
index 6f39f01..6226d74 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3InputStream.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3InputStream.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.fs.FileSystem;
 
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
+@Deprecated
 class S3InputStream extends FSInputStream {
 
   private FileSystemStore store;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3OutputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3OutputStream.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3OutputStream.java
index 761f2ce..699faa9 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3OutputStream.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3OutputStream.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.util.Progressable;
 
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
+@Deprecated
 class S3OutputStream extends OutputStream {
 
   private Configuration conf;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
index ccc8969..0478a32 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.classification.InterfaceStability;
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
+@Deprecated
 public class VersionMismatchException extends S3FileSystemException {
   private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/S3Contract.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/S3Contract.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/S3Contract.java
index 483b78c..ffb2619 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/S3Contract.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/S3Contract.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.fs.contract.AbstractBondedFSContract;
 /**
  * The contract of S3: only enabled if the test bucket is provided.
  */
+@Deprecated
 public class S3Contract extends AbstractBondedFSContract {
 
   public static final String CONTRACT_XML = "contract/s3.xml";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractCreate.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractCreate.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractCreate.java
index b8c758c..4e98db9 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractCreate.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractCreate.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.fs.contract.AbstractContractCreateTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 import org.apache.hadoop.fs.contract.ContractTestUtils;
 
+@Deprecated
 public class TestS3ContractCreate extends AbstractContractCreateTest {
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractDelete.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractDelete.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractDelete.java
index 2d3cec7..37b4ed2 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractDelete.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractDelete.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.contract.AbstractContractDeleteTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 
+@Deprecated
 public class TestS3ContractDelete extends AbstractContractDeleteTest {
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractMkdir.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractMkdir.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractMkdir.java
index 992ce53..1e6ac7f 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractMkdir.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractMkdir.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.fs.contract.AbstractContractMkdirTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 import org.apache.hadoop.fs.contract.ContractTestUtils;
 
+@Deprecated
 public class TestS3ContractMkdir extends AbstractContractMkdirTest {
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractOpen.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractOpen.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractOpen.java
index 2a4ba31..2af61de 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractOpen.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractOpen.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.fs.contract.AbstractContractOpenTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 import org.apache.hadoop.fs.contract.ContractTestUtils;
 
+@Deprecated
 public class TestS3ContractOpen extends AbstractContractOpenTest {
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRename.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRename.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRename.java
index 68bdbda..ba45478 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRename.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRename.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.contract.AbstractContractRenameTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 
+@Deprecated
 public class TestS3ContractRename extends AbstractContractRenameTest {
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRootDir.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRootDir.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRootDir.java
index aeb68ba..4a22304 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRootDir.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractRootDir.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 /**
  * root dir operations against an S3 bucket
  */
+@Deprecated
 public class TestS3ContractRootDir extends AbstractContractRootDirectoryTest {
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractSeek.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractSeek.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractSeek.java
index 5f9535f..b15c0a2 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractSeek.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3/TestS3ContractSeek.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.fs.contract.ContractTestUtils;
 import org.junit.Ignore;
 import org.junit.Test;
 
+@Deprecated
 public class TestS3ContractSeek extends AbstractContractSeekTest {
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java
index ed0de55..223bfd7 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/InMemoryFileSystemStore.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.fs.s3.INode.FileType;
  * A stub implementation of {@link FileSystemStore} for testing
  * {@link S3FileSystem} without actually connecting to S3.
  */
+@Deprecated
 public class InMemoryFileSystemStore implements FileSystemStore {
   
   private Configuration conf;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java
index 53b3c03..6f5825e 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/Jets3tS3FileSystemContractTest.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.fs.s3;
 
 import java.io.IOException;
 
+@Deprecated
 public class Jets3tS3FileSystemContractTest
   extends S3FileSystemContractBaseTest {
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java
index de106f8..9a6bebb 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3FileSystemContractBaseTest.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystemContractBaseTest;
 import org.junit.internal.AssumptionViolatedException;
 
+@Deprecated
 public abstract class S3FileSystemContractBaseTest
   extends FileSystemContractBaseTest {
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3InMemoryFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3InMemoryFileSystem.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3InMemoryFileSystem.java
index a4e9770..cd32039 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3InMemoryFileSystem.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/S3InMemoryFileSystem.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.fs.s3.InMemoryFileSystemStore;
  * A helper implementation of {@link S3FileSystem}
  * without actually connecting to S3 for unit testing.
  */
+@Deprecated
 public class S3InMemoryFileSystem extends S3FileSystem {
     public S3InMemoryFileSystem() {
         super(new InMemoryFileSystemStore());

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestINode.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestINode.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestINode.java
index 086a43e..660bcb4 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestINode.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestINode.java
@@ -25,6 +25,7 @@ import junit.framework.TestCase;
 
 import org.apache.hadoop.fs.s3.INode.FileType;
 
+@Deprecated
 public class TestINode extends TestCase {
 
   public void testSerializeFileWithSingleBlock() throws IOException {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java
index 5d66cf1..f94c283 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestInMemoryS3FileSystemContract.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.fs.s3;
 
 import java.io.IOException;
 
+@Deprecated
 public class TestInMemoryS3FileSystemContract
   extends S3FileSystemContractBaseTest {
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3Credentials.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3Credentials.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3Credentials.java
index bcd52c0..5c86e84 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3Credentials.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3Credentials.java
@@ -36,6 +36,7 @@ import org.junit.rules.TestName;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+@Deprecated
 public class TestS3Credentials {
   public static final Log LOG = LogFactory.getLog(TestS3Credentials.class);
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3FileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3FileSystem.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3FileSystem.java
index 4947f08..9c2bdfe 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3FileSystem.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3FileSystem.java
@@ -25,6 +25,7 @@ import junit.framework.TestCase;
 
 import org.apache.hadoop.conf.Configuration;
 
+@Deprecated
 public class TestS3FileSystem extends TestCase {
 
   public static final URI EXPECTED = URI.create("s3://c");

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70a45e31/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3InMemoryFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3InMemoryFileSystem.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3InMemoryFileSystem.java
index fbdcd68..e67db62 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3InMemoryFileSystem.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3/TestS3InMemoryFileSystem.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
 
+@Deprecated
 public class TestS3InMemoryFileSystem extends TestCase {
 
   private static final String TEST_PATH = "s3://test/data.txt";


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message