From 291b726ecf6348e3e04e5514821fa61a9413ff5e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 03 Feb 2015 11:25:13 +0000
Subject: [PATCH] Code cleanup
---
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 56 ++++++++++++++++++++++++++------------------------------
1 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 69e35ac..642f113 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -100,6 +100,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.util.Utils;
+import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentGroup;
import com.forgerock.opendj.cli.BooleanArgument;
@@ -155,7 +156,6 @@
/** {@inheritDoc} */
@Override
public void appendUsage(StringBuilder sb, SubCommand sc, String argLongID) {
- final String toolName = "dsconfig";
final SubCommandHandler sch = handlers.get(sc);
final RelationDefinition<?, ?> rd = getRelationDefinition(sch);
if (rd instanceof InstantiableRelationDefinition) {
@@ -166,7 +166,8 @@
final List<PropertyDefinition<?>> props =
new ArrayList<PropertyDefinition<?>>(defn.getAllPropertyDefinitions());
Collections.sort(props);
- final String propPrefix = toolName + "-" + sc.getName() + "-" + argLongID + "-";
+
+ final String propPrefix = DSCONFIGTOOLNAME + "-" + sc.getName() + "-" + argLongID + "-";
sb.append(EOL);
toSimpleList(props, propPrefix, sb);
sb.append(EOL);
@@ -500,8 +501,7 @@
@Override
public MenuResult<Integer> invoke(ConsoleApplication app) throws ClientException {
try {
- MenuResult<Integer> result = handler.run(app, factory);
-
+ final MenuResult<Integer> result = handler.run(app, factory);
if (result.isQuit()) {
return result;
} else {
@@ -608,8 +608,7 @@
app.println();
app.println();
- MenuResult<Integer> result = menu.run();
-
+ final MenuResult<Integer> result = menu.run();
if (result.isCancel()) {
return MenuResult.again();
}
@@ -1060,9 +1059,7 @@
private void checkForConflictingArguments() throws ArgumentException {
if (quietArgument.isPresent() && verboseArgument.isPresent()) {
- final LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(quietArgument.getLongIdentifier(),
- verboseArgument.getLongIdentifier());
- throw new ArgumentException(message);
+ throw conflictingArgs(quietArgument, verboseArgument);
}
if (batchFileArgument.isPresent() && !noPromptArgument.isPresent()) {
@@ -1078,18 +1075,18 @@
}
if (scriptFriendlyArgument.isPresent() && verboseArgument.isPresent()) {
- final LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
- scriptFriendlyArgument.getLongIdentifier(), verboseArgument.getLongIdentifier());
- throw new ArgumentException(message);
+ throw conflictingArgs(scriptFriendlyArgument, verboseArgument);
}
if (noPropertiesFileArgument.isPresent() && propertiesFileArgument.isPresent()) {
- final LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
- noPropertiesFileArgument.getLongIdentifier(), propertiesFileArgument.getLongIdentifier());
- throw new ArgumentException(message);
+ throw conflictingArgs(noPropertiesFileArgument, propertiesFileArgument);
}
}
+ private ArgumentException conflictingArgs(Argument arg1, Argument arg2) {
+ return new ArgumentException(ERR_TOOL_CONFLICTING_ARGS.get(arg1.getLongIdentifier(), arg2.getLongIdentifier()));
+ }
+
/** Run the top-level interactive console. */
private int runInteractiveMode() {
@@ -1182,7 +1179,6 @@
app.println();
final MenuResult<Integer> result = menu.run();
-
if (result.isQuit()) {
return ReturnCode.SUCCESS.get();
} else {
@@ -1198,7 +1194,6 @@
private int runSubCommand(SubCommandHandler handler) {
try {
final MenuResult<Integer> result = handler.run(this, factory);
-
if (result.isSuccess()) {
if (isInteractive() && handler.isCommandBuilderUseful()) {
printCommandBuilder(getCommandBuilder(handler));
@@ -1244,17 +1239,14 @@
* @return <T> The builded command.
*/
<T> CommandBuilder getCommandBuilder(final T subCommand) {
- String commandName = System.getProperty(PROPERTY_SCRIPT_NAME);
- if (commandName == null) {
- commandName = DSCONFIGTOOLNAME;
- }
- CommandBuilder commandBuilder = null;
+ final String commandName = getCommandName();
+ final String subCommandName;
if (subCommand instanceof SubCommandHandler) {
- commandBuilder = new CommandBuilder(commandName,
- ((SubCommandHandler) subCommand).getSubCommand().getName());
+ subCommandName = ((SubCommandHandler) subCommand).getSubCommand().getName();
} else {
- commandBuilder = new CommandBuilder(commandName, (String) subCommand);
+ subCommandName = (String) subCommand;
}
+ final CommandBuilder commandBuilder = new CommandBuilder(commandName, subCommandName);
if (factory != null && factory.getContextCommandBuilder() != null) {
commandBuilder.append(factory.getContextCommandBuilder());
}
@@ -1280,6 +1272,14 @@
return commandBuilder;
}
+ private String getCommandName() {
+ final String commandName = System.getProperty(PROPERTY_SCRIPT_NAME);
+ if (commandName != null && commandName.length() != 0) {
+ return commandName;
+ }
+ return DSCONFIGTOOLNAME;
+ }
+
/**
* Prints the contents of a command builder. This method has been created since SetPropSubCommandHandler calls it.
* All the logic of DSConfig is on this method. It writes the content of the CommandBuilder to the standard output,
@@ -1337,12 +1337,8 @@
* session started.
*/
private String getSessionStartTimeMessage() {
- String scriptName = System.getProperty(PROPERTY_SCRIPT_NAME);
- if (scriptName == null || scriptName.length() == 0) {
- scriptName = DSCONFIGTOOLNAME;
- }
final String date = formatDateTimeStringForEquivalentCommand(new Date(sessionStartTime));
- return INFO_DSCFG_SESSION_START_TIME_MESSAGE.get(scriptName, date).toString();
+ return INFO_DSCFG_SESSION_START_TIME_MESSAGE.get(getCommandName(), date).toString();
}
private void handleBatchFile(String[] args) {
--
Gitblit v1.10.0