This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 db36e39ad0 HDDS-11822. Register subcommands in OzoneShell (#7513)
db36e39ad0 is described below
commit db36e39ad0fd8220a4a44f7741911e67da9866d3
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Dec 2 12:59:41 2024 +0100
HDDS-11822. Register subcommands in OzoneShell (#7513)
---
.../org/apache/hadoop/ozone/shell/OzoneShell.java | 20 ++++++++++++++++----
.../hadoop/ozone/shell/bucket/BucketCommands.java | 12 +-----------
.../apache/hadoop/ozone/shell/keys/KeyCommands.java | 11 +----------
.../hadoop/ozone/shell/prefix/PrefixCommands.java | 12 +-----------
.../ozone/shell/snapshot/SnapshotCommands.java | 12 +-----------
.../ozone/shell/tenant/TenantUserCommands.java | 11 +----------
.../hadoop/ozone/shell/token/TokenCommands.java | 11 +----------
.../hadoop/ozone/shell/volume/VolumeCommands.java | 12 +-----------
8 files changed, 23 insertions(+), 78 deletions(-)
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java
index 04b2c706f7..925e3bc13e 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java
@@ -19,6 +19,13 @@ package org.apache.hadoop.ozone.shell;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.tracing.TracingUtil;
+import org.apache.hadoop.ozone.shell.bucket.BucketCommands;
+import org.apache.hadoop.ozone.shell.keys.KeyCommands;
+import org.apache.hadoop.ozone.shell.prefix.PrefixCommands;
+import org.apache.hadoop.ozone.shell.snapshot.SnapshotCommands;
+import org.apache.hadoop.ozone.shell.tenant.TenantUserCommands;
+import org.apache.hadoop.ozone.shell.token.TokenCommands;
+import org.apache.hadoop.ozone.shell.volume.VolumeCommands;
import picocli.CommandLine.Command;
@@ -27,14 +34,19 @@ import picocli.CommandLine.Command;
*/
@Command(name = "ozone sh",
description = "Shell for Ozone object store",
+ subcommands = {
+ BucketCommands.class,
+ KeyCommands.class,
+ PrefixCommands.class,
+ SnapshotCommands.class,
+ TenantUserCommands.class,
+ TokenCommands.class,
+ VolumeCommands.class,
+ },
versionProvider = HddsVersionProvider.class,
mixinStandardHelpOptions = true)
public class OzoneShell extends Shell {
- public OzoneShell() {
- super(OzoneShell.class);
- }
-
/**
* Main for the ozShell Command handling.
*
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketCommands.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketCommands.java
index 80e26e0445..8a92de696a 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketCommands.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketCommands.java
@@ -23,12 +23,9 @@ import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.MissingSubcommandException;
-import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.shell.OzoneShell;
import org.apache.hadoop.ozone.shell.Shell;
-import org.kohsuke.MetaInfServices;
import picocli.CommandLine.Command;
import picocli.CommandLine.ParentCommand;
@@ -55,9 +52,7 @@ import picocli.CommandLine.ParentCommand;
},
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
-@MetaInfServices(SubcommandWithParent.class)
-public class BucketCommands implements GenericParentCommand, Callable<Void>,
- SubcommandWithParent {
+public class BucketCommands implements GenericParentCommand, Callable<Void> {
@ParentCommand
private Shell shell;
@@ -77,9 +72,4 @@ public class BucketCommands implements GenericParentCommand,
Callable<Void>,
public OzoneConfiguration createOzoneConfiguration() {
return shell.createOzoneConfiguration();
}
-
- @Override
- public Class<?> getParentType() {
- return OzoneShell.class;
- }
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyCommands.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyCommands.java
index bbef584143..f4ac9e1fe8 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyCommands.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyCommands.java
@@ -23,12 +23,9 @@ import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.MissingSubcommandException;
-import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.shell.OzoneShell;
import org.apache.hadoop.ozone.shell.Shell;
-import org.kohsuke.MetaInfServices;
import picocli.CommandLine.Command;
import picocli.CommandLine.ParentCommand;
@@ -55,9 +52,8 @@ import picocli.CommandLine.ParentCommand;
},
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
-@MetaInfServices(SubcommandWithParent.class)
public class KeyCommands
- implements GenericParentCommand, Callable<Void>, SubcommandWithParent {
+ implements GenericParentCommand, Callable<Void> {
@ParentCommand
private Shell shell;
@@ -77,9 +73,4 @@ public class KeyCommands
public OzoneConfiguration createOzoneConfiguration() {
return shell.createOzoneConfiguration();
}
-
- @Override
- public Class<?> getParentType() {
- return OzoneShell.class;
- }
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/prefix/PrefixCommands.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/prefix/PrefixCommands.java
index e2d703bbf2..f058c4214d 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/prefix/PrefixCommands.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/prefix/PrefixCommands.java
@@ -23,12 +23,9 @@ import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.MissingSubcommandException;
-import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.shell.OzoneShell;
import org.apache.hadoop.ozone.shell.Shell;
-import org.kohsuke.MetaInfServices;
import picocli.CommandLine.Command;
import picocli.CommandLine.ParentCommand;
@@ -45,9 +42,7 @@ import picocli.CommandLine.ParentCommand;
},
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
-@MetaInfServices(SubcommandWithParent.class)
-public class PrefixCommands implements GenericParentCommand, Callable<Void>,
- SubcommandWithParent {
+public class PrefixCommands implements GenericParentCommand, Callable<Void> {
@ParentCommand
private Shell shell;
@@ -67,9 +62,4 @@ public class PrefixCommands implements GenericParentCommand,
Callable<Void>,
public OzoneConfiguration createOzoneConfiguration() {
return shell.createOzoneConfiguration();
}
-
- @Override
- public Class<?> getParentType() {
- return OzoneShell.class;
- }
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/snapshot/SnapshotCommands.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/snapshot/SnapshotCommands.java
index 25a3c1c66f..e4ae7f5ad7 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/snapshot/SnapshotCommands.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/snapshot/SnapshotCommands.java
@@ -23,12 +23,9 @@ import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.MissingSubcommandException;
-import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.shell.OzoneShell;
import org.apache.hadoop.ozone.shell.Shell;
-import org.kohsuke.MetaInfServices;
import picocli.CommandLine.Command;
import picocli.CommandLine.ParentCommand;
@@ -48,9 +45,7 @@ import picocli.CommandLine.ParentCommand;
},
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
-@MetaInfServices(SubcommandWithParent.class)
-public class SnapshotCommands implements GenericParentCommand, Callable<Void>,
- SubcommandWithParent {
+public class SnapshotCommands implements GenericParentCommand, Callable<Void> {
@ParentCommand
private Shell shell;
@@ -70,9 +65,4 @@ public class SnapshotCommands implements
GenericParentCommand, Callable<Void>,
public OzoneConfiguration createOzoneConfiguration() {
return shell.createOzoneConfiguration();
}
-
- @Override
- public Class<?> getParentType() {
- return OzoneShell.class;
- }
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantUserCommands.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantUserCommands.java
index 86a051fb76..baff85d0bf 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantUserCommands.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantUserCommands.java
@@ -20,11 +20,8 @@ package org.apache.hadoop.ozone.shell.tenant;
import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.MissingSubcommandException;
-import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.shell.OzoneShell;
import org.apache.hadoop.ozone.shell.Shell;
-import org.kohsuke.MetaInfServices;
import picocli.CommandLine;
import java.util.concurrent.Callable;
@@ -46,9 +43,8 @@ import java.util.concurrent.Callable;
},
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
-@MetaInfServices(SubcommandWithParent.class)
public class TenantUserCommands implements
- GenericParentCommand, Callable<Void>, SubcommandWithParent {
+ GenericParentCommand, Callable<Void> {
@CommandLine.ParentCommand
private Shell shell;
@@ -68,9 +64,4 @@ public class TenantUserCommands implements
public OzoneConfiguration createOzoneConfiguration() {
return shell.createOzoneConfiguration();
}
-
- @Override
- public Class<?> getParentType() {
- return OzoneShell.class;
- }
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenCommands.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenCommands.java
index 5b449c6cc5..3223b5b49e 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenCommands.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenCommands.java
@@ -23,12 +23,9 @@ import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.MissingSubcommandException;
-import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.shell.OzoneShell;
import org.apache.hadoop.ozone.shell.Shell;
-import org.kohsuke.MetaInfServices;
import picocli.CommandLine.Command;
import picocli.CommandLine.ParentCommand;
@@ -45,9 +42,8 @@ import picocli.CommandLine.ParentCommand;
},
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
-@MetaInfServices(SubcommandWithParent.class)
public class TokenCommands
- implements GenericParentCommand, Callable<Void>, SubcommandWithParent {
+ implements GenericParentCommand, Callable<Void> {
@ParentCommand
private Shell shell;
@@ -67,9 +63,4 @@ public class TokenCommands
public OzoneConfiguration createOzoneConfiguration() {
return shell.createOzoneConfiguration();
}
-
- @Override
- public Class<?> getParentType() {
- return OzoneShell.class;
- }
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeCommands.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeCommands.java
index 8c52f0ada9..1cf8855203 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeCommands.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeCommands.java
@@ -23,12 +23,9 @@ import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.MissingSubcommandException;
-import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.shell.OzoneShell;
import org.apache.hadoop.ozone.shell.Shell;
-import org.kohsuke.MetaInfServices;
import picocli.CommandLine.Command;
import picocli.CommandLine.ParentCommand;
@@ -53,9 +50,7 @@ import picocli.CommandLine.ParentCommand;
},
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
-@MetaInfServices(SubcommandWithParent.class)
-public class VolumeCommands implements GenericParentCommand, Callable<Void>,
- SubcommandWithParent {
+public class VolumeCommands implements GenericParentCommand, Callable<Void> {
@ParentCommand
private Shell shell;
@@ -75,9 +70,4 @@ public class VolumeCommands implements GenericParentCommand,
Callable<Void>,
public OzoneConfiguration createOzoneConfiguration() {
return shell.createOzoneConfiguration();
}
-
- @Override
- public Class<?> getParentType() {
- return OzoneShell.class;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
