Repository: hadoop Updated Branches: refs/heads/branch-2 8f500942d -> f78be9746
MAPREDUCE-6717. Remove deprecated StringUtils.getFormattedTimeWithDiff. Contributed by Shen Yinjie. (cherry picked from commit d1626a7b37472f8b76bfbd5ee484cefa7cba7d3d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f78be974 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f78be974 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f78be974 Branch: refs/heads/branch-2 Commit: f78be974691b5b6ae75e62e209d9b3f17f1670e3 Parents: 8f50094 Author: Akira Ajisaka <aajis...@apache.org> Authored: Thu Jul 7 11:18:43 2016 -0700 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Thu Jul 7 11:19:33 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/util/StringUtils.java | 21 -------------------- 1 file changed, 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f78be974/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java index e8d76a3..11a93de 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java +++ b/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.net.URI; import java.net.URISyntaxException; -import java.text.DateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -323,26 +322,6 @@ public class StringUtils { } /** - * @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) * as returned by formatTimeDiff(). * If finish time is 0, empty string is returned, if start time is 0 --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
