Repository: hadoop Updated Branches: refs/heads/trunk c37346d0e -> 092b4d5bf
HADOOP-13538. Deprecate getInstance and initialize methods with Path in TrashPolicy. Contributed by Yiqun Lin. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/092b4d5b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/092b4d5b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/092b4d5b Branch: refs/heads/trunk Commit: 092b4d5bfd02131d62723fc5673892305eb9fcef Parents: c37346d Author: Akira Ajisaka <[email protected]> Authored: Wed Aug 24 16:47:52 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Wed Aug 24 16:47:52 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/092b4d5b/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/092b4d5b/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]
