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

Jean-Noël Rouvignac
05.31.2016 2a20cb6cc04bc9f5917a50a68ba1e91cc8b606b0
Prep work for OPENDJ-1342: align APIs for RDNs

RDN.create(AttributeType, ByteString) => new RDN(AttributeType, ByteString)
11 files modified
44 ■■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java 8 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java 3 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java 15 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
@@ -143,7 +143,7 @@
      String type = profile.getRelationChildRDNType(r);
      AttributeType atype = DirectoryServer.getAttributeType(type);
      ByteString avalue = ByteString.valueOfUtf8(name);
      dn = dn.child(RDN.create(atype, avalue));
      dn = dn.child(new RDN(atype, avalue));
    }
@@ -160,7 +160,7 @@
      String type = profile.getRelationChildRDNType(r);
      AttributeType atype = DirectoryServer.getAttributeType(type);
      ByteString avalue = ByteString.valueOfUtf8(d.getName());
      dn = dn.child(RDN.create(atype, avalue));
      dn = dn.child(new RDN(atype, avalue));
    }
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -992,6 +992,6 @@
                               String rdnStringValue)
  {
    ByteString attrValue = ByteString.valueOfUtf8(rdnStringValue);
    return parentDN.child(RDN.create(rdnAttrType, attrValue));
    return parentDN.child(new RDN(rdnAttrType, attrValue));
  }
}
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
@@ -1019,7 +1019,7 @@
                               String rdnStringValue)
  {
    ByteString attrValue = ByteString.valueOfUtf8(rdnStringValue);
    return parentDN.child(RDN.create(rdnAttrType, attrValue));
    return parentDN.child(new RDN(rdnAttrType, attrValue));
  }
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
@@ -451,7 +451,7 @@
          throws CryptoManagerException {
    // Construct the key entry DN.
    final ByteString distinguishedValue = ByteString.valueOfUtf8(ADS_CERTIFICATE_ALIAS);
    final DN entryDN = localTruststoreDN.child(RDN.create(attrKeyID, distinguishedValue));
    final DN entryDN = localTruststoreDN.child(new RDN(attrKeyID, distinguishedValue));
    // Construct the search filter.
    final String FILTER_OC_INSTANCE_KEY = "(objectclass=" + ocInstanceKey.getNameOrOID() + ")";
    // Construct the attribute list.
@@ -571,7 +571,7 @@
    // Construct the key entry DN.
    final ByteString distinguishedValue = ByteString.valueOfUtf8(instanceKeyID);
    final DN entryDN = instanceKeysDN.child(
         RDN.create(attrKeyID, distinguishedValue));
         new RDN(attrKeyID, distinguishedValue));
    // Check for the entry. If it does not exist, create it.
    final String FILTER_OC_INSTANCE_KEY = "(objectclass=" + ocInstanceKey.getNameOrOID() + ")";
@@ -1526,7 +1526,7 @@
      ByteString distinguishedValue =
           ByteString.valueOfUtf8(keyEntry.getKeyID().getStringValue());
      DN entryDN = secretKeysDN.child(
           RDN.create(attrKeyID, distinguishedValue));
           new RDN(attrKeyID, distinguishedValue));
      // Set the entry object classes.
      LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
@@ -1996,7 +1996,7 @@
      ByteString distinguishedValue =
           ByteString.valueOfUtf8(keyEntry.getKeyID().getStringValue());
      DN entryDN = secretKeysDN.child(
           RDN.create(attrKeyID, distinguishedValue));
           new RDN(attrKeyID, distinguishedValue));
      // Set the entry object classes.
      LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
@@ -2904,8 +2904,7 @@
                  for (ByteString value : attr)
                  {
                    inheritFromDN = inheritFromDN.child(
                        RDN.create(subEntry.getInheritFromRDNType(),
                        value));
                        new RDN(subEntry.getInheritFromRDNType(), value));
                    break;
                  }
                }
opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
@@ -122,21 +122,6 @@
  }
  /**
   * Creates a new RDN with the provided information.
   *
   * @param  attributeType   The attribute type for this RDN.  It must
   *                         not be {@code null}.
   * @param  attributeValue  The value for this RDN.  It must not be
   *                         {@code null}.
   *
   * @return  The RDN created with the provided information.
   */
  public static RDN create(AttributeType attributeType, ByteString attributeValue)
  {
    return new RDN(attributeType, attributeValue);
  }
  /**
   * Retrieves the number of attribute-value pairs contained in this RDN.
   *
   * @return The number of attribute-value pairs contained in this RDN.
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
@@ -64,7 +64,7 @@
    //Setup the DN to use in the response tests.
    AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
    ByteString attributeValue = ByteString.valueOfUtf8("testValue");
    dn = new DN(new RDN[] { RDN.create(attribute, attributeValue) });
    dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
  }
  /**
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
@@ -64,7 +64,7 @@
    //Setup the DN to use in the response tests.
    AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
    ByteString attributeValue = ByteString.valueOfUtf8("testValue");
    dn = new DN(new RDN[] { RDN.create(attribute, attributeValue) });
    dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
  }
  /**
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
@@ -64,7 +64,7 @@
    //Setup the DN to use in the response tests.
    AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
    ByteString attributeValue = ByteString.valueOfUtf8("testValue");
    dn = new DN(new RDN[] { RDN.create(attribute, attributeValue) });
    dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
  }
  /**
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
@@ -65,7 +65,7 @@
    //Setup the DN to use in the response tests.
    AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
    ByteString attributeValue = ByteString.valueOfUtf8("testValue");
    dn = new DN(new RDN[] { RDN.create(attribute, attributeValue) });
    dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
  }
  /**
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
@@ -64,7 +64,7 @@
    //Setup the DN to use in the response tests.
    AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
    ByteString attributeValue = ByteString.valueOfUtf8("testValue");
    dn = new DN(new RDN[] { RDN.create(attribute, attributeValue) });
    dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
  }
  /**