Skip to content

HDDS-11830. Subcommands should not extend GenericCli #7537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nandakumar131 merged 1 commit into from
Dec 7, 2024
Merged

HDDS-11830. Subcommands should not extend GenericCli #7537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -63,23 +62,14 @@
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,
Expand Down
14 changes: 1 addition & 13 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/OMAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,8 +37,6 @@
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;

Expand All @@ -64,24 +61,15 @@
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)) {
Expand Down
14 changes: 1 addition & 13 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -44,21 +41,12 @@
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;
}
}
7 changes: 1 addition & 6 deletions ...ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/segmentparser/RatisLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -39,9 +38,5 @@
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 {
}
Loading