From 8c890fb8be9c70a3d10f943c22d1f5db710115e2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Oct 2014 14:05:02 +0000
Subject: [PATCH] OPENDJ-1559 (CR-4758) Create ReplicaId class to replace use of Pair<DN, Integer>
---
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursor.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursor.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
index 1ede615..351e252 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursor.java
@@ -31,10 +31,8 @@
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.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
-import org.opends.server.types.DN;
-
-import com.forgerock.opendj.util.Pair;
/**
* {@link DBCursor} over a replica returning {@link UpdateMsg}s.
@@ -51,7 +49,7 @@
new AtomicReference<ReplicaOfflineMsg>();
private UpdateMsg currentRecord;
- private final Pair<DN, Integer> replicaID;
+ private final ReplicaId replicaId;
private final ReplicationDomainDB domainDB;
/**
@@ -64,16 +62,15 @@
* @param offlineCSN
* the offline CSN from which to builder the
* {@link ReplicaOfflineMsg} to return
- * @param replicaID
- * the baseDN => serverId pair to uniquely identify the replica
+ * @param replicaId
+ * the replica identifier
* @param domainDB
* the DB for the provided replication domain
*/
- public ReplicaCursor(DBCursor<UpdateMsg> cursor, CSN offlineCSN,
- Pair<DN, Integer> replicaID, ReplicationDomainDB domainDB)
+ public ReplicaCursor(DBCursor<UpdateMsg> cursor, CSN offlineCSN, ReplicaId replicaId, ReplicationDomainDB domainDB)
{
this.cursor = cursor;
- this.replicaID = replicaID;
+ this.replicaId = replicaId;
this.domainDB = domainDB;
setOfflineCSN(offlineCSN);
}
@@ -103,9 +100,9 @@
*
* @return the replica identifier that this cursor is associated to
*/
- public Pair<DN, Integer> getReplicaID()
+ public ReplicaId getReplicaId()
{
- return replicaID;
+ return replicaId;
}
/** {@inheritDoc} */
--
Gitblit v1.10.0