From a7067bf75cd103dc367c912983ea14b7111306a4 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 Fix construction of object classes in control panel
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
index 81497a6..9c7bbf7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
@@ -18,6 +18,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.server.util.CollectionUtils.*;
+import static org.opends.server.util.SchemaUtils.*;
import java.util.ArrayList;
import java.util.Collection;
@@ -36,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClass;
+import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
@@ -145,7 +147,6 @@
}
else if (currentSups.contains(oldObjectClass))
{
- ArrayList<String> allNames = new ArrayList<>(ocToDelete.getNormalizedNames());
Map<String, List<String>> extraProperties =
DeleteSchemaElementsTask.cloneExtraProperties(ocToDelete);
Set<ObjectClass> newSups = new LinkedHashSet<>();
@@ -160,17 +161,20 @@
newSups.add(oc);
}
}
- return new ObjectClass("",
- ocToDelete.getNameOrOID(),
- allNames,
- ocToDelete.getOID(),
- ocToDelete.getDescription(),
- newSups,
- ocToDelete.getDeclaredRequiredAttributes(),
- ocToDelete.getDeclaredOptionalAttributes(),
- ocToDelete.getObjectClassType(),
- ocToDelete.isObsolete(),
- extraProperties);
+ final String oid = ocToDelete.getOID();
+ final Schema schema = getInfo().getServerDescriptor().getSchema();
+ return new SchemaBuilder(schema.getSchemaNG()).buildObjectClass(oid)
+ .names(ocToDelete.getNames())
+ .description(ocToDelete.getDescription())
+ .superiorObjectClasses(getNameOrOIDsForOCs(newSups))
+ .requiredAttributes(getNameOrOIDsForATs(ocToDelete.getDeclaredRequiredAttributes()))
+ .optionalAttributes(getNameOrOIDsForATs(ocToDelete.getDeclaredOptionalAttributes()))
+ .type(ocToDelete.getObjectClassType())
+ .obsolete(ocToDelete.isObsolete())
+ .extraProperties(extraProperties)
+ .addToSchema()
+ .toSchema()
+ .getObjectClass(oid);
}
else
{
--
Gitblit v1.10.0