From d9df9288eaa3a66fb29fd4ab649d4c2ef886445c Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:13 +0000
Subject: [PATCH] OPENDJ-2987 Address all changes suggested in PR 510
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 32 --------------------------------
1 files changed, 0 insertions(+), 32 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 baa74a6..242eada 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
@@ -49,7 +49,6 @@
import java.util.TreeSet;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.LocalizableMessageDescriptor.Arg2;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
@@ -3426,8 +3425,6 @@
continue;
}
- // Now we know we are not in the config schema, let's check the unknown elements ...
- validateNoUnknownElements(newObjectClass);
oidList.add(newObjectClass.getOID());
try
{
@@ -3483,35 +3480,6 @@
}
}
- private void validateNoUnknownElements(ObjectClass oc) throws DirectoryException
- {
- validateNoUnknownElements(oc.getDeclaredOptionalAttributes(), oc.getOID(),
- WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR);
- validateNoUnknownElements(oc.getDeclaredRequiredAttributes(), oc.getOID(),
- WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR);
- for (ObjectClass superiorClass : oc.getSuperiorClasses())
- {
- if (superiorClass.isPlaceHolder())
- {
- LocalizableMessage message =
- WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.get(oc.getOID(), superiorClass.getOID());
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
- }
- }
- }
-
- private void validateNoUnknownElements(Set<AttributeType> attributeTypes, String oid, Arg2<Object, Object> msg)
- throws DirectoryException
- {
- for (AttributeType attributeType : attributeTypes)
- {
- if (attributeType.isPlaceHolder())
- {
- throw new DirectoryException(CONSTRAINT_VIOLATION, msg.get(oid, attributeType.getOID()));
- }
- }
- }
-
@Override
public void createBackup(BackupConfig backupConfig) throws DirectoryException
{
--
Gitblit v1.10.0