From ddf7385f6d72164c9e66aff00b3a4f076ec69c78 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 21 Apr 2016 16:03:20 +0000
Subject: [PATCH] Consolidated InternalClientConnection.processModifyDN() methods

---
 opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
index 7069860..71875e6 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
@@ -56,7 +56,6 @@
 import org.opends.server.core.CompareOperation;
 import org.opends.server.core.DeleteOperation;
 import org.opends.server.core.ExtendedOperation;
-import org.opends.server.core.ModifyDNOperation;
 import org.opends.server.protocols.internal.InternalClientConnection;
 import org.opends.server.protocols.internal.InternalSearchListener;
 import org.opends.server.protocols.internal.InternalSearchOperation;
@@ -72,15 +71,10 @@
 import static org.forgerock.opendj.ldap.LdapException.*;
 import static org.forgerock.util.promise.Promises.*;
 
-/**
- * This class provides a connection factory and an adapter for the OpenDJ 2.x
- * server.
- */
+/** This class provides a connection factory and an adapter for the OpenDJ 2.x server. */
 public final class Adapters {
 
-    /**
-     * Constructor.
-     */
+    /** Constructor. */
     private Adapters() {
         // No implementation required.
     }
@@ -226,13 +220,7 @@
 
             @Override
             public Result modifyDN(final ModifyDNRequest request) throws LdapException {
-                final ModifyDNOperation modifyDNOperation =
-                        icc.processModifyDN(valueOfObject(request.getName()),
-                                valueOfObject(request.getNewRDN()),
-                                request.isDeleteOldRDN(),
-                                request.getNewSuperior() != null ? valueOfObject(request.getNewSuperior()) : null,
-                                to(request.getControls()));
-                return getResponseResult(modifyDNOperation);
+                return getResponseResult(icc.processModifyDN(request));
             }
 
             @Override

--
Gitblit v1.10.0