From 327ed7b44629d254f59b785ee2e0b7f8860e5cf8 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:11 +0000
Subject: [PATCH] OPENDJ-2987 Simplify ways to retrieve an object class from the DirectoryServer Keep only DirectoryServer.getObjectClass() and DirectoryServer.getDefaultObjectClass() methods
---
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java | 71 +++--------------
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 8 +-
opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java | 8 +-
opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java | 2
opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java | 2
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java | 2
opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 8 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java | 8 +-
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java | 2
opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java | 2
opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java | 12 +-
opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 6
opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java | 2
opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java | 6
opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java | 6
34 files changed, 73 insertions(+), 118 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index f0e9cd6..f79eac7 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -89,7 +89,7 @@
if (attribute.getAttributeDescription().getAttributeType().isObjectClass()) {
for (ByteString attrName : attribute) {
try {
- entry.addObjectClass(DirectoryServer.getObjectClass2(attrName.toString()));
+ entry.addObjectClass(DirectoryServer.getObjectClass(attrName.toString()));
} catch (DirectoryException e) {
throw new IllegalStateException(e.getMessage(), e);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
index d56879e..cdcfae2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
@@ -277,7 +277,7 @@
for (Object value : getAttributeValues(attrType.getNameOrOID()))
{
String ocName = value.toString().trim();
- objectClasses.put(DirectoryServer.getObjectClass2(ocName), ocName);
+ objectClasses.put(DirectoryServer.getObjectClass(ocName), ocName);
}
}
else
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
index ff9c2ee..a0a5991 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -651,7 +651,7 @@
for (Object value : csr.getAttributeValues(attrType.getNameOrOID()))
{
String ocName = value.toString().trim();
- objectClasses.put(DirectoryServer.getObjectClass2(ocName), ocName);
+ objectClasses.put(DirectoryServer.getObjectClass(ocName), ocName);
}
}
else
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
index 80dfe0a..ecb07a8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
@@ -603,7 +603,7 @@
final LinkedHashMap<ObjectClass, String> ocMap = new LinkedHashMap<>(objectClassNames.size());
for (final String name : objectClassNames)
{
- ocMap.put(DirectoryServer.getObjectClass2(name), name);
+ ocMap.put(DirectoryServer.getObjectClass(name), name);
}
if (sync)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
index 2c90cc0..ce04849 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
@@ -157,7 +157,7 @@
*/
public ObjectClass getMonitorObjectClass()
{
- return DirectoryServer.getObjectClass2(OC_EXTENSIBLE_OBJECT_LC);
+ return DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC);
}
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 7f59b6d..ab076b9 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
@@ -212,7 +212,7 @@
// Construct the backup base entry.
LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>(2);
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- objectClasses.put(DirectoryServer.getObjectClass2(OC_UNTYPED_OBJECT_LC), OC_UNTYPED_OBJECT);
+ objectClasses.put(DirectoryServer.getObjectClass(OC_UNTYPED_OBJECT_LC), OC_UNTYPED_OBJECT);
LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(1);
@@ -503,7 +503,7 @@
LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- ocMap.put(DirectoryServer.getObjectClass2(OC_BACKUP_DIRECTORY), OC_BACKUP_DIRECTORY);
+ ocMap.put(DirectoryServer.getObjectClass(OC_BACKUP_DIRECTORY), OC_BACKUP_DIRECTORY);
LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
@@ -579,8 +579,8 @@
// Construct the backup entry to return.
LinkedHashMap<ObjectClass, String> ocMap = new LinkedHashMap<>(3);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- ocMap.put(DirectoryServer.getObjectClass2(OC_BACKUP_INFO), OC_BACKUP_INFO);
- ocMap.put(DirectoryServer.getObjectClass2(OC_EXTENSIBLE_OBJECT_LC), OC_EXTENSIBLE_OBJECT);
+ ocMap.put(DirectoryServer.getObjectClass(OC_BACKUP_INFO), OC_BACKUP_INFO);
+ ocMap.put(DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC), OC_EXTENSIBLE_OBJECT);
LinkedHashMap<AttributeType, List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index 46d79f6..22f1965 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -176,8 +176,8 @@
CHANGELOG_ROOT_OBJECT_CLASSES = new LinkedHashMap<>(2);
static
{
- CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getObjectClass2(OC_TOP), OC_TOP);
- CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getObjectClass2("container"), "container");
+ CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP);
+ CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getObjectClass("container"), "container");
}
/** The set of objectclasses that will be used in ECL entries. */
@@ -185,8 +185,8 @@
CHANGELOG_ENTRY_OBJECT_CLASSES = new LinkedHashMap<>(2);
static
{
- CHANGELOG_ENTRY_OBJECT_CLASSES.put(DirectoryServer.getObjectClass2(OC_TOP), OC_TOP);
- CHANGELOG_ENTRY_OBJECT_CLASSES.put(DirectoryServer.getObjectClass2(OC_CHANGELOG_ENTRY), OC_CHANGELOG_ENTRY);
+ CHANGELOG_ENTRY_OBJECT_CLASSES.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP);
+ CHANGELOG_ENTRY_OBJECT_CLASSES.put(DirectoryServer.getObjectClass(OC_CHANGELOG_ENTRY), OC_CHANGELOG_ENTRY);
}
/** The attribute type for the "creatorsName" attribute. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
index 9225747..b3f329f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -193,8 +193,8 @@
addAll(userDefinedAttributes, configEntry.getOperationalAttributes().values());
// Construct the set of objectclasses to include in the base monitor entry.
- monitorObjectClasses.put(DirectoryServer.getObjectClass2(OC_TOP), OC_TOP);
- monitorObjectClasses.put(DirectoryServer.getObjectClass2(OC_MONITOR_ENTRY), OC_MONITOR_ENTRY);
+ monitorObjectClasses.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP);
+ monitorObjectClasses.put(DirectoryServer.getObjectClass(OC_MONITOR_ENTRY), OC_MONITOR_ENTRY);
// Create the set of base DNs that we will handle. In this case, it's just
// the DN of the base monitor entry.
@@ -560,7 +560,7 @@
*/
private Entry getBaseMonitorEntry()
{
- final ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass2(OC_EXTENSIBLE_OBJECT_LC);
+ final ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC);
final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(extensibleObjectOC, OC_EXTENSIBLE_OBJECT);
final HashMap<AttributeType, List<Attribute>> monitorUserAttrs = new LinkedHashMap<>();
@@ -631,7 +631,7 @@
*/
private Entry getBranchMonitorEntry(final DN dn)
{
- final ObjectClass monitorOC = DirectoryServer.getObjectClass2(OC_MONITOR_BRANCH);
+ final ObjectClass monitorOC = DirectoryServer.getObjectClass(OC_MONITOR_BRANCH);
final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(monitorOC, OC_MONITOR_BRANCH);
final HashMap<AttributeType, List<Attribute>> monitorUserAttrs = new LinkedHashMap<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
index bcbc0de..ddd9108 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
@@ -146,7 +146,7 @@
objectClasses.put(DirectoryServer.getTopObjectClass(), "top");
String nulOCName = "nullbackendobject";
- ObjectClass nulOC = DirectoryServer.getObjectClass2(nulOCName);
+ ObjectClass nulOC = DirectoryServer.getObjectClass(nulOCName);
try {
DirectoryServer.registerObjectClass(nulOC, false);
} catch (DirectoryException de) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
index 8aba15a..9ea3eaa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -220,8 +220,8 @@
// Construct the set of objectclasses to include in the root DSE entry.
dseObjectClasses = new HashMap<>(2);
- dseObjectClasses.put(DirectoryServer.getObjectClass2(OC_TOP), OC_TOP);
- dseObjectClasses.put(DirectoryServer.getObjectClass2(OC_ROOT_DSE), OC_ROOT_DSE);
+ dseObjectClasses.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP);
+ dseObjectClasses.put(DirectoryServer.getObjectClass(OC_ROOT_DSE), OC_ROOT_DSE);
// Set the backend ID for this backend. The identifier needs to be
// specific enough to avoid conflict with user backend identifiers.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 49e0230..f2f2874 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -247,8 +247,8 @@
// Construct the set of objectclasses to include in the schema entry.
schemaObjectClasses = new LinkedHashMap<>(3);
schemaObjectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- schemaObjectClasses.put(DirectoryServer.getObjectClass2(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
- schemaObjectClasses.put(DirectoryServer.getObjectClass2(OC_SUBSCHEMA), OC_SUBSCHEMA);
+ schemaObjectClasses.put(DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
+ schemaObjectClasses.put(DirectoryServer.getObjectClass(OC_SUBSCHEMA), OC_SUBSCHEMA);
configEntryDN = configEntry.getName();
baseDNs = cfg.getBaseDN();
@@ -2603,8 +2603,8 @@
{
Map<ObjectClass,String> objectClasses = new LinkedHashMap<>();
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- objectClasses.put(DirectoryServer.getObjectClass2(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
- objectClasses.put(DirectoryServer.getObjectClass2(OC_SUBSCHEMA), OC_SUBSCHEMA);
+ objectClasses.put(DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC), OC_LDAP_SUBENTRY);
+ objectClasses.put(DirectoryServer.getObjectClass(OC_SUBSCHEMA), OC_SUBSCHEMA);
Map<AttributeType,List<Attribute>> userAttributes = new LinkedHashMap<>();
Map<AttributeType,List<Attribute>> operationalAttributes = new LinkedHashMap<>();
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 6673b1f..481fd60 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
@@ -190,7 +190,7 @@
// Construct the trust store base entry.
LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>(2);
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- objectClasses.put(DirectoryServer.getObjectClass2("ds-cfg-branch"), "ds-cfg-branch");
+ objectClasses.put(DirectoryServer.getObjectClass("ds-cfg-branch"), "ds-cfg-branch");
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(1);
for (AVA ava : getBaseDN().rdn())
@@ -414,7 +414,7 @@
// Construct the certificate entry to return.
LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- ocMap.put(DirectoryServer.getObjectClass2(OC_CRYPTO_INSTANCE_KEY), OC_CRYPTO_INSTANCE_KEY);
+ ocMap.put(DirectoryServer.getObjectClass(OC_CRYPTO_INSTANCE_KEY), OC_CRYPTO_INSTANCE_KEY);
LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
@@ -1055,7 +1055,7 @@
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
- if (entry.hasObjectClass(DirectoryServer.getObjectClass2(OC_SELF_SIGNED_CERT_REQUEST)))
+ if (entry.hasObjectClass(DirectoryServer.getObjectClass(OC_SELF_SIGNED_CERT_REQUEST)))
{
try
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
index 86560c7..46986f1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
@@ -326,7 +326,7 @@
for (ByteString os : a.getValues())
{
String ocName = os.toString();
- objectClasses.put(getObjectClass2(ocName), ocName);
+ objectClasses.put(getObjectClass(ocName), ocName);
}
}
else if (attrType.isOperational())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index b2ebdf4..4a9b9ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -75,7 +75,6 @@
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.MatchingRuleUse;
import org.forgerock.opendj.ldap.schema.ObjectClass;
-import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.ldap.schema.UnknownSchemaElementException;
import org.forgerock.opendj.server.config.server.AlertHandlerCfg;
@@ -2383,33 +2382,17 @@
}
/**
- * Retrieves the objectclass for the provided lowercase name or OID.
+ * Retrieves the objectclass for the provided name or OID. It can optionally return a generated
+ * "default" version if the requested objectclass is not defined in the schema.
*
- * @param lowerName The lowercase name or OID for the objectclass to
- * retrieve.
- *
- * @return The requested objectclass, or {@code null} if there is no
- * such objectclass defined in the server schema.
+ * @param nameOrOid
+ * The name or OID for the objectclass to retrieve.
+ * @return The objectclass type, or {@code null} if there is no objectclass with the specified
+ * name or OID defined in the server schema and a default class should not be returned.
*/
- public static ObjectClass getObjectClass(String lowerName)
+ public static ObjectClass getObjectClass(String nameOrOid)
{
- return directoryServer.schema.getObjectClass(lowerName);
- }
-
- /**
- * Retrieves the objectclass for the provided name or OID. It can
- * optionally return a generated "default" version if the requested
- * objectclass is not defined in the schema.
- *
- * @param nameOrOid The name or OID for the objectclass to retrieve.
- * @return The objectclass type, or {@code null} if there is no
- * objectclass with the specified name or OID defined in the server
- * schema and a default class should not be returned.
- */
- public static ObjectClass getObjectClass2(String nameOrOid)
- {
- ObjectClass oc = getObjectClass(toLowerCase(nameOrOid));
- return oc != null ? oc : getDefaultObjectClass(nameOrOid);
+ return directoryServer.schema.getObjectClass(nameOrOid);
}
/**
@@ -2436,10 +2419,12 @@
/**
* Deregisters the provided objectclass with the Directory Server.
*
- * @param objectClass The objectclass instance to deregister with the
- * server.
+ * @param objectClass
+ * The objectclass instance to deregister with the server.
+ * @throws DirectoryException
+ * If a conflict is encountered
*/
- public static void deregisterObjectClass(ObjectClass objectClass)
+ public static void deregisterObjectClass(ObjectClass objectClass) throws DirectoryException
{
directoryServer.schema.deregisterObjectClass(objectClass);
}
@@ -2474,36 +2459,6 @@
}
/**
- * Causes the Directory Server to construct a new auxiliary objectclass
- * definition with the provided name and with no required or allowed
- * attributes. This should only be used if there is no objectclass for the
- * specified name. It will not register the created objectclass with the
- * Directory Server.
- *
- * @param name The name to use for the objectclass, as provided by the user.
- *
- * @return The constructed objectclass definition.
- */
- public static ObjectClass getDefaultAuxiliaryObjectClass(String name)
- {
- String lowerName = toLowerCase(name);
- ObjectClass objectClass = directoryServer.schema.getObjectClass(lowerName);
- if (objectClass == null)
- {
- String oid = lowerName + "-oid";
- String definition = "( " + oid + " NAME '" + name + "' ABSTRACT )";
-
- objectClass = new ObjectClass(definition, name,
- Collections.singleton(name), oid, null,
- Collections.singleton(getTopObjectClass()),
- null, null,
- ObjectClassType.AUXILIARY, false, null);
- }
-
- return objectClass;
- }
-
- /**
* Retrieves the set of attribute type definitions that have been
* defined in the Directory Server.
*
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 5fcf3b0..d2f1fa1 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
@@ -154,9 +154,9 @@
{
}
- ocInstanceKey = DirectoryServer.getObjectClass2(OC_CRYPTO_INSTANCE_KEY);
- ocCipherKey = DirectoryServer.getObjectClass2(OC_CRYPTO_CIPHER_KEY);
- ocMacKey = DirectoryServer.getObjectClass2(OC_CRYPTO_MAC_KEY);
+ ocInstanceKey = DirectoryServer.getObjectClass(OC_CRYPTO_INSTANCE_KEY);
+ ocCipherKey = DirectoryServer.getObjectClass(OC_CRYPTO_CIPHER_KEY);
+ ocMacKey = DirectoryServer.getObjectClass(OC_CRYPTO_MAC_KEY);
attrCert = getAttributeType(ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
attrAlias = getAttributeType(ATTR_CRYPTO_KEY_ID);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
index b43dd91..4c421cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
@@ -147,7 +147,7 @@
ifNull(entry);
// FIXME -- This needs to exclude enhanced groups once we have support for them.
- return entry.hasObjectClass(DirectoryServer.getObjectClass2(OC_GROUP_OF_URLS_LC));
+ return entry.hasObjectClass(DirectoryServer.getObjectClass(OC_GROUP_OF_URLS_LC));
}
@Override
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
index 2288323..cc7a387 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
@@ -256,7 +256,7 @@
private boolean hasObjectClass(Entry entry, String ocName)
{
- return entry.hasObjectClass(DirectoryServer.getObjectClass2(ocName));
+ return entry.hasObjectClass(DirectoryServer.getObjectClass(ocName));
}
@Override
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
index 90c7964..e01e0fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
@@ -158,7 +158,7 @@
ifNull(entry);
// FIXME -- This needs to exclude enhanced groups once we have support for them.
- return entry.hasObjectClass(DirectoryServer.getObjectClass2(OC_VIRTUAL_STATIC_GROUP));
+ return entry.hasObjectClass(DirectoryServer.getObjectClass(OC_VIRTUAL_STATIC_GROUP));
}
@Override
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
index e19175e..9aed664 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
@@ -81,7 +81,7 @@
@Override
public ObjectClass getMonitorObjectClass()
{
- return DirectoryServer.getObjectClass2(OC_MONITOR_BACKEND);
+ return DirectoryServer.getObjectClass(OC_MONITOR_BACKEND);
}
@Override
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
index 218bdfb..895f6bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
@@ -91,7 +91,7 @@
@Override
public ObjectClass getMonitorObjectClass()
{
- return DirectoryServer.getObjectClass2(OC_MONITOR_CONNHANDLER);
+ return DirectoryServer.getObjectClass(OC_MONITOR_CONNHANDLER);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
index 197d976..36bf28d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -153,8 +153,8 @@
{
LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>();
put(objectClasses, DirectoryServer.getTopObjectClass());
- put(objectClasses, DirectoryServer.getObjectClass2(OC_PERSON));
- put(objectClasses, DirectoryServer.getObjectClass2(OC_ROOT_DN));
+ put(objectClasses, DirectoryServer.getObjectClass(OC_PERSON));
+ put(objectClasses, DirectoryServer.getObjectClass(OC_ROOT_DN));
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>();
put(userAttrs, ATTR_COMMON_NAME, commonName);
@@ -882,7 +882,7 @@
for (ByteString v : a)
{
String ocName = v.toString();
- objectClasses.put(DirectoryServer.getObjectClass2(ocName), ocName);
+ objectClasses.put(DirectoryServer.getObjectClass(ocName), ocName);
}
}
else
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
index 074a292..08d5710 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
@@ -156,7 +156,7 @@
@Override
public ObjectClass getMonitorObjectClass()
{
- return DirectoryServer.getObjectClass2(OC_MONITOR_CONNHANDLERSTATS);
+ return DirectoryServer.getObjectClass(OC_MONITOR_CONNHANDLERSTATS);
}
@Override
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index fa62d2c..0b42750 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -547,7 +547,7 @@
for (ByteString os : a.getValues())
{
String ocName = os.toString();
- ObjectClass oc = DirectoryServer.getObjectClass2(ocName);
+ ObjectClass oc = DirectoryServer.getObjectClass(ocName);
objectClasses.put(oc, ocName);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java
index e776118..2e19c20 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java
@@ -309,7 +309,7 @@
for (ByteString v : a)
{
String stringValue = v.toString();
- objectClasses.put(DirectoryServer.getObjectClass2(stringValue), stringValue);
+ objectClasses.put(DirectoryServer.getObjectClass(stringValue), stringValue);
}
}
else if (t.isOperational())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
index fbb9d0a..a59e2e7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
@@ -485,7 +485,7 @@
for (String objectClassName : objectClassNames)
{
- ObjectClass c = DirectoryServer.getObjectClass2(objectClassName);
+ ObjectClass c = DirectoryServer.getObjectClass(objectClassName);
for (AttributeType t : c.getRequiredAttributes())
{
if (t.isOperational())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
index d9c97ac..3ca93f4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
@@ -249,7 +249,7 @@
for (TemplateValue v : valueList)
{
String ocName = toLowerCase(v.getValue().toString());
- objectClasses.put(DirectoryServer.getObjectClass2(ocName), ocName);
+ objectClasses.put(DirectoryServer.getObjectClass(ocName), ocName);
}
}
else if (t.isOperational())
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 a869b51..0f137ba 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
@@ -1345,7 +1345,7 @@
for (ByteString v : a)
{
String ocName = v.toString();
- ocs.put(DirectoryServer.getObjectClass2(ocName), ocName);
+ ocs.put(DirectoryServer.getObjectClass(ocName), ocName);
}
AttributeDescription attrDesc = a.getAttributeDescription();
@@ -3479,7 +3479,7 @@
{
entryBuffer.position(startPos);
final String ocName = entryBuffer.readStringUtf8(endPos - startPos);
- objectClasses.put(DirectoryServer.getObjectClass2(ocName), ocName);
+ objectClasses.put(DirectoryServer.getObjectClass(ocName), ocName);
}
/**
@@ -4214,7 +4214,7 @@
String lowerName = toLowerName(rule, v);
// Create a default object class if necessary.
- ObjectClass oc = DirectoryServer.getObjectClass2(lowerName);
+ ObjectClass oc = DirectoryServer.getObjectClass(lowerName);
if (replace)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
index a9c848f..ac07c9c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
@@ -756,7 +756,7 @@
}
String ocName = value.toString().trim();
- ObjectClass objectClass = DirectoryServer.getObjectClass2(ocName);
+ ObjectClass objectClass = DirectoryServer.getObjectClass(ocName);
if (objectClasses.containsKey(objectClass))
{
logger.warn(WARN_LDIF_DUPLICATE_OBJECTCLASS, entryDN, lastEntryLineNumber, ocName);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
index 0bb90f0..c91329c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -1971,7 +1971,7 @@
// then we'll need to include the extensibleObject class.
if (!structuralClass.isRequiredOrOptional(attrType) && !extensibleObjectAdded)
{
- ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass2(OC_EXTENSIBLE_OBJECT_LC);
+ ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC);
objectClasses.put(extensibleObjectOC, OC_EXTENSIBLE_OBJECT);
extensibleObjectAdded = true;
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
index 835f2c3..15e6614 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
@@ -376,7 +376,7 @@
// check the object classes were not changed
for (String ocBefore : entryBefore.getObjectClasses().values()) {
- ObjectClass objectClass = DirectoryServer.getObjectClass2(ocBefore);
+ ObjectClass objectClass = DirectoryServer.getObjectClass(ocBefore);
String ocAfter = entryAfter.getObjectClasses().get(objectClass);
assertEquals(ocBefore, ocAfter);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java
index 5607bbe..89e304a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java
@@ -284,7 +284,7 @@
UpdatePreOpPlugin.reset();
- ObjectClass oc = DirectoryServer.getObjectClass2("extensibleobject");
+ ObjectClass oc = DirectoryServer.getObjectClass("extensibleobject");
UpdatePreOpPlugin.addObjectClassToAdd(oc);
AddOperation addOperation = getRootConnection().processAdd(entry);
@@ -316,7 +316,7 @@
UpdatePreOpPlugin.reset();
- ObjectClass oc = DirectoryServer.getObjectClass2("extensibleobject");
+ ObjectClass oc = DirectoryServer.getObjectClass("extensibleobject");
UpdatePreOpPlugin.addObjectClassToRemove(oc);
AddOperation addOperation = getRootConnection().processAdd(entry);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
index 8f104cb..4d54a6a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
@@ -2123,7 +2123,7 @@
retrieveSuccessfulOperationElements(modifyOperation);
Entry e = DirectoryServer.getEntry(DN.valueOf("uid=test.user," + baseDN));
- assertFalse(e.hasObjectClass(DirectoryServer.getObjectClass2("extensibleobject")));
+ assertFalse(e.hasObjectClass(DirectoryServer.getObjectClass("extensibleobject")));
}
@@ -2159,11 +2159,11 @@
retrieveSuccessfulOperationElements(modifyOperation);
Entry e = DirectoryServer.getEntry(DN.valueOf("uid=test.user," + baseDN));
- assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass2("extensibleobject")));
- assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass2("inetOrgPerson")));
- assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass2("organizationalPerson")));
- assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass2("person")));
- assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass2("top")));
+ assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass("extensibleobject")));
+ assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass("inetOrgPerson")));
+ assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass("organizationalPerson")));
+ assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass("person")));
+ assertTrue(e.hasObjectClass(DirectoryServer.getObjectClass("top")));
assertEquals(e.getUserAttributes().size(), 8, "Incorrect number of user attributes");
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java
index a611fda..39c4fa2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java
@@ -188,7 +188,7 @@
final int restoreBeginCountStart = restoreBeginCount.get();
final int restoreEndCountStart = restoreEndCount.get();
- ObjectClass backupClass = DirectoryServer.getObjectClass2("ds-task-backup");
+ ObjectClass backupClass = DirectoryServer.getObjectClass("ds-task-backup");
testTask(taskEntry, expectedState, 30);
if (expectedState == TaskState.COMPLETED_SUCCESSFULLY ||
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java
index 425bf99..096f7f1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java
@@ -357,7 +357,7 @@
int importEndCount = TestTaskListener.importEndCount.get();
ObjectClass exportClass =
- DirectoryServer.getObjectClass2("ds-task-export");
+ DirectoryServer.getObjectClass("ds-task-export");
// Use a big timeout since this test is sensitive to host environment (e.g.
// low memory, etc). See issue OPENDJ-256.
--
Gitblit v1.10.0