From 1854aa16ed2741a5d1ce01c827a2f450c19355cc Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 11 May 2016 13:22:07 +0000
Subject: [PATCH] OPENDJ-2987 Replaced ObjectClass.getPrimaryName() by getNameOrOID()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 2 +-
opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java | 6 +++---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java | 8 ++++----
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java | 2 +-
opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java | 2 +-
opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java | 10 ----------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java | 2 +-
13 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
index bd3dee5..ddb0f5f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
@@ -529,7 +529,7 @@
optional = ocToDelete.getDeclaredOptionalAttributes();
}
return new ObjectClass("",
- ocToDelete.getPrimaryName(),
+ ocToDelete.getNameOrOID(),
new ArrayList<>(ocToDelete.getNormalizedNames()),
ocToDelete.getOID(),
ocToDelete.getDescription(),
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
index 3865bed..d6fffae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
@@ -179,7 +179,7 @@
optional.add(newAttribute);
}
return new ObjectClass("",
- ocToDelete.getPrimaryName(),
+ ocToDelete.getNameOrOID(),
allNames,
ocToDelete.getOID(),
ocToDelete.getDescription(),
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 98e47c9..1513163 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
@@ -161,7 +161,7 @@
}
}
return new ObjectClass("",
- ocToDelete.getPrimaryName(),
+ ocToDelete.getNameOrOID(),
allNames,
ocToDelete.getOID(),
ocToDelete.getDescription(),
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
index 63aa7b2..a687bd7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -657,7 +657,7 @@
if (mustAdd(oc))
{
SomeSchemaElement element = new SomeSchemaElement(oc);
- String name = oc.getPrimaryName();
+ String name = oc.getNameOrOID();
if (Utilities.isStandard(element))
{
standardOcNames.add(name);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index eeccb16..49bb92f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -442,7 +442,7 @@
// Ignore: this is called to get an initial panel size.
return;
}
- String n = oc.getPrimaryName();
+ String n = oc.getNameOrOID();
if (n == null)
{
n = NOT_APPLICABLE.toString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
index 7a93d9e..5d97779 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
@@ -141,7 +141,7 @@
*/
protected Set<String> getAliases(ObjectClass oc)
{
- return getAliases(oc.getNormalizedNames(), oc.getPrimaryName());
+ return getAliases(oc.getNormalizedNames(), oc.getNameOrOID());
}
private Set<String> getAliases(Iterable<String> names, String primaryName)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
index 8825ebc..3163777 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
@@ -277,7 +277,7 @@
return;
}
hmAttrs.clear();
- String n = oc.getPrimaryName();
+ String n = oc.getNameOrOID();
if (n == null)
{
n = NOT_APPLICABLE.toString();
@@ -295,7 +295,7 @@
description.setText(n);
ArrayList<String> otherNames = new ArrayList<>();
Iterable<String> ocNames = oc.getNormalizedNames();
- String primaryName = oc.getPrimaryName();
+ String primaryName = oc.getNameOrOID();
if (primaryName == null)
{
primaryName = "";
@@ -420,14 +420,14 @@
}
else if (superiors.size() == 1)
{
- n = superiors.iterator().next().getPrimaryName();
+ n = superiors.iterator().next().getNameOrOID();
}
else
{
SortedSet<String> names = new TreeSet<>();
for (ObjectClass superior : superiors)
{
- names.add(superior.getPrimaryName());
+ names.add(superior.getNameOrOID());
}
n = Utilities.getStringFromCollection(names, ", ");
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
index 0ee9e6e..ed52abb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -724,7 +724,7 @@
final MonitorProvider<?> monitorProvider)
{
final ObjectClass monitorOC = monitorProvider.getMonitorObjectClass();
- final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(monitorOC, monitorOC.getPrimaryName());
+ final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(monitorOC, monitorOC.getNameOrOID());
final MonitorData monitorAttrs = monitorProvider.getMonitorData();
final Map<AttributeType, List<Attribute>> attrMap = asMap(monitorAttrs);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
index d6751e2..6caa30b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -194,7 +194,7 @@
private void put(Map<ObjectClass, String> objectClasses, ObjectClass oc)
{
- objectClasses.put(oc, oc.getPrimaryName());
+ objectClasses.put(oc, oc.getNameOrOID());
}
private void put(Map<AttributeType, List<Attribute>> Attrs, String attrName, String value)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
index 0a0731d..2f6376d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
@@ -199,16 +199,6 @@
}
/**
- * Retrieves the primary name for this schema definition.
- *
- * @return The primary name for this schema definition, or
- * <code>null</code> if there is no primary name.
- */
- public final String getPrimaryName() {
- return primaryName;
- }
-
- /**
* Retrieves an iterable over the set of normalized names that may
* be used to reference this schema definition. The normalized form
* of an attribute name is defined as the user-defined name
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
index 34aae9b..ad5c562 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
@@ -141,7 +141,7 @@
for (ObjectClass oc : addObjectClasses)
{
- addOperation.addObjectClass(oc, oc.getPrimaryName());
+ addOperation.addObjectClass(oc, oc.getNameOrOID());
}
return PluginResult.PreOperation.continueOperationProcessing();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
index de4cccc..c0612c5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.types;
@@ -671,7 +671,7 @@
public final void testGetPrimaryNameDefault() throws Exception {
SchemaDefinitionBuilder builder = getBuilder(null, "1.2.3");
CommonSchemaElements d = builder.getInstance();
- Assert.assertNull(d.getPrimaryName());
+ Assert.assertNull(d.getNameOrOID());
}
@@ -687,7 +687,7 @@
public final void testGetPrimaryName() throws Exception {
SchemaDefinitionBuilder builder = getBuilder("testType", "1.2.3");
CommonSchemaElements d = builder.getInstance();
- Assert.assertEquals(d.getPrimaryName(), "testType");
+ Assert.assertEquals(d.getNameOrOID(), "testType");
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
index 6fafa87..3341094 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
@@ -371,7 +371,7 @@
ObjectClass type = new ObjectClass(definition, null, null, "1.2.3", null,
null, null, null, null, false, null);
- Assert.assertNull(type.getPrimaryName());
+ Assert.assertNull(type.getNameOrOID());
}
--
Gitblit v1.10.0