From 8b3cd28204e15e0a98ce038b355f100cd7c44e3c Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <capponi.nicolas@gmail.com>
Date: Thu, 28 Jan 2016 08:28:20 +0000
Subject: [PATCH] OPENDJ-1632 (PR-201) Migrate AttributeType in one shot
---
opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
index 0da929f..a155e61 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*
*/
package org.opends.server.schema;
@@ -33,12 +33,12 @@
import java.util.TreeSet;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.NameForm;
@@ -83,7 +83,7 @@
TreeSet<String> invalidOIDs = new TreeSet<>();
Schema schema = DirectoryServer.getSchema();
- for (Syntax as : schema.getSyntaxes().values())
+ for (Syntax as : schema.getSyntaxes())
{
if (! isNumericOID(as.getOID()))
{
@@ -117,7 +117,7 @@
TreeSet<String> invalidOIDs = new TreeSet<>();
Schema schema = DirectoryServer.getSchema();
- for (MatchingRule mr : schema.getMatchingRules().values())
+ for (MatchingRule mr : schema.getMatchingRules())
{
if (! isNumericOID(mr.getOID()))
{
@@ -190,8 +190,7 @@
{
for (ByteString v : a)
{
- AttributeType at = AttributeTypeSyntax.decodeAttributeType(
- v, DirectoryServer.getSchema(),true);
+ AttributeType at = DirectoryServer.getSchema().parseAttributeType(v.toString());
if (! isNumericOID(at.getOID()))
{
invalidOIDs.add(at.getNameOrOID());
--
Gitblit v1.10.0