From d366a5db9c1477c823758862268dd493dbbcc936 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:49:03 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer.getTopObjectClass() and getObjectClassAttributeType()
---
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
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 69f7c75..eccbdf3 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
@@ -73,6 +73,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.util.Reject;
import org.opends.admin.ads.ADSContext;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
@@ -538,7 +539,7 @@
}
final Entry entry = new Entry(entryDN, null, null, null);
- entry.addObjectClass(DirectoryServer.getTopObjectClass());
+ entry.addObjectClass(CoreSchema.getTopObjectClass());
entry.addObjectClass(ocCertRequest);
AddOperation addOperation = icc.processAdd(entry);
if (ResultCode.SUCCESS != addOperation.getResultCode()) {
@@ -637,7 +638,7 @@
final InternalSearchOperation searchOp = icc.processSearch(request);
if (searchOp.getSearchEntries().isEmpty()) {
final Entry entry = new Entry(entryDN, null, null, null);
- entry.addObjectClass(DirectoryServer.getTopObjectClass());
+ entry.addObjectClass(CoreSchema.getTopObjectClass());
entry.addObjectClass(ocInstanceKey);
// Add the key ID attribute.
@@ -1581,7 +1582,7 @@
// Set the entry object classes.
LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
- ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
+ ocMap.put(CoreSchema.getTopObjectClass(), OC_TOP);
ocMap.put(ocCipherKey, OC_CRYPTO_CIPHER_KEY);
// Create the user attributes.
@@ -2051,7 +2052,7 @@
// Set the entry object classes.
LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
- ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
+ ocMap.put(CoreSchema.getTopObjectClass(), OC_TOP);
ocMap.put(ocMacKey, OC_CRYPTO_MAC_KEY);
// Create the user attributes.
--
Gitblit v1.10.0