mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noël Rouvignac
11.15.2016 f4d58cd99b8fc03b348841066672d1236ca37264
OPENDJ-1342 Migrate AVA, RDN, and DN classes: Fix change in behaviour for DN.parent()

Previously DN.parent() would return null instead of the rootDN.
Now we have:

assertEquals(DN.valueOf("dc=com").parent(), DN.rootDN());
assertNull(DN.rootDN().parent());
3 files modified
10 ■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java
@@ -405,7 +405,7 @@
    try
    {
      List<SubEntry> subentries = new ArrayList<>();
      for (DN subDN = dn; subDN != null; subDN = subDN.parent())
      for (DN subDN = dn; subDN != null && !subDN.isRootDN(); subDN = subDN.parent())
      {
        List<SubEntry> subList = subEntryMap.get(subDN);
        if (subList != null)
@@ -452,7 +452,7 @@
    try
    {
      List<SubEntry> subentries = new ArrayList<>();
      for (DN subDN = entry.getName(); subDN != null; subDN = subDN.parent())
      for (DN subDN = entry.getName(); subDN != null && !subDN.isRootDN(); subDN = subDN.parent())
      {
        List<SubEntry> subList = subEntryMap.get(subDN);
        if (subList != null)
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -905,7 +905,7 @@
      {
        return workflow;
      }
      entryDN = entryDN.parent();
      entryDN = DirectoryServer.getParentDNInSuffix(entryDN);
    }
    return null;
  }
opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
@@ -395,11 +395,11 @@
   *
   * @return The array of test DN strings.
   */
  @DataProvider(name = "createParentAndRDNTestData")
  @DataProvider
  public Object[][] createParentAndRDNTestData() {
    return new Object[][] {
        { "", null, null },
        { "dc=com", null, "dc=com" },
        { "dc=com", "", "dc=com" },
        { "dc=opends,dc=com", "dc=com", "dc=opends" },
        { "dc=world,dc=opends,dc=com", "dc=opends,dc=com", "dc=world" },
        { "dc=hello,dc=world,dc=opends,dc=com",