From c0a5d19fa897c532ced3e13e01f18f869270e9a0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Mar 2015 16:01:25 +0000
Subject: [PATCH] Pass ServerContext object down method calls to the pluggable backend Importer class.
---
opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java
index 775407d..98d1ce5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java
@@ -161,8 +161,7 @@
RebuildConfig rebuildConfig = new RebuildConfig();
rebuildConfig.setBaseDN(baseDNs[0]);
rebuildConfig.addRebuildIndex(index);
- backend = DirectoryServer.getBackend(backendID);
- backend.rebuildBackend(rebuildConfig);
+ rebuildBackend(backendID, rebuildConfig);
if(index.contains(".") && !index.startsWith("vlv."))
{
@@ -188,8 +187,7 @@
RebuildConfig rebuildConfig = new RebuildConfig();
rebuildConfig.setBaseDN(baseDNs[0]);
rebuildConfig.addRebuildIndex("id2entry");
- backend = DirectoryServer.getBackend(backendID);
- backend.rebuildBackend(rebuildConfig);
+ rebuildBackend(backendID, rebuildConfig);
}
@@ -207,11 +205,10 @@
RebuildConfig rebuildConfig = new RebuildConfig();
rebuildConfig.setBaseDN(baseDNs[0]);
rebuildConfig.addRebuildIndex("id2entry");
- backend = DirectoryServer.getBackend(backendID);
TaskUtils.disableBackend(backendID);
try {
- backend.rebuildBackend(rebuildConfig);
+ rebuildBackend(backendID, rebuildConfig);
} finally {
TaskUtils.enableBackend(backendID);
}
@@ -224,8 +221,7 @@
RebuildConfig rebuildConfig = new RebuildConfig();
rebuildConfig.setBaseDN(baseDNs[0]);
rebuildConfig.addRebuildIndex(index);
- backend = DirectoryServer.getBackend(backendID);
- backend.rebuildBackend(rebuildConfig);
+ rebuildBackend(backendID, rebuildConfig);
}
@Test(dataProvider = "systemIndexes",
@@ -236,8 +232,7 @@
RebuildConfig rebuildConfig = new RebuildConfig();
rebuildConfig.setBaseDN(baseDNs[0]);
rebuildConfig.addRebuildIndex(index);
- backend = DirectoryServer.getBackend(backendID);
- backend.rebuildBackend(rebuildConfig);
+ rebuildBackend(backendID, rebuildConfig);
}
@Test(dataProvider = "systemIndexes")
@@ -248,9 +243,8 @@
rebuildConfig.setBaseDN(baseDNs[0]);
rebuildConfig.addRebuildIndex(index);
- backend = DirectoryServer.getBackend(backendID);
TaskUtils.disableBackend(backendID);
- backend.rebuildBackend(rebuildConfig);
+ rebuildBackend(backendID, rebuildConfig);
//TODO: Verify dn2uri database as well.
if (!"dn2uri".equalsIgnoreCase(index))
@@ -296,11 +290,10 @@
private void rebuildIndexes(RebuildConfig rebuildConfig) throws Exception
{
- backend = DirectoryServer.getBackend(backendID);
TaskUtils.disableBackend(backendID);
try
{
- backend.rebuildBackend(rebuildConfig);
+ rebuildBackend(backendID, rebuildConfig);
assertEquals(verifyBackend(null), 0);
}
finally
@@ -309,6 +302,12 @@
}
}
+ private void rebuildBackend(String backendID, RebuildConfig rebuildConfig) throws Exception
+ {
+ backend = DirectoryServer.getBackend(backendID);
+ backend.rebuildBackend(rebuildConfig, DirectoryServer.getInstance().getServerContext());
+ }
+
@Test
public void testRebuildRedundentIndexes() throws Exception
{
--
Gitblit v1.10.0