Prep work for OPENDJ-1342: align APIs for DNs: isAncestorOf(DN) => isSuperi...

Jean-Noël Rouvignac

03.20.2016 e41a9d4d573a382c5e0536c970bd2878bd8dc6bc

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2012-2015 ForgeRock AS
 *      Portions Copyright 2012-2016 ForgeRock AS
 */
package org.opends.guitools.controlpanel.browser;

@@ -1129,7 +1129,7 @@
    {
      DN dn1 = DN.valueOf(getNode().getDN());
      DN dn2 = url.getBaseDN();
      if (dn2.isAncestorOf(dn1))
      if (dn2.isSuperiorOrEqualTo(dn1))
      {
        String host = url.getHost();
        int port = url.getPort();

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java

@@ -836,7 +836,7 @@
            {
              isBaseDN = true;
            }
            else if (baseDN.getDn().isAncestorOf(theDN))
            else if (baseDN.getDn().isSuperiorOrEqualTo(theDN))
            {
              isSubordinate = true;
            }
@@ -1681,7 +1681,7 @@
  {
    for (DN suffix : allSuffixes)
    {
      if (suffix.isAncestorOf(dn) && !suffix.equals(dn))
      if (suffix.isSuperiorOrEqualTo(dn) && !suffix.equals(dn))
      {
        return false;
      }

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2011-2015 ForgeRock AS
 *      Portions Copyright 2011-2016 ForgeRock AS
 */

package org.opends.guitools.controlpanel.ui;
@@ -623,11 +623,11 @@
          {
            return invalidBaseDNValue(dn, ERR_BASE_DN_ALREADY_EXISTS.get(dn), errors);
          }
          else if (baseDN.getDn().isAncestorOf(theDN) && backendName.equalsIgnoreCase(backend.getBackendID()))
          else if (baseDN.getDn().isSuperiorOrEqualTo(theDN) && backendName.equalsIgnoreCase(backend.getBackendID()))
          {
            return invalidBaseDNValue(dn, ERR_BASE_DN_ANCESTOR_EXISTS.get(baseDN.getDn()), errors);
          }
          else if (theDN.isAncestorOf(baseDN.getDn()) && backendName.equalsIgnoreCase(backend.getBackendID()))
          else if (theDN.isSuperiorOrEqualTo(baseDN.getDn()) && backendName.equalsIgnoreCase(backend.getBackendID()))
          {
            return invalidBaseDNValue(dn, ERR_BASE_DN_DN_IS_ANCESTOR_OF.get(baseDN.getDn()), errors);
          }

 opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java

@@ -1130,7 +1130,7 @@
          boolean isBelowBaseDN = false;
          for (DN baseDN : baseDNs)
          {
            if (baseDN.isAncestorOf(entryDN))
            if (baseDN.isSuperiorOrEqualTo(entryDN))
            {
              isBelowBaseDN = true;
              break;

 opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java

@@ -513,7 +513,7 @@
    boolean matchFound = false;
    for (DN dn : baseDNs)
    {
      if (dn.isAncestorOf(e.getName()))
      if (dn.isSuperiorOrEqualTo(e.getName()))
      {
        matchFound = true;
        break;

 opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java

@@ -3350,7 +3350,7 @@
        found = true;
        break;
      }
      else if (dn.isAncestorOf(baseDN))
      else if (dn.isSuperiorOrEqualTo(baseDN))
      {
        matchedDN = dn;
        break;

 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java

@@ -101,7 +101,7 @@
        for (DN includeBranch : includeBranches)
        {
          if (includeBranch.isSubordinateOrEqualTo(baseDN) ||
               includeBranch.isAncestorOf(baseDN))
               includeBranch.isSuperiorOrEqualTo(baseDN))
          {
            exportContainers.add(entryContainer);
            break;

 opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java

@@ -95,7 +95,7 @@
      {
        otherBaseDNs.add(dn);

        if (baseDN.isAncestorOf(dn) || baseDN.isSubordinateOrEqualTo(dn))
        if (baseDN.isSuperiorOrEqualTo(dn) || baseDN.isSubordinateOrEqualTo(dn))
        {
          LocalizableMessage message = ERR_REGISTER_BASEDN_HIERARCHY_CONFLICT.
              get(baseDN, backend.getBackendID(), dn);

 opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014-2015 ForgeRock AS
 *      Portions Copyright 2014-2016 ForgeRock AS
 */
package org.opends.server.core;

@@ -269,9 +269,9 @@
    case SINGLE_LEVEL:
      return baseDN.equals(dn.getParentDNInSuffix());
    case WHOLE_SUBTREE:
      return baseDN.isAncestorOf(dn);
      return baseDN.isSuperiorOrEqualTo(dn);
    case SUBORDINATES:
      return !baseDN.equals(dn) && baseDN.isAncestorOf(dn);
      return !baseDN.equals(dn) && baseDN.isSuperiorOrEqualTo(dn);
    default:
      return false;
    }
@@ -356,9 +356,9 @@
    case SINGLE_LEVEL:
      return baseDN.equals(dn.parent());
    case WHOLE_SUBTREE:
      return baseDN.isAncestorOf(dn);
      return baseDN.isSuperiorOrEqualTo(dn);
    case SUBORDINATES:
      return !baseDN.equals(dn) && baseDN.isAncestorOf(dn);
      return !baseDN.equals(dn) && baseDN.isSuperiorOrEqualTo(dn);
    default:
      return false;
    }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2011-2015 ForgeRock AS
 *      Portions Copyright 2011-2016 ForgeRock AS
 */
package org.opends.server.extensions;

@@ -156,14 +156,14 @@
            break;

          case SUBORDINATES:
            if (baseDN.equals(nextDN) || !baseDN.isAncestorOf(nextDN))
            if (baseDN.equals(nextDN) || !baseDN.isSuperiorOrEqualTo(nextDN))
            {
              continue;
            }
            break;

          default:
            if (!baseDN.isAncestorOf(nextDN))
            if (!baseDN.isSuperiorOrEqualTo(nextDN))
            {
              continue;
            }

 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/RemotePendingChanges.java

@@ -226,7 +226,7 @@
             * Check if the operation to be run is an addOperation on a
             * parent of the current AddOperation.
             */
            if (pendingMsg.getDN().isAncestorOf(targetDN))
            if (pendingMsg.getDN().isSuperiorOrEqualTo(targetDN))
            {
              hasDependencies = true;
              addDependency(change, pendingChange);

 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011-2015 ForgeRock AS
 *      Portions Copyright 2011-2016 ForgeRock AS
 */
package org.opends.server.replication.protocol;

@@ -395,7 +395,7 @@
    try
    {
      DN newDN = computeNewDN();
      return newDN.isAncestorOf(targetDn);
      return newDN.isSuperiorOrEqualTo(targetDn);
    } catch (DirectoryException e)
    {
      // The DN was not a correct DN, and therefore does not a parent of the

 opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java

@@ -1131,7 +1131,7 @@
    {
      for (DN includeDN : includeBranches)
      {
        if (baseDN.isAncestorOf(includeDN))
        if (baseDN.isSuperiorOrEqualTo(includeDN))
        {
          return true;
        }

 opendj-server-legacy/src/main/java/org/opends/server/types/DN.java

@@ -469,7 +469,7 @@
   * @return  <CODE>true</CODE> if this DN is an ancestor of the
   *          provided DN, or <CODE>false</CODE> if not.
   */
  public boolean isAncestorOf(DN dn)
  public boolean isSuperiorOrEqualTo(DN dn)
  {
    int offset = dn.numComponents - numComponents;
    if (offset < 0)

 opendj-server-legacy/src/main/java/org/opends/server/types/LDIFExportConfig.java

@@ -877,7 +877,7 @@
    {
      for (DN excludeBranch : excludeBranches)
      {
        if (excludeBranch.isAncestorOf(dn))
        if (excludeBranch.isSuperiorOrEqualTo(dn))
        {
          return false;
        }
@@ -888,7 +888,7 @@
    {
      for (DN includeBranch : includeBranches)
      {
        if (includeBranch.isAncestorOf(dn))
        if (includeBranch.isSuperiorOrEqualTo(dn))
        {
          break checkIncludeBranches;
        }

 opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportConfig.java

@@ -742,7 +742,7 @@
    {
      for (DN excludeBranch : excludeBranches)
      {
        if (excludeBranch.isAncestorOf(dn))
        if (excludeBranch.isSuperiorOrEqualTo(dn))
        {
          return false;
        }
@@ -753,7 +753,7 @@
    {
      for (DN includeBranch : includeBranches)
      {
        if (includeBranch.isAncestorOf(dn))
        if (includeBranch.isSuperiorOrEqualTo(dn))
        {
          return true;
        }

 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java

@@ -1065,7 +1065,7 @@

      // If the request base DN is not a subordinate of the subordinate
      // workflow base DN then do not search in the subordinate workflow.
      if (!originalBaseDN.isAncestorOf(subordinateDN))
      if (!originalBaseDN.isSuperiorOrEqualTo(subordinateDN))
      {
        continue;
      }

 opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java

@@ -586,8 +586,8 @@
    assertTrue(p.compareTo(c) < 0);
    assertTrue(c.compareTo(p) > 0);

    assertTrue(p.isAncestorOf(c));
    assertFalse(c.isAncestorOf(p));
    assertTrue(p.isSuperiorOrEqualTo(c));
    assertFalse(c.isSuperiorOrEqualTo(p));

    assertTrue(c.isSubordinateOrEqualTo(p));
    assertFalse(p.isSubordinateOrEqualTo(c));
@@ -800,8 +800,8 @@
    assertTrue(c.compareTo(p) > 0);
    assertTrue(p.compareTo(c) < 0);

    assertTrue(p.isAncestorOf(c));
    assertFalse(c.isAncestorOf(p));
    assertTrue(p.isSuperiorOrEqualTo(c));
    assertFalse(c.isSuperiorOrEqualTo(p));

    assertTrue(c.isSubordinateOrEqualTo(p));
    assertFalse(p.isSubordinateOrEqualTo(c));
@@ -1004,7 +1004,7 @@
    DN dn = DN.valueOf(s);
    DN other = DN.valueOf(d);

    assertEquals(dn.isAncestorOf(other), e, s + " isAncestoryOf " + d);
    assertEquals(dn.isSuperiorOrEqualTo(other), e, s + " isAncestoryOf " + d);
  }


@@ -1019,7 +1019,7 @@
      AssertionError.class })
  public void testIsAncestorOfException() throws Exception {
    DN dn = DN.valueOf("dc=com");
    dn.isAncestorOf(null);
    dn.isSuperiorOrEqualTo(null);
  }