From ace1265f5f8bcadcbfea6931328d4c8a3dfbaa1e Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 02 Jun 2016 12:19:10 +0000
Subject: [PATCH] OPENDJ-3037 remove now unnecessary calls to toLowerCase() for parameters of Schema.getObjectClass()
---
opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java | 3 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 9 ++--
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 9 ++--
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 5 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java | 8 ++--
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java | 22 +++++-----
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 11 ++---
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java | 5 +-
opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java | 13 +++---
12 files changed, 43 insertions(+), 50 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index dee7981..1631c0b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -50,6 +50,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.AttributeUsage;
import org.forgerock.opendj.ldap.schema.MatchingRule;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
@@ -62,7 +63,6 @@
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.config.ConfigConstants;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
@@ -413,20 +413,19 @@
*/
static LocalizableMessage getSchemaElementType(String name, Schema schema)
{
- final String lowerCase = name.toLowerCase();
- if (schema.hasAttributeType(lowerCase))
+ if (schema.hasAttributeType(name))
{
return INFO_CTRL_PANEL_TYPE_ATTRIBUTE.get();
}
- else if (schema.hasObjectClass(lowerCase))
+ else if (schema.hasObjectClass(name))
{
return INFO_CTRL_PANEL_TYPE_OBJECT_CLASS.get();
}
- else if (schema.hasSyntax(lowerCase))
+ else if (schema.hasSyntax(name))
{
return INFO_CTRL_PANEL_TYPE_ATTRIBUTE_SYNTAX.get();
}
- else if (schema.hasMatchingRule(lowerCase))
+ else if (schema.hasMatchingRule(name))
{
return INFO_CTRL_PANEL_TYPE_MATCHING_RULE.get();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
index c887f22..2625bd7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
@@ -113,7 +113,7 @@
Schema schema = getInfo().getServerDescriptor().getSchema();
if (o != null && schema != null)
{
- ObjectClass oc = schema.getObjectClass(o.toLowerCase());
+ ObjectClass oc = schema.getObjectClass(o);
if (!oc.isPlaceHolder())
{
notifySchemaSelectionListeners(oc);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index d0246f2..c839e9d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -716,10 +716,9 @@
{
List<Object> ocs = sr.getAttributeValues(
ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
- for (Object o : ocs)
+ for (Object oc : ocs)
{
- String oc = (String)o;
- ObjectClass objectClass = schema.getObjectClass(oc.toLowerCase());
+ ObjectClass objectClass = schema.getObjectClass((String) oc);
if (!objectClass.isPlaceHolder())
{
for (AttributeType attr : objectClass.getRequiredAttributes())
@@ -1155,7 +1154,7 @@
List<Object> ocs = sr.getAttributeValues(ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
for (Object oc : ocs)
{
- ObjectClass objectClass = schema.getObjectClass(((String) oc).toLowerCase());
+ ObjectClass objectClass = schema.getObjectClass(((String) oc));
if (!objectClass.isPlaceHolder() && objectClass.isRequired(attrType))
{
return true;
@@ -1823,7 +1822,7 @@
Schema schema = getInfo().getServerDescriptor().getSchema();
if (schema != null && structural != null)
{
- ObjectClass oc = schema.getObjectClass(structural.toLowerCase());
+ ObjectClass oc = schema.getObjectClass(structural);
if (!oc.isPlaceHolder())
{
values.addAll(getObjectClassSuperiorValues(oc));
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index 8fb27a4..1a29adc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -615,10 +615,9 @@
}
if (ocs != null && schema != null)
{
- for (Object o : ocs)
+ for (Object oc : ocs)
{
- String oc = (String)o;
- ObjectClass objectClass = schema.getObjectClass(oc.toLowerCase());
+ ObjectClass objectClass = schema.getObjectClass((String) oc);
if (!objectClass.isPlaceHolder())
{
for (AttributeType attr : objectClass.getRequiredAttributes())
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 191913a..498ffde 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -246,7 +246,7 @@
SortedSet<String> auxiliaryClasses = new TreeSet<>();
for (Object o : ocValues)
{
- ObjectClass objectClass = schema.getObjectClass(((String) o).toLowerCase());
+ ObjectClass objectClass = schema.getObjectClass(((String) o));
if (!objectClass.isPlaceHolder())
{
if (objectClass.getObjectClassType() == ObjectClassType.STRUCTURAL)
@@ -360,7 +360,7 @@
Schema schema = getInfo().getServerDescriptor().getSchema();
if (schema != null)
{
- ObjectClass oc = schema.getObjectClass(ocValue.getStructural().toLowerCase());
+ ObjectClass oc = schema.getObjectClass(ocValue.getStructural());
if (!oc.isPlaceHolder())
{
Set<String> names = getObjectClassSuperiorValues(oc);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
index 53de9f6..6263a91 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
@@ -69,7 +69,7 @@
Schema sc = DirectoryServer.getSchema();
for (String name : OBJECTCLASS_TO_KEEP)
{
- ObjectClass oc = sc.getObjectClass(name.toLowerCase());
+ ObjectClass oc = sc.getObjectClass(name);
if (!oc.isPlaceHolder())
{
objectclassesToKeep.add(oc);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
index 74049f1..ab972db 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
@@ -26,6 +26,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.server.config.meta.PluginCfgDefn;
import org.forgerock.opendj.server.config.server.LDAPAttributeDescriptionListPluginCfg;
import org.forgerock.opendj.server.config.server.PluginCfg;
@@ -33,13 +34,11 @@
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.types.DirectoryConfig;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.operation.PreParseSearchOperation;
import static org.opends.messages.PluginMessages.*;
-import static org.opends.server.core.DirectoryServer.getObjectClass;
+import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
/**
* This pre-parse plugin modifies the operation to allow an object class
@@ -89,15 +88,15 @@
{
if (attrName.startsWith("@"))
{
- final String lowerName = toLowerCase(attrName.substring(1));
- final ObjectClass oc = getObjectClass(lowerName);
+ final String ocName = attrName.substring(1);
+ final ObjectClass oc = getObjectClass(ocName);
if (oc.isPlaceHolder())
{
- logger.trace("Cannot replace unknown objectclass %s", lowerName);
+ logger.trace("Cannot replace unknown objectclass %s", ocName);
}
else
{
- logger.trace("Replacing objectclass %s", lowerName);
+ logger.trace("Replacing objectclass %s", ocName);
for (final AttributeType at : oc.getRequiredAttributes())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
index f3422cb..39c193b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -969,8 +969,7 @@
private boolean isSynchronizable(final Entry entry)
{
final Schema schema = DirectoryServer.getSchema();
- final ObjectClass sambaOc = schema
- .getObjectClass(toLowerCase(SAMBA_SAM_ACCOUNT_OC_NAME));
+ final ObjectClass sambaOc = schema.getObjectClass(SAMBA_SAM_ACCOUNT_OC_NAME);
return !sambaOc.isPlaceHolder() && entry.hasObjectClass(sambaOc);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 1d533d7..f842a5e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -19,7 +19,7 @@
import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.config.ConfigConstants.DN_DEFAULT_SCHEMA_ROOT;
+import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.internal.Requests.*;
import static org.opends.server.replication.plugin.EntryHistorical.*;
@@ -971,15 +971,14 @@
for (String className : newFractionalSpecificClassesAttributes.keySet())
{
// Does the class exist ?
- ObjectClass fractionalClass = schema.getObjectClass(className.toLowerCase());
+ ObjectClass fractionalClass = schema.getObjectClass(className);
if (fractionalClass.isPlaceHolder())
{
throw new ConfigException(
NOTE_ERR_FRACTIONAL_CONFIG_UNKNOWN_OBJECT_CLASS.get(className));
}
- boolean isExtensibleObjectClass =
- "extensibleObject".equalsIgnoreCase(className);
+ boolean isExtensibleObjectClass = fractionalClass.isExtensible();
Set<String> attributes =
newFractionalSpecificClassesAttributes.get(className);
@@ -4438,7 +4437,7 @@
if (name.startsWith("@"))
{
String ocName = name.substring(1);
- ObjectClass objectClass = DirectoryServer.getObjectClass(toLowerCase(ocName));
+ ObjectClass objectClass = DirectoryServer.getObjectClass(ocName);
if (!objectClass.isPlaceHolder())
{
for (AttributeType at : objectClass.getRequiredAttributes())
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 2e19c20..4cc5ad3 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
@@ -19,8 +19,8 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.StaticUtils.*;
-import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;
+import static com.forgerock.opendj.cli.Utils.*;
import java.io.File;
import java.io.IOException;
@@ -37,6 +37,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
import org.opends.server.loggers.JDKLogging;
@@ -50,7 +51,6 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Modification;
import org.opends.server.types.NullOutputStream;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.RawModification;
import org.opends.server.util.AddChangeRecordEntry;
import org.opends.server.util.BuildVersion;
@@ -308,8 +308,8 @@
{
for (ByteString v : a)
{
- String stringValue = v.toString();
- objectClasses.put(DirectoryServer.getObjectClass(stringValue), stringValue);
+ String ocName = v.toString();
+ objectClasses.put(DirectoryServer.getObjectClass(ocName), ocName);
}
}
else 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 3ca93f4..81a0c78 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
@@ -17,7 +17,6 @@
package org.opends.server.tools.makeldif;
import static org.opends.server.util.LDIFWriter.*;
-import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -30,11 +29,11 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.LDIFExportConfig;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.util.LDIFException;
/**
@@ -248,7 +247,7 @@
{
for (TemplateValue v : valueList)
{
- String ocName = toLowerCase(v.getValue().toString());
+ String ocName = v.getValue().toString();
objectClasses.put(DirectoryServer.getObjectClass(ocName), ocName);
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
index b3b11ae..1c254a0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
@@ -29,6 +29,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.task.Task;
import org.opends.server.core.DirectoryServer;
@@ -47,7 +48,6 @@
import org.opends.server.types.Entry;
import org.opends.server.types.HostPort;
import org.opends.server.types.Modification;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -655,7 +655,7 @@
String objectClassStr = fractionalConf[0];
if (!objectClassStr.equals("*"))
{
- ObjectClass objectClass = DirectoryServer.getObjectClass(objectClassStr.toLowerCase());
+ ObjectClass objectClass = DirectoryServer.getObjectClass(objectClassStr);
assertTrue(newEntry.hasObjectClass(objectClass));
}
@@ -708,7 +708,7 @@
String objectClassStr = fractionalConf[0];
if (!objectClassStr.equals("*"))
{
- ObjectClass objectClass = DirectoryServer.getObjectClass(objectClassStr.toLowerCase());
+ ObjectClass objectClass = DirectoryServer.getObjectClass(objectClassStr);
assertTrue(entry.hasObjectClass(objectClass));
}
@@ -1235,7 +1235,7 @@
Entry newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
assertEquals(entry.getName(), newEntry.getName());
- ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
+ ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson");
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
@@ -1270,7 +1270,7 @@
newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
assertEquals(entry.getName(), newEntry.getName());
- objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
+ objectClass = DirectoryServer.getObjectClass("inetOrgPerson");
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
checkEntryAttributeValue(newEntry, "givenName", "ValueToBeKeptToo");
@@ -1326,7 +1326,7 @@
Entry newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
assertEquals(entry.getName(), newEntry.getName());
- ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
+ ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson");
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
checkEntryAttributeValue(newEntry, "carLicense", "cirLicenseValue");
@@ -1363,7 +1363,7 @@
newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
assertEquals(entry.getName(), newEntry.getName());
- objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
+ objectClass = DirectoryServer.getObjectClass("inetOrgPerson");
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
checkEntryAttributeValue(newEntry, "description", "ValueToBeKeptToo");
@@ -1418,7 +1418,7 @@
Entry newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
assertEquals(entry.getName(), newEntry.getName());
- ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
+ ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson");
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
checkEntryAttributeValue(newEntry, "givenName", "ValueToBeRemoved");
@@ -1441,7 +1441,7 @@
newEntry = getEntry(newEntryDn, TIMEOUT, true);
assertNotNull(newEntry);
assertEquals(newEntryDn, newEntry.getName());
- objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
+ objectClass = DirectoryServer.getObjectClass("inetOrgPerson");
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
assertThat(newEntry.getAttribute("givenName")).isEmpty();
@@ -1500,7 +1500,7 @@
Entry newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
assertEquals(entry.getName(), newEntry.getName());
- ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
+ ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson");
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
checkEntryAttributeValue(newEntry, "description", "ValueToBeRemoved");
@@ -1523,7 +1523,7 @@
newEntry = getEntry(newEntryDn, TIMEOUT, true);
assertNotNull(newEntry);
assertEquals(newEntryDn, newEntry.getName());
- objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
+ objectClass = DirectoryServer.getObjectClass("inetOrgPerson");
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
assertThat(newEntry.getAttribute("description")).isEmpty();
--
Gitblit v1.10.0