From 4f6891a8bd4d017a41b5f75748398ff59787501c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 15 Oct 2015 19:38:35 +0000
Subject: [PATCH] Renamed DirectoryServer.getAttributeType() to DirectoryServer.getAttributeTypeOrNull().
---
opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
index 6f61778..a69915c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
@@ -110,16 +110,16 @@
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- AttributeType t = DirectoryServer.getAttributeType("attributetypes");
+ AttributeType t = DirectoryServer.getAttributeTypeOrNull("attributetypes");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("objectclasses");
+ t = DirectoryServer.getAttributeTypeOrNull("objectclasses");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("ldapsyntaxes");
+ t = DirectoryServer.getAttributeTypeOrNull("ldapsyntaxes");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("matchingrules");
+ t = DirectoryServer.getAttributeTypeOrNull("matchingrules");
assertTrue(schemaEntry.hasAttribute(t));
}
@@ -161,16 +161,16 @@
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- AttributeType t = DirectoryServer.getAttributeType("attributetypes");
+ AttributeType t = DirectoryServer.getAttributeTypeOrNull("attributetypes");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("objectclasses");
+ t = DirectoryServer.getAttributeTypeOrNull("objectclasses");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("ldapsyntaxes");
+ t = DirectoryServer.getAttributeTypeOrNull("ldapsyntaxes");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("matchingrules");
+ t = DirectoryServer.getAttributeTypeOrNull("matchingrules");
assertTrue(schemaEntry.hasAttribute(t));
@@ -179,16 +179,16 @@
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- t = DirectoryServer.getAttributeType("attributetypes");
+ t = DirectoryServer.getAttributeTypeOrNull("attributetypes");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("objectclasses");
+ t = DirectoryServer.getAttributeTypeOrNull("objectclasses");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("ldapsyntaxes");
+ t = DirectoryServer.getAttributeTypeOrNull("ldapsyntaxes");
assertTrue(schemaEntry.hasAttribute(t));
- t = DirectoryServer.getAttributeType("matchingrules");
+ t = DirectoryServer.getAttributeTypeOrNull("matchingrules");
assertTrue(schemaEntry.hasAttribute(t));
}
@@ -400,10 +400,10 @@
throws Exception
{
DN schemaDN = DN.valueOf("cn=schema");
- AttributeType a = DirectoryServer.getAttributeType("attributetypes");
- AttributeType o = DirectoryServer.getAttributeType("objectclasses");
- AttributeType m = DirectoryServer.getAttributeType("matchingrules");
- AttributeType s = DirectoryServer.getAttributeType("ldapsyntaxes");
+ AttributeType a = DirectoryServer.getAttributeTypeOrNull("attributetypes");
+ AttributeType o = DirectoryServer.getAttributeTypeOrNull("objectclasses");
+ AttributeType m = DirectoryServer.getAttributeTypeOrNull("matchingrules");
+ AttributeType s = DirectoryServer.getAttributeTypeOrNull("ldapsyntaxes");
assertFalse(schemaBackend.showAllAttributes());
Entry schemaEntry = schemaBackend.getSchemaEntry(schemaDN, false);
--
Gitblit v1.10.0