OPENDJ-1936 - move common changelog classes and tests out of JE implementat...

Matthew Swift

20.56.2015 a9f684014f3b4e2278d86ed8702619c8e1b009cf

OPENDJ-1936 - move common changelog classes and tests out of JE implementation packages

 opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java

@@ -88,9 +88,9 @@
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.je.ECLMultiDomainDBCursor;
import org.opends.server.replication.server.changelog.je.MultiDomainDBCursor;
import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.file.ECLMultiDomainDBCursor;
import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.Attributes;

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java

@@ -59,8 +59,8 @@
import org.opends.server.replication.server.changelog.api.ChangeNumberIndexRecord;
import org.opends.server.replication.server.changelog.api.ChangelogDB;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.file.FileChangelogDB;
import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.je.JEChangelogDB;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.types.*;

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java

@@ -33,7 +33,7 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy;
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
import org.opends.server.replication.server.changelog.je.MultiDomainDBCursor;
import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.DN;

/**

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexer.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
@@ -21,9 +21,9 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2013-2014 ForgeRock AS
 *      Copyright 2013-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.util.Map.Entry;
import java.util.Set;
@@ -43,7 +43,6 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;

import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy.*;
@@ -302,7 +301,7 @@
   * Restores in memory data needed to build the CNIndexDB. In particular,
   * initializes the changes cursor to the medium consistency point.
   */
  private void initialize() throws ChangelogException, DirectoryException
  private void initialize() throws ChangelogException
  {
    final ReplicationDomainDB domainDB = changelogDB.getReplicationDomainDB();


 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/CompositeDBCursor.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2013-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.util.*;
import java.util.Map.Entry;

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/DomainDBCursor.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DomainDBCursor.java
@@ -20,9 +20,9 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2014 ForgeRock AS
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.util.Iterator;
import java.util.Map.Entry;

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLEnabledDomainPredicate.java
@@ -20,9 +20,9 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2014 ForgeRock AS
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.types.DN;

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursor.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
@@ -22,7 +22,7 @@
 *
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.util.ArrayList;
import java.util.List;

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java

@@ -64,10 +64,6 @@
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.replication.server.changelog.je.ChangeNumberIndexer;
import org.opends.server.replication.server.changelog.je.DomainDBCursor;
import org.opends.server.replication.server.changelog.je.MultiDomainDBCursor;
import org.opends.server.replication.server.changelog.je.ReplicaCursor;
import org.opends.server.types.DN;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/MultiDomainDBCursor.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/MultiDomainDBCursor.java
@@ -20,9 +20,9 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2014 ForgeRock AS
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.util.Iterator;
import java.util.Map.Entry;

 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ReplicaCursor.java

File was renamed from opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
@@ -20,9 +20,9 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2014 ForgeRock AS
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.util.concurrent.atomic.AtomicReference;


 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java

@@ -62,6 +62,10 @@
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.replication.server.changelog.file.ChangeNumberIndexer;
import org.opends.server.replication.server.changelog.file.DomainDBCursor;
import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.replication.server.changelog.file.ReplicaCursor;
import org.opends.server.types.DN;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;

 opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java

@@ -86,7 +86,7 @@
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.types.Attribute;

 opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java

@@ -39,7 +39,7 @@
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.tools.LDAPSearch;

 opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java

File was renamed from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
@@ -21,10 +21,10 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2013-2014 ForgeRock AS
 *      Copyright 2013-2015 ForgeRock AS
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.lang.Thread.State;
import java.util.Arrays;
@@ -48,6 +48,10 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.replication.server.changelog.file.ChangeNumberIndexer;
import org.opends.server.replication.server.changelog.file.DomainDBCursor;
import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.DN;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;

 opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/CompositeDBCursorTest.java

File was renamed from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2013-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import static org.forgerock.util.Pair.*;
import static org.testng.Assert.*;
@@ -33,6 +33,7 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.file.CompositeDBCursor;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;


 opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ECLMultiDomainDBCursorTest.java

File was renamed from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java
@@ -20,9 +20,9 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2014 ForgeRock AS
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.util.HashSet;
import java.util.Set;
@@ -35,6 +35,9 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.file.ECLMultiDomainDBCursor;
import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.DN;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;

 opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FakeUpdateMsg.java

File was renamed from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java
@@ -20,9 +20,9 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2014 ForgeRock AS
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;
@@ -44,4 +44,4 @@
  {
    return "UpdateMsg(" + t + ")";
  }
}
}

 opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ReplicaCursorTest.java

File was renamed from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java
@@ -20,15 +20,16 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2014 ForgeRock AS
 *      Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.ReplicaOfflineMsg;
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.file.ReplicaCursor;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;


 opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/SequentialDBCursor.java

File was renamed from opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
@@ -21,9 +21,9 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2013-2014 ForgeRock AS
 *      Copyright 2013-2015 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;
package org.opends.server.replication.server.changelog.file;

import java.util.ArrayList;
import java.util.Arrays;
@@ -91,4 +91,4 @@
                + " nextMessages=" + msgs + ")";
  }

}
}