From 73d88be801a676244bd429e223d217c688291f02 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 07 Nov 2016 15:05:30 +0000
Subject: [PATCH] OPENDJ-3417 Rename Backend to LocalBackend
---
opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
index 4507918..7bd2c36 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
@@ -37,8 +37,8 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.messages.Severity;
import org.opends.messages.TaskMessages;
-import org.opends.server.api.Backend;
-import org.opends.server.api.Backend.BackendOperation;
+import org.opends.server.api.LocalBackend;
+import org.opends.server.api.LocalBackend.BackendOperation;
import org.opends.server.api.ClientConnection;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
@@ -214,7 +214,7 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
- Backend<?> backend = null;
+ LocalBackend<?> backend = null;
ArrayList<DN> defaultIncludeBranches;
HashSet<DN> excludeBranches = new HashSet<>(excludeBranchStrings.size());
HashSet<DN> includeBranches = new HashSet<>(includeBranchStrings.size());
@@ -299,7 +299,7 @@
// Find the backend that includes all the branches.
for(DN includeBranch : includeBranches)
{
- Backend<?> locatedBackend = DirectoryServer.getBackend(includeBranch);
+ LocalBackend<?> locatedBackend = DirectoryServer.getBackend(includeBranch);
if(locatedBackend != null)
{
if(backend == null)
@@ -328,7 +328,7 @@
for(DN includeBranch : includeBranches)
{
- if (!Backend.handlesEntry(includeBranch, defaultIncludeBranches, excludeBranches))
+ if (!LocalBackend.handlesEntry(includeBranch, defaultIncludeBranches, excludeBranches))
{
LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
includeBranch, backend.getBackendID());
@@ -416,7 +416,7 @@
}
// Get the backend into which the LDIF should be imported.
- Backend<?> backend = null;
+ LocalBackend<?> backend = null;
HashSet<DN> defaultIncludeBranches;
HashSet<DN> excludeBranches = new HashSet<>(excludeBranchStrings.size());
HashSet<DN> includeBranches = new HashSet<>(includeBranchStrings.size());
@@ -457,7 +457,7 @@
// Find the backend that includes all the branches.
for(DN includeBranch : includeBranches)
{
- Backend<?> locatedBackend = DirectoryServer.getBackend(includeBranch);
+ LocalBackend<?> locatedBackend = DirectoryServer.getBackend(includeBranch);
if(locatedBackend != null)
{
if(backend == null)
@@ -479,7 +479,7 @@
if (backend.getSubordinateBackends() != null)
{
- for (Backend<?> subBackend : backend.getSubordinateBackends())
+ for (LocalBackend<?> subBackend : backend.getSubordinateBackends())
{
for (DN baseDN : subBackend.getBaseDNs())
{
@@ -520,7 +520,7 @@
// Make sure the selected backend will handle all the include branches
for (DN includeBranch : includeBranches)
{
- if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
+ if (! LocalBackend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch, backend.getBackendID());
--
Gitblit v1.10.0