From d10351e60b3f786a16abe58d916220bb29c0421f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 25 Aug 2015 13:11:18 +0000
Subject: [PATCH] Use Collection.contains()
---
opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java | 16 +++++-----------
opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java | 13 ++++---------
2 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
index 9650ef2..dc4e151 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
@@ -26,7 +26,6 @@
*/
package org.opends.server.tools;
-import java.util.ArrayList;
import java.util.List;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -47,12 +46,9 @@
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.StaticUtils.*;
-/**
- * This class provides utility functions for all JE related client tools.
- */
+/** This class provides utility functions for all JE related client tools. */
public class BackendToolUtils
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private static final int ERROR = 1;
@@ -74,8 +70,8 @@
* @return 0 if everything went fine. 1 if an error occurred.
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static int getBackends(final ArrayList<Backend> backendList, final ArrayList<BackendCfg> entryList,
- final ArrayList<List<DN>> dnList)
+ public static int getBackends(final List<? super Backend<?>> backendList, final List<BackendCfg> entryList,
+ final List<List<DN>> dnList)
{
try
{
@@ -98,7 +94,7 @@
final BackendCfg cfg;
try
{
- backend = (Backend) backendClass.newInstance();
+ backend = (Backend<?>) backendClass.newInstance();
backend.setBackendID(backendID);
cfg = root.getBackend(backendID);
backend.configureBackend(cfg, DirectoryServer.getInstance().getServerContext());
@@ -235,5 +231,4 @@
throw e;
}
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
index f50c9fd..b2d05e6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java
@@ -603,30 +603,24 @@
*/
private Backend<?> retrieveBackend(final DN selectedDN) throws ConfigException, Exception
{
- Backend<?> backend = null;
-
final ArrayList<Backend> backendList = new ArrayList<>();
final ArrayList<BackendCfg> entryList = new ArrayList<>();
final ArrayList<List<DN>> dnList = new ArrayList<>();
BackendToolUtils.getBackends(backendList, entryList, dnList);
+ Backend<?> backend = null;
final int numBackends = backendList.size();
for (int i = 0; i < numBackends; i++)
{
final Backend<?> b = backendList.get(i);
final List<DN> baseDNs = dnList.get(i);
-
- for (final DN baseDN : baseDNs)
+ if (baseDNs.contains(selectedDN))
{
- if (baseDN.equals(selectedDN))
+ if (backend != null)
{
- if (backend != null)
- {
- throw new ConfigException(ERR_MULTIPLE_BACKENDS_FOR_BASE.get(baseDNString.getValue()));
- }
- backend = b;
- break;
+ throw new ConfigException(ERR_MULTIPLE_BACKENDS_FOR_BASE.get(baseDNString.getValue()));
}
+ backend = b;
}
}
--
Gitblit v1.10.0