From d6b4863175cbac9c771441d8d50b75774044c07d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 18 Apr 2016 15:57:03 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index 72ed8d4..96fcee9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -19,8 +19,8 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static com.forgerock.opendj.cli.CommonArguments.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.CommonArguments.*;
import static com.forgerock.opendj.cli.Utils.*;
import java.io.File;
@@ -34,8 +34,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
@@ -51,8 +52,6 @@
import org.opends.server.tasks.ImportTask;
import org.opends.server.tools.makeldif.TemplateFile;
import org.opends.server.tools.tasks.TaskTool;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ExistingFileBehavior;
import org.opends.server.types.InitializationException;
@@ -495,7 +494,6 @@
if (initializeServer)
{
- DirectoryServer.InitializationBuilder ib;
try
{
new DirectoryServer.InitializationBuilder(configFile.getValue())
@@ -667,8 +665,8 @@
}
}
- ArrayList<Backend> backendList = new ArrayList<>();
- ArrayList<BackendCfg> entryList = new ArrayList<>();
+ ArrayList<Backend<?>> backendList = new ArrayList<>();
+ ArrayList<BackendCfg> entryList = new ArrayList<>();
ArrayList<List<DN>> dnList = new ArrayList<>();
int code = BackendToolUtils.getBackends(backendList, entryList, dnList);
if (code != 0)
@@ -978,22 +976,6 @@
return retCode;
}
- private Object getMessage(Exception e)
- {
- try
- {
- throw e;
- }
- catch (ConfigException | InitializationException e2)
- {
- return e2.getMessage();
- }
- catch (Exception e2)
- {
- return getExceptionMessage(e2);
- }
- }
-
private boolean useBackend(Set<DN> includeBranches, List<DN> dnlist)
{
for (DN baseDN : dnlist)
--
Gitblit v1.10.0