浏览代码

MAPREDUCE-6717. Remove deprecated StringUtils.getFormattedTimeWithDiff. Contributed by Shen Yinjie.

(cherry picked from commit d1626a7b37472f8b76bfbd5ee484cefa7cba7d3d)
Akira Ajisaka 8 年之前
父节点
当前提交
f78be97469

+ 0 - 21
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java

@@ -22,7 +22,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.StringWriter;
 import java.net.URI;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URISyntaxException;
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collection;
@@ -322,26 +321,6 @@ public class StringUtils {
     return buf.toString();
     return buf.toString();
   }
   }
 
 
-  /**
-   * @param dateFormat date format to use
-   * @param finishTime finish time
-   * @param startTime  start time
-   * @return formatted value.
-   * Formats time in ms and appends difference (finishTime - startTime)
-   * as returned by formatTimeDiff().
-   * If finish time is 0, empty string is returned, if start time is 0
-   * then difference is not appended to return value.
-   * @deprecated Use
-   * {@link StringUtils#getFormattedTimeWithDiff(FastDateFormat, long, long)} or
-   * {@link StringUtils#getFormattedTimeWithDiff(String, long, long)} instead.
-   */
-  @Deprecated
-  public static String getFormattedTimeWithDiff(DateFormat dateFormat,
-      long finishTime, long startTime){
-    String formattedFinishTime = dateFormat.format(finishTime);
-    return getFormattedTimeWithDiff(formattedFinishTime, finishTime, startTime);
-  }
-
   /**
   /**
    * Formats time in ms and appends difference (finishTime - startTime)
    * Formats time in ms and appends difference (finishTime - startTime)
    * as returned by formatTimeDiff().
    * as returned by formatTimeDiff().