From a3c93828f847345ed67fda0cddf1089d8fb433d5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 07 Mar 2016 15:04:03 +0000
Subject: [PATCH] OPENDJ-1342 Migrate AVA, RDN, and DN classes: DirectoryException => LocalizedIllegalArgumentException
---
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
index 5d3685d..b7b3888 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
@@ -34,6 +34,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
@@ -54,12 +56,10 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.Control;
import org.opends.server.types.CryptoManagerException;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ObjectClass;
-import org.forgerock.opendj.ldap.RDN;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.operation.PostResponseAddOperation;
@@ -122,7 +122,7 @@
*/
public CryptoManagerSync() throws InitializationException
{
- super(toDN(CONFIG_DN), EnumSet.of(
+ super(DN.valueOf(CONFIG_DN), EnumSet.of(
// No implementation required for modify_dn operations
// FIXME: Technically it is possible to perform a subtree modDN
// in this case however such subtree modDN would essentially be
@@ -170,19 +170,6 @@
DirectoryServer.registerInternalPlugin(this);
}
- private static DN toDN(final String dn) throws InitializationException
- {
- try
- {
- return DN.valueOf(dn);
- }
- catch (DirectoryException e)
- {
- throw new RuntimeException(e);
- }
- }
-
-
private void searchAdminSuffix()
{
SearchRequest request = newSearchRequest(adminSuffixDN, SearchScope.WHOLE_SUBTREE, keySearchFilter);
--
Gitblit v1.10.0