From 790af3f9788b802f6a420504714b7772881ba05c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 May 2016 09:55:02 +0000
Subject: [PATCH] OPENDJ-2987 ObjectClass.getRequiredAttributeChain() => getRequiredAttributes()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java | 4 +-
opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java | 24 ++++++------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 4 +-
opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java | 2
15 files changed, 33 insertions(+), 33 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 e5e3fc4..683b3dd 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
@@ -491,7 +491,7 @@
boolean containsAttribute = false;
for (AttributeType attr : providedAttrsToDelete)
{
- if(ocToDelete.getRequiredAttributeChain().contains(attr) ||
+ if(ocToDelete.getRequiredAttributes().contains(attr) ||
ocToDelete.getOptionalAttributeChain().contains(attr))
{
containsAttribute = true;
@@ -633,7 +633,7 @@
{
for (ObjectClass oc : schema.getObjectClasses().values())
{
- if (oc.getRequiredAttributeChain().contains(attr))
+ if (oc.getRequiredAttributes().contains(attr))
{
dependentClasses.add(oc);
}
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 1facc76..f403af7 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
@@ -159,7 +159,7 @@
private ObjectClass getObjectClassToAdd(ObjectClass ocToDelete)
{
boolean containsAttribute =
- ocToDelete.getRequiredAttributeChain().contains(oldAttribute) ||
+ ocToDelete.getRequiredAttributes().contains(oldAttribute) ||
ocToDelete.getOptionalAttributeChain().contains(oldAttribute);
if (containsAttribute)
{
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 70879be..4a4428c 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
@@ -1278,7 +1278,7 @@
private boolean mustAddAttributeName(ObjectClass oc, String f, Object filterType)
{
- Set<AttributeType> definedAttrs = FILTER_REQUIRED_ATTRIBUTES.equals(filterType) ? oc.getRequiredAttributeChain()
+ Set<AttributeType> definedAttrs = FILTER_REQUIRED_ATTRIBUTES.equals(filterType) ? oc.getRequiredAttributes()
: oc.getOptionalAttributeChain();
return mustAddAttributeName(f, definedAttrs);
}
@@ -1597,7 +1597,7 @@
for (ObjectClass o : schema.getObjectClasses().values())
{
- if (o.getRequiredAttributeChain().contains(attribute))
+ if (o.getRequiredAttributes().contains(attribute))
{
dependentClasses.add(o.getNameOrOID());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index c9d2c5e..f6e7366 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -562,7 +562,7 @@
SortedSet<String> requiredByOcs = new TreeSet<>(lowerCaseComparator);
for (ObjectClass oc : schema.getObjectClasses().values())
{
- if (oc.getRequiredAttributeChain().contains(attr))
+ if (oc.getRequiredAttributes().contains(attr))
{
requiredByOcs.add(oc.getNameOrOID());
}
@@ -737,7 +737,7 @@
for (ObjectClass o : schema.getObjectClasses().values())
{
- if (o.getRequiredAttributeChain().contains(attribute))
+ if (o.getRequiredAttributes().contains(attribute))
{
dependentClasses.add(o.getNameOrOID());
}
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 7350237..df5dea4 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
@@ -1085,7 +1085,7 @@
inheritedRequiredAttributes.clear();
for (ObjectClass p : getObjectClassSuperiors())
{
- inheritedRequiredAttributes.addAll(p.getRequiredAttributeChain());
+ inheritedRequiredAttributes.addAll(p.getRequiredAttributes());
inheritedOptionalAttributes.addAll(p.getOptionalAttributeChain());
}
for (AttributeType attr : inheritedRequiredAttributes)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
index 72b84af..c945e9e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -464,7 +464,7 @@
inheritedRequiredAttributes.clear();
for (ObjectClass oc : superiors.getSelectedSuperiors())
{
- inheritedRequiredAttributes.addAll(oc.getRequiredAttributeChain());
+ inheritedRequiredAttributes.addAll(oc.getRequiredAttributes());
inheritedOptionalAttributes.addAll(oc.getOptionalAttributeChain());
}
for (AttributeType attr : inheritedRequiredAttributes)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index d260a7d..560e7d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -722,7 +722,7 @@
ObjectClass objectClass = schema.getObjectClass(oc.toLowerCase());
if (objectClass != null)
{
- for (AttributeType attr : objectClass.getRequiredAttributeChain())
+ for (AttributeType attr : objectClass.getRequiredAttributes())
{
requiredAttributes.add(attr.getNameOrOID());
}
@@ -1638,7 +1638,7 @@
ObjectClass objectClass = schema.getObjectClass(oc);
if (objectClass != null)
{
- for (AttributeType attr : objectClass.getRequiredAttributeChain())
+ for (AttributeType attr : objectClass.getRequiredAttributes())
{
attributes.add(attr.getNameOrOID().toLowerCase());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
index 8b76fbb..c79076d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
@@ -280,7 +280,7 @@
SortedSet<String> requiredByOcs = new TreeSet<>(lowerCaseComparator);
for (ObjectClass oc : schema.getObjectClasses().values())
{
- if (oc.getRequiredAttributeChain().contains(attr))
+ if (oc.getRequiredAttributes().contains(attr))
{
requiredByOcs.add(oc.getNameOrOID());
}
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 751df1c..5ec10f4 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
@@ -322,7 +322,7 @@
Comparator<String> lowerCaseComparator = new LowerCaseComparator();
SortedSet<String> requiredAttrs = new TreeSet<>(lowerCaseComparator);
Set<String> inheritedAttrs = new HashSet<>();
- for (AttributeType attr : oc.getRequiredAttributeChain())
+ for (AttributeType attr : oc.getRequiredAttributes())
{
requiredAttrs.add(attr.getNameOrOID());
}
@@ -341,7 +341,7 @@
}
for (ObjectClass parent : parents)
{
- for (AttributeType attr : parent.getRequiredAttributeChain())
+ for (AttributeType attr : parent.getRequiredAttributes())
{
inheritedAttrs.add(attr.getNameOrOID());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index faf1b72..6b6e501 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -621,7 +621,7 @@
ObjectClass objectClass = schema.getObjectClass(oc.toLowerCase());
if (objectClass != null)
{
- for (AttributeType attr : objectClass.getRequiredAttributeChain())
+ for (AttributeType attr : objectClass.getRequiredAttributes())
{
String attrName = attr.getNameOrOID();
String lowerCase = attrName.toLowerCase();
@@ -749,7 +749,7 @@
ObjectClass objectClass = schema.getObjectClass(oc);
if (objectClass != null)
{
- for (AttributeType attr : objectClass.getRequiredAttributeChain())
+ for (AttributeType attr : objectClass.getRequiredAttributes())
{
attributes.add(attr.getNameOrOID().toLowerCase());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
index 08c605d..4db1d32 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
@@ -99,7 +99,7 @@
{
logger.trace("Replacing objectclass %s", lowerName);
- for (final AttributeType at : oc.getRequiredAttributeChain())
+ for (final AttributeType at : oc.getRequiredAttributes())
{
newAttrs.add(at.getNameOrOID());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 6b76dd5..e3ec136 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -4443,7 +4443,7 @@
DirectoryServer.getObjectClass(toLowerCase(ocName));
if (objectClass != null)
{
- for (AttributeType at : objectClass.getRequiredAttributeChain())
+ for (AttributeType at : objectClass.getRequiredAttributes())
{
expandedNames.add(at.getNameOrOID());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
index b605297..c843fa4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
@@ -485,7 +485,7 @@
for (String objectClassName : objectClassNames)
{
ObjectClass c = DirectoryServer.getObjectClass2(objectClassName);
- for (AttributeType t : c.getRequiredAttributeChain())
+ for (AttributeType t : c.getRequiredAttributes())
{
if (t.isOperational())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
index 8232b39..c33188d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
@@ -214,7 +214,7 @@
Set<AttributeType> tmp = new HashSet<>(this.requiredAttributes);
for(ObjectClass oc: this.superiorClasses)
{
- tmp.addAll(oc.getRequiredAttributeChain());
+ tmp.addAll(oc.getRequiredAttributes());
}
this.requiredAttributesChain = Collections.unmodifiableSet(tmp);
}
@@ -315,7 +315,7 @@
* attributes for this objectclass and any superior
* objectclasses that it might have.
*/
- public Set<AttributeType> getRequiredAttributeChain() {
+ public Set<AttributeType> getRequiredAttributes() {
return requiredAttributesChain;
}
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 412a48d..2f4521a 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
@@ -683,7 +683,7 @@
/**
- * Check the {@link ObjectClass#getRequiredAttributeChain()} method
+ * Check the {@link ObjectClass#getRequiredAttributes()} method
* with no superior and no optional attributes.
*
* @throws Exception
@@ -695,13 +695,13 @@
ObjectClassBuilder builder = new ObjectClassBuilder("testType",
"1.2.3");
ObjectClass c = builder.getInstance();
- Assert.assertTrue(c.getRequiredAttributeChain().isEmpty());
+ Assert.assertTrue(c.getRequiredAttributes().isEmpty());
}
/**
- * Check the {@link ObjectClass#getRequiredAttributeChain()} method
+ * Check the {@link ObjectClass#getRequiredAttributes()} method
* with no superior and some optional attributes.
*
* @throws Exception
@@ -715,7 +715,7 @@
builder.addRequiredAttributeTypes(types[0], types[1], types[2]);
ObjectClass c = builder.getInstance();
- Set<AttributeType> chain = c.getRequiredAttributeChain();
+ Set<AttributeType> chain = c.getRequiredAttributes();
Assert.assertEquals(chain.size(), 3);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -725,7 +725,7 @@
/**
- * Check the {@link ObjectClass#getRequiredAttributeChain()} method
+ * Check the {@link ObjectClass#getRequiredAttributes()} method
* with a superior but no optional attributes of its own.
*
* @throws Exception
@@ -742,7 +742,7 @@
builder.setSuperior(Collections.singleton(parent));
ObjectClass child = builder.getInstance();
- Set<AttributeType> chain = child.getRequiredAttributeChain();
+ Set<AttributeType> chain = child.getRequiredAttributes();
Assert.assertEquals(chain.size(), 3);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -752,7 +752,7 @@
/**
- * Check the {@link ObjectClass#getRequiredAttributeChain()} method
+ * Check the {@link ObjectClass#getRequiredAttributes()} method
* with multiple superiors but no optional attributes of its own.
*
* @throws Exception
@@ -775,7 +775,7 @@
builder.setSuperior(superiors);
ObjectClass child = builder.getInstance();
- Set<AttributeType> chain = child.getRequiredAttributeChain();
+ Set<AttributeType> chain = child.getRequiredAttributes();
Assert.assertEquals(chain.size(), 6);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -788,7 +788,7 @@
/**
- * Check the {@link ObjectClass#getRequiredAttributeChain()} method
+ * Check the {@link ObjectClass#getRequiredAttributes()} method
* with a superior and some optional attributes of its own.
*
* @throws Exception
@@ -806,7 +806,7 @@
builder.setSuperior(Collections.singleton(parent));
ObjectClass child = builder.getInstance();
- Set<AttributeType> chain = child.getRequiredAttributeChain();
+ Set<AttributeType> chain = child.getRequiredAttributes();
Assert.assertEquals(chain.size(), 6);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -819,7 +819,7 @@
/**
- * Check the {@link ObjectClass#getRequiredAttributeChain()} method
+ * Check the {@link ObjectClass#getRequiredAttributes()} method
* with multiple superiors and some optional attributes of its own.
*
* @throws Exception
@@ -843,7 +843,7 @@
builder.setSuperior(superiors);
ObjectClass child = builder.getInstance();
- Set<AttributeType> chain = child.getRequiredAttributeChain();
+ Set<AttributeType> chain = child.getRequiredAttributes();
Assert.assertEquals(chain.size(), 9);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
--
Gitblit v1.10.0