Skip to content

Commit d1e2b80

Browse files
tasanumaaajisaka
tasanuma
authored and
aajisaka
committed
MAPREDUCE-7098. Upgrade common-langs version to 3.7 in hadoop-mapreduce-project
Signed-off-by: Akira Ajisaka <[email protected]>
1 parent 02c4b89 commit d1e2b80

File tree

22 files changed

+39
-44
lines changed

22 files changed

+39
-44
lines changed

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import java.util.regex.Pattern;
3737

3838
import org.apache.commons.lang.SystemUtils;
39-
import org.apache.commons.lang.time.FastDateFormat;
39+
import org.apache.commons.lang3.time.FastDateFormat;
4040
import org.apache.hadoop.classification.InterfaceAudience;
4141
import org.apache.hadoop.classification.InterfaceStability;
4242
import org.apache.hadoop.fs.Path;

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import java.util.concurrent.TimeUnit;
4141
import java.util.regex.Pattern;
4242

43-
import org.apache.commons.lang.time.FastDateFormat;
43+
import org.apache.commons.lang3.time.FastDateFormat;
4444
import org.apache.hadoop.test.UnitTestcaseTimeLimit;
4545
import org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
4646
import org.junit.Test;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.hadoop.mapreduce.v2.app.job.impl;
2020

21-
import static org.apache.commons.lang.StringUtils.isEmpty;
21+
import static org.apache.commons.lang3.StringUtils.isEmpty;
2222

2323
import java.io.IOException;
2424
import java.net.InetAddress;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import javax.servlet.http.HttpServletResponse;
2727

28-
import org.apache.commons.lang.StringUtils;
28+
import org.apache.commons.lang3.StringUtils;
2929
import org.apache.hadoop.conf.Configuration;
3030
import org.apache.hadoop.mapreduce.JobACL;
3131
import org.apache.hadoop.mapreduce.v2.api.records.JobId;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.EnumSet;
2828
import java.util.Collection;
2929

30-
import org.apache.commons.lang.StringEscapeUtils;
30+
import org.apache.commons.lang3.StringEscapeUtils;
3131
import org.apache.hadoop.conf.Configuration;
3232
import org.apache.hadoop.mapreduce.MRConfig;
3333
import org.apache.hadoop.mapreduce.v2.api.records.JobId;
@@ -134,8 +134,8 @@ protected void render(Block html) {
134134
.append(getAttemptId(taskId, ta)).append("\",\"")
135135
.append(progress).append("\",\"")
136136
.append(ta.getState().toString()).append("\",\"")
137-
.append(StringEscapeUtils.escapeJavaScript(
138-
StringEscapeUtils.escapeHtml(ta.getStatus()))).append("\",\"")
137+
.append(StringEscapeUtils.escapeEcmaScript(
138+
StringEscapeUtils.escapeHtml4(ta.getStatus()))).append("\",\"")
139139

140140
.append(nodeHttpAddr == null ? "N/A" :
141141
"<a class='nodelink' href='" + MRWebAppUtil.getYARNWebappScheme() + nodeHttpAddr + "'>"
@@ -151,8 +151,8 @@ protected void render(Block html) {
151151
.append(ta.getStartTime()).append("\",\"")
152152
.append(ta.getFinishTime()).append("\",\"")
153153
.append(ta.getElapsedTime()).append("\",\"")
154-
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
155-
diag)));
154+
.append(StringEscapeUtils.escapeEcmaScript(
155+
StringEscapeUtils.escapeHtml4(diag)));
156156
if (enableUIActions) {
157157
attemptsTableData.append("\",\"");
158158
if (EnumSet.of(

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlock.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import static org.apache.hadoop.yarn.webapp.view.JQueryUI.C_PROGRESSBAR;
2525
import static org.apache.hadoop.yarn.webapp.view.JQueryUI.C_PROGRESSBAR_VALUE;
2626

27-
import org.apache.commons.lang.StringEscapeUtils;
27+
import org.apache.commons.lang3.StringEscapeUtils;
2828
import org.apache.hadoop.mapreduce.v2.api.records.TaskType;
2929
import org.apache.hadoop.mapreduce.v2.app.job.Task;
3030
import org.apache.hadoop.mapreduce.v2.app.webapp.dao.TaskInfo;
@@ -103,8 +103,8 @@ public class TasksBlock extends HtmlBlock {
103103
.append(join(pct, '%')).append("'> ").append("<div class='")
104104
.append(C_PROGRESSBAR_VALUE).append("' style='")
105105
.append(join("width:", pct, '%')).append("'> </div> </div>\",\"")
106-
.append(StringEscapeUtils.escapeJavaScript(
107-
StringEscapeUtils.escapeHtml(info.getStatus()))).append("\",\"")
106+
.append(StringEscapeUtils.escapeEcmaScript(
107+
StringEscapeUtils.escapeHtml4(info.getStatus()))).append("\",\"")
108108

109109
.append(info.getState()).append("\",\"")
110110
.append(info.getStartTime()).append("\",\"")

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.io.IOException;
2323
import java.util.Iterator;
2424

25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626
import org.apache.hadoop.conf.Configuration;
2727
import org.apache.hadoop.fs.Path;
2828
import org.apache.hadoop.mapreduce.JobACL;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/checkpoint/RandomNameCNS.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package org.apache.hadoop.mapreduce.checkpoint;
1919

20-
import org.apache.commons.lang.RandomStringUtils;
20+
import org.apache.commons.lang3.RandomStringUtils;
2121

2222
/**
2323
* Simple naming service that generates a random checkpoint name.

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HumanReadableHistoryViewerPrinter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package org.apache.hadoop.mapreduce.jobhistory;
1919

20-
import org.apache.commons.lang.time.FastDateFormat;
20+
import org.apache.commons.lang3.time.FastDateFormat;
2121
import org.apache.hadoop.classification.InterfaceAudience;
2222
import org.apache.hadoop.classification.InterfaceStability;
2323
import org.apache.hadoop.mapred.JobStatus;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/PathOutputCommitterFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
2525

26-
import org.apache.commons.lang.StringUtils;
26+
import org.apache.commons.lang3.StringUtils;
2727
import org.apache.hadoop.classification.InterfaceAudience;
2828
import org.apache.hadoop.classification.InterfaceStability;
2929
import org.apache.hadoop.conf.Configuration;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.HashSet;
2323
import java.util.Set;
2424

25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626
import org.apache.hadoop.classification.InterfaceAudience;
2727
import org.apache.hadoop.classification.InterfaceStability;
2828
import org.apache.hadoop.conf.Configuration;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.util.Arrays;
3232

3333
import com.google.common.annotations.VisibleForTesting;
34-
import org.apache.commons.lang.StringUtils;
34+
import org.apache.commons.lang3.StringUtils;
3535
import org.apache.hadoop.classification.InterfaceAudience;
3636
import org.apache.hadoop.classification.InterfaceStability;
3737
import org.apache.hadoop.classification.InterfaceAudience.Private;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestRehashPartitioner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.Arrays;
2323
import java.util.Collections;
2424

25-
import org.apache.commons.lang.ArrayUtils;
25+
import org.apache.commons.lang3.ArrayUtils;
2626
import org.apache.hadoop.io.IntWritable;
2727
import org.apache.hadoop.io.NullWritable;
2828

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobsBlock.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.text.SimpleDateFormat;
2222
import java.util.Date;
2323

24-
import org.apache.commons.lang.StringEscapeUtils;
24+
import org.apache.commons.lang3.StringEscapeUtils;
2525
import org.apache.hadoop.mapreduce.v2.app.AppContext;
2626
import org.apache.hadoop.mapreduce.v2.app.job.Job;
2727
import org.apache.hadoop.mapreduce.v2.hs.webapp.dao.JobInfo;
@@ -83,11 +83,11 @@ public class HsJobsBlock extends HtmlBlock {
8383
.append(dateFormat.format(new Date(job.getFinishTime()))).append("\",\"")
8484
.append("<a href='").append(url("job", job.getId())).append("'>")
8585
.append(job.getId()).append("</a>\",\"")
86-
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
86+
.append(StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(
8787
job.getName()))).append("\",\"")
88-
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
88+
.append(StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(
8989
job.getUserName()))).append("\",\"")
90-
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
90+
.append(StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(
9191
job.getQueueName()))).append("\",\"")
9292
.append(job.getState()).append("\",\"")
9393
.append(String.valueOf(job.getMapsTotal())).append("\",\"")

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import java.util.Collection;
3131

32-
import org.apache.commons.lang.StringEscapeUtils;
32+
import org.apache.commons.lang3.StringEscapeUtils;
3333
import org.apache.hadoop.mapreduce.v2.api.records.TaskId;
3434
import org.apache.hadoop.mapreduce.v2.api.records.TaskType;
3535
import org.apache.hadoop.mapreduce.v2.app.job.TaskAttempt;
@@ -147,8 +147,8 @@ protected void render(Block html) {
147147
attemptsTableData.append("[\"")
148148
.append(getAttemptId(taskId, ta)).append("\",\"")
149149
.append(ta.getState()).append("\",\"")
150-
.append(StringEscapeUtils.escapeJavaScript(
151-
StringEscapeUtils.escapeHtml(ta.getStatus()))).append("\",\"")
150+
.append(StringEscapeUtils.escapeEcmaScript(
151+
StringEscapeUtils.escapeHtml4(ta.getStatus()))).append("\",\"")
152152

153153
.append("<a class='nodelink' href='" + MRWebAppUtil.getYARNWebappScheme() + nodeHttpAddr + "'>")
154154
.append(nodeRackName + "/" + nodeHttpAddr + "</a>\",\"")
@@ -171,8 +171,8 @@ protected void render(Block html) {
171171
.append(elapsedReduceTime).append("\",\"");
172172
}
173173
attemptsTableData.append(attemptElapsed).append("\",\"")
174-
.append(StringEscapeUtils.escapeJavaScript(
175-
StringEscapeUtils.escapeHtml(ta.getNote())))
174+
.append(StringEscapeUtils.escapeEcmaScript(
175+
StringEscapeUtils.escapeHtml4(ta.getNote())))
176176
.append("\"],\n");
177177
}
178178
//Remove the last comma and close off the array of arrays

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientCache.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.security.PrivilegedAction;
2323
import java.util.HashMap;
2424
import java.util.Map;
25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626
import org.apache.hadoop.conf.Configuration;
2727
import org.apache.hadoop.ipc.RPC;
2828
import org.apache.hadoop.mapreduce.JobID;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.List;
2929
import java.util.concurrent.atomic.AtomicBoolean;
3030

31-
import org.apache.commons.lang.StringUtils;
31+
import org.apache.commons.lang3.StringUtils;
3232
import org.apache.hadoop.conf.Configuration;
3333
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
3434
import org.apache.hadoop.ipc.RPC;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/NotRunningJob.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.ArrayList;
2424
import java.util.HashMap;
2525

26-
import org.apache.commons.lang.NotImplementedException;
26+
import org.apache.commons.lang3.NotImplementedException;
2727
import org.apache.hadoop.mapreduce.v2.api.MRClientProtocol;
2828
import org.apache.hadoop.mapreduce.v2.api.protocolrecords.CancelDelegationTokenRequest;
2929
import org.apache.hadoop.mapreduce.v2.api.protocolrecords.CancelDelegationTokenResponse;
@@ -167,7 +167,7 @@ public GetTaskAttemptCompletionEventsResponse getTaskAttemptCompletionEvents(
167167
public GetTaskAttemptReportResponse getTaskAttemptReport(
168168
GetTaskAttemptReportRequest request) throws IOException {
169169
//not invoked by anybody
170-
throw new NotImplementedException();
170+
throw new NotImplementedException("Code is not implemented");
171171
}
172172

173173
@Override
@@ -222,26 +222,26 @@ public KillTaskAttemptResponse killTaskAttempt(
222222
public GetDelegationTokenResponse getDelegationToken(
223223
GetDelegationTokenRequest request) throws IOException {
224224
/* Should not be invoked by anyone. */
225-
throw new NotImplementedException();
225+
throw new NotImplementedException("Code is not implemented");
226226
}
227227

228228
@Override
229229
public RenewDelegationTokenResponse renewDelegationToken(
230230
RenewDelegationTokenRequest request) throws IOException {
231231
/* Should not be invoked by anyone. */
232-
throw new NotImplementedException();
232+
throw new NotImplementedException("Code is not implemented");
233233
}
234234

235235
@Override
236236
public CancelDelegationTokenResponse cancelDelegationToken(
237237
CancelDelegationTokenRequest request) throws IOException {
238238
/* Should not be invoked by anyone. */
239-
throw new NotImplementedException();
239+
throw new NotImplementedException("Code is not implemented");
240240
}
241241

242242
@Override
243243
public InetSocketAddress getConnectAddress() {
244244
/* Should not be invoked by anyone. Normally used to set token service */
245-
throw new NotImplementedException();
245+
throw new NotImplementedException("Code is not implemented");
246246
}
247247
}

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.hadoop.mapred;
2020

21-
import static org.apache.commons.lang.StringUtils.isEmpty;
21+
import static org.apache.commons.lang3.StringUtils.isEmpty;
2222
import static org.apache.hadoop.mapreduce.MRJobConfig.MR_AM_RESOURCE_PREFIX;
2323

2424
import java.io.IOException;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.util.List;
3030
import java.util.StringTokenizer;
3131

32-
import org.apache.commons.lang.RandomStringUtils;
32+
import org.apache.commons.lang3.RandomStringUtils;
3333
import org.apache.hadoop.conf.Configuration;
3434
import org.apache.hadoop.fs.FSDataOutputStream;
3535
import org.apache.hadoop.fs.FileSystem;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.io.IOException;
2121
import java.lang.reflect.Field;
2222

23-
import org.apache.commons.lang.StringUtils;
23+
import org.apache.commons.lang3.StringUtils;
2424
import org.apache.hadoop.conf.Configuration;
2525
import org.apache.hadoop.io.NullWritable;
2626
import org.apache.hadoop.mapreduce.Job;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@
142142
<artifactId>commons-cli</artifactId>
143143
<scope>provided</scope>
144144
</dependency>
145-
<dependency>
146-
<groupId>commons-lang</groupId>
147-
<artifactId>commons-lang</artifactId>
148-
<scope>provided</scope>
149-
</dependency>
150145
<dependency>
151146
<groupId>commons-collections</groupId>
152147
<artifactId>commons-collections</artifactId>

0 commit comments

Comments
 (0)