From 43f0c2c3c6570234721fb5635e043999fb894e28 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 20 Jan 2015 10:44:19 +0000
Subject: [PATCH] Code cleanup
---
opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java | 138 ++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 82 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
index 2159e0a..14a6d3c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
@@ -22,12 +22,16 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.tools;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.Utils.*;
+
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.config.ConfigConstants.*;
+import static org.opends.server.util.StaticUtils.*;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -38,45 +42,36 @@
import java.util.Iterator;
import java.util.List;
-import org.opends.server.api.Backend;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.admin.std.server.BackendCfg;
+import org.opends.server.api.Backend;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.DebugLogger;
import org.opends.server.loggers.ErrorLogPublisher;
-import org.opends.server.loggers.JDKLogging;
-import org.opends.server.loggers.TextWriter;
import org.opends.server.loggers.ErrorLogger;
+import org.opends.server.loggers.JDKLogging;
import org.opends.server.loggers.TextErrorLogPublisher;
+import org.opends.server.loggers.TextWriter;
+import org.opends.server.protocols.ldap.LDAPAttribute;
+import org.opends.server.tasks.RestoreTask;
+import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.BuildVersion;
+import org.opends.server.util.args.LDAPConnectionArgumentParser;
+import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ClientException;
import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
-import org.opends.server.util.args.LDAPConnectionArgumentParser;
-
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-import static com.forgerock.opendj.cli.ArgumentConstants.*;
-import static org.opends.server.config.ConfigConstants.*;
-import static com.forgerock.opendj.cli.Utils.wrapText;
-import static com.forgerock.opendj.cli.Utils.filterExitCode;
-
-import org.opends.server.tools.tasks.TaskTool;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.protocols.ldap.LDAPAttribute;
-import org.opends.server.tasks.RestoreTask;
-
-
/**
* This program provides a utility that may be used to restore a binary backup
* of a Directory Server backend generated using the BackUpDB tool. This will
@@ -137,14 +132,14 @@
}
- // Define the command-line arguments that may be used with this program.
- private BooleanArgument displayUsage = null;
- private BooleanArgument listBackups = null;
- private BooleanArgument verifyOnly = null;
- private StringArgument backupIDString = null;
- private StringArgument configClass = null;
- private StringArgument configFile = null;
- private StringArgument backupDirectory = null;
+ /** Define the command-line arguments that may be used with this program. */
+ private BooleanArgument displayUsage;
+ private BooleanArgument listBackups;
+ private BooleanArgument verifyOnly;
+ private StringArgument backupIDString;
+ private StringArgument configClass;
+ private StringArgument configFile;
+ private StringArgument backupDirectory;
private int process(String[] args, boolean initializeServer,
@@ -285,59 +280,44 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void addTaskAttributes(List<RawAttribute> attributes)
{
- ArrayList<ByteString> values;
-
- if (backupDirectory.getValue() != null &&
- !backupDirectory.getValue().equals(
- backupDirectory.getDefaultValue())) {
- values = new ArrayList<ByteString>(1);
- values.add(ByteString.valueOf(backupDirectory.getValue()));
- attributes.add(
- new LDAPAttribute(ATTR_BACKUP_DIRECTORY_PATH, values));
- }
-
- if (backupIDString.getValue() != null &&
- !backupIDString.getValue().equals(
- backupIDString.getDefaultValue())) {
- values = new ArrayList<ByteString>(1);
- values.add(ByteString.valueOf(backupIDString.getValue()));
- attributes.add(
- new LDAPAttribute(ATTR_BACKUP_ID, values));
- }
-
- if (verifyOnly.getValue() != null &&
- !verifyOnly.getValue().equals(
- verifyOnly.getDefaultValue())) {
- values = new ArrayList<ByteString>(1);
- values.add(ByteString.valueOf(verifyOnly.getValue()));
- attributes.add(
- new LDAPAttribute(ATTR_TASK_RESTORE_VERIFY_ONLY, values));
- }
-
+ addAttribute(attributes, ATTR_BACKUP_DIRECTORY_PATH, backupDirectory);
+ addAttribute(attributes, ATTR_BACKUP_ID, backupIDString);
+ addAttribute(attributes, ATTR_TASK_RESTORE_VERIFY_ONLY, verifyOnly);
}
- /**
- * {@inheritDoc}
- */
+ private void addAttribute(List<RawAttribute> attributes, String attrName, Argument arg)
+ {
+ if (arg.getValue() != null && !arg.getValue().equals(arg.getDefaultValue()))
+ {
+ attributes.add(new LDAPAttribute(attrName, toByteStrings(arg.getValue())));
+ }
+ }
+
+ private ArrayList<ByteString> toByteStrings(String value)
+ {
+ final ArrayList<ByteString> values = new ArrayList<ByteString>(1);
+ values.add(ByteString.valueOf(value));
+ return values;
+ }
+
+ /** {@inheritDoc} */
+ @Override
public String getTaskObjectclass() {
return "ds-task-restore";
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public Class<?> getTaskClass() {
return RestoreTask.class;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
protected int processLocal(boolean initializeServer,
PrintStream out,
PrintStream err) {
@@ -676,15 +656,9 @@
return 0;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public String getTaskId() {
- if (backupIDString != null) {
- return backupIDString.getValue();
- } else {
- return null;
- }
+ return backupIDString != null? backupIDString.getValue() : null;
}
}
-
--
Gitblit v1.10.0