From d79928cc7cd9a3edf6f6a4dcf213234015cd0590 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Jan 2016 15:01:25 +0000
Subject: [PATCH] DirectoryServer.java: Renamed getAttributeTypeOrDefault(String) to getAttributeType(String)
---
opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
index 11973e9..b096492 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
@@ -39,13 +39,13 @@
import org.opends.server.admin.std.server.UniqueAttributePluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.AddOperation;
-import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.*;
import org.testng.annotations.*;
+import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.util.CollectionUtils.*;
import static org.testng.Assert.*;
@@ -732,7 +732,7 @@
deleteAttrsFromEntry(DN dn, String... attrTypeStrings) throws Exception {
LinkedList<Modification> mods = new LinkedList<>();
for(String attrTypeString : attrTypeStrings) {
- AttributeType attrType = getAttrType(attrTypeString);
+ AttributeType attrType = getAttributeType(attrTypeString);
mods.add(new Modification(ModificationType.DELETE,
Attributes.empty(attrType)));
}
@@ -787,7 +787,7 @@
* @param attrTypeString The attribute type string to remove.
*/
private void delAttribute(Entry entry, String attrTypeString) {
- entry.removeAttribute(getAttrType(attrTypeString));
+ entry.removeAttribute(getAttributeType(attrTypeString));
}
/**
@@ -817,10 +817,6 @@
Attributes.create(attrName, attrValues)));
}
- private AttributeType getAttrType(String attrTypeString) {
- return DirectoryServer.getAttributeTypeOrDefault(attrTypeString);
- }
-
/**
* Perform modify operation with list of modifications. Expect return code
* of value rc.
--
Gitblit v1.10.0