Repository: hadoop Updated Branches: refs/heads/branch-2 dfcbc1202 -> 2321b7303
HADOOP-13538. Deprecate getInstance and initialize methods with Path in TrashPolicy. Contributed by Yiqun Lin. (cherry picked from commit 092b4d5bfd02131d62723fc5673892305eb9fcef) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2321b730 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2321b730 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2321b730 Branch: refs/heads/branch-2 Commit: 2321b73037fcf7ea9ee60c1a94838233c3df8908 Parents: dfcbc12 Author: Akira Ajisaka <[email protected]> Authored: Wed Aug 24 16:47:52 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Wed Aug 24 16:50:11 2016 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/TrashPolicy.java | 4 ++++ .../src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java | 4 ++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2321b730/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java index 92a4d1f..157b9ab 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java @@ -42,7 +42,9 @@ public abstract class TrashPolicy extends Configured { * @param conf the configuration to be used * @param fs the filesystem to be used * @param home the home directory + * @deprecated Use {@link #initialize(Configuration, FileSystem)} instead. */ + @Deprecated public abstract void initialize(Configuration conf, FileSystem fs, Path home); /** @@ -116,7 +118,9 @@ public abstract class TrashPolicy extends Configured { * @param fs the file system to be used * @param home the home directory * @return an instance of TrashPolicy + * @deprecated Use {@link #getInstance(Configuration, FileSystem)} instead. */ + @Deprecated public static TrashPolicy getInstance(Configuration conf, FileSystem fs, Path home) { Class<? extends TrashPolicy> trashClass = conf.getClass( "fs.trash.classname", TrashPolicyDefault.class, TrashPolicy.class); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2321b730/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java index 66ef890..72222be 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java @@ -75,7 +75,11 @@ public class TrashPolicyDefault extends TrashPolicy { initialize(conf, fs); } + /** + * @deprecated Use {@link #initialize(Configuration, FileSystem)} instead. + */ @Override + @Deprecated public void initialize(Configuration conf, FileSystem fs, Path home) { this.fs = fs; this.deletionInterval = (long)(conf.getFloat( --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
