From 2a20cb6cc04bc9f5917a50a68ba1e91cc8b606b0 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 25 Feb 2016 16:24:28 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for RDNs
---
opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java | 4 ++--
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java | 8 ++++----
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 3 +--
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java | 15 ---------------
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java | 2 +-
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java | 2 +-
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java | 2 +-
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java | 2 +-
11 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
index 25cfec4..1e7fb74 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
+++ b/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));
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
index 46818c1..831a8c9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
+++ b/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));
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
index b169803..1a1e639 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
+++ b/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));
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
index beb1f08..83f10ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/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);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
index bc28674..3d29400 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
+++ b/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;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
index 81a0f7e..6445082 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
+++ b/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.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
index 92876a8..b7e4fee 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
+++ b/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) });
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
index 5eca91b..c53b8b3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
+++ b/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) });
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
index 75bfba8..2ea3ef9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
+++ b/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) });
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
index 797dc46..6713fea 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
+++ b/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) });
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
index 9b42973..3a56dca 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
+++ b/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) });
}
/**
--
Gitblit v1.10.0