Fix OPENDJ-525: Remove compiler warnings when building using JDK7

Matthew Swift

19.26.2012 108e2020c1d149962dfc43dcbc6bc24a05a8e5f7

Fix OPENDJ-525: Remove compiler warnings when building using JDK7

 opends/build.xml

@@ -168,7 +168,15 @@
  <!-- Prevent ant runtime from being included on classpath during
       compilation. -->  
  <presetdef name="javac">
    <javac includeantruntime="false" />
    <javac optimize="true" includeantruntime="false"
        debug="on" debuglevel="${build.debuglevel}"
        deprecation="true" fork="true"
        memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
      <compilerarg value="-Xlint:-rawtypes" />
      <compilerarg value="-Xlint:-static" />
      <compilerarg value="-Xlint:-unchecked" />
    </javac>
  </presetdef>

  <!-- Create a package bundle containing the DSML library. -->
@@ -594,11 +602,7 @@
    <mkdir dir="${build.lib.dir}" />

    <javac srcdir="${src.dir}:${admin.src.dir}:${msg.src.dir}:${msg.javagen.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
         destdir="${classes.dir}" debug="on" debuglevel="${build.debuglevel}"
         deprecation="true" fork="true"
         memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />

         destdir="${classes.dir}">
      <classpath>
        <fileset dir="${lib.dir}">
          <include name="*.jar" />
@@ -625,11 +629,7 @@
  <target name="compilequicksetup" depends="buildtools,compile"
          description="Compile the Quick Setup source files.">
    <mkdir dir="${quicksetup.classes.dir}" />
    <javac srcdir="${ads.src.dir}" destdir="${quicksetup.classes.dir}"
         optimize="true" debug="on" debuglevel="lines,source"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
         memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
    <javac srcdir="${ads.src.dir}" destdir="${quicksetup.classes.dir}">
      <classpath>
        <fileset dir="${build.dir}/build-tools">
          <include name="build-tools.jar" />
@@ -637,10 +637,7 @@
        <pathelement path="${classes.dir}"/>
      </classpath>
    </javac>
    <javac srcdir="${src.dir}:${msg.src.dir}:${msg.javagen.dir}" destdir="${quicksetup.classes.dir}"
               debug="on" debuglevel="${build.debuglevel}"
               deprecation="true" fork="true" memoryInitialSize="${MEM}"
               memoryMaximumSize="${MEM}">
    <javac srcdir="${src.dir}:${msg.src.dir}:${msg.javagen.dir}" destdir="${quicksetup.classes.dir}">
      <include name="**/org/opends/server/util/SetupUtils.java"/>
      <include name="**/org/opends/server/util/CertificateManager.java"/>
      <include name="**/org/opends/server/util/DynamicConstants.java"/>
@@ -652,14 +649,8 @@
      <include name="**/org/opends/messages/Category.java"/>
      <include name="**/org/opends/messages/QuickSetupMessages.java"/>
      <include name="**/org/opends/server/types/OpenDsException.java"/>
    <compilerarg value="-Xlint:all" />
    </javac>
    <javac srcdir="${quicksetup.src.dir}" destdir="${quicksetup.classes.dir}"
         debug="on" debuglevel="${build.debuglevel}"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
         memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />

    <javac srcdir="${quicksetup.src.dir}" destdir="${quicksetup.classes.dir}">
      <classpath>
        <fileset dir="${build.dir}/build-tools">
          <include name="build-tools.jar" />
@@ -763,12 +754,7 @@
    <!-- Recreate the classes directory and recompile into it. -->
    <mkdir dir="${classes.dir}" />
    <javac srcdir="${src.dir}:${msg.src.dir}:${msg.javagen.dir}:${admin.src.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
         destdir="${classes.dir}"
         debug="on" debuglevel="${build.debuglevel}"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
         memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />

         destdir="${classes.dir}">
      <classpath>
        <fileset dir="${lib.dir}">
          <include name="*.jar" />
@@ -804,11 +790,7 @@

    <!-- Recreate the quicksetup classes directory and recompile into it. -->
    <mkdir dir="${quicksetup.classes.dir}" />
    <javac srcdir="${ads.src.dir}" destdir="${quicksetup.classes.dir}"
         optimize="true" debug="on" debuglevel="lines,source"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
         memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
    <javac srcdir="${ads.src.dir}" destdir="${quicksetup.classes.dir}">
      <classpath>
        <fileset dir="${build.dir}/build-tools">
          <include name="build-tools.jar" />
@@ -816,10 +798,7 @@
        <pathelement path="${classes.dir}"/>
      </classpath>
    </javac>
    <javac srcdir="${src.dir}:${msg.src.dir}:${msg.javagen.dir}" destdir="${quicksetup.classes.dir}"
                       debug="on" debuglevel="${build.debuglevel}"
                       deprecation="true" fork="true" memoryInitialSize="${MEM}"
                       memoryMaximumSize="${MEM}">
    <javac srcdir="${src.dir}:${msg.src.dir}:${msg.javagen.dir}" destdir="${quicksetup.classes.dir}">
      <include name="**/org/opends/server/util/SetupUtils.java"/>
      <include name="**/org/opends/server/util/CertificateManager.java"/>
      <include name="**/org/opends/server/util/DynamicConstants.java"/>
@@ -831,13 +810,8 @@
      <include name="**/org/opends/messages/Category.java"/>
      <include name="**/org/opends/messages/QuickSetupMessages.java"/>
      <include name="**/org/opends/server/types/OpenDsException.java"/>
      <compilerarg value="-Xlint:all" />
    </javac>
    <javac srcdir="${quicksetup.src.dir}" destdir="${quicksetup.classes.dir}"
        debug="on" debuglevel="${build.debuglevel}"
        deprecation="true" fork="true" memoryInitialSize="${MEM}"
        memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
    <javac srcdir="${quicksetup.src.dir}" destdir="${quicksetup.classes.dir}">
      <classpath>
        <fileset dir="${build.dir}/build-tools">
          <include name="build-tools.jar" />
@@ -1254,13 +1228,8 @@

    <mkdir dir="${dsml.classes.dir}" />

    <javac srcdir="${dsml.gen.dir}" destdir="${dsml.classes.dir}"
         debug="on" debuglevel="${build.debuglevel}"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
         memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
    <javac srcdir="${dsml.gen.dir}" destdir="${dsml.classes.dir}">
      <compilerarg value="-Xlint:-path" />

      <classpath>
        <fileset dir="${dsml.lib.dir}">
          <include name="*.jar" />
@@ -1268,13 +1237,8 @@
      </classpath>
    </javac>

    <javac srcdir="${dsml.src.dir}" destdir="${dsml.classes.dir}"
         debug="on" debuglevel="${build.debuglevel}"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
         memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
    <javac srcdir="${dsml.src.dir}" destdir="${dsml.classes.dir}">
      <compilerarg value="-Xlint:-path" />

      <classpath>
        <fileset dir="${dsml.lib.dir}">
          <include name="*.jar" />
@@ -1521,11 +1485,7 @@
    <mkdir dir="${classes.dir}" />

    <javac srcdir="${src.dir}:${admin.src.dir}:${msg.src.dir}:${msg.javagen.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
        destdir="${classes.dir}" debug="on" debuglevel="${build.debuglevel}"
        deprecation="true" fork="true"
        memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />

        destdir="${classes.dir}">
      <classpath>
        <fileset dir="${lib.dir}">
          <include name="*.jar" />
@@ -1563,12 +1523,7 @@

    <!-- Compile the test cases -->
    <mkdir dir="${unittest.classes.dir}" />
    <javac srcdir="${unittest.testng.src.dir}" destdir="${unittest.classes.dir}"
           debug="on" debuglevel="${build.debuglevel}"
           deprecation="true" fork="true" memoryInitialSize="${MEM}"
           memoryMaximumSize="${MEM}" excludes="org/opends/server/snmp/**">
      <compilerarg value="-Xlint:all" />

    <javac srcdir="${unittest.testng.src.dir}" destdir="${unittest.classes.dir}" excludes="org/opends/server/snmp/**">
      <classpath>
        <fileset dir="${lib.dir}">
          <include name="*.jar" />
@@ -2168,18 +2123,10 @@
                     org/opends/messages/MessagePropertyKey.java,
                     org/opends/messages/MessageDescriptor.java,
                     org/opends/server/types/PublicAPI.java,
                     org/opends/server/types/StabilityLevel.java"
           debug="on" debuglevel="${build.debuglevel}"
           deprecation="true" fork="true" memoryInitialSize="${MEM}"
           memoryMaximumSize="${MEM}"/>
                     org/opends/server/types/StabilityLevel.java"/>


    <javac srcdir="${buildtools.src.dir}" destdir="${buildtools.classes.dir}"
           debug="on" debuglevel="${build.debuglevel}"
           deprecation="true" fork="true" memoryInitialSize="${MEM}"
           memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />

    <javac srcdir="${buildtools.src.dir}" destdir="${buildtools.classes.dir}">
      <classpath>
        <fileset dir="${ant.lib.dir}">
          <include name="*.jar" />
@@ -2443,12 +2390,8 @@

    <mkdir dir="${classes.dir}" />

    <javac srcdir="${snmp.gen.dir}"
         destdir="${classes.dir}" debug="on" debuglevel="${build.debuglevel}"
         source="1.4" target="1.4" deprecation="true" fork="true" nowarn="on"
         memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />

    <javac srcdir="${snmp.gen.dir}" destdir="${classes.dir}" >
      <compilerarg value="-Xlint:-serial" />
      <classpath>
        <fileset dir="${lib.dir}">
          <include name="*.jar" />
@@ -2459,12 +2402,7 @@
      </classpath>
    </javac>

     <javac srcdir="${snmp.src.dir}"
         destdir="${classes.dir}" debug="on" debuglevel="${build.debuglevel}"
         deprecation="true" fork="true"
         memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />

     <javac srcdir="${snmp.src.dir}" destdir="${classes.dir}">
      <classpath>
        <fileset dir="${lib.dir}">
          <include name="*.jar" />
@@ -2521,11 +2459,7 @@
    <!-- Compile the SNMP test cases -->
    <mkdir dir="${unittest.classes.dir}" />
    <javac srcdir="${unittest.testng.src.dir}" destdir="${unittest.classes.dir}"
           debug="on" debuglevel="${build.debuglevel}"
           deprecation="true" fork="true" memoryInitialSize="${MEM}"
           memoryMaximumSize="${MEM}" includes="org/opends/server/snmp/**">
      <compilerarg value="-Xlint:all" />

           includes="org/opends/server/snmp/**">
      <classpath>
        <fileset dir="${lib.dir}">
          <include name="*.jar" />

 opends/resource/Messages.java.stub

@@ -63,6 +63,7 @@
  * it returns <CODE>null</CODE> if the default ClassLoader is to be
  * used.
  */
  @SuppressWarnings("unused")
  private static ClassLoader getClassLoader()
  {
    ClassLoader cl;

 opends/src/build-tools/org/opends/build/tools/CheckPrecommit.java

@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions copyright 2012 ForgeRock AS.
 */
package org.opends.build.tools;

@@ -37,10 +38,7 @@
import java.util.LinkedList;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;

import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.wc.SVNPropertyData;
@@ -176,7 +174,7 @@

    try
    {
      long status = ourClientManager.getStatusClient().doStatus(workspacePath, SVNRevision.WORKING, 
      ourClientManager.getStatusClient().doStatus(workspacePath, SVNRevision.WORKING,
              SVNDepth.INFINITY, false, false, false, false, this, null);
    }
    catch (Exception e)

 opends/src/build-tools/org/opends/build/tools/GenerateMessageFile.java

@@ -23,7 +23,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 *      Portions Copyright 2011-2012 ForgeRock AS
 */
package org.opends.build.tools;

@@ -700,7 +700,7 @@
                              KEY_FORM_MSG);
            }

            if (c == null) {
            if (s == null) {
              throw new BuildException(
                      "No severity could be assigned to message " +
                              key + ".  The severity " +

 opends/src/build-tools/org/opends/build/tools/Utilities.java

@@ -25,8 +25,6 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 */
package org.opends.build.tools;
import org.opends.messages.Message;

import java.util.StringTokenizer;

/**

 opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java

@@ -111,6 +111,7 @@
    ProgressDialog progressDialog = new ProgressDialog(
        Utilities.createFrame(),
        Utilities.getParentDialog(this), getTitle(), getInfo());
    @SuppressWarnings("deprecation")
    Object[] backends = list.getSelectedValues();
    ArrayList<BackendDescriptor> backendsToDelete =
      new ArrayList<BackendDescriptor>();

 opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java

@@ -173,6 +173,7 @@
         */
        public void run()
        {
          @SuppressWarnings("deprecation")
          Object[] s = list.getSelectedValues();
          Set<Object> selected = new HashSet<Object>();
          if (s != null)
@@ -377,6 +378,7 @@
    ProgressDialog progressDialog = new ProgressDialog(
        Utilities.createFrame(),
        Utilities.getParentDialog(this), getTitle(), getInfo());
    @SuppressWarnings("deprecation")
    Object[] dns = list.getSelectedValues();
    ArrayList<BaseDNDescriptor> baseDNsToDelete =
      new ArrayList<BaseDNDescriptor>();

 opends/src/guitools/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java

@@ -441,6 +441,7 @@

  private void addClicked()
  {
    @SuppressWarnings("deprecation")
    Object[] selectedObjects = availableList.getSelectedValues();
    for (int i=0; i<selectedObjects.length; i++)
    {
@@ -456,6 +457,7 @@

  private void removeClicked()
  {
    @SuppressWarnings("deprecation")
    Object[] selectedObjects = selectedList.getSelectedValues();
    for (int i=0; i<selectedObjects.length; i++)
    {

 opends/src/guitools/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java

@@ -659,6 +659,7 @@

  private void add1Clicked()
  {
    @SuppressWarnings("deprecation")
    Object[] selectedObjects = availableList.getSelectedValues();
    for (int i=0; i<selectedObjects.length; i++)
    {
@@ -674,6 +675,7 @@

  private void add2Clicked()
  {
    @SuppressWarnings("deprecation")
    Object[] selectedObjects = availableList.getSelectedValues();
    for (int i=0; i<selectedObjects.length; i++)
    {
@@ -689,6 +691,7 @@

  private void remove1Clicked()
  {
    @SuppressWarnings("deprecation")
    Object[] selectedObjects = selectedList1.getSelectedValues();
    for (int i=0; i<selectedObjects.length; i++)
    {
@@ -704,6 +707,7 @@

  private void remove2Clicked()
  {
    @SuppressWarnings("deprecation")
    Object[] selectedObjects = selectedList2.getSelectedValues();
    for (int i=0; i<selectedObjects.length; i++)
    {

 opends/src/server/org/opends/server/backends/jeb/DatabaseContainer.java

@@ -111,11 +111,11 @@
                              database.getDatabaseName(),
                              txn.getId());
        }
        entryContainer.transactionCommit(txn);
        EntryContainer.transactionCommit(txn);
      }
      catch (DatabaseException e)
      {
        entryContainer.transactionAbort(txn);
        EntryContainer.transactionAbort(txn);
        throw e;
      }
    }

 opends/src/server/org/opends/server/core/GroupManager.java

@@ -84,6 +84,7 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;

@@ -706,8 +707,8 @@


        InternalSearchOperation internalSearch =
             new InternalSearchOperation(conn, conn.nextOperationID(),
                                         conn.nextMessageID(), requestControls,
             new InternalSearchOperation(conn, nextOperationID(),
                                         nextMessageID(), requestControls,
                                         baseDN,
                                         SearchScope.WHOLE_SUBTREE,
                                         DereferencePolicy.NEVER_DEREF_ALIASES,

 opends/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java

@@ -173,7 +173,7 @@
    String output;
    try
    {
      output = bsdmd5crypt.crypt(plaintext.toString());
      output = BSDMD5Crypt.crypt(plaintext.toString());
    }
    catch (Exception e)
    {
@@ -257,7 +257,7 @@
    String storedString = storedPassword.toString();
    try
    {
      String userString   = bsdmd5crypt.crypt(plaintextPassword.toString(),
      String userString   = BSDMD5Crypt.crypt(plaintextPassword.toString(),
        storedString);
      return userString.equals(storedString);
    }

 opends/src/server/org/opends/server/extensions/FIFOEntryCache.java

@@ -704,7 +704,8 @@
        if ((entriesDeleted % 1000)  == 0)
        {
          cacheWriteLock.unlock();
          Thread.currentThread().yield();
          Thread.currentThread();
          Thread.yield();
          cacheWriteLock.lock();
        }
      }
@@ -811,7 +812,8 @@
      if ((entriesExamined % 1000) == 0)
      {
        cacheWriteLock.unlock();
        Thread.currentThread().yield();
        Thread.currentThread();
        Thread.yield();
        cacheWriteLock.lock();
      }
    }

 opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java

@@ -781,7 +781,8 @@
          entriesExamined++;
          if ((entriesExamined % 1000) == 0) {
            cacheWriteLock.unlock();
            Thread.currentThread().yield();
            Thread.currentThread();
            Thread.yield();
            cacheWriteLock.lock();
          }
        }
@@ -883,7 +884,8 @@
        entriesExamined++;
        if ((entriesExamined % 1000) == 0) {
          cacheWriteLock.unlock();
          Thread.currentThread().yield();
          Thread.currentThread();
          Thread.yield();
          cacheWriteLock.lock();
        }
      } catch (Exception e) {

 opends/src/server/org/opends/server/extensions/StaticGroup.java

@@ -69,6 +69,7 @@

import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.Validator.*;

@@ -698,8 +699,8 @@
      InternalClientConnection conn =
           InternalClientConnection.getRootConnection();
      ModifyOperationBasis modifyOperation =
           new ModifyOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), requestControls,
           new ModifyOperationBasis(conn, nextOperationID(),
                               nextMessageID(), requestControls,
                               groupEntryDN, mods);
      modifyOperation.run();
      if (modifyOperation.getResultCode() != ResultCode.SUCCESS)
@@ -753,8 +754,8 @@
      InternalClientConnection conn =
           InternalClientConnection.getRootConnection();
      ModifyOperationBasis modifyOperation =
           new ModifyOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), requestControls,
           new ModifyOperationBasis(conn, nextOperationID(),
                               nextMessageID(), requestControls,
                               groupEntryDN, mods);
      modifyOperation.run();
      if (modifyOperation.getResultCode() != ResultCode.SUCCESS)

 opends/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java

@@ -41,6 +41,7 @@
import org.opends.server.types.*;

import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.util.ServerConstants.*;

@@ -438,7 +439,7 @@

    InternalClientConnection conn = socket.getConnection();
    AddOperationBasis op =
         new AddOperationBasis(conn, conn.nextOperationID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               messageID, message.getControls(),
                               request.getDN(),
                               request.getAttributes());
@@ -487,7 +488,7 @@

    InternalClientConnection conn = socket.getConnection();
    BindOperationBasis op =
         new BindOperationBasis(conn, conn.nextOperationID(),
         new BindOperationBasis(conn, nextOperationID(),
                  messageID, message.getControls(),
                  String.valueOf(request.getProtocolVersion()),
                  request.getDN(), request.getSimplePassword());
@@ -531,7 +532,7 @@

    InternalClientConnection conn = socket.getConnection();
    CompareOperationBasis op =
         new CompareOperationBasis(conn, conn.nextOperationID(),
         new CompareOperationBasis(conn, nextOperationID(),
                  messageID, message.getControls(), request.getDN(),
                  request.getAttributeType(),
                  request.getAssertionValue());
@@ -571,7 +572,7 @@

    InternalClientConnection conn = socket.getConnection();
    DeleteOperationBasis op =
         new DeleteOperationBasis(conn, conn.nextOperationID(),
         new DeleteOperationBasis(conn, nextOperationID(),
                  messageID, message.getControls(), request.getDN());
    op.run();

@@ -619,7 +620,7 @@

    InternalClientConnection conn = socket.getConnection();
    ExtendedOperationBasis op =
         new ExtendedOperationBasis(conn, conn.nextOperationID(),
         new ExtendedOperationBasis(conn, nextOperationID(),
                  messageID, message.getControls(), request.getOID(),
                  request.getValue());
    op.run();
@@ -659,7 +660,7 @@

    InternalClientConnection conn = socket.getConnection();
    ModifyOperationBasis op =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
         new ModifyOperationBasis(conn, nextOperationID(),
                  messageID, message.getControls(), request.getDN(),
                  request.getModifications());
    op.run();
@@ -698,7 +699,7 @@

    InternalClientConnection conn = socket.getConnection();
    ModifyDNOperationBasis op =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(),
         new ModifyDNOperationBasis(conn, nextOperationID(),
               messageID, message.getControls(), request.getEntryDN(),
               request.getNewRDN(), request.deleteOldRDN(),
               request.getNewSuperior());
@@ -738,7 +739,7 @@

    InternalClientConnection conn = socket.getConnection();
    InternalSearchOperation op =
         new InternalSearchOperation(conn, conn.nextOperationID(),
         new InternalSearchOperation(conn, nextOperationID(),
                messageID, message.getControls(), request.getBaseDN(),
                request.getScope(), request.getDereferencePolicy(),
                request.getSizeLimit(), request.getTimeLimit(),

 opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java

@@ -29,7 +29,6 @@


import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.schema.StringPrepProfile.*;

import java.util.Collection;

 opends/src/server/org/opends/server/tools/DBTest.java

@@ -388,8 +388,8 @@
      DirectoryServer directoryServer = DirectoryServer.getInstance();
      try
      {
        directoryServer.bootstrapClient();
        directoryServer.initializeJMX();
        DirectoryServer.bootstrapClient();
        DirectoryServer.initializeJMX();
      }
      catch (Exception e)
      {

 opends/src/server/org/opends/server/tools/EncodePassword.java

@@ -1184,7 +1184,7 @@
        try
        {
          // attempt masking at this rate
          this.sleep(1);
          Thread.sleep(1);
        }
        catch (InterruptedException iex)
        {

 opends/src/server/org/opends/server/tools/LDIFModify.java

@@ -537,7 +537,7 @@
    {
      // Bootstrap the Directory Server configuration for use as a client.
      DirectoryServer directoryServer = DirectoryServer.getInstance();
      directoryServer.bootstrapClient();
      DirectoryServer.bootstrapClient();


      // If we're to use the configuration then initialize it, along with the
@@ -547,7 +547,7 @@
      {
        try
        {
          directoryServer.initializeJMX();
          DirectoryServer.initializeJMX();
        }
        catch (Exception e)
        {

 opends/src/server/org/opends/server/tools/ListBackends.java

@@ -253,8 +253,8 @@
    {
      try
      {
        directoryServer.bootstrapClient();
        directoryServer.initializeJMX();
        DirectoryServer.bootstrapClient();
        DirectoryServer.initializeJMX();
      }
      catch (Exception e)
      {

 opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java

@@ -249,11 +249,11 @@
      // Initialize the Directory Server configuration handler using the
      // information that was provided.
      DirectoryServer directoryServer = DirectoryServer.getInstance();
      directoryServer.bootstrapClient();
      DirectoryServer.bootstrapClient();

      try
      {
        directoryServer.initializeJMX();
        DirectoryServer.initializeJMX();
      }
      catch (Exception e)
      {

 opends/src/server/org/opends/server/types/IdentifiedException.java

@@ -43,6 +43,13 @@
       extends OpenDsException
{
  /**
   * Generated serialization ID.
   */
  private static final long serialVersionUID = 7071843225564003122L;



  /**
   * Creates a new identified exception.
   */
  protected IdentifiedException()

 opends/src/server/org/opends/server/types/LockManager.java

@@ -37,8 +37,6 @@
import org.opends.server.loggers.debug.DebugTracer;

import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;




 opends/src/server/org/opends/server/types/OpenDsException.java

@@ -41,6 +41,11 @@
        extends Exception
{

  /**
   * Generated serialization ID.
   */
  private static final long serialVersionUID = 7310881401563732702L;

  /** Message that explains the problem. */
  Message message;


 opends/src/server/org/opends/server/types/Privilege.java

@@ -32,8 +32,6 @@
import java.util.HashSet;
import java.util.Set;

import static org.opends.server.util.StaticUtils.*;



/**

 opends/src/server/org/opends/server/util/EmbeddedUtils.java

@@ -131,7 +131,7 @@
  public static void initializeForClientUse()
  {
    DirectoryServer directoryServer = DirectoryServer.getInstance();
    directoryServer.bootstrapClient();
    DirectoryServer.bootstrapClient();
  }
}


 opends/src/server/org/opends/server/util/PasswordReader.java

@@ -103,7 +103,7 @@

        try
        {
          currentThread.sleep(1);
          Thread.sleep(1);
        }
        catch (InterruptedException ie)
        {

 opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/QuickSetupTestCase.java

@@ -28,8 +28,6 @@
package org.opends.quicksetup;

import org.testng.annotations.BeforeSuite;
import org.testng.annotations.AfterSuite;
import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;

import java.io.IOException;

 opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java

@@ -34,14 +34,9 @@
import org.opends.server.types.OperatingSystem;
import org.opends.server.types.ByteStringBuilder;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.net.ServerSocket;
import java.util.List;
import java.util.ArrayList;

 opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/UtilsTest.java

@@ -29,7 +29,6 @@

import static org.testng.Assert.*;
import org.testng.annotations.*;
import org.opends.quicksetup.Constants;
import org.opends.server.DirectoryServerTestCase;

/**

 opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java

@@ -38,7 +38,6 @@
import org.opends.server.api.AlertGenerator;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.DummyAlertHandler;
import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.types.DN;

import static org.testng.Assert.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java

@@ -29,21 +29,15 @@


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

import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;
import org.opends.messages.MessageBuilder;
import org.opends.server.config.ConfigAttribute;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.JMXMBean;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;

import static org.testng.Assert.*;



 opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java

@@ -50,9 +50,7 @@
import org.opends.server.protocols.ldap.ModifyResponseProtocolOp;
import org.opends.server.tools.LDAPPasswordModify;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.Attribute;
import org.opends.server.types.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ModificationType;
import org.opends.server.types.RawModification;

 opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java

@@ -31,8 +31,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ByteString;
import static org.opends.server.config.ConfigConstants.ATTR_AUTHZ_GLOBAL_ACI;
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.ldap.LDAPResultCode;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import org.testng.annotations.DataProvider;
@@ -40,9 +38,6 @@
import org.testng.annotations.BeforeClass;
import org.testng.Assert;

import javax.naming.Context;
import java.util.Hashtable;

public class TargetTestCase extends AciTestCase
{
  private static final String testUser="uid=user.3,ou=People,o=test";

 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java

@@ -50,19 +50,15 @@
import org.opends.server.tasks.TasksTestCase;
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.tools.LDIFDiff;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchScope;

import static org.testng.Assert.*;

import static org.opends.server.util.StaticUtils.*;



/**

 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java

@@ -265,7 +265,7 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, entry.getDN(), entry.getObjectClasses(),
                          entry.getUserAttributes(),
                          entry.getOperationalAttributes());
@@ -288,7 +288,7 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    DeleteOperationBasis deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, schemaDN);

    schemaBackend.deleteEntry(schemaDN, deleteOperation);
@@ -310,8 +310,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), null,
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), null,
                               currentSchemaDN, newSchemaDN.getRDN(),
                               true, null);


 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java

@@ -772,8 +772,8 @@
        InternalClientConnection.getRootConnection();

    DeleteOperationBasis delete = new DeleteOperationBasis(conn,
        conn.nextOperationID(),
        conn.nextMessageID(),
        InternalClientConnection.nextOperationID(),
        InternalClientConnection.nextMessageID(),
        deleteSubTreeControl,

        DN.decode("dc=test1,dc=com"));
@@ -823,8 +823,8 @@
          DN.decode("uid=user.539,ou=People,dc=test,dc=com"), LockMode.DEFAULT);

      DeleteOperationBasis delete = new DeleteOperationBasis(conn,
        conn.nextOperationID(),
        conn.nextMessageID(),
        InternalClientConnection.nextOperationID(),
        InternalClientConnection.nextMessageID(),
        noControls,

          DN.decode("uid=user.539,ou=People,dc=test,dc=com"));
@@ -1111,8 +1111,8 @@
      InternalClientConnection conn = InternalClientConnection
          .getRootConnection();

      ModifyOperationBasis modifyOp = new ModifyOperationBasis(conn, conn
          .nextOperationID(), conn.nextMessageID(), noControls, DN
      ModifyOperationBasis modifyOp = new ModifyOperationBasis(conn, InternalClientConnection
          .nextOperationID(), InternalClientConnection.nextMessageID(), noControls, DN
          .decode("uid=user.1,ou=People,dc=test,dc=com"), modifications);

      backend.replaceEntry(entry, newEntry, modifyOp);
@@ -1317,8 +1317,8 @@
          InternalClientConnection.getRootConnection();

      ModifyDNOperationBasis modifyDN = new ModifyDNOperationBasis(conn,
          conn.nextOperationID(),
          conn.nextMessageID(),
          InternalClientConnection.nextOperationID(),
          InternalClientConnection.nextMessageID(),
          noControls,
          DN.decode("ou=People,dc=test,dc=com"),
          RDN.decode("ou=Good People"),

 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java

@@ -28,19 +28,12 @@

import static org.testng.AssertJUnit.assertTrue;

import java.io.File;
import java.util.List;

import org.opends.server.TestCaseUtils;
import org.opends.server.api.Backend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.admin.std.meta.LocalDBBackendCfgDefn;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.types.Entry;
import org.opends.server.types.FilePermission;
import org.opends.server.types.DN;
import org.opends.server.util.Base64;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.AfterClass;

 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java

@@ -34,7 +34,6 @@
import static org.testng.Assert.*;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.jeb.RebuildConfig.RebuildMode;
import org.opends.server.config.ConfigConstants;
import org.opends.server.tasks.TaskUtils;
import static org.opends.server.util.ServerConstants.OC_TOP;
import static org.opends.server.util.ServerConstants.OC_EXTENSIBLE_OBJECT;
@@ -42,7 +41,6 @@
import org.opends.server.types.*;

import java.util.List;
import java.util.LinkedHashSet;
import java.util.HashMap;
import java.util.LinkedHashMap;


 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java

@@ -45,8 +45,6 @@
import org.testng.annotations.Test;
import org.testng.annotations.AfterClass;
import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import java.util.*;

public class TestVLVIndex extends DirectoryServerTestCase {
@@ -378,8 +376,8 @@
    requestControls.add(new VLVRequestControl(0, 3, 1, 0));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -466,8 +464,8 @@
    requestControls.add(new VLVRequestControl(0, 3, 0, 0));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -554,8 +552,8 @@
    requestControls.add(new VLVRequestControl(0, 3, 3, 0));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -641,8 +639,8 @@
    requestControls.add(new VLVRequestControl(0, 3, -1, 0));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -695,8 +693,8 @@
    requestControls.add(new VLVRequestControl(3, 3, 1, 0));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -748,8 +746,8 @@
    requestControls.add(new VLVRequestControl(3, 3, 30, 0));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -816,8 +814,8 @@
    requestControls.add(new VLVRequestControl(0, 4, 7, 0));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -904,8 +902,8 @@
    requestControls.add(new VLVRequestControl(0, 3, ByteString.valueOf("a")));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -993,8 +991,8 @@
                                              ByteString.valueOf("aaccf")));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -1082,8 +1080,8 @@
                                              ByteString.valueOf("albert")));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -1171,8 +1169,8 @@
                                              ByteString.valueOf("albert")));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -1260,8 +1258,8 @@
    requestControls.add(new VLVRequestControl(0, 3, ByteString.valueOf("zz")));

    InternalSearchOperation internalSearch =
        new InternalSearchOperation(conn, conn.nextOperationID(),
                                    conn.nextMessageID(), requestControls,
        new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                    InternalClientConnection.nextMessageID(), requestControls,
                                    DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
                                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                                    SearchFilter.createFilterFromString("(objectClass=*)"),

 opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java

@@ -27,7 +27,6 @@
package org.opends.server.controls;

import static org.opends.server.util.ServerConstants.OID_ECL_COOKIE_EXCHANGE_CONTROL;
import static org.opends.server.util.ServerConstants.OID_PERSISTENT_SEARCH;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
@@ -37,9 +36,7 @@
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.replication.common.MultiDomainServerState;
import org.opends.server.types.ByteString;
import org.opends.server.types.ByteStringBuilder;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;


 opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java

@@ -336,12 +336,6 @@
            assertEquals(subInitialTestCurrent, mvf.getSubInitialElement());
          }

          if (subAnyTestCurrent == null)
          {
            assertNull(mvf.getSubAnyElements());
          }
          else
          {
            ret = mvf.getSubAnyElements();
            assertNotNull(ret);
            assertEquals(subAnyTestCurrent.size(), ret.size());
@@ -349,7 +343,7 @@
            {
              assertTrue(subAnyTestCurrent.contains(r));
            }
          }

          if (subFinalTestCurrent == null)
          {
            assertNull(mvf.getSubFinalElement());
@@ -587,7 +581,7 @@
    AttributeValue attVal = null ;
    if (attType != null)
    {
      AttributeValues.create(attType, value);
      attVal = AttributeValues.create(attType, value);
    }

    // Check null, null

 opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java

@@ -318,8 +318,8 @@
    requestControls.add(new ServerSideSortRequestControl("givenName"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -389,8 +389,8 @@
                                 "givenName:caseExactOrderingMatch"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -458,8 +458,8 @@
    requestControls.add(new ServerSideSortRequestControl("-givenName"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -529,8 +529,8 @@
                                 "-givenName:caseExactOrderingMatch"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -598,8 +598,8 @@
    requestControls.add(new ServerSideSortRequestControl("givenName,sn"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -667,8 +667,8 @@
    requestControls.add(new ServerSideSortRequestControl("givenName,-sn"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -736,8 +736,8 @@
    requestControls.add(new ServerSideSortRequestControl(true, "undefined"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -769,8 +769,8 @@
                                 "givenName:undefinedOrderingMatch"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -800,8 +800,8 @@
                                 "bad_sort:caseExactOrderingMatch"));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),

 opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java

@@ -509,8 +509,8 @@
    requestControls.add(new VLVRequestControl(0, 3, 1, 0));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -602,8 +602,8 @@
    requestControls.add(new VLVRequestControl(0, 3, 0, 0));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -695,8 +695,8 @@
    requestControls.add(new VLVRequestControl(0, 3, 3, 0));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -787,8 +787,8 @@
    requestControls.add(new VLVRequestControl(0, 3, -1, 0));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -845,8 +845,8 @@
    requestControls.add(new VLVRequestControl(3, 3, 1, 0));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -902,8 +902,8 @@
    requestControls.add(new VLVRequestControl(3, 3, 30, 0));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -974,8 +974,8 @@
    requestControls.add(new VLVRequestControl(0, 3, 7, 0));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1066,8 +1066,8 @@
    requestControls.add(new VLVRequestControl(0, 3, ByteString.valueOf("a")));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1160,8 +1160,8 @@
                                              ByteString.valueOf("aaccf")));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1254,8 +1254,8 @@
                                              ByteString.valueOf("albert")));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1348,8 +1348,8 @@
                                              ByteString.valueOf("albert")));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1442,8 +1442,8 @@
    requestControls.add(new VLVRequestControl(0, 3, ByteString.valueOf("zz")));

    InternalSearchOperation internalSearch =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), requestControls,
                  DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=person)"),

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java

@@ -45,8 +45,6 @@
import org.opends.messages.Message;
import org.opends.server.plugins.DelayPreOpPlugin;
import org.opends.server.plugins.DisconnectClientPlugin;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.AbandonRequestProtocolOp;
import org.opends.server.protocols.ldap.AddRequestProtocolOp;
@@ -93,8 +91,8 @@

    return new Operation[]
    {
      new AbandonOperationBasis(conn, conn.nextOperationID(),
                           conn.nextMessageID(),
      new AbandonOperationBasis(conn, InternalClientConnection.nextOperationID(),
                           InternalClientConnection.nextMessageID(),
                           new ArrayList<Control>(), 1)
    };
  }
@@ -118,8 +116,8 @@
         InternalClientConnection.getRootConnection();

    AbandonOperationBasis abandonOperation =
         new AbandonOperationBasis(conn, conn.nextOperationID(),
                  conn.nextMessageID(), new ArrayList<Control>(), 1);
         new AbandonOperationBasis(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), new ArrayList<Control>(), 1);
    assertEquals(abandonOperation.getIDToAbandon(), 1);
  }

@@ -135,8 +133,8 @@
         InternalClientConnection.getRootConnection();

    AbandonOperationBasis abandonOperation =
         new AbandonOperationBasis(conn, conn.nextOperationID(),
                  conn.nextMessageID(), new ArrayList<Control>(), 1);
         new AbandonOperationBasis(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), new ArrayList<Control>(), 1);

    CancelRequest cancelRequest = new CancelRequest(true,
            Message.raw("Test Cancel"));
@@ -157,8 +155,8 @@
         InternalClientConnection.getRootConnection();

    AbandonOperationBasis abandonOperation =
         new AbandonOperationBasis(conn, conn.nextOperationID(),
                  conn.nextMessageID(), new ArrayList<Control>(), 1);
         new AbandonOperationBasis(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), new ArrayList<Control>(), 1);
    assertNull(abandonOperation.getCancelRequest());
  }

@@ -192,8 +190,8 @@
         InternalClientConnection.getRootConnection();

    AbandonOperationBasis abandonOperation =
         new AbandonOperationBasis(conn, conn.nextOperationID(),
                  conn.nextMessageID(), new ArrayList<Control>(), 1);
         new AbandonOperationBasis(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), new ArrayList<Control>(), 1);
    abandonOperation.run();
    assertEquals(abandonOperation.getResultCode(),
                 ResultCode.CANNOT_CANCEL);

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java

@@ -44,8 +44,6 @@
import org.opends.server.plugins.DisconnectClientPlugin;
import org.opends.server.plugins.ShortCircuitPlugin;
import org.opends.server.plugins.UpdatePreOpPlugin;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.AddRequestProtocolOp;
import org.opends.server.protocols.ldap.AddResponseProtocolOp;
@@ -112,17 +110,17 @@

    Operation[] opArray = new Operation[]
    {
      new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                       null, ByteString.valueOf("ou=People,o=test"),
                       ldapAttrList),
      new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                       noControls, ByteString.valueOf("ou=People,o=test"),
                       ldapAttrList),
      new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                       null, entry.getDN(), entry.getObjectClasses(),
                       entry.getUserAttributes(),
                       entry.getOperationalAttributes()),
      new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                       noControls, entry.getDN(), entry.getObjectClasses(),
                       entry.getUserAttributes(),
                       entry.getOperationalAttributes()),
@@ -205,7 +203,7 @@
    ldapAttrList.add(new LDAPAttribute("ou", values));

    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, ByteString.valueOf("ou=People,o=test"),
                          ldapAttrList);
    assertNotNull(addOperation.getEntryDN());
@@ -233,7 +231,7 @@
         "ou: People");

    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, entry.getDN(), entry.getObjectClasses(),
                          entry.getUserAttributes(),
                          entry.getOperationalAttributes());
@@ -263,7 +261,7 @@
         "ou: People");

    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, entry.getDN(), entry.getObjectClasses(),
                          entry.getUserAttributes(),
                          entry.getOperationalAttributes());
@@ -1968,7 +1966,7 @@
         InternalClientConnection.getRootConnection();

    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, entry.getDN(), entry.getObjectClasses(),
                          entry.getUserAttributes(),
                          entry.getOperationalAttributes());
@@ -2001,7 +1999,7 @@
         InternalClientConnection.getRootConnection();

    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, entry.getDN(), entry.getObjectClasses(),
                          entry.getUserAttributes(),
                          entry.getOperationalAttributes());
@@ -2533,7 +2531,7 @@
    rawAttrs.add(RawAttribute.create("o", "test"));

    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          controls, ByteString.valueOf("o=test"), rawAttrs);
    addOperation.run();
    assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java

@@ -42,8 +42,6 @@
import org.opends.server.api.Backend;
import org.opends.server.plugins.DisconnectClientPlugin;
import org.opends.server.plugins.ShortCircuitPlugin;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.BindRequestProtocolOp;
import org.opends.server.protocols.ldap.BindResponseProtocolOp;
@@ -55,8 +53,6 @@
import org.opends.server.workflowelement.localbackend.LocalBackendDeleteOperation;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import static org.opends.server.protocols.ldap.LDAPConstants.*;


@@ -86,22 +82,22 @@

    return new Operation[]
    {
      new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          new ArrayList<Control>(), ByteString.empty()),
      new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, ByteString.empty()),
      new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          new ArrayList<Control>(),
                          ByteString.valueOf("o=test")),
      new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, ByteString.valueOf("o=test")),
      new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          new ArrayList<Control>(), DN.nullDN()),
      new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, DN.nullDN()),
      new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          new ArrayList<Control>(), DN.decode("o=test")),
      new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null, DN.decode("o=test"))
    };
  }
@@ -141,7 +137,7 @@
         InternalClientConnection.getRootConnection();

    DeleteOperation deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, ByteString.valueOf("o=test"));
    assertNotNull(deleteOperation.getEntryDN());
  }
@@ -161,7 +157,7 @@
         InternalClientConnection.getRootConnection();

    DeleteOperation deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, DN.decode("o=test"));
    assertNotNull(deleteOperation.getEntryDN());
  }
@@ -185,7 +181,7 @@
         InternalClientConnection.getRootConnection();

    DeleteOperation deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, DN.decode("o=test"));
    assertNotNull(deleteOperation.getEntryDN());

@@ -801,7 +797,7 @@
         InternalClientConnection.getRootConnection();

    DeleteOperationBasis deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, ByteString.valueOf("o=test"));

    CancelRequest cancelRequest = new CancelRequest(false,
@@ -826,7 +822,7 @@
         InternalClientConnection.getRootConnection();

    DeleteOperationBasis deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, ByteString.valueOf("o=test"));

    deleteOperation.run();
@@ -1182,7 +1178,7 @@
         ShortCircuitPlugin.createShortCircuitControlList(0, "PreParse");

    DeleteOperationBasis deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             controls, ByteString.valueOf("o=test"));
    deleteOperation.run();
    assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java

@@ -1416,8 +1416,8 @@
    // group operations correctly.
    InternalClientConnection conn0 = new InternalClientConnection(DN.nullDN());
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn0, conn0.nextOperationID(),
                  conn0.nextMessageID(), null, DN.nullDN(),
         new InternalSearchOperation(conn0, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.nullDN(),
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,
@@ -1442,8 +1442,8 @@
    // group operations correctly.
    InternalClientConnection conn1 = new InternalClientConnection(user1DN);
    searchOperation =
         new InternalSearchOperation(conn1, conn1.nextOperationID(),
                  conn1.nextMessageID(), null, DN.nullDN(),
         new InternalSearchOperation(conn1, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.nullDN(),
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,  false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,
@@ -1472,8 +1472,8 @@
    // group operations correctly.
    InternalClientConnection conn2 = new InternalClientConnection(user2DN);
    searchOperation =
         new InternalSearchOperation(conn2, conn2.nextOperationID(),
                  conn2.nextMessageID(), null, DN.nullDN(),
         new InternalSearchOperation(conn2, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.nullDN(),
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,  false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,
@@ -1502,8 +1502,8 @@
    // group operations correctly.
    InternalClientConnection conn3 = new InternalClientConnection(user3DN);
    searchOperation =
         new InternalSearchOperation(conn3, conn3.nextOperationID(),
                  conn3.nextMessageID(), null, DN.nullDN(),
         new InternalSearchOperation(conn3, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.nullDN(),
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,  false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,
@@ -2311,8 +2311,8 @@
    DN userDN = DN.decode("uid=test1,ou=people,dc=example,dc=com");
    InternalClientConnection conn = new InternalClientConnection(userDN);
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), null, DN.nullDN(),
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.nullDN(),
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,
@@ -2337,8 +2337,8 @@
    InternalClientConnection conn1 =
            new InternalClientConnection(userDN);
    searchOperation =
         new InternalSearchOperation(conn1, conn1.nextOperationID(),
                  conn1.nextMessageID(), null, DN.nullDN(),
         new InternalSearchOperation(conn1, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.nullDN(),
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,
@@ -2387,8 +2387,8 @@
    DN userDN = DN.decode("uid=test1,ou=people,dc=example,dc=com");
    InternalClientConnection conn = new InternalClientConnection(userDN);
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), null, DN.nullDN(),
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.nullDN(),
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,
@@ -2417,8 +2417,8 @@
    InternalClientConnection conn1 =
            new InternalClientConnection(userDN);
    searchOperation =
         new InternalSearchOperation(conn1, conn1.nextOperationID(),
                  conn1.nextMessageID(), null, DN.nullDN(),
         new InternalSearchOperation(conn1, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.nullDN(),
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java

@@ -36,9 +36,7 @@

import org.opends.server.TestCaseUtils;
import org.opends.server.types.ByteString;
import org.opends.server.protocols.asn1.*;
import org.opends.server.protocols.ldap.*;
import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.tools.LDAPWriter;

import static org.testng.Assert.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java

@@ -118,49 +118,49 @@
    LDAPAttribute ldapAttr = new LDAPAttribute("description", ldapValues);
    ldapMods.add(new LDAPModification(ModificationType.ADD, ldapAttr));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.valueOf("o=test"), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.valueOf("o=test"), ldapMods));

    ldapMods = new ArrayList<RawModification>();
    ldapMods.add(new LDAPModification(ModificationType.DELETE, ldapAttr));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.valueOf("o=test"), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.valueOf("o=test"), ldapMods));

    ldapMods = new ArrayList<RawModification>();
    ldapMods.add(new LDAPModification(ModificationType.REPLACE, ldapAttr));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.valueOf("o=test"), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.valueOf("o=test"), ldapMods));

    ldapMods = new ArrayList<RawModification>();
@@ -170,17 +170,17 @@
    ldapMods.add(new LDAPModification(ModificationType.DELETE, ldapAttr));
    ldapMods.add(new LDAPModification(ModificationType.ADD, ldapAttr2));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.valueOf("o=test"), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.valueOf("o=test"), ldapMods));

    ldapMods = new ArrayList<RawModification>();
@@ -188,17 +188,17 @@
    ldapMods.add(new LDAPModification(ModificationType.REPLACE, ldapAttr));
    ldapMods.add(new LDAPModification(ModificationType.REPLACE, ldapAttr2));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.empty(), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   ByteString.valueOf("o=test"), ldapMods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   ByteString.valueOf("o=test"), ldapMods));


@@ -207,48 +207,48 @@
    mods.add(new Modification(ModificationType.ADD,
        Attributes.create("description", "foo")));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls, DN.nullDN(),
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls, DN.nullDN(),
                                   mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   DN.decode("o=test"), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   DN.decode("o=test"), mods));

    mods = new ArrayList<Modification>();
    mods.add(new Modification(ModificationType.DELETE,
        Attributes.create("description", "foo")));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls, DN.nullDN(),
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls, DN.nullDN(),
                                   mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   DN.decode("o=test"), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   DN.decode("o=test"), mods));

    mods = new ArrayList<Modification>();
    mods.add(new Modification(ModificationType.REPLACE,
        Attributes.create("description", "foo")));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls, DN.nullDN(),
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls, DN.nullDN(),
                                   mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   DN.decode("o=test"), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   DN.decode("o=test"), mods));

    mods = new ArrayList<Modification>();
@@ -257,16 +257,16 @@
    mods.add(new Modification(ModificationType.ADD,
        Attributes.create("description", "bar")));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls, DN.nullDN(),
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls, DN.nullDN(),
                                   mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   DN.decode("o=test"), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   DN.decode("o=test"), mods));

    mods = new ArrayList<Modification>();
@@ -275,16 +275,16 @@
    mods.add(new Modification(ModificationType.REPLACE,
        Attributes.create("cn", "bar")));

    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls, DN.nullDN(),
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null, DN.nullDN(), mods));
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls, DN.nullDN(),
                                   mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), null,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), null,
                                   DN.decode("o=test"), mods));
    opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
                                   conn.nextMessageID(), noControls,
    opList.add(new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                                   InternalClientConnection.nextMessageID(), noControls,
                                   DN.decode("o=test"), mods));


@@ -375,7 +375,7 @@
    mods.add(new LDAPModification(ModificationType.REPLACE, attr));

    ModifyOperation modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, ByteString.empty(), mods);
    assertNotNull(modifyOperation.getEntryDN());
  }
@@ -399,7 +399,7 @@
    mods.add(new Modification(ModificationType.REPLACE,
        Attributes.create("description", "foo")));
    ModifyOperation modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, DN.nullDN(), mods);
    assertNotNull(modifyOperation.getEntryDN());
  }
@@ -424,7 +424,7 @@
    mods.add(new Modification(ModificationType.REPLACE,
        Attributes.create("description", "foo")));
    ModifyOperation modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, DN.nullDN(), mods);
    assertNotNull(modifyOperation.getEntryDN());

@@ -4096,7 +4096,7 @@
    mods.add(new LDAPModification(ModificationType.REPLACE, attr));

    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, ByteString.valueOf(baseDN), mods);

    CancelRequest cancelRequest = new CancelRequest(false,
@@ -4130,7 +4130,7 @@
    mods.add(new LDAPModification(ModificationType.REPLACE, attr));

    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             null, ByteString.valueOf(baseDN), mods);

    modifyOperation.run();
@@ -4609,7 +4609,7 @@
                                    "foo"));

    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             controls, ByteString.valueOf("o=test"), mods);
    modifyOperation.run();
    assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/PluginConfigManagerTestCase.java

@@ -33,8 +33,6 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;

import org.opends.server.TestCaseUtils;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java

@@ -39,7 +39,6 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.UnbindRequestProtocolOp;
import org.opends.server.tools.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java

@@ -36,7 +36,6 @@
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.AfterClass;

/**
 * An abstract base class for all subtree specification tests.

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java

@@ -263,11 +263,11 @@

    ModifyDNOperationBasis[] modifies = new ModifyDNOperationBasis[]
    {
      new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                            noControls, ByteString.valueOf("cn=test,ou=test"),
                            ByteString.valueOf("cn=test2"), true,
                            ByteString.valueOf("dc=example,dc=com")),
      new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                            noControls, DN.decode("cn=test,ou=test"),
                            RDN.decode("cn=test2"), true,
                            DN.decode("dc=example,dc=com"))
@@ -286,7 +286,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("uid=user.0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.test0"), false,
@@ -311,7 +311,7 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("uid=user.test0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.0"), true,
@@ -345,7 +345,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), false,
@@ -370,7 +370,7 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.test0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.0"), true,
@@ -404,7 +404,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("uid=user.0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.test0"), true,
@@ -429,7 +429,7 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("uid=user.test0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.0"), true,
@@ -463,7 +463,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), true,
@@ -494,7 +494,7 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.test0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.0"), true,
@@ -528,7 +528,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("uid=user.0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.test0"), true,
@@ -553,7 +553,7 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("uid=user.test0,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.0"), true,
@@ -587,7 +587,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), true,
@@ -612,7 +612,7 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.test0,dc=example,dc=com"),
                               RDN.decode("uid=user.0"), true,
@@ -646,7 +646,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("cn=Aaccf Amar Test"), true,
@@ -672,7 +672,7 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("cn=Aaccf Amar Test,dc=example,dc=com"),
                               RDN.decode("uid=user.0"), false,
@@ -708,7 +708,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.invalid,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), true,
@@ -731,7 +731,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("invalid=invalid"), true,
@@ -754,7 +754,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), true,
@@ -777,7 +777,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("invalid DN"),
                               ByteString.valueOf("uid=user.test0"), true,
@@ -800,7 +800,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("uid=user.0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("invalid RDN"), true,
@@ -823,7 +823,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               ByteString.valueOf("uid=user.0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.test0"), true,
@@ -846,7 +846,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("dc=example,dc=com"),
                               RDN.decode("dc=exampletest"), true,
@@ -869,8 +869,8 @@
    InvocationCounterPlugin.resetAllCounters();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(), controls,
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls,
                               ByteString.valueOf("uid=user.0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.test0"), false,
                               null);
@@ -894,8 +894,8 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(), controls,
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls,
                               ByteString.valueOf("uid=user.test0,ou=People,dc=example,dc=com"),
                               ByteString.valueOf("uid=user.0"), true,
                               null);
@@ -928,8 +928,8 @@
    InvocationCounterPlugin.resetAllCounters();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(), controls,
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), false,
                               null);
@@ -953,8 +953,8 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(),
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(),
                               controls,
                               DN.decode("uid=user.test0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.0"), true,
@@ -988,8 +988,8 @@
    InvocationCounterPlugin.resetAllCounters();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(), controls,
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), false,
                               null);
@@ -1013,8 +1013,8 @@
    InvocationCounterPlugin.resetAllCounters();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(), controls,
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), false,
                               null);
@@ -1038,8 +1038,8 @@
    InvocationCounterPlugin.resetAllCounters();

    modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(), controls,
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls,
                               DN.decode("uid=user.test0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.0"), true,
                               null);
@@ -1072,8 +1072,8 @@
    InvocationCounterPlugin.resetAllCounters();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(), controls,
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), false,
                               null);
@@ -1098,8 +1098,8 @@
    InvocationCounterPlugin.resetAllCounters();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(proxyUserConn, proxyUserConn.nextOperationID(),
                               proxyUserConn.nextMessageID(), controls,
         new ModifyDNOperationBasis(proxyUserConn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), false,
                               null);
@@ -1126,7 +1126,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               controls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), false,
@@ -1504,7 +1504,7 @@
         InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.invalid,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=user.test0"), true,

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java

@@ -32,7 +32,6 @@

import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;
import org.opends.messages.Message;
import org.opends.server.plugins.InvocationCounterPlugin;
import org.opends.server.protocols.internal.InternalClientConnection;
@@ -40,8 +39,6 @@

import static org.testng.Assert.*;

import static org.opends.server.util.ServerConstants.*;



/**
@@ -62,9 +59,9 @@

    return new Operation[]
    {
      new UnbindOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new UnbindOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          null),
      new UnbindOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
      new UnbindOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          new ArrayList<Control>())
    };
  }
@@ -101,8 +98,8 @@
         InternalClientConnection.getRootConnection();

    UnbindOperationBasis unbindOperation =
         new UnbindOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(), new ArrayList<Control>());
         new UnbindOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(), new ArrayList<Control>());
    unbindOperation.run();
    examineCompletedOperation(unbindOperation);

@@ -126,8 +123,8 @@
         new CancelRequest(false, Message.raw("Test Unbind Cancel"));

    UnbindOperationBasis unbindOperation =
         new UnbindOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(), new ArrayList<Control>());
         new UnbindOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(), new ArrayList<Control>());
    assertEquals(unbindOperation.cancel(cancelRequest).getResultCode(),
                 ResultCode.CANNOT_CANCEL);
  }
@@ -148,8 +145,8 @@
         new CancelRequest(false, Message.raw("Test Unbind Cancel"));

    UnbindOperationBasis unbindOperation =
         new UnbindOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(), new ArrayList<Control>());
         new UnbindOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(), new ArrayList<Control>());
    assertNull(unbindOperation.getCancelRequest());

    assertEquals(unbindOperation.cancel(cancelRequest).getResultCode(),

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java

@@ -46,7 +46,6 @@
import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.UtilTestCase;
import org.opends.server.workflowelement.WorkflowElement;
import org.opends.server.workflowelement.localbackend.LocalBackendWorkflowElement;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java

@@ -31,8 +31,6 @@
import org.opends.messages.MessageBuilder;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertNotNull;

import java.util.ArrayList;

import org.opends.server.TestCaseUtils;

 opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java

@@ -40,8 +40,6 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.admin.ads.ADSContext;
import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import java.util.LinkedHashSet;

/**

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java

@@ -138,7 +138,7 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    BindOperationBasis bindOperation =
         new BindOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new BindOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                           new ArrayList<Control>(), "3", DN.nullDN(),
                           SASL_MECHANISM_ANONYMOUS, null);
    handler.processSASLBind(bindOperation);
@@ -165,7 +165,7 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    BindOperationBasis bindOperation =
         new BindOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new BindOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                           new ArrayList<Control>(), "3", DN.nullDN(),
                           SASL_MECHANISM_ANONYMOUS, ByteString.empty());
    handler.processSASLBind(bindOperation);
@@ -191,7 +191,7 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    BindOperationBasis bindOperation =
         new BindOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new BindOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                           new ArrayList<Control>(), "3", DN.nullDN(),
                           SASL_MECHANISM_ANONYMOUS,
                           ByteString.valueOf("Internal Trace String"));

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java

@@ -415,7 +415,7 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);


 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java

@@ -28,7 +28,6 @@



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

import org.testng.annotations.BeforeClass;
@@ -41,7 +40,6 @@
            CramMD5SASLMechanismHandlerCfgDefn;
import org.opends.server.admin.std.server.
            CramMD5SASLMechanismHandlerCfg;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.BindOperation;

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java

@@ -743,7 +743,7 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);


 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java

@@ -503,7 +503,8 @@

    cache.putEntry(testEntriesList.get(0), b, 1);
    Entry testEntry = testEntriesList.get(1);
    testEntry.setDN(testEntry.getDN().decode(
    testEntry.getDN();
    testEntry.setDN(DN.decode(
      testEntry.getDN().getRDN() + ",cn=config"));
    cache.putEntry(testEntry, c, 1);
    cache.clearSubtree(DN.decode("o=test"));

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java

@@ -682,7 +682,7 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);


 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java

@@ -28,7 +28,6 @@



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

import org.testng.annotations.AfterClass;
@@ -42,7 +41,6 @@
            DigestMD5SASLMechanismHandlerCfgDefn;
import org.opends.server.admin.std.server.
            DigestMD5SASLMechanismHandlerCfg;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.BindOperation;

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java

@@ -426,8 +426,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     entryDN, SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
                                     0, false, filter, attrList, null);
@@ -466,8 +466,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     entryDN, SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
                                     0, false, filter, attrList, null);
@@ -1019,8 +1019,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), null,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), null,
                                     DN.decode("o=test"),
                                     SearchScope.WHOLE_SUBTREE,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
@@ -1072,8 +1072,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), null,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), null,
                                     DN.decode("o=test"),
                                     SearchScope.WHOLE_SUBTREE,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java

@@ -471,8 +471,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     entryDN, SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
                                     0, false, filter, attrList, null);
@@ -511,8 +511,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     entryDN, SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
                                     0, false, filter, attrList, null);

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java

@@ -46,8 +46,6 @@
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.BindRequestProtocolOp;
import org.opends.server.protocols.ldap.BindResponseProtocolOp;

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java

@@ -31,8 +31,6 @@
import java.io.File;
import java.io.FileWriter;
import java.util.List;
import javax.net.ssl.KeyManager;

import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -41,15 +39,11 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.FileBasedKeyManagerProviderCfgDefn;
import org.opends.server.admin.std.server.FileBasedKeyManagerProviderCfg;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

import static org.testng.Assert.*;

import static org.opends.server.util.ServerConstants.*;



 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java

@@ -31,8 +31,6 @@
import java.io.File;
import java.io.FileWriter;
import java.util.List;
import javax.net.ssl.TrustManager;

import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -41,15 +39,11 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.FileBasedTrustManagerProviderCfgDefn;
import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

import static org.testng.Assert.*;

import static org.opends.server.util.ServerConstants.*;



 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java

@@ -512,8 +512,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     entryDN, SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
                                     0, false, filter, attrList, null);
@@ -552,8 +552,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     entryDN, SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
                                     0, false, filter, attrList, null);

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java

@@ -370,8 +370,8 @@
      InternalClientConnection conn =
           InternalClientConnection.getRootConnection();
      ModifyOperationBasis op =
           new ModifyOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), new ArrayList<Control>(),
           new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                               DN.decode("cn=uid=test.user,o=test"), mods);

      MessageBuilder invalidReason = new MessageBuilder();
@@ -443,8 +443,8 @@
      InternalClientConnection conn =
           InternalClientConnection.getRootConnection();
      ModifyOperationBasis op =
           new ModifyOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), new ArrayList<Control>(),
           new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                               DN.decode("cn=uid=test.user,o=test"), mods);

      MessageBuilder invalidReason = new MessageBuilder();
@@ -518,8 +518,8 @@
      InternalClientConnection conn =
           InternalClientConnection.getRootConnection();
      ModifyOperationBasis op =
           new ModifyOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), new ArrayList<Control>(),
           new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                               DN.decode("cn=uid=test.user,o=test"), mods);

      MessageBuilder invalidReason = new MessageBuilder();
@@ -593,8 +593,8 @@
      InternalClientConnection conn =
           InternalClientConnection.getRootConnection();
      ModifyOperationBasis op =
           new ModifyOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), new ArrayList<Control>(),
           new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                               DN.decode("cn=uid=test.user,o=test"), mods);

      MessageBuilder invalidReason = new MessageBuilder();

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java

@@ -31,7 +31,6 @@
import static org.testng.Assert.assertNotNull;

import org.opends.server.TestCaseUtils;
import org.opends.server.config.ConfigEntry;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;


 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java

@@ -28,8 +28,6 @@



import java.security.cert.X509Certificate;

import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;


 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java

@@ -515,8 +515,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     entryDN, SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
                                     0, false, filter, attrList, null);
@@ -555,8 +555,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     entryDN, SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
                                     0, false, filter, attrList, null);

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java

@@ -316,8 +316,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -385,8 +385,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -453,8 +453,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -522,8 +522,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -589,8 +589,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -657,8 +657,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);


 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java

@@ -104,7 +104,7 @@

    scheme.initializePasswordStorageScheme(configuration);

    String passwordString = scheme.encodeOffline(plaintext.toByteArray());
    String passwordString = SaltedSHA1PasswordStorageScheme.encodeOffline(plaintext.toByteArray());
    String[] pwComps = UserPasswordSyntax.decodeUserPassword(passwordString);
    ByteString encodedPassword = ByteString.valueOf(pwComps[1]);


 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java

@@ -291,8 +291,8 @@
      InternalClientConnection conn =
           InternalClientConnection.getRootConnection();
      ModifyOperationBasis op =
           new ModifyOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), new ArrayList<Control>(),
           new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                               DN.decode("cn=uid=test.user,o=test"), mods);

      MessageBuilder invalidReason = new MessageBuilder();
@@ -367,8 +367,8 @@
      InternalClientConnection conn =
           InternalClientConnection.getRootConnection();
      ModifyOperationBasis op =
           new ModifyOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), new ArrayList<Control>(),
           new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                               DN.decode("cn=uid=test.user,o=test"), mods);

      MessageBuilder invalidReason = new MessageBuilder();

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java

@@ -199,8 +199,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(),requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(),requestControls,
                                     DN.decode("o=test"),
                                     SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,
@@ -236,8 +236,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(), requestControls,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(), requestControls,
                                     DN.decode("o=test"),
                                     SearchScope.BASE_OBJECT,
                                     DereferencePolicy.NEVER_DEREF_ALIASES, 0,

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java

@@ -316,8 +316,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -385,8 +385,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
      new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
      new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -453,8 +453,8 @@
    InternalClientConnection conn =
      InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
      new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
      new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -522,8 +522,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
      new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
      new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -589,8 +589,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);

@@ -657,8 +657,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(),
                             conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(),
                             InternalClientConnection.nextMessageID(),
                             new ArrayList<Control>(),
                             DN.decode("uid=test.user,o=test"), mods);


 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java

@@ -30,7 +30,6 @@


import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -663,8 +662,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), null, DN.decode("o=test"),
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.decode("o=test"),
                  SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString(
@@ -738,8 +737,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), null, DN.decode("o=test"),
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), null, DN.decode("o=test"),
                  SearchScope.WHOLE_SUBTREE,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString(

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java

@@ -40,12 +40,10 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.ExtendedRequestProtocolOp;
import org.opends.server.protocols.ldap.ExtendedResponseProtocolOp;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.protocols.ldap.UnbindRequestProtocolOp;

 opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java

@@ -32,7 +32,6 @@
import org.testng.annotations.AfterClass;

import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;

 opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java

@@ -36,11 +36,7 @@
import org.opends.server.admin.std.server.PluginCfg;
import org.opends.server.api.plugin.*;
import org.opends.server.config.ConfigException;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Writer;
import static org.opends.server.protocols.asn1.ASN1Constants.UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.*;
import org.opends.server.types.operation.*;
import org.opends.server.controls.ControlDecoder;

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java

@@ -132,8 +132,8 @@
  @Test(dataProvider = "internalConns")
  public void testNextOperationID(InternalClientConnection conn)
  {
    long opID1 = conn.nextOperationID();
    long opID2 = conn.nextOperationID();
    long opID1 = InternalClientConnection.nextOperationID();
    long opID2 = InternalClientConnection.nextOperationID();
    assertEquals(opID2, (opID1 + 1));
  }

@@ -147,8 +147,8 @@
  @Test(dataProvider = "internalConns")
  public void testNextMessageID(InternalClientConnection conn)
  {
    int msgID1 = conn.nextMessageID();
    int msgID2 = conn.nextMessageID();
    int msgID1 = InternalClientConnection.nextMessageID();
    int msgID2 = InternalClientConnection.nextMessageID();
    assertEquals(msgID2, (msgID1 + 1));
  }


 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java

@@ -74,8 +74,8 @@
  {
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    new InternalSearchOperation(conn, conn.nextOperationID(),
                                conn.nextMessageID(), new ArrayList<Control>(),
    new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                                ByteString.empty(), SearchScope.BASE_OBJECT,
                                DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,
                                false, LDAPFilter.decode("(objectClass=*)"),
@@ -96,8 +96,8 @@
  {
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    new InternalSearchOperation(conn, conn.nextOperationID(),
                                conn.nextMessageID(), new ArrayList<Control>(),
    new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                                ByteString.empty(), SearchScope.BASE_OBJECT,
                                DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,
                                false, LDAPFilter.decode("(objectClass=*)"),
@@ -122,8 +122,8 @@

    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    new InternalSearchOperation(conn, conn.nextOperationID(),
                                conn.nextMessageID(), new ArrayList<Control>(),
    new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                                DN.nullDN(), SearchScope.BASE_OBJECT,
                                DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,
                                false, searchFilter,
@@ -147,8 +147,8 @@

    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    new InternalSearchOperation(conn, conn.nextOperationID(),
                                conn.nextMessageID(), new ArrayList<Control>(),
    new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                InternalClientConnection.nextMessageID(), new ArrayList<Control>(),
                                DN.nullDN(), SearchScope.BASE_OBJECT,
                                DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,
                                false, searchFilter,
@@ -192,8 +192,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(),
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(),
                                     new ArrayList<Control>(),
                                     ByteString.empty(),
                                     SearchScope.BASE_OBJECT,
@@ -222,8 +222,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(),
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(),
                                     new ArrayList<Control>(),
                                     ByteString.empty(),
                                     SearchScope.BASE_OBJECT,
@@ -253,8 +253,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(),
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(),
                                     new ArrayList<Control>(),
                                     ByteString.empty(),
                                     SearchScope.BASE_OBJECT,
@@ -282,8 +282,8 @@
    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                                     conn.nextMessageID(),
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                                     InternalClientConnection.nextMessageID(),
                                     new ArrayList<Control>(),
                                     ByteString.empty(),
                                     SearchScope.BASE_OBJECT,

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java

@@ -132,8 +132,8 @@
            "ds-cfg-enabled", "true")));
    ModifyOperationBasis op = new ModifyOperationBasis(
        conn,
        conn.nextOperationID(),
        conn.nextMessageID(),
        InternalClientConnection.nextOperationID(),
        InternalClientConnection.nextMessageID(),
        new ArrayList<Control>(),
        DN
            .decode("cn=JMX Connection Handler,cn=Connection Handlers,cn=config"),

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java

@@ -39,8 +39,6 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.api.Backend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.tools.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java

@@ -40,7 +40,6 @@

import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.ListIterator;


 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java

@@ -27,8 +27,6 @@
package org.opends.server.protocols.ldap;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import org.testng.annotations.*;
import org.opends.server.protocols.asn1.*;
import org.opends.server.types.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java

@@ -37,8 +37,6 @@
import org.opends.server.protocols.asn1.ASN1Reader;

import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertSame;

import java.util.ArrayList;

public class TestLDAPFilter extends LdapTestCase

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java

@@ -35,8 +35,6 @@
import org.testng.annotations.Test;
import static org.testng.Assert.*;

import java.util.ArrayList;

/**
 * This class defines a set of tests for the
 * org.opends.server.protocol.ldap.ModifyDNRequestProtocolOp class.

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java

@@ -37,7 +37,6 @@

import java.util.LinkedHashSet;
import java.util.Arrays;
import java.util.ArrayList;

/**
 * Test class for LDAP Search protocol operation classes.

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java

@@ -38,8 +38,6 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;

import java.util.ArrayList;

public class TestSearchResultEntryProtocolOp extends LdapTestCase
{
  @BeforeClass

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java

@@ -39,7 +39,6 @@
import java.util.TreeSet;

import org.opends.server.TestCaseUtils;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.MemoryBackend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.service.ReplicationBroker;

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java

@@ -2160,7 +2160,6 @@
      // When problem found, we have to re-enable this test.
      if (false)
      {

        // ACI step
        debugInfo(tn, "Starting ACI step");
        s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java

@@ -84,7 +84,6 @@
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchScope;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;


 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java

@@ -41,7 +41,6 @@
import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;


 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java

@@ -35,7 +35,6 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.ModifyMsg;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
@@ -53,9 +52,6 @@
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchScope;
import org.opends.server.types.operation.PluginOperation;
import org.opends.server.backends.task.TaskBackend;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
@@ -63,11 +59,7 @@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import static org.opends.messages.ReplicationMessages.ERR_NO_MATCHING_DOMAIN;
import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.config.ConfigConstants.ATTR_TASK_CONFLICTS_HIST_PURGE_COUNT;
import static org.opends.server.config.ConfigConstants.ATTR_TASK_CONFLICTS_HIST_PURGE_COMPLETED_IN_TIME;

import java.net.ServerSocket;
import java.util.LinkedList;
import java.util.List;

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java

@@ -30,9 +30,7 @@
import static org.testng.Assert.assertTrue;

import org.opends.server.TestCaseUtils;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.core.AddOperationBasis;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.common.ServerState;


 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java

@@ -39,8 +39,6 @@
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicBoolean;

import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction;

import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
@@ -52,7 +50,6 @@
import org.opends.messages.Severity;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
import org.opends.server.admin.std.server.SynchronizationProviderCfg;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.core.DirectoryServer;

 opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java

@@ -38,11 +38,9 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.SchemaTestMatchingRule;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskBackend;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SchemaConfigManager;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.DN;

import static org.testng.Assert.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java

@@ -33,19 +33,13 @@

import org.opends.server.TestCaseUtils;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskBackend;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.GetConnectionIDExtendedOperation;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.types.DN;

import static org.testng.Assert.*;

import static org.opends.server.util.ServerConstants.*;



/**

 opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java

@@ -36,11 +36,8 @@
import org.opends.server.TestCaseUtils;
import org.opends.messages.Message;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskBackend;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.GetConnectionIDExtendedOperation;
import org.opends.server.protocols.asn1.*;
import org.opends.server.protocols.ldap.*;
import org.opends.server.types.DN;
import org.opends.server.types.ByteString;

 opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java

@@ -35,9 +35,7 @@
import org.testng.annotations.BeforeClass;

import org.opends.server.TestCaseUtils;
import org.opends.server.backends.SchemaTestMatchingRule;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskBackend;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.LDAPSearch;

 opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java

@@ -31,16 +31,9 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.TestTaskListener;
import org.opends.server.backends.task.TaskState;
import org.opends.server.backends.jeb.JebTestCase;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;

import java.util.UUID;

public class TestRebuildTask extends TasksTestCase

 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java

@@ -43,14 +43,12 @@

import org.opends.server.TestCaseUtils;
import org.opends.messages.Message;
import org.opends.server.admin.std.server.DigestMD5SASLMechanismHandlerCfg;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.controls.PasswordPolicyRequestControl;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.AnonymousSASLMechanismHandler;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.*;

import static org.testng.Assert.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java

@@ -42,14 +42,10 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Entry;
import org.opends.server.types.OperatingSystem;
import org.opends.server.types.ResultCode;
import org.opends.server.util.Base64;
import org.opends.server.tools.dsconfig.DSConfig;
import static org.testng.Assert.*;

import static org.opends.server.util.ServerConstants.*;



/**

 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java

@@ -42,10 +42,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Entry;
import org.opends.server.types.OperatingSystem;
import org.opends.server.types.ResultCode;
import org.opends.server.util.Base64;

import static org.testng.Assert.*;

import static org.opends.server.util.ServerConstants.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java

@@ -37,13 +37,8 @@
import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Entry;
import org.opends.server.types.ResultCode;

import static org.testng.Assert.*;

import static org.opends.server.util.ServerConstants.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java

@@ -38,11 +38,6 @@

import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.util.Base64;

import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;

import static org.testng.Assert.*;


@@ -420,9 +415,10 @@
    File newTargetFile = File.createTempFile("difftest", "newtarget.ldif");
    newTargetFile.deleteOnExit();

    DirectoryServer.getInstance();
    args = new String[]
    {
      "-c", DirectoryServer.getInstance().getConfigFile(),
      "-c", DirectoryServer.getConfigFile(),
      "-s", sourceFile,
      "-m", diffOutputFile.getAbsolutePath(),
      "-t", newTargetFile.getAbsolutePath()
@@ -508,9 +504,10 @@
    File newTargetFile = File.createTempFile("difftest", "newtarget.ldif");
    newTargetFile.deleteOnExit();

    DirectoryServer.getInstance();
    args = new String[]
    {
      "-c", DirectoryServer.getInstance().getConfigFile(),
      "-c", DirectoryServer.getConfigFile(),
      "-s", sourceFile,
      "-m", diffOutputFile.getAbsolutePath(),
      "-t", newTargetFile.getAbsolutePath()

 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFSearchTestCase.java

@@ -32,15 +32,12 @@
import org.testng.annotations.AfterClass;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertEquals;
import org.opends.server.TestCaseUtils;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Entry;
import org.opends.server.util.LDIFReader;
import java.io.*;
import java.util.Map;
import java.util.HashMap;


/**

 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java

@@ -29,7 +29,6 @@


import java.io.File;
import java.io.FileWriter;
import java.util.ArrayList;

import org.testng.annotations.BeforeClass;
@@ -37,18 +36,9 @@
import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Entry;
import org.opends.server.types.OperatingSystem;
import org.opends.server.types.ResultCode;
import org.opends.server.util.Base64;

import static org.testng.Assert.*;

import static org.opends.server.util.ServerConstants.*;



/**

 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java

@@ -27,17 +27,12 @@



import java.io.File;
import java.io.FileWriter;

import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.core.DirectoryServer;

import static org.testng.Assert.*;

import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java

@@ -31,9 +31,6 @@
import org.testng.annotations.Test;
import org.testng.Assert;

import java.util.Arrays;
import java.io.ByteArrayOutputStream;

/**
 * This class defines a set of tests for the
 * org.opends.server.types.ByteString class.

 opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java

@@ -26,11 +26,8 @@
 */
package org.opends.server.types;

import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;

import static org.testng.Assert.*;



 opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java

@@ -34,7 +34,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;
import org.opends.messages.Message;

import static org.testng.Assert.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java

@@ -30,7 +30,6 @@

import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;
import org.opends.messages.Message;

import static org.testng.Assert.*;

 opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java

@@ -1392,7 +1392,7 @@
    // Try to add the entry.  If this fails with the proxy control, then add it
    // with a root connection so we can do other things with it.
    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          controls, e.getDN(), e.getObjectClasses(),
                          e.getUserAttributes(), e.getOperationalAttributes());
    addOperation.run();
@@ -1415,7 +1415,7 @@
        Attributes.create("description", "foo")));

    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             controls, e.getDN(), mods);
    modifyOperation.run();

@@ -1432,8 +1432,8 @@

    // Try to rename the entry.
    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), controls, e.getDN(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls, e.getDN(),
                               RDN.decode("cn=Proxy V1 Test"), true, null);
    modifyDNOperation.run();

@@ -1454,7 +1454,7 @@
    // Try to delete the operation.  If this fails, then delete it with a root
    // connection so it gets cleaned up.
    DeleteOperationBasis deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             controls, newEntryDN);
    deleteOperation.run();

@@ -1506,8 +1506,8 @@

    // Test a compare operation against the PWReset Target user.
    CompareOperationBasis compareOperation =
         new CompareOperationBasis(conn, conn.nextOperationID(),
                              conn.nextMessageID(), controls, targetDN,
         new CompareOperationBasis(conn, InternalClientConnection.nextOperationID(),
                              InternalClientConnection.nextMessageID(), controls, targetDN,
                              DirectoryServer.getAttributeType("cn", true),
             ByteString.valueOf("PWReset Target"));
    compareOperation.run();
@@ -1525,8 +1525,8 @@

    // Test a search operation against the PWReset Target user.
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), controls, targetDN,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), controls, targetDN,
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,
@@ -1588,7 +1588,7 @@
    // with a root connection so we can do other things with it.
    DN authDN = conn.getAuthenticationInfo().getAuthenticationDN();
    AddOperationBasis addOperation =
         new AddOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                          controls, e.getDN(), e.getObjectClasses(),
                          e.getUserAttributes(), e.getOperationalAttributes());
    addOperation.run();
@@ -1613,7 +1613,7 @@
        Attributes.create("description", "foo")));

    ModifyOperationBasis modifyOperation =
         new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new ModifyOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             controls, e.getDN(), mods);
    modifyOperation.run();

@@ -1632,8 +1632,8 @@

    // Try to rename the entry.
    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, conn.nextOperationID(),
                               conn.nextMessageID(), controls, e.getDN(),
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(),
                               InternalClientConnection.nextMessageID(), controls, e.getDN(),
                               RDN.decode("cn=Proxy V2 Test"), true, null);
    modifyDNOperation.run();

@@ -1656,7 +1656,7 @@
    // Try to delete the operation.  If this fails, then delete it with a root
    // connection so it gets cleaned up.
    DeleteOperationBasis deleteOperation =
         new DeleteOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
         new DeleteOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                             controls, newEntryDN);
    deleteOperation.run();

@@ -1711,8 +1711,8 @@

    // Test a compare operation against the PWReset Target user.
    CompareOperationBasis compareOperation =
         new CompareOperationBasis(conn, conn.nextOperationID(),
                              conn.nextMessageID(), controls, targetDN,
         new CompareOperationBasis(conn, InternalClientConnection.nextOperationID(),
                              InternalClientConnection.nextMessageID(), controls, targetDN,
                              DirectoryServer.getAttributeType("cn", true),
             ByteString.valueOf("PWReset Target"));
    compareOperation.run();
@@ -1730,8 +1730,8 @@

    // Test a search operation against the PWReset Target user.
    InternalSearchOperation searchOperation =
         new InternalSearchOperation(conn, conn.nextOperationID(),
                  conn.nextMessageID(), controls, targetDN,
         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
                  InternalClientConnection.nextMessageID(), controls, targetDN,
                  SearchScope.BASE_OBJECT,
                  DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                  SearchFilter.createFilterFromString("(objectClass=*)"), null,