This is an automated email from the ASF dual-hosted git repository.
nanda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 51c6ed65ad HDDS-11830. Subcommands should not extend GenericCli
.(#7537)
51c6ed65ad is described below
commit 51c6ed65add3775ff7f4481aacccf5015e354b2b
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat Dec 7 07:21:00 2024 +0100
HDDS-11830. Subcommands should not extend GenericCli .(#7537)
---
.../hadoop/ozone/admin/nssummary/NSSummaryAdmin.java | 12 +-----------
.../java/org/apache/hadoop/ozone/admin/om/OMAdmin.java | 14 +-------------
.../java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java | 14 +-------------
.../hadoop/ozone/debug/segmentparser/RatisLogParser.java | 7 +------
4 files changed, 4 insertions(+), 43 deletions(-)
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
index af039cfff6..ef9be49abf 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.admin.nssummary;
import org.apache.hadoop.fs.ozone.OzoneClientUtils;
-import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.OzoneAdmin;
import org.apache.hadoop.hdds.cli.AdminSubcommand;
@@ -63,23 +62,14 @@ import static
org.apache.hadoop.hdds.server.http.HttpServer2.HTTP_SCHEME;
FileSizeDistSubCommand.class
})
@MetaInfServices(AdminSubcommand.class)
-public class NSSummaryAdmin extends GenericCli implements AdminSubcommand {
+public class NSSummaryAdmin implements AdminSubcommand {
@CommandLine.ParentCommand
private OzoneAdmin parent;
- @CommandLine.Spec
- private CommandLine.Model.CommandSpec spec;
-
public OzoneAdmin getParent() {
return parent;
}
- @Override
- public Void call() throws Exception {
- GenericCli.missingSubcommand(spec);
- return null;
- }
-
private boolean isObjectStoreBucket(OzoneBucket bucket, ObjectStore
objectStore) {
boolean enableFileSystemPaths = getOzoneConfig()
.getBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
index 9e2e31b6f8..9076ce9bf7 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.ozone.admin.om;
-import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.OzoneAdmin;
import org.apache.hadoop.hdds.cli.AdminSubcommand;
@@ -38,8 +37,6 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY;
import org.apache.ratis.protocol.ClientId;
import org.kohsuke.MetaInfServices;
import picocli.CommandLine;
-import picocli.CommandLine.Model.CommandSpec;
-import picocli.CommandLine.Spec;
import java.util.Collection;
@@ -64,24 +61,15 @@ import java.util.Collection;
FetchKeySubCommand.class
})
@MetaInfServices(AdminSubcommand.class)
-public class OMAdmin extends GenericCli implements AdminSubcommand {
+public class OMAdmin implements AdminSubcommand {
@CommandLine.ParentCommand
private OzoneAdmin parent;
- @Spec
- private CommandSpec spec;
-
public OzoneAdmin getParent() {
return parent;
}
- @Override
- public Void call() throws Exception {
- GenericCli.missingSubcommand(spec);
- return null;
- }
-
public ClientProtocol createClient(String omServiceId) throws Exception {
OzoneConfiguration conf = parent.getOzoneConf();
if (OmUtils.isOmHAServiceId(conf, omServiceId)) {
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
index d31f752704..996485b13f 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
@@ -17,14 +17,11 @@
*/
package org.apache.hadoop.ozone.admin.scm;
-import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.OzoneAdmin;
import org.apache.hadoop.hdds.cli.AdminSubcommand;
import org.kohsuke.MetaInfServices;
import picocli.CommandLine;
-import picocli.CommandLine.Model.CommandSpec;
-import picocli.CommandLine.Spec;
/**
* Subcommand for admin operations related to SCM.
@@ -44,21 +41,12 @@ import picocli.CommandLine.Spec;
RotateKeySubCommand.class
})
@MetaInfServices(AdminSubcommand.class)
-public class ScmAdmin extends GenericCli implements AdminSubcommand {
+public class ScmAdmin implements AdminSubcommand {
@CommandLine.ParentCommand
private OzoneAdmin parent;
- @Spec
- private CommandSpec spec;
-
public OzoneAdmin getParent() {
return parent;
}
-
- @Override
- public Void call() throws Exception {
- GenericCli.missingSubcommand(spec);
- return null;
- }
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/segmentparser/RatisLogParser.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/segmentparser/RatisLogParser.java
index 653ea710ac..1fad2b607c 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/segmentparser/RatisLogParser.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/segmentparser/RatisLogParser.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.ozone.debug.segmentparser;
-import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.DebugSubcommand;
@@ -39,9 +38,5 @@ import picocli.CommandLine;
versionProvider = HddsVersionProvider.class,
mixinStandardHelpOptions = true)
@MetaInfServices(DebugSubcommand.class)
-public class RatisLogParser extends GenericCli implements DebugSubcommand {
-
- public static void main(String[] args) {
- new RatisLogParser().run(args);
- }
+public class RatisLogParser implements DebugSubcommand {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
