jdemendi

17.21.2007 c429ea0c780d83a49531de1f7d42e9f802ce8fe8

In most cases, we should never expose the XxxOperationBasis
class in method signatures. Exposing XxxOperationBasis is
not clean because the XxxOperationBasis is a big container
implementing various interfaces. We should always use interfaces
instead, and if one interface is not enough then use two or three
of them as formal parameters.

This set of changes is removing all the un-necessary use of
XxxOperationBasis in the code, including unit-tests.

 opends/src/server/org/opends/server/api/AccessLogPublisher.java

@@ -341,7 +341,7 @@
   *                            DN request.
   */
  public abstract void logModifyDNRequest(
                            ModifyDNOperationBasis modifyDNOperation);
                            ModifyDNOperation modifyDNOperation);



@@ -355,7 +355,7 @@
   *                            DN response.
   */
  public abstract void logModifyDNResponse(
                            ModifyDNOperationBasis modifyDNOperation);
                            ModifyDNOperation modifyDNOperation);



@@ -424,8 +424,7 @@
   *                          information to use to log the unbind
   *                          request.
   */
  public abstract void logUnbind(UnbindOperationBasis
      unbindOperation);
  public abstract void logUnbind(UnbindOperation unbindOperation);

  /**
   * Gets the DN of the configuration entry for this access log

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

@@ -80,6 +80,7 @@
import org.opends.server.types.SearchResultReference;

import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.operation.PostOperationAbandonOperation;
import org.opends.server.types.operation.PostOperationAddOperation;
import org.opends.server.types.operation.PostOperationBindOperation;
import org.opends.server.types.operation.PostOperationCompareOperation;
@@ -88,6 +89,7 @@
import org.opends.server.types.operation.PostOperationModifyDNOperation;
import org.opends.server.types.operation.PostOperationModifyOperation;
import org.opends.server.types.operation.PostOperationSearchOperation;
import org.opends.server.types.operation.PostOperationUnbindOperation;
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PostResponseBindOperation;
import org.opends.server.types.operation.PostResponseCompareOperation;
@@ -104,13 +106,18 @@
import org.opends.server.types.operation.PreOperationModifyDNOperation;
import org.opends.server.types.operation.PreOperationModifyOperation;
import org.opends.server.types.operation.PreOperationSearchOperation;
import org.opends.server.types.operation.PreParseAbandonOperation;
import org.opends.server.types.operation.PreParseAddOperation;
import org.opends.server.types.operation.PreParseBindOperation;
import org.opends.server.types.operation.PreParseCompareOperation;
import org.opends.server.types.operation.PreParseDeleteOperation;
import org.opends.server.types.operation.PreParseModifyDNOperation;
import org.opends.server.types.operation.PreParseExtendedOperation;
import org.opends.server.types.operation.PreParseModifyOperation;
import org.opends.server.types.operation.PreParseSearchOperation;
import org.opends.server.types.operation.PreParseUnbindOperation;
import org.opends.server.types.operation.SearchEntrySearchOperation;
import org.opends.server.types.operation.SearchReferenceSearchOperation;
import org.opends.server.workflowelement.localbackend.*;

import static org.opends.server.loggers.ErrorLogger.*;
@@ -1740,7 +1747,7 @@
   * @return  The result of processing the pre-parse abandon plugins.
   */
  public PreParsePluginResult invokePreParseAbandonPlugins(
                                   AbandonOperationBasis abandonOperation)
                                   PreParseAbandonOperation abandonOperation)
  {
    PreParsePluginResult result = null;

@@ -2310,7 +2317,7 @@
   * @return  The result of processing the pre-parse modify DN plugins.
   */
  public PreParsePluginResult invokePreParseModifyDNPlugins(
                                   ModifyDNOperationBasis modifyDNOperation)
                                   PreParseModifyDNOperation modifyDNOperation)
  {
    PreParsePluginResult result = null;

@@ -2474,7 +2481,7 @@
   * @return  The result of processing the pre-parse unbind plugins.
   */
  public PreParsePluginResult invokePreParseUnbindPlugins(
                                   UnbindOperationBasis unbindOperation)
                                   PreParseUnbindOperation unbindOperation)
  {
    PreParsePluginResult result = null;

@@ -3208,7 +3215,7 @@
   * @return  The result of processing the post-operation abandon plugins.
   */
  public PostOperationPluginResult invokePostOperationAbandonPlugins(
                                        AbandonOperationBasis abandonOperation)
                              PostOperationAbandonOperation abandonOperation)
  {
    PostOperationPluginResult result = null;

@@ -3942,7 +3949,7 @@
   * @return  The result of processing the post-operation unbind plugins.
   */
  public PostOperationPluginResult invokePostOperationUnbindPlugins(
                                        UnbindOperationBasis unbindOperation)
                                 PostOperationUnbindOperation unbindOperation)
  {
    PostOperationPluginResult result = null;

@@ -4685,8 +4692,8 @@
   * @return  The result of processing the search result entry plugins.
   */
  public SearchEntryPluginResult invokeSearchResultEntryPlugins(
                                      SearchOperationBasis searchOperation,
                                      SearchResultEntry searchEntry)
      SearchEntrySearchOperation searchOperation,
      SearchResultEntry searchEntry)
  {
    SearchEntryPluginResult result = null;

@@ -4825,8 +4832,8 @@
   * @return  The result of processing the search result reference plugins.
   */
  public SearchReferencePluginResult invokeSearchResultReferencePlugins(
                                          SearchOperationBasis searchOperation,
                                          SearchResultReference searchReference)
      SearchReferenceSearchOperation searchOperation,
      SearchResultReference searchReference)
  {
    SearchReferencePluginResult result = null;


 opends/src/server/org/opends/server/loggers/AccessLogger.java

@@ -710,8 +710,7 @@
   * @param  modifyDNOperation  The modify DN operation containing the
   *                            information to use to log the modify DN request.
   */
  public static void logModifyDNRequest(ModifyDNOperationBasis
      modifyDNOperation)
  public static void logModifyDNRequest(ModifyDNOperation modifyDNOperation)
  {
    for (AccessLogPublisher publisher : accessPublishers)
    {
@@ -729,8 +728,7 @@
   *                            information to use to log the modify DN
   *                            response.
   */
  public static void logModifyDNResponse(ModifyDNOperationBasis
      modifyDNOperation)
  public static void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
  {
    for (AccessLogPublisher publisher : accessPublishers)
    {
@@ -820,7 +818,7 @@
   * @param  unbindOperation  The unbind operation containing the information to
   *                          use to log the unbind request.
   */
  public static void logUnbind(UnbindOperationBasis unbindOperation)
  public static void logUnbind(UnbindOperation unbindOperation)
  {
    for (AccessLogPublisher publisher : accessPublishers)
    {

 opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java

@@ -44,9 +44,9 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.core.UnbindOperationBasis;
import org.opends.server.core.UnbindOperation;
import org.opends.server.types.*;
import org.opends.server.util.TimeThread;

@@ -1369,7 +1369,7 @@
   * @param  modifyDNOperation  The modify DN operation containing the
   *                            info to use to log the modify DN request.
   */
  public void logModifyDNRequest(ModifyDNOperationBasis modifyDNOperation)
  public void logModifyDNRequest(ModifyDNOperation modifyDNOperation)
  {
    long connectionID = modifyDNOperation.getConnectionID();
    if (connectionID < 0)
@@ -1430,7 +1430,7 @@
   *                            information to use to log the modify DN
   *                            response.
   */
  public void logModifyDNResponse(ModifyDNOperationBasis modifyDNOperation)
  public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
  {
    long connectionID = modifyDNOperation.getConnectionID();
    if (connectionID < 0)
@@ -1679,7 +1679,7 @@
   * @param  unbindOperation  The unbind operation containing the info to
   *                          use to log the unbind request.
   */
  public void logUnbind(UnbindOperationBasis unbindOperation)
  public void logUnbind(UnbindOperation unbindOperation)
  {
    long connectionID = unbindOperation.getConnectionID();
    if (connectionID < 0)

 opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java

@@ -42,10 +42,10 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.core.SearchOperation;
import org.opends.server.core.UnbindOperationBasis;
import org.opends.server.core.UnbindOperation;
import org.opends.server.types.*;
import org.opends.server.util.Base64;
import org.opends.server.util.StaticUtils;
@@ -738,7 +738,7 @@
   * {@inheritDoc}
   */
  @Override()
  public void logModifyDNRequest(ModifyDNOperationBasis modifyDNOperation)
  public void logModifyDNRequest(ModifyDNOperation modifyDNOperation)
  {
  }

@@ -748,7 +748,7 @@
   * {@inheritDoc}
   */
  @Override()
  public void logModifyDNResponse(ModifyDNOperationBasis modifyDNOperation)
  public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
  {
    long connectionID = modifyDNOperation.getConnectionID();
    if (connectionID < 0)
@@ -860,7 +860,7 @@
   * {@inheritDoc}
   */
  @Override()
  public void logUnbind(UnbindOperationBasis unbindOperation)
  public void logUnbind(UnbindOperation unbindOperation)
  {
  }


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

@@ -1184,7 +1184,7 @@
   *          processed and contains information about the result of
   *          the processing.
   */
  public ModifyDNOperationBasis processModifyDN(String rawEntryDN,
  public ModifyDNOperation processModifyDN(String rawEntryDN,
                                           String rawNewRDN,
                                           boolean deleteOldRDN)
  {
@@ -1208,7 +1208,7 @@
   *          processed and contains information about the result of
   *          the processing.
   */
  public ModifyDNOperationBasis processModifyDN(ByteString rawEntryDN,
  public ModifyDNOperation processModifyDN(ByteString rawEntryDN,
                                           ByteString rawNewRDN,
                                           boolean deleteOldRDN)
  {
@@ -1233,7 +1233,7 @@
   *          processed and contains information about the result of
   *          the processing.
   */
  public ModifyDNOperationBasis processModifyDN(String rawEntryDN,
  public ModifyDNOperation processModifyDN(String rawEntryDN,
                                           String rawNewRDN,
                                           boolean deleteOldRDN,
                                           String rawNewSuperior)
@@ -1262,7 +1262,7 @@
   *          processed and contains information about the result of
   *          the processing.
   */
  public ModifyDNOperationBasis processModifyDN(ByteString rawEntryDN,
  public ModifyDNOperation processModifyDN(ByteString rawEntryDN,
                                           ByteString rawNewRDN,
                                           boolean deleteOldRDN,
                                           ByteString rawNewSuperior)
@@ -1294,7 +1294,7 @@
   *          processed and contains information about the result of
   *          the processing.
   */
  public ModifyDNOperationBasis processModifyDN(DN entryDN,
  public ModifyDNOperation processModifyDN(DN entryDN,
                                           RDN newRDN,
                                           boolean deleteOldRDN)
  {
@@ -1319,7 +1319,7 @@
   *          processed and contains information about the result of
   *          the processing.
   */
  public ModifyDNOperationBasis processModifyDN(DN entryDN,
  public ModifyDNOperation processModifyDN(DN entryDN,
                                           RDN newRDN,
                                           boolean deleteOldRDN,
                                           DN newSuperior)

 opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java

@@ -477,7 +477,7 @@
   * @return  A reference to the add operation that was processed and contains
   *          information about the result of the processing.
   */
  public AddOperationBasis processAdd(ASN1OctetString rawEntryDN,
  public AddOperation processAdd(ASN1OctetString rawEntryDN,
                                 ArrayList<RawAttribute> rawAttributes)
  {
    AddOperationBasis addOperation =
@@ -619,7 +619,7 @@
   * @return  A reference to the delete operation that was processed and
   *          contains information about the result of the processing.
   */
  public DeleteOperationBasis processDelete(ASN1OctetString rawEntryDN)
  public DeleteOperation processDelete(ASN1OctetString rawEntryDN)
  {
    DeleteOperationBasis deleteOperation =
         new DeleteOperationBasis(this, nextOperationID(), nextMessageID(),
@@ -676,7 +676,7 @@
   * @return  A reference to the modify operation that was processed and
   *          contains information about the result of the processing
   */
  public ModifyOperationBasis processModify(ASN1OctetString rawEntryDN,
  public ModifyOperation processModify(ASN1OctetString rawEntryDN,
                              ArrayList<RawModification> rawModifications)
  {
    ModifyOperationBasis modifyOperation =
@@ -744,7 +744,7 @@
   * @return  A reference to the modify DN operation that was processed and
   *          contains information about the result of the processing.
   */
  public ModifyDNOperationBasis processModifyDN(ASN1OctetString rawEntryDN,
  public ModifyDNOperation processModifyDN(ASN1OctetString rawEntryDN,
                                           ASN1OctetString rawNewRDN,
                                           boolean deleteOldRDN)
  {
@@ -767,7 +767,7 @@
   * @return  A reference to the modify DN operation that was processed and
   *          contains information about the result of the processing.
   */
  public ModifyDNOperationBasis processModifyDN(ASN1OctetString rawEntryDN,
  public ModifyDNOperation processModifyDN(ASN1OctetString rawEntryDN,
                                           ASN1OctetString rawNewRDN,
                                           boolean deleteOldRDN,
                                           ASN1OctetString rawNewSuperior)
@@ -807,7 +807,7 @@
   *          processed and contains information about the result of
   *          the processing.
   */
  public ModifyDNOperationBasis processModifyDN(DN entryDN, RDN newRDN,
  public ModifyDNOperation processModifyDN(DN entryDN, RDN newRDN,
                                           boolean deleteOldRDN,
                                           DN newSuperior)
  {

 opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java

@@ -66,6 +66,7 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyOperationBasis;
@@ -1570,7 +1571,7 @@
 * @return true if the process is completed, false if it must continue.
 * @throws Exception When the operation is not valid.
 */
private boolean solveNamingConflict(ModifyDNOperationBasis op,
private boolean solveNamingConflict(ModifyDNOperation op,
    UpdateMessage msg) throws Exception
{
  ResultCode result = op.getResultCode();
@@ -1843,7 +1844,7 @@
    InternalClientConnection conn =
      InternalClientConnection.getRootConnection();

    ModifyDNOperationBasis newOp = conn.processModifyDN(
    ModifyDNOperation newOp = conn.processModifyDN(
        dn, generateDeleteConflictDn(uid, dn),false, baseDN);

    if (newOp.getResultCode() != ResultCode.SUCCESS)

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

@@ -182,7 +182,7 @@
   * @param  addOperation  The add operation to be tested.
   */
  @Test(dataProvider = "addOperations")
  public void testGetAndSetRawEntryDN(AddOperationBasis addOperation)
  public void testGetAndSetRawEntryDN(AddOperation addOperation)
  {
    ByteString originalDN = addOperation.getRawEntryDN();
    assertNotNull(originalDN);
@@ -298,7 +298,7 @@
   * @param  addOperation  The add operation to be tested.
   */
  @Test(dataProvider = "addOperations")
  public void testGetAndSetRawAttributes(AddOperationBasis addOperation)
  public void testGetAndSetRawAttributes(AddOperation addOperation)
  {
    List<RawAttribute> rawAttrs = addOperation.getRawAttributes();
    assertNotNull(rawAttrs);

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

@@ -689,7 +689,7 @@

    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    ModifyDNOperationBasis modifyDNOperation =
    ModifyDNOperation modifyDNOperation =
         conn.processModifyDN(groupDN, newRDN, true);
    assertEquals(modifyDNOperation.getResultCode(), ResultCode.SUCCESS);


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

@@ -203,7 +203,7 @@
   *
   * @param  searchOperation  The operation to be tested.
   */
  private void examineCompletedOperation(SearchOperationBasis searchOperation)
  private void examineCompletedOperation(SearchOperation searchOperation)
  {
    assertTrue(searchOperation.getProcessingStartTime() > 0);
    assertTrue(searchOperation.getProcessingStopTime() > 0);

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

@@ -165,7 +165,7 @@
   *
   * @param  modifyDNOperation  The operation to be tested.
   */
  private void examineCompletedOperation(ModifyDNOperationBasis modifyDNOperation)
  private void examineCompletedOperation(ModifyDNOperation modifyDNOperation)
  {
    assertTrue(modifyDNOperation.getProcessingStartTime() > 0);
    assertTrue(modifyDNOperation.getProcessingStopTime() > 0);
@@ -185,7 +185,7 @@
   *
   * @param  modifyDNOperation  The operation to be tested.
   */
  private void examineIncompleteOperation(ModifyDNOperationBasis modifyDNOperation)
  private void examineIncompleteOperation(ModifyDNOperation modifyDNOperation)
  {
    assertTrue(modifyDNOperation.getProcessingStartTime() > 0);
    assertTrue(modifyDNOperation.getProcessingStopTime() > 0);
@@ -206,7 +206,7 @@
   *
   * @param  modifyDNOperation  The operation to be tested.
   */
  private void examineUnparsedOperation(ModifyDNOperationBasis modifyDNOperation)
  private void examineUnparsedOperation(ModifyDNOperation modifyDNOperation)
  {
    assertTrue(modifyDNOperation.getProcessingStartTime() > 0);
    assertTrue(modifyDNOperation.getProcessingStopTime() > 0);

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

@@ -79,7 +79,7 @@
   *
   * @param  unbindOperation  The operation to be tested.
   */
  private void examineCompletedOperation(UnbindOperationBasis unbindOperation)
  private void examineCompletedOperation(UnbindOperation unbindOperation)
  {
    assertTrue(unbindOperation.getProcessingStartTime() > 0);
    assertTrue(unbindOperation.getProcessingStopTime() > 0);

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

@@ -45,8 +45,8 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
@@ -390,7 +390,7 @@
    assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);


    ModifyDNOperationBasis modifyDNOperation =
    ModifyDNOperation modifyDNOperation =
         conn.processModifyDN(e.getDN(), RDN.decode("cn=test2"), false);
    assertEquals(modifyDNOperation.getResultCode(), ResultCode.SUCCESS);


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

@@ -47,7 +47,7 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.ldap.LDAPAttribute;
@@ -723,7 +723,7 @@
    assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);


    ModifyDNOperationBasis modifyDNOperation =
    ModifyDNOperation modifyDNOperation =
         conn.processModifyDN(new ASN1OctetString("cn=test,o=test"),
                              new ASN1OctetString("cn=test2"), true);
    assertEquals(modifyDNOperation.getResultCode(), ResultCode.SUCCESS);
@@ -756,7 +756,7 @@
    assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);


    ModifyDNOperationBasis modifyDNOperation =
    ModifyDNOperation modifyDNOperation =
         conn.processModifyDN(new ASN1OctetString("cn=test,o=test"),
                              new ASN1OctetString("cn=test2"), true,
                              new ASN1OctetString("dc=example,dc=com"));
@@ -791,7 +791,7 @@
    assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);


    ModifyDNOperationBasis modifyDNOperation =
    ModifyDNOperation modifyDNOperation =
         conn.processModifyDN(DN.decode("cn=test,o=test"),
                              RDN.decode("cn=test2"), true);
    assertEquals(modifyDNOperation.getResultCode(), ResultCode.SUCCESS);
@@ -824,7 +824,7 @@
    assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);


    ModifyDNOperationBasis modifyDNOperation =
    ModifyDNOperation modifyDNOperation =
         conn.processModifyDN(DN.decode("cn=test,o=test"),
                              RDN.decode("cn=test2"), true,
                              DN.decode("dc=example,dc=com"));

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

@@ -56,6 +56,7 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DeleteOperationBasis;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyOperationBasis;
@@ -688,7 +689,7 @@
  {
    assertEquals(conn.hasPrivilege(Privilege.JMX_WRITE, null), hasPrivilege);

    ModifyDNOperationBasis modifyDNOperation =
    ModifyDNOperation modifyDNOperation =
         conn.processModifyDN(DN.decode("cn=Work Queue,cn=config"),
                              RDN.decode("cn=New RDN for Work Queue"), true,
                              null);

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

@@ -52,6 +52,7 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DeleteOperationBasis;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyOperationBasis;
@@ -597,7 +598,7 @@
  {
    assertEquals(conn.hasPrivilege(Privilege.CONFIG_WRITE, null), hasPrivilege);

    ModifyDNOperationBasis modifyDNOperation =
    ModifyDNOperation modifyDNOperation =
         conn.processModifyDN(DN.decode("cn=Work Queue,cn=config"),
                              RDN.decode("cn=New RDN for Work Queue"), true,
                              null);