Move TrashPolicy#initialize out of getTrashPolicy

Author: ivandika3

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java

@@ -3449,9 +3449,7 @@ public Collection<? extends BlockStoragePolicySpi> getAllStoragePolicies()
   public TrashPolicy getTrashPolicy(Configuration conf) {
     Class<? extends TrashPolicy> trashClass = conf.getClass(
         "fs.trash.classname", TrashPolicyDefault.class, TrashPolicy.class);
-    TrashPolicy trashPolicy = ReflectionUtils.newInstance(trashClass, conf);
-    trashPolicy.initialize(conf, this); // initialize TrashPolicy
-    return trashPolicy;
+    return ReflectionUtils.newInstance(trashClass, conf);
   }
 
   /**

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

@@ -167,6 +167,8 @@ public static TrashPolicy getInstance(Configuration conf, FileSystem fs, Path ho
    * @return an instance of TrashPolicy
    */
   public static TrashPolicy getInstance(Configuration conf, FileSystem fs) {
-    return fs.getTrashPolicy(conf);
+    TrashPolicy trashPolicy = fs.getTrashPolicy(conf);
+    trashPolicy.initialize(conf, fs); // initialize TrashPolicy
+    return trashPolicy;
   }
 }