Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-13538. Deprecate getInstance and initialize methods with Path in TrashPolicy. Contributed by Yiqun Lin. 

(cherry picked from commit 092b4d5bfd)
This commit is contained in:
Akira Ajisaka 2016-08-24 16:47:52 +09:00
parent dfcbc12026
commit 2321b73037
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java
View File

@ -42,7 +42,9 @@ public abstract class TrashPolicy extends Configured {
* @param conf the configuration to be used * @param conf the configuration to be used
* @param fs the filesystem to be used * @param fs the filesystem to be used
* @param home the home directory * @param home the home directory
* @deprecated Use {@link #initialize(Configuration, FileSystem)} instead.
*/ */
@Deprecated
public abstract void initialize(Configuration conf, FileSystem fs, Path home); 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 fs the file system to be used
* @param home the home directory * @param home the home directory
* @return an instance of TrashPolicy * @return an instance of TrashPolicy
* @deprecated Use {@link #getInstance(Configuration, FileSystem)} instead.
*/ */
@Deprecated
public static TrashPolicy getInstance(Configuration conf, FileSystem fs, Path home) { public static TrashPolicy getInstance(Configuration conf, FileSystem fs, Path home) {
Class<? extends TrashPolicy> trashClass = conf.getClass( Class<? extends TrashPolicy> trashClass = conf.getClass(
"fs.trash.classname", TrashPolicyDefault.class, TrashPolicy.class); "fs.trash.classname", TrashPolicyDefault.class, TrashPolicy.class);

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
View File

@ -75,7 +75,11 @@ public class TrashPolicyDefault extends TrashPolicy {
initialize(conf, fs); initialize(conf, fs);
} }
/**
* @deprecated Use {@link #initialize(Configuration, FileSystem)} instead.
*/
@Override @Override
@Deprecated
public void initialize(Configuration conf, FileSystem fs, Path home) { public void initialize(Configuration conf, FileSystem fs, Path home) {
this.fs = fs; this.fs = fs;
this.deletionInterval = (long)(conf.getFloat( this.deletionInterval = (long)(conf.getFloat(