From dc1a95c709158ba2ae660cd940baf81709857a9f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:10 +0000
Subject: [PATCH] OPENDJ-2987 Update server Schema class to rely on SDK schema for object classes
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
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 03e8fef..2c35c6a 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
@@ -46,7 +46,6 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -566,7 +565,7 @@
operationalAttrs, attributeTypesType, includeSchemaFile,
AttributeTypeSyntax.isStripSyntaxMinimumUpperBound(),
ignoreShowAllOption);
- buildSchemaAttribute(schema.getObjectClasses().values(), userAttrs,
+ buildSchemaAttribute(schema.getObjectClasses(), userAttrs,
operationalAttrs, objectClassesType, includeSchemaFile, false,
ignoreShowAllOption);
buildSchemaAttribute(schema.getMatchingRules(), userAttrs,
@@ -1379,7 +1378,7 @@
// Make sure that the attribute type isn't used as a required or optional
// attribute type in any objectclass.
- for (ObjectClass oc : schema.getObjectClasses().values())
+ for (ObjectClass oc : schema.getObjectClasses())
{
if (oc.getDeclaredRequiredAttributes().contains(removeType) ||
oc.getDeclaredOptionalAttributes().contains(removeType))
@@ -1643,7 +1642,7 @@
// Make sure that the objectclass isn't used as the superior class for any
// other objectclass.
- for (ObjectClass oc : schema.getObjectClasses().values())
+ for (ObjectClass oc : schema.getObjectClasses())
{
for(ObjectClass superiorClass : oc.getSuperiorClasses())
{
@@ -2693,7 +2692,7 @@
// same file are written before the subordinate classes.
Set<ObjectClass> addedClasses = new HashSet<>();
values = new LinkedHashSet<>();
- for (ObjectClass oc : schema.getObjectClasses().values())
+ for (ObjectClass oc : schema.getObjectClasses())
{
if (schemaFile.equals(getSchemaFile(oc)))
{
@@ -3489,9 +3488,7 @@
// loop on all the object classes in the current schema and delete
// them from the new schema if they are not in the imported schema entry.
- ConcurrentHashMap<String, ObjectClass> currentObjectClasses = newSchema.getObjectClasses();
-
- for (ObjectClass removeClass : currentObjectClasses.values())
+ for (ObjectClass removeClass : newSchema.getObjectClasses())
{
String schemaFile = getSchemaFile(removeClass);
if (CONFIG_SCHEMA_ELEMENTS_FILE.equals(schemaFile))
--
Gitblit v1.10.0