From d2529c057e0c082437af9cfb8b2d72839929bbfe Mon Sep 17 00:00:00 2001
From: Ruud Senden <8635138+rsenden@users.noreply.github.com>
Date: Fri, 28 Jul 2023 10:12:23 +0200
Subject: [PATCH] chore: Remove unused options from container commands (closes
#379)
---
.../app/_main/cli/cmd/FCLIRootCommands.java | 4 +--
.../util/FortifyCLIDynamicInitializer.java | 8 +++---
.../java/com/fortify/cli/FortifyCLITest.java | 4 ++-
.../cli/cmd/AbstractContainerCommand.java | 26 +++++++++++++++++++
...mand.java => AbstractRunnableCommand.java} | 4 +--
.../cli/common/cli/mixin/ICommandAware.java | 4 +--
.../output/cli/cmd/AbstractOutputCommand.java | 4 +--
.../rest/cli/cmd/AbstractWaitForCommand.java | 4 +--
.../config/_main/cli/cmd/ConfigCommands.java | 4 +--
.../language/cli/cmd/LanguageCommands.java | 4 +--
.../config/proxy/cli/cmd/ProxyCommands.java | 4 +--
.../cli/cmd/TrustStoreCommands.java | 4 +--
.../session/cli/cmd/FoDSessionCommands.java | 4 +--
.../cli/fod/_main/cli/cmd/FoDCommands.java | 4 +--
.../cli/fod/app/cli/cmd/FoDAppCommands.java | 4 +--
.../cli/cmd/FoDAppMicroserviceCommands.java | 4 +--
.../release/cli/cmd/FoDAppRelCommands.java | 4 +--
.../cli/fod/rest/cli/cmd/FoDRestCommands.java | 6 ++---
.../cli/fod/scan/cli/cmd/FoDScanCommands.java | 4 +--
.../cli/fod/user/cli/cmd/FoDUserCommands.java | 4 +--
.../cli/cmd/FoDUserGroupCommands.java | 4 +--
.../_main/cli/cmd/LicenseCommands.java | 4 +--
.../msp_report/cli/cmd/MspReportCommands.java | 4 +--
.../ncd_report/cli/cmd/NcdReportCommands.java | 4 +--
.../NcdReportAuthorDeduplicatorTest.java | 1 -
.../cli/cmd/SCDastSessionCommands.java | 4 +--
.../sc_dast/_main/cli/cmd/SCDastCommands.java | 4 +--
.../rest/cli/cmd/SCDastRestCommands.java | 4 +--
.../scan/cli/cmd/SCDastScanCommands.java | 4 +--
.../cli/cmd/SCDastScanPolicyCommands.java | 4 +--
.../cli/cmd/SCDastScanSettingsCommands.java | 4 +--
.../sensor/cli/cmd/SCDastSensorCommands.java | 4 +--
.../cli/cmd/SCSastSessionCommands.java | 4 +--
.../sc_sast/_main/cli/cmd/SCSastCommands.java | 4 +--
.../cli/cmd/SCSastControllerRestCommands.java | 4 +--
.../scan/cli/cmd/SCSastScanCommands.java | 4 +--
.../session/cli/cmd/SSCSessionCommands.java | 4 +--
.../cli/ssc/_main/cli/cmd/SSCCommands.java | 4 +--
.../cli/cmd/SSCActivityFeedCommands.java | 4 +--
.../ssc/alert/cli/cmd/SSCAlertCommands.java | 4 +--
.../cli/cmd/SSCAlertDefinitionCommands.java | 4 +--
.../cli/ssc/app/cli/cmd/SSCAppCommands.java | 4 +--
.../cli/cmd/SSCAppVersionCommands.java | 4 +--
.../cmd/SSCAppVersionAttributeCommands.java | 4 +--
.../cmd/SSCAppVersionFilterSetCommands.java | 4 +--
.../cli/cmd/SSCAppVersionUserCommands.java | 4 +--
.../artifact/cli/cmd/SSCArtifactCommands.java | 4 +--
.../cmd/SSCAttributeDefinitionCommands.java | 4 +--
.../ssc/event/cli/cmd/SSCEventCommands.java | 4 +--
.../cli/cmd/SSCIssueTemplateCommands.java | 4 +--
.../cli/ssc/job/cli/cmd/SSCJobCommands.java | 4 +--
.../ssc/plugin/cli/cmd/SSCPluginCommands.java | 4 +--
.../cli/cmd/SSCReportTemplateCommands.java | 4 +--
.../cli/ssc/rest/cli/cmd/SSCRestCommands.java | 4 +--
.../cli/ssc/role/cli/cmd/SSCRoleCommands.java | 4 +--
.../cli/cmd/SSCRolePermissionCommands.java | 4 +--
.../cli/cmd/SSCSeedBundleCommands.java | 4 +--
.../ssc/token/cli/cmd/SSCTokenCommands.java | 4 +--
.../cli/cmd/SSCTokenDefinitionCommands.java | 4 +--
.../cli/ssc/user/cli/cmd/SSCUserCommands.java | 4 +--
.../cli/cmd/SSCVulnerabilityCommands.java | 4 +--
.../cli/tool/_main/cli/cmd/ToolCommands.java | 4 +--
.../cli/cmd/ToolFoDUploaderCommands.java | 4 +--
.../cli/cmd/ToolSCClientCommands.java | 4 +--
.../cli/cmd/ToolVulnExporterCommands.java | 4 +--
.../cli/util/_main/cli/cmd/UtilCommands.java | 4 +--
.../cli/cmd/AllCommandsCommands.java | 4 +--
.../cli/cmd/AllCommandsUsageCommand.java | 4 +--
.../cli/cmd/AutoCompleteCommands.java | 4 +--
.../cmd/AutoCompleteGenerationCommand.java | 4 +--
.../crypto/cli/cmd/AbstractCryptoCommand.java | 4 +--
.../util/crypto/cli/cmd/CryptoCommands.java | 4 +--
.../cli/cmd/SampleDataCommands.java | 4 +--
.../cli/util/state/cli/cmd/StateCommands.java | 4 +--
.../variable/cli/cmd/VariableCommands.java | 4 +--
75 files changed, 176 insertions(+), 149 deletions(-)
create mode 100644 fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractContainerCommand.java
rename fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/{AbstractFortifyCLICommand.java => AbstractRunnableCommand.java} (97%)
diff --git a/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java
index 223e675551..06d1638bf0 100644
--- a/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java
+++ b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java
@@ -13,7 +13,7 @@
package com.fortify.cli.app._main.cli.cmd;
import com.fortify.cli.app.FortifyCLIVersionProvider;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.util.DisableTest;
import com.fortify.cli.common.util.DisableTest.TestType;
import com.fortify.cli.config._main.cli.cmd.ConfigCommands;
@@ -53,7 +53,7 @@
UtilCommands.class
}
)
-public class FCLIRootCommands extends AbstractFortifyCLICommand {
+public class FCLIRootCommands extends AbstractContainerCommand {
// We only want to have the --version option on the top-level fcli command,
@Option(names = {"-V", "--version"}, versionHelp = true, scope = ScopeType.LOCAL, order = -1002)
@DisableTest(TestType.OPT_SHORT_NAME)
diff --git a/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java
index d44fd963ca..786a820d88 100644
--- a/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java
+++ b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java
@@ -19,9 +19,9 @@
import org.slf4j.LoggerFactory;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand.GenericOptionsArgGroup;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand.LogLevel;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand.GenericOptionsArgGroup;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand.LogLevel;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;
@@ -111,7 +111,7 @@ private CommandLine createGenericOptionsCommandLine() {
@Command(name = "fcli")
@RequiredArgsConstructor
- public static final class FortifyCLIInitializerCommand extends AbstractFortifyCLICommand implements Runnable {
+ public static final class FortifyCLIInitializerCommand extends AbstractRunnableCommand implements Runnable {
private final Consumer consumer;
@Override
diff --git a/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java b/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java
index df28465b24..0871efd271 100644
--- a/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java
+++ b/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java
@@ -101,7 +101,9 @@ private void checkOptions(Results results, CommandSpec cmdSpec) {
private void checkStandardOptions(Results results, CommandSpec spec) {
var optionNames = spec.optionsMap().keySet();
- var expectedOptionNames = Arrays.asList("-h", "--help", "--log-level", "--log-file", "--env-prefix");
+ var expectedOptionNames = spec.userObject() instanceof Runnable
+ ? Arrays.asList("-h", "--help", "--log-level", "--log-file", "--env-prefix")
+ : Arrays.asList("-h", "--help");
if ( !optionNames.containsAll(expectedOptionNames) ) {
results.add(TestType.CMD_STD_OPTS, Level.ERROR, spec, "Missing one or more standard option names: "+expectedOptionNames);
}
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractContainerCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractContainerCommand.java
new file mode 100644
index 0000000000..93c82df210
--- /dev/null
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractContainerCommand.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright 2021, 2023 Open Text.
+ *
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
+ * without notice.
+ *******************************************************************************/
+package com.fortify.cli.common.cli.cmd;
+
+import picocli.CommandLine.Option;
+
+/**
+ * This abstract class should be used as the base class for all fcli container commands.
+ * It is responsible for providing the standard help option.
+ *
+ * @author Ruud Senden
+ */
+public abstract class AbstractContainerCommand {
+ @Option(names = {"-h", "--help"}, usageHelp = true)
+ private boolean usageHelpRequested;
+}
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractRunnableCommand.java
similarity index 97%
rename from fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java
rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractRunnableCommand.java
index 312de0bbe2..b581c0e6cd 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractRunnableCommand.java
@@ -25,7 +25,7 @@
import picocli.CommandLine.Spec;
/**
- * This abstract class should be used as the base class for all fcli commands.
+ * This abstract class should be used as the base class for all runnable fcli commands.
* It is responsible for providing the following fcli features:
*
* - Providing standard command configuration settings (default value provider, ...)
@@ -36,7 +36,7 @@
*
* @author Ruud Senden
*/
-public class AbstractFortifyCLICommand {
+public abstract class AbstractRunnableCommand implements Runnable {
// Have picocli inject the CommandSpec representing the current command
@Spec private CommandSpec commandSpec;
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java
index 2296b7d276..7b190d1fda 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.common.cli.mixin;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
import picocli.CommandLine.Model.CommandSpec;
import picocli.CommandLine.Spec;
@@ -28,7 +28,7 @@
* Mixins usually wouldn't implement this interface directly, but instead
* utilize {@link CommandHelperMixin} as it provides some useful utility methods
* related to the the injected {@link CommandSpec}. Injection is handled
- * by {@link AbstractFortifyCLICommand}.
+ * by {@link AbstractRunnableCommand}.
*
* @author rsenden
*
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java
index 0750a0f01d..88b5c33d60 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java
@@ -15,11 +15,11 @@
import java.util.Arrays;
import java.util.List;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
import com.fortify.cli.common.output.cli.mixin.IOutputHelper;
import com.fortify.cli.common.output.writer.ISingularSupplier;
-public abstract class AbstractOutputCommand extends AbstractFortifyCLICommand implements Runnable, ISingularSupplier {
+public abstract class AbstractOutputCommand extends AbstractRunnableCommand implements Runnable, ISingularSupplier {
private static final List> supportedInterfaces = Arrays.asList(
IBaseRequestSupplier.class,
IJsonNodeSupplier.class);
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java
index 7f592ec321..d5abbd9cad 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.common.rest.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
import com.fortify.cli.common.output.product.IProductHelperSupplier;
import com.fortify.cli.common.output.transform.IActionCommandResultSupplier;
@@ -28,7 +28,7 @@
import lombok.Getter;
import picocli.CommandLine.Mixin;
-public abstract class AbstractWaitForCommand extends AbstractFortifyCLICommand implements IActionCommandResultSupplier, IProductHelperSupplier, ISingularSupplier, Runnable {
+public abstract class AbstractWaitForCommand extends AbstractRunnableCommand implements IActionCommandResultSupplier, IProductHelperSupplier, ISingularSupplier, Runnable {
@Getter @Mixin private OutputHelperMixins.WaitFor outputHelper;
@Mixin private WaitHelperControlOptions controlOptions;
@Mixin private WaitHelperWaitOptions waitOptions;
diff --git a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java
index 53e20fab91..2fec04a295 100644
--- a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java
+++ b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.config._main.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.config.language.cli.cmd.LanguageCommands;
import com.fortify.cli.config.proxy.cli.cmd.ProxyCommands;
import com.fortify.cli.config.truststore.cli.cmd.TrustStoreCommands;
@@ -30,5 +30,5 @@
TrustStoreCommands.class
}
)
-public class ConfigCommands extends AbstractFortifyCLICommand {
+public class ConfigCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java
index ca557a4ef5..d0a931cded 100644
--- a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java
+++ b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.config.language.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine;
@@ -27,5 +27,5 @@
LanguageGetCommand.class
}
)
-public class LanguageCommands extends AbstractFortifyCLICommand {
+public class LanguageCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java
index 9f5301cda0..4b8ce92915 100644
--- a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java
+++ b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.config.proxy.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -26,5 +26,5 @@
ProxyUpdateCommand.class
}
)
-public class ProxyCommands extends AbstractFortifyCLICommand {
+public class ProxyCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java
index 1006d19433..c67fded932 100644
--- a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java
+++ b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.config.truststore.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -24,5 +24,5 @@
TrustStoreSetCommand.class,
}
)
-public class TrustStoreCommands extends AbstractFortifyCLICommand {
+public class TrustStoreCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java
index 986453ebc9..28f3a5ba71 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.fod._common.session.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -24,5 +24,5 @@
FoDSessionLogoutCommand.class
}
)
-public class FoDSessionCommands extends AbstractFortifyCLICommand {
+public class FoDSessionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java
index d857b2b380..ae7066ee94 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.fod._main.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.fod._common.session.cli.cmd.FoDSessionCommands;
import com.fortify.cli.fod.app.cli.cmd.FoDAppCommands;
import com.fortify.cli.fod.microservice.cli.cmd.FoDAppMicroserviceCommands;
@@ -48,4 +48,4 @@
}
)
-public class FoDCommands extends AbstractFortifyCLICommand {}
+public class FoDCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java
index aafb52e7f7..dbaaf9cf3d 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.fod.app.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine;
@@ -29,5 +29,5 @@
}
)
@DefaultVariablePropertyName("applicationId")
-public class FoDAppCommands extends AbstractFortifyCLICommand {
+public class FoDAppCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java
index 7c509d74cb..f28eb0775a 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java
@@ -13,7 +13,7 @@
package com.fortify.cli.fod.microservice.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine;
@@ -28,5 +28,5 @@
}
)
@DefaultVariablePropertyName("microserviceId")
-public class FoDAppMicroserviceCommands extends AbstractFortifyCLICommand {
+public class FoDAppMicroserviceCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java
index a3c5ccf440..56c5cbbd9e 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java
@@ -13,7 +13,7 @@
package com.fortify.cli.fod.release.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine;
@@ -28,5 +28,5 @@
}
)
@DefaultVariablePropertyName("releaseId")
-public class FoDAppRelCommands extends AbstractFortifyCLICommand {
+public class FoDAppRelCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java
index cce4cef67e..000d955f33 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java
@@ -12,9 +12,9 @@
*******************************************************************************/
package com.fortify.cli.fod.rest.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
-
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.fod.rest.lookup.cli.cmd.FoDLookupCommand;
+
import picocli.CommandLine.Command;
@Command(
@@ -26,5 +26,5 @@
}
)
-public class FoDRestCommands extends AbstractFortifyCLICommand {
+public class FoDRestCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java
index 18261ccb6d..fcf96d4128 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java
@@ -13,7 +13,7 @@
package com.fortify.cli.fod.scan.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import com.fortify.cli.fod.scan.cli.cmd.dast.FoDDastScanImportCommand;
import com.fortify.cli.fod.scan.cli.cmd.dast.FoDDastScanStartCommand;
@@ -48,5 +48,5 @@
}
)
@DefaultVariablePropertyName("scanId")
-public class FoDScanCommands extends AbstractFortifyCLICommand {
+public class FoDScanCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java
index 80bc6f9cf2..8441d26b46 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.fod.user.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine;
@@ -27,5 +27,5 @@
}
)
@DefaultVariablePropertyName("userId")
-public class FoDUserCommands extends AbstractFortifyCLICommand {
+public class FoDUserCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java
index a4396d0f22..a4e2618f68 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.fod.user_group.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine;
@@ -27,5 +27,5 @@
}
)
@DefaultVariablePropertyName("id")
-public class FoDUserGroupCommands extends AbstractFortifyCLICommand {
+public class FoDUserGroupCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/_main/cli/cmd/LicenseCommands.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/_main/cli/cmd/LicenseCommands.java
index 13a409bc00..c259e1268a 100644
--- a/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/_main/cli/cmd/LicenseCommands.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/_main/cli/cmd/LicenseCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.license._main.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.license.msp_report.cli.cmd.MspReportCommands;
import com.fortify.cli.license.ncd_report.cli.cmd.NcdReportCommands;
@@ -26,4 +26,4 @@
NcdReportCommands.class
}
)
-public class LicenseCommands extends AbstractFortifyCLICommand {}
+public class LicenseCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportCommands.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportCommands.java
index 77d4930de3..c5d5853f65 100644
--- a/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportCommands.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.license.msp_report.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,4 +23,4 @@
MspReportGenerateConfigCommand.class
}
)
-public class MspReportCommands extends AbstractFortifyCLICommand {}
+public class MspReportCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportCommands.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportCommands.java
index d0a86ec22a..af49661e99 100644
--- a/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportCommands.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.license.ncd_report.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,4 +23,4 @@
NcdReportGenerateConfigCommand.class
}
)
-public class NcdReportCommands extends AbstractFortifyCLICommand {}
+public class NcdReportCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-license/src/test/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java b/fcli-core/fcli-license/src/test/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java
index 7722666569..d5a3ff32d5 100644
--- a/fcli-core/fcli-license/src/test/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java
+++ b/fcli-core/fcli-license/src/test/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java
@@ -21,7 +21,6 @@
import org.junit.jupiter.api.Test;
import com.fortify.cli.common.json.JsonHelper;
-import com.fortify.cli.license.ncd_report.collector.NcdReportAuthorDeduplicator;
import com.fortify.cli.license.ncd_report.config.NcdReportContributorConfig;
import com.fortify.cli.license.ncd_report.descriptor.INcdReportAuthorDescriptor;
import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java
index 0093895345..22361f43cf 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_dast._common.session.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -24,5 +24,5 @@
SCDastSessionLogoutCommand.class
}
)
-public class SCDastSessionCommands extends AbstractFortifyCLICommand {
+public class SCDastSessionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java
index 5a2b084d6e..1179ecb2f5 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_dast._main.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.sc_dast._common.session.cli.cmd.SCDastSessionCommands;
import com.fortify.cli.sc_dast.rest.cli.cmd.SCDastRestCommands;
import com.fortify.cli.sc_dast.scan.cli.cmd.SCDastScanCommands;
@@ -42,4 +42,4 @@
SCDastRestCommands.class,
}
)
-public class SCDastCommands extends AbstractFortifyCLICommand {}
+public class SCDastCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java
index 7957b6e892..07245abf32 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_dast.rest.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,5 +23,5 @@
}
)
-public class SCDastRestCommands extends AbstractFortifyCLICommand {
+public class SCDastRestCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java
index 8fc484e2f9..940b7ac852 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_dast.scan.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import com.fortify.cli.sc_dast.scan.cli.cmd.action.SCDastScanCompleteCommand;
import com.fortify.cli.sc_dast.scan.cli.cmd.action.SCDastScanDeleteCommand;
@@ -40,5 +40,5 @@
}
)
@DefaultVariablePropertyName("id")
-public class SCDastScanCommands extends AbstractFortifyCLICommand {
+public class SCDastScanCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java
index 3f932c83cf..cd467e8ce3 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_dast.scan_policy.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine.Command;
@@ -25,5 +25,5 @@
}
)
@DefaultVariablePropertyName("id")
-public class SCDastScanPolicyCommands extends AbstractFortifyCLICommand {
+public class SCDastScanPolicyCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java
index 2116a70bdb..dba877ce7e 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_dast.scan_settings.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine.Command;
@@ -25,5 +25,5 @@
}
)
@DefaultVariablePropertyName("id")
-public class SCDastScanSettingsCommands extends AbstractFortifyCLICommand {
+public class SCDastScanSettingsCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java
index 5d00866718..62273a8538 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_dast.sensor.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine.Command;
@@ -27,5 +27,5 @@
}
)
@DefaultVariablePropertyName("id")
-public class SCDastSensorCommands extends AbstractFortifyCLICommand {
+public class SCDastSensorCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java
index 986be1a7a5..da39b50217 100644
--- a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java
+++ b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_sast._common.session.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -24,5 +24,5 @@
SCSastSessionLogoutCommand.class
}
)
-public class SCSastSessionCommands extends AbstractFortifyCLICommand {
+public class SCSastSessionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java
index d0445fa826..714c1dc87c 100644
--- a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java
+++ b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_sast._main.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.sc_sast._common.session.cli.cmd.SCSastSessionCommands;
import com.fortify.cli.sc_sast.rest.cli.cmd.SCSastControllerRestCommands;
import com.fortify.cli.sc_sast.scan.cli.cmd.SCSastScanCommands;
@@ -36,4 +36,4 @@
SCSastControllerRestCommands.class,
}
)
-public class SCSastCommands extends AbstractFortifyCLICommand {}
+public class SCSastCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java
index 6eaab5ab1d..48638f0db6 100644
--- a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java
+++ b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_sast.rest.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,5 +23,5 @@
}
)
-public class SCSastControllerRestCommands extends AbstractFortifyCLICommand {
+public class SCSastControllerRestCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java
index 13729ea36d..1aa2385fca 100644
--- a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java
+++ b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.sc_sast.scan.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine.Command;
@@ -27,5 +27,5 @@
}
)
@DefaultVariablePropertyName("jobToken")
-public class SCSastScanCommands extends AbstractFortifyCLICommand {
+public class SCSastScanCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java
index 46eb0faa33..06e3f72d20 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc._common.session.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -24,5 +24,5 @@
SSCSessionLogoutCommand.class
}
)
-public class SSCSessionCommands extends AbstractFortifyCLICommand {
+public class SSCSessionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java
index 51ccc8564d..565bab71e9 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc._main.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.ssc._common.session.cli.cmd.SSCSessionCommands;
import com.fortify.cli.ssc.activity_feed.cli.cmd.SSCActivityFeedCommands;
import com.fortify.cli.ssc.alert.cli.cmd.SSCAlertCommands;
@@ -78,4 +78,4 @@
SSCRestCommands.class,
}
)
-public class SSCCommands extends AbstractFortifyCLICommand {}
+public class SSCCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java
index b8ee67beaa..a5e966bf18 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.activity_feed.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -22,5 +22,5 @@
SSCActivityFeedListCommand.class
}
)
-public class SSCActivityFeedCommands extends AbstractFortifyCLICommand {
+public class SSCActivityFeedCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java
index 32045516fc..1a25511e00 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.alert.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -22,5 +22,5 @@
SSCAlertListCommand.class
}
)
-public class SSCAlertCommands extends AbstractFortifyCLICommand {
+public class SSCAlertCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java
index d8cba61c84..5f9305b9f2 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.alert_definition.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,5 +23,5 @@
SSCAlertDefinitionListCommand.class
}
)
-public class SSCAlertDefinitionCommands extends AbstractFortifyCLICommand {
+public class SSCAlertDefinitionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java
index ab8e4d6627..e20b766da1 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.app.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine.Command;
@@ -27,5 +27,5 @@
}
)
@DefaultVariablePropertyName("id")
-public class SSCAppCommands extends AbstractFortifyCLICommand {
+public class SSCAppCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java
index 70b2799841..9ff41efd96 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.appversion.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import picocli.CommandLine.Command;
@@ -31,5 +31,5 @@
}
)
@DefaultVariablePropertyName("id")
-public class SSCAppVersionCommands extends AbstractFortifyCLICommand {
+public class SSCAppVersionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java
index fa1e6b0697..1a426dcfcd 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.appversion_attribute.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,5 +23,5 @@
SSCAppVersionAttributeSetCommand.class
}
)
-public class SSCAppVersionAttributeCommands extends AbstractFortifyCLICommand {
+public class SSCAppVersionAttributeCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java
index 838ad8dbe2..7a969e496d 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.appversion_filterset.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,5 +23,5 @@
SSCAppVersionFilterSetListCommand.class,
}
)
-public class SSCAppVersionFilterSetCommands extends AbstractFortifyCLICommand {
+public class SSCAppVersionFilterSetCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionUserCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionUserCommands.java
index f06375de1c..a7a56bb36b 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionUserCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionUserCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.appversion_user.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -24,5 +24,5 @@
SSCAppVersionUserListCommand.class,
}
)
-public class SSCAppVersionUserCommands extends AbstractFortifyCLICommand {
+public class SSCAppVersionUserCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/artifact/cli/cmd/SSCArtifactCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/artifact/cli/cmd/SSCArtifactCommands.java
index 6c5f1a2a7e..0bace39b68 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/artifact/cli/cmd/SSCArtifactCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/artifact/cli/cmd/SSCArtifactCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.artifact.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.common.variable.DefaultVariablePropertyName;
import com.fortify.cli.ssc.artifact.cli.cmd.import_debricked.SSCArtifactImportDebrickedCommand;
@@ -33,5 +33,5 @@
}
)
@DefaultVariablePropertyName("id")
-public class SSCArtifactCommands extends AbstractFortifyCLICommand {
+public class SSCArtifactCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java
index eadc78d645..17e364ac4d 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.attribute_definition.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,5 +23,5 @@
SSCAttributeDefinitionListCommand.class
}
)
-public class SSCAttributeDefinitionCommands extends AbstractFortifyCLICommand {
+public class SSCAttributeDefinitionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java
index 835c370f52..f61f833bb6 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.event.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -22,5 +22,5 @@
SSCEventListCommand.class
}
)
-public class SSCEventCommands extends AbstractFortifyCLICommand {
+public class SSCEventCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java
index 49dc8816dc..3b7133200a 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.issue_template.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -27,5 +27,5 @@
SSCIssueTemplateUpdateCommand.class
}
)
-public class SSCIssueTemplateCommands extends AbstractFortifyCLICommand {
+public class SSCIssueTemplateCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java
index 4531a2b7a3..a265d3f26c 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.job.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -25,5 +25,5 @@
SSCJobUpdateCommand.class
}
)
-public class SSCJobCommands extends AbstractFortifyCLICommand {
+public class SSCJobCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java
index 6e36f8d9f4..dfe880f8a4 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.plugin.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -28,5 +28,5 @@
}
)
-public class SSCPluginCommands extends AbstractFortifyCLICommand {
+public class SSCPluginCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java
index 2ed2e50b3f..18f09ed799 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.report_template.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -27,5 +27,5 @@
SSCReportTemplateDeleteCommand.class
}
)
-public class SSCReportTemplateCommands extends AbstractFortifyCLICommand {
+public class SSCReportTemplateCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java
index c34a548196..cb9828d0f0 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.rest.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,5 +23,5 @@
}
)
-public class SSCRestCommands extends AbstractFortifyCLICommand {
+public class SSCRestCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java
index b281223422..28cafdd77f 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.role.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -26,5 +26,5 @@
}
)
-public class SSCRoleCommands extends AbstractFortifyCLICommand {
+public class SSCRoleCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java
index 52ca8667d3..56c1e6a492 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java
@@ -13,7 +13,7 @@
package com.fortify.cli.ssc.role_permission.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -26,5 +26,5 @@
}
)
-public class SSCRolePermissionCommands extends AbstractFortifyCLICommand {
+public class SSCRolePermissionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java
index c203d461bb..d0c8e9d614 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.seed_bundle.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -22,5 +22,5 @@
SSCSeedBundleUploadCommand.class
}
)
-public class SSCSeedBundleCommands extends AbstractFortifyCLICommand {
+public class SSCSeedBundleCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java
index d11b63bf85..d2ace886de 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.token.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -26,5 +26,5 @@
}
)
-public class SSCTokenCommands extends AbstractFortifyCLICommand {
+public class SSCTokenCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java
index e918eb1b83..6212b11df3 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.token_definition.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,5 +23,5 @@
}
)
-public class SSCTokenDefinitionCommands extends AbstractFortifyCLICommand {
+public class SSCTokenDefinitionCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCUserCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCUserCommands.java
index 5e644a1d0e..f877d5b8bc 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCUserCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCUserCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.user.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -24,5 +24,5 @@
SSCUserListCommand.class
}
)
-public class SSCUserCommands extends AbstractFortifyCLICommand {
+public class SSCUserCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/vulnerability/cli/cmd/SSCVulnerabilityCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/vulnerability/cli/cmd/SSCVulnerabilityCommands.java
index e88575fb5e..b18177f83f 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/vulnerability/cli/cmd/SSCVulnerabilityCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/vulnerability/cli/cmd/SSCVulnerabilityCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.ssc.vulnerability.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -22,5 +22,5 @@
SSCVulnerabilityCountCommand.class,
}
)
-public class SSCVulnerabilityCommands extends AbstractFortifyCLICommand {
+public class SSCVulnerabilityCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java
index 215835fc66..0875dc4285 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.tool._main.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.tool.fod_uploader.cli.cmd.ToolFoDUploaderCommands;
import com.fortify.cli.tool.sc_client.cli.cmd.ToolSCClientCommands;
import com.fortify.cli.tool.vuln_exporter.cli.cmd.ToolVulnExporterCommands;
@@ -28,4 +28,4 @@
ToolVulnExporterCommands.class
}
)
-public class ToolCommands extends AbstractFortifyCLICommand {}
+public class ToolCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java
index 904c982b1d..130742f2b3 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.tool.fod_uploader.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -26,6 +26,6 @@
}
)
-public class ToolFoDUploaderCommands extends AbstractFortifyCLICommand {
+public class ToolFoDUploaderCommands extends AbstractContainerCommand {
static final String TOOL_NAME = "fod-uploader";
}
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java
index ab107a1cfe..36427d50f0 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.tool.sc_client.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -26,6 +26,6 @@
}
)
-public class ToolSCClientCommands extends AbstractFortifyCLICommand {
+public class ToolSCClientCommands extends AbstractContainerCommand {
static final String TOOL_NAME = "sc-client";
}
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java
index be27443f2f..c1abeb351b 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.tool.vuln_exporter.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -26,6 +26,6 @@
}
)
-public class ToolVulnExporterCommands extends AbstractFortifyCLICommand {
+public class ToolVulnExporterCommands extends AbstractContainerCommand {
static final String TOOL_NAME = "vuln-exporter";
}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java
index fc03bc0f63..c18463ced7 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util._main.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import com.fortify.cli.util.all_commands.cli.cmd.AllCommandsCommands;
import com.fortify.cli.util.autocomplete.cli.cmd.AutoCompleteCommands;
import com.fortify.cli.util.crypto.cli.cmd.CryptoCommands;
@@ -34,4 +34,4 @@
VariableCommands.class
}
)
-public class UtilCommands extends AbstractFortifyCLICommand {}
+public class UtilCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java
index 52d4495b89..1b9dc39726 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util.all_commands.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,4 +23,4 @@
AllCommandsListCommand.class
}
)
-public class AllCommandsCommands extends AbstractFortifyCLICommand {}
+public class AllCommandsCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java
index 13e4e0c24c..16250767f5 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util.all_commands.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
import com.fortify.cli.util.all_commands.cli.mixin.AllCommandsCommandSelectorMixin;
import picocli.CommandLine;
@@ -21,7 +21,7 @@
import picocli.CommandLine.Model.CommandSpec;
@Command(name = "usage")
-public final class AllCommandsUsageCommand extends AbstractFortifyCLICommand implements Runnable {
+public final class AllCommandsUsageCommand extends AbstractRunnableCommand implements Runnable {
@Mixin private AllCommandsCommandSelectorMixin selectorMixin;
@Override
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java
index 857155390d..853e40cd3e 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util.autocomplete.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -22,4 +22,4 @@
AutoCompleteGenerationCommand.class
}
)
-public class AutoCompleteCommands extends AbstractFortifyCLICommand {}
+public class AutoCompleteCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java
index 18b6dcd5d9..206238d21d 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util.autocomplete.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
import picocli.AutoComplete;
import picocli.CommandLine.Command;
@@ -27,7 +27,7 @@
*
*/
@Command(name = "generate")
-public final class AutoCompleteGenerationCommand extends AbstractFortifyCLICommand implements Runnable {
+public final class AutoCompleteGenerationCommand extends AbstractRunnableCommand implements Runnable {
@Spec CommandSpec spec;
public void run() {
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java
index d16220c03f..b7f72bf26d 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java
@@ -14,13 +14,13 @@
import java.util.Scanner;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
import com.fortify.cli.common.cli.mixin.CommandHelperMixin;
import lombok.SneakyThrows;
import picocli.CommandLine.Mixin;
-public abstract class AbstractCryptoCommand extends AbstractFortifyCLICommand implements Runnable {
+public abstract class AbstractCryptoCommand extends AbstractRunnableCommand implements Runnable {
@Mixin private CommandHelperMixin commandHelper;
@Override @SneakyThrows
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java
index a58c739860..1741a6aef6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util.crypto.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -23,4 +23,4 @@
CryptoDecryptCommand.class
}
)
-public class CryptoCommands extends AbstractFortifyCLICommand {}
+public class CryptoCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java
index ad817ead1b..4503f99768 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util.sample_data.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -24,4 +24,4 @@
SampleDataListCommand.class
}
)
-public class SampleDataCommands extends AbstractFortifyCLICommand {}
+public class SampleDataCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateCommands.java
index 6ea5ffb67a..d2ebcdfb9d 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util.state.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -22,5 +22,5 @@
StateClearCommand.class,
}
)
-public class StateCommands extends AbstractFortifyCLICommand {
+public class StateCommands extends AbstractContainerCommand {
}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableCommands.java
index 2bd905f16e..c52afc91dd 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableCommands.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package com.fortify.cli.util.variable.cli.cmd;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
import picocli.CommandLine.Command;
@@ -28,5 +28,5 @@
}
)
-public class VariableCommands extends AbstractFortifyCLICommand {
+public class VariableCommands extends AbstractContainerCommand {
}