From dfbe880eb338a1d752ce790f689b5133761d7079 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Sep 2013 07:35:55 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java b/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
index 2f8b64e..2a86679 100644
--- a/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
@@ -27,19 +27,19 @@
*/
package org.opends.server.replication.protocol;
-import static org.opends.server.replication.protocol.OperationContext.*;
-
import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
import org.opends.server.controls.SubtreeDeleteControl;
+import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DeleteOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.common.CSN;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.Operation;
+import org.opends.server.types.DN;
import org.opends.server.types.operation.PostOperationDeleteOperation;
+import static org.opends.server.replication.protocol.OperationContext.*;
+
/**
* Object used when sending delete information to replication servers.
*/
@@ -58,7 +58,7 @@
public DeleteMsg(PostOperationDeleteOperation operation)
{
super((OperationContext) operation.getAttachment(SYNCHROCONTEXT),
- operation.getRawEntryDN().toString());
+ operation.getEntryDN());
try
{
if (operation.getRequestControl(SubtreeDeleteControl.DECODER) != null)
@@ -75,7 +75,7 @@
* @param csn The CSN with which the message must be created.
* @param entryUUID The unique id with which the message must be created.
*/
- public DeleteMsg(String dn, CSN csn, String entryUUID)
+ public DeleteMsg(DN dn, CSN csn, String entryUUID)
{
super(new DeleteContext(csn, entryUUID), dn);
}
@@ -111,13 +111,12 @@
* {@inheritDoc}
*/
@Override
- public Operation createOperation(InternalClientConnection connection,
- String newDn)
+ public DeleteOperation createOperation(InternalClientConnection connection,
+ DN newDN)
{
- DeleteOperationBasis del = new DeleteOperationBasis(connection,
+ DeleteOperation del = new DeleteOperationBasis(connection,
InternalClientConnection.nextOperationID(),
- InternalClientConnection.nextMessageID(), null,
- ByteString.valueOf(newDn));
+ InternalClientConnection.nextMessageID(), null, newDN);
if (isSubtreeDelete)
del.addRequestControl(new SubtreeDeleteControl(false));
--
Gitblit v1.10.0