From 39fb26309091c573b915529452d40bd24e97d1f3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 May 2016 08:44:50 +0000
Subject: [PATCH] OPENDJ-2987 DirectoryServer.getDefaultObjectClass() => DirectoryServer.getObjectClass2()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java | 13 ------
opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 9 +---
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java | 10 +----
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java | 15 +------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java | 12 -----
opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java | 9 ----
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java | 24 ++++++------
opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java | 8 ---
opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java | 2
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java | 9 ----
10 files changed, 24 insertions(+), 87 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 0277b3b..f0e9cd6 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
@@ -17,6 +17,7 @@
import static com.forgerock.opendj.ldap.CoreMessages.*;
import static com.forgerock.opendj.util.StaticUtils.*;
+
import static org.forgerock.opendj.ldap.LdapException.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.CollectionUtils.*;
@@ -58,7 +59,6 @@
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.ObjectClass;
import org.opends.server.types.Operation;
import org.opends.server.types.SearchFilter;
import org.opends.server.util.ServerConstants;
@@ -89,12 +89,7 @@
if (attribute.getAttributeDescription().getAttributeType().isObjectClass()) {
for (ByteString attrName : attribute) {
try {
- final String ocName = attrName.toString();
- ObjectClass oc = DirectoryServer.getObjectClass(ocName);
- if (oc == null) {
- oc = DirectoryServer.getDefaultObjectClass(ocName);
- }
- entry.addObjectClass(oc);
+ entry.addObjectClass(DirectoryServer.getObjectClass2(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 fa89de0..6a3544d 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
@@ -16,8 +16,6 @@
*/
package org.opends.guitools.controlpanel.datamodel;
-import static org.opends.server.util.StaticUtils.*;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -279,16 +277,7 @@
for (Object value : getAttributeValues(attrType.getNameOrOID()))
{
String ocName = value.toString().trim();
- String lowerOCName = toLowerCase(ocName);
-
- ObjectClass objectClass =
- DirectoryServer.getObjectClass(lowerOCName);
- if (objectClass == null)
- {
- objectClass = DirectoryServer.getDefaultObjectClass(ocName);
- }
-
- objectClasses.put(objectClass, ocName);
+ objectClasses.put(DirectoryServer.getObjectClass2(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 6778767..5281880 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
@@ -20,7 +20,6 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.server.util.CollectionUtils.*;
import static org.opends.server.util.LDIFReader.*;
-import static org.opends.server.util.StaticUtils.*;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -652,16 +651,7 @@
for (Object value : csr.getAttributeValues(attrType.getNameOrOID()))
{
String ocName = value.toString().trim();
- String lowerOCName = toLowerCase(ocName);
-
- ObjectClass objectClass =
- DirectoryServer.getObjectClass(lowerOCName);
- if (objectClass == null)
- {
- objectClass = DirectoryServer.getDefaultObjectClass(ocName);
- }
-
- objectClasses.put(objectClass, ocName);
+ objectClasses.put(DirectoryServer.getObjectClass2(ocName), ocName);
}
}
else
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 d137598..d4079e0 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
@@ -152,7 +152,7 @@
objectClasses.put(topOC, topOCName);
String nulOCName = "nullbackendobject";
- ObjectClass nulOC = DirectoryServer.getDefaultObjectClass(nulOCName);
+ ObjectClass nulOC = DirectoryServer.getObjectClass2(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 73855c3..abc3f06 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,19 +220,8 @@
// Construct the set of objectclasses to include in the root DSE entry.
dseObjectClasses = new HashMap<>(2);
- ObjectClass topOC = DirectoryServer.getObjectClass(OC_TOP);
- if (topOC == null)
- {
- topOC = DirectoryServer.getDefaultObjectClass(OC_TOP);
- }
- dseObjectClasses.put(topOC, OC_TOP);
-
- ObjectClass rootDSEOC = DirectoryServer.getObjectClass(OC_ROOT_DSE);
- if (rootDSEOC == null)
- {
- rootDSEOC = DirectoryServer.getDefaultObjectClass(OC_ROOT_DSE);
- }
- dseObjectClasses.put(rootDSEOC, OC_ROOT_DSE);
+ dseObjectClasses.put(DirectoryServer.getObjectClass2(OC_TOP), OC_TOP);
+ dseObjectClasses.put(DirectoryServer.getObjectClass2(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/core/AddOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
index 302cf96..1782322 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
@@ -52,7 +52,6 @@
import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.loggers.AccessLogger.*;
import static org.opends.server.util.CollectionUtils.*;
-import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.workflowelement.localbackend.LocalBackendWorkflowElement.*;
/**
@@ -327,13 +326,7 @@
for (ByteString os : a.getValues())
{
String ocName = os.toString();
- ObjectClass oc = DirectoryServer.getObjectClass(toLowerCase(ocName));
- if (oc == null)
- {
- oc = DirectoryServer.getDefaultObjectClass(ocName);
- }
-
- objectClasses.put(oc,ocName);
+ objectClasses.put(getObjectClass2(ocName), ocName);
}
}
else if (attrType.isOperational())
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 d9b53da..f83700e 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,14 +547,8 @@
for (ByteString os : a.getValues())
{
String ocName = os.toString();
- ObjectClass oc =
- DirectoryServer.getObjectClass(toLowerCase(ocName));
- if (oc == null)
- {
- oc = DirectoryServer.getDefaultObjectClass(ocName);
- }
-
- objectClasses.put(oc ,ocName);
+ ObjectClass oc = DirectoryServer.getObjectClass2(ocName);
+ objectClasses.put(oc, ocName);
}
}
else if (attrType.isOperational())
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 1b4472a..b70c561 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,14 +756,7 @@
}
String ocName = value.toString().trim();
- String lowerOCName = toLowerCase(ocName);
-
- ObjectClass objectClass = DirectoryServer.getObjectClass(lowerOCName);
- if (objectClass == null)
- {
- objectClass = DirectoryServer.getDefaultObjectClass(ocName);
- }
-
+ ObjectClass objectClass = DirectoryServer.getObjectClass2(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 6eb35c8..9776aa3 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,13 +1971,7 @@
// then we'll need to include the extensibleObject class.
if (!structuralClass.isRequiredOrOptional(attrType) && !extensibleObjectAdded)
{
- ObjectClass extensibleObjectOC =
- DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC);
- if (extensibleObjectOC == null)
- {
- extensibleObjectOC =
- DirectoryServer.getDefaultObjectClass(OC_EXTENSIBLE_OBJECT);
- }
+ ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass2(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 7e22af0..f485c92 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
@@ -16,6 +16,10 @@
*/
package org.opends.server.backends.pluggable;
+import static org.assertj.core.api.Assertions.*;
+import static org.opends.server.util.StaticUtils.*;
+import static org.testng.Assert.*;
+
import java.io.ByteArrayInputStream;
import java.util.List;
import java.util.Map;
@@ -23,21 +27,22 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.pluggable.spi.TreeName;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.EntryEncodeConfig;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.ObjectClass;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import static org.assertj.core.api.Assertions.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.testng.Assert.*;
-
/**
* DnKeyFormat Tester.
*/
@@ -371,13 +376,8 @@
// check the object classes were not changed
for (String ocBefore : entryBefore.getObjectClasses().values()) {
- ObjectClass objectClass = DirectoryServer.getObjectClass(ocBefore
- .toLowerCase());
- if (objectClass == null) {
- objectClass = DirectoryServer.getDefaultObjectClass(ocBefore);
- }
+ ObjectClass objectClass = DirectoryServer.getObjectClass2(ocBefore);
String ocAfter = entryAfter.getObjectClasses().get(objectClass);
-
assertEquals(ocBefore, ocAfter);
}
--
Gitblit v1.10.0