Skip to content

Commit 798b33c

Browse files
author
slfan1989
committed
HADOOP-18359. Fix CheckStyle.
1 parent 297c639 commit 798b33c

File tree

6 files changed

+76
-75
lines changed

6 files changed

+76
-75
lines changed

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@
3030

3131
import org.apache.commons.cli.CommandLine;
3232
import org.apache.commons.cli.CommandLineParser;
33-
import org.apache.commons.cli.GnuParser;
33+
import org.apache.commons.cli.DefaultParser;
3434
import org.apache.commons.cli.HelpFormatter;
3535
import org.apache.commons.cli.Option;
36-
import org.apache.commons.cli.OptionBuilder;
3736
import org.apache.commons.cli.Options;
3837
import org.apache.commons.cli.ParseException;
3938
import org.apache.hadoop.conf.Configuration;
@@ -553,7 +552,7 @@ public MyOptions(String[] args) {
553552

554553
try {
555554
Options opts = buildOptions();
556-
CommandLineParser parser = new GnuParser();
555+
CommandLineParser parser = new DefaultParser();
557556
CommandLine line = parser.parse(opts, args, true);
558557
processOptions(line, opts);
559558
validateOptions();

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/RPCCallBenchmark.java‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -91,75 +91,75 @@ private void validateOptions() throws ParseException {
9191
private Options buildOptions() {
9292
Options opts = new Options();
9393
opts.addOption(
94-
Option.builder("s")
95-
.longOpt("serverThreads")
96-
.hasArg(true)
97-
.argName("numthreads")
98-
.desc("number of server threads (handlers) to run (or 0 to not run server)")
99-
.build());
94+
Option.builder("s")
95+
.longOpt("serverThreads")
96+
.hasArg(true)
97+
.argName("numthreads")
98+
.desc("number of server threads (handlers) to run (or 0 to not run server)")
99+
.build());
100100

101101
opts.addOption(
102-
Option.builder("r")
103-
.longOpt("serverReaderThreads")
104-
.hasArg(true)
105-
.argName("threads")
106-
.desc("number of server reader threads to run")
107-
.build());
102+
Option.builder("r")
103+
.longOpt("serverReaderThreads")
104+
.hasArg(true)
105+
.argName("threads")
106+
.desc("number of server reader threads to run")
107+
.build());
108108

109109
opts.addOption(
110-
Option.builder("c")
111-
.longOpt("clientThreads")
112-
.hasArg(true)
113-
.argName("numthreads")
114-
.desc("number of client threads to run (or 0 to not run client)")
115-
.build());
110+
Option.builder("c")
111+
.longOpt("clientThreads")
112+
.hasArg(true)
113+
.argName("numthreads")
114+
.desc("number of client threads to run (or 0 to not run client)")
115+
.build());
116116

117117
opts.addOption(
118-
Option.builder("m")
119-
.longOpt("messageSize")
120-
.hasArg(true)
121-
.argName("bytes")
122-
.desc("size of call parameter in bytes")
123-
.build());
118+
Option.builder("m")
119+
.longOpt("messageSize")
120+
.hasArg(true)
121+
.argName("bytes")
122+
.desc("size of call parameter in bytes")
123+
.build());
124124

125125
opts.addOption(
126-
Option.builder("t")
127-
.longOpt("time")
128-
.hasArg(true)
129-
.argName("seconds")
130-
.desc("number of seconds to run clients for")
131-
.build());
126+
Option.builder("t")
127+
.longOpt("time")
128+
.hasArg(true)
129+
.argName("seconds")
130+
.desc("number of seconds to run clients for")
131+
.build());
132132

133133
opts.addOption(
134-
Option.builder("p")
135-
.longOpt("port")
136-
.hasArg(true)
137-
.argName("port")
138-
.desc("port to listen or connect on")
139-
.build());
134+
Option.builder("p")
135+
.longOpt("port")
136+
.hasArg(true)
137+
.argName("port")
138+
.desc("port to listen or connect on")
139+
.build());
140140

141141
opts.addOption(
142-
Option.builder("h")
143-
.longOpt("host")
144-
.hasArg(true)
145-
.argName("addr")
146-
.desc("host to listen or connect on")
147-
.build());
142+
Option.builder("h")
143+
.longOpt("host")
144+
.hasArg(true)
145+
.argName("addr")
146+
.desc("host to listen or connect on")
147+
.build());
148148

149149
opts.addOption(
150-
Option.builder("e")
151-
.longOpt("engine")
152-
.hasArg(true)
153-
.argName("protobuf")
154-
.desc("engine to use")
155-
.build());
150+
Option.builder("e")
151+
.longOpt("engine")
152+
.hasArg(true)
153+
.argName("protobuf")
154+
.desc("engine to use")
155+
.build());
156156

157157
opts.addOption(
158-
Option.builder("?")
159-
.longOpt("help")
160-
.hasArg(false)
161-
.desc("show this screen")
162-
.build());
158+
Option.builder("?")
159+
.longOpt("help")
160+
.hasArg(false)
161+
.desc("show this screen")
162+
.build());
163163

164164
return opts;
165165
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.Map;
3535

3636
import org.apache.commons.cli.Option;
37-
import org.apache.commons.cli.OptionBuilder;
3837
import org.apache.commons.cli.Options;
3938
import org.apache.commons.math3.util.Pair;
4039
import org.apache.hadoop.conf.Configuration;
@@ -198,10 +197,11 @@ public void testEmptyFilenames() throws Exception {
198197
@Test
199198
public void testCreateWithOptions() throws Exception {
200199
// Create new option newOpt
201-
Option opt = OptionBuilder.withArgName("int")
202-
.hasArg()
203-
.withDescription("A new option")
204-
.create("newOpt");
200+
201+
Option opt = Option.builder("newOpt").argName("int")
202+
.hasArg()
203+
.desc("A new option")
204+
.build();
205205
Options opts = new Options();
206206
opts.addOption(opt);
207207

‎hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/JMXGet.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.commons.cli.GnuParser;
4040
import org.apache.commons.cli.HelpFormatter;
4141
import org.apache.commons.cli.Option;
42-
import org.apache.commons.cli.OptionBuilder;
4342
import org.apache.commons.cli.Options;
4443
import org.apache.commons.cli.ParseException;
4544

@@ -247,33 +246,33 @@ private static void err(String msg) {
247246
private static CommandLine parseArgs(Options opts, String... args)
248247
throws IllegalArgumentException {
249248

250-
Option jmx_service = Option.builder("service")
249+
Option jmxService = Option.builder("service")
251250
.argName("NameNode|DataNode").hasArg()
252251
.desc("specify jmx service (NameNode by default)").build();
253252

254-
Option jmx_server = Option.builder("server")
253+
Option jmxServer = Option.builder("server")
255254
.argName("mbean server").hasArg()
256255
.desc("specify mbean server (localhost by default)").build();
257256

258-
Option jmx_help = Option.builder("help").desc("print help").build();
257+
Option jmxHelp = Option.builder("help").desc("print help").build();
259258

260-
Option jmx_port = Option.builder("port")
259+
Option jmxPort = Option.builder("port")
261260
.argName("mbean server port")
262261
.hasArg().desc("specify mbean server port, "
263262
+ "if missing - it will try to connect to MBean Server in the same VM").build();
264263

265-
Option jmx_localVM = Option.builder("localVM")
264+
Option jmxLocalVM = Option.builder("localVM")
266265
.argName("VM's connector url").hasArg()
267266
.desc("connect to the VM on the same machine;"
268267
+ "\n use:\n jstat -J-Djstat.showUnsupported=true -snap <vmpid> | "
269268
+ "grep sun.management.JMXConnectorServer.address\n "
270269
+ "to find the url").build();
271270

272-
opts.addOption(jmx_server);
273-
opts.addOption(jmx_help);
274-
opts.addOption(jmx_service);
275-
opts.addOption(jmx_port);
276-
opts.addOption(jmx_localVM);
271+
opts.addOption(jmxServer);
272+
opts.addOption(jmxHelp);
273+
opts.addOption(jmxService);
274+
opts.addOption(jmxPort);
275+
opts.addOption(jmxLocalVM);
277276

278277
CommandLine commandLine = null;
279278
CommandLineParser parser = new GnuParser();

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/pipes/Submitter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,14 @@ static class CommandLineParser {
345345

346346
void addOption(String longName, boolean required, String description,
347347
String paramName) {
348-
Option option = Option.builder(longName).argName(paramName).hasArg().desc(description).required(required).build();
348+
Option option = Option.builder(longName).argName(paramName)
349+
.hasArg().desc(description).required(required).build();
349350
options.addOption(option);
350351
}
351352

352353
void addArgument(String name, boolean required, String description) {
353-
Option option = Option.builder().argName(name).hasArg().desc(description).required(required).build();
354+
Option option = Option.builder().argName(name)
355+
.hasArg().desc(description).required(required).build();
354356
options.addOption(option);
355357

356358
}

‎hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateBlockImagesDriver.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public GenerateBlockImagesDriver(Configuration conf) {
6565
public int run(String[] args) throws Exception {
6666
Options options = new Options();
6767
options.addOption("h", "help", false, "Shows this message");
68-
options.addOption(Option.builder(FSIMAGE_INPUT_PATH_ARG).argName("Input path of the XML fsImage")
68+
options.addOption(Option.builder(FSIMAGE_INPUT_PATH_ARG)
69+
.argName("Input path of the XML fsImage")
6970
.hasArg().required(true)
7071
.desc("Input path to the Hadoop fsImage XML file (required)")
7172
.build());

0 commit comments

Comments
 (0)