From 2d1ec373572251fa589b9552ed573f68c1e18557 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 May 2016 09:55:14 +0000
Subject: [PATCH] OPENDJ-2987 ObjectClass.getOptionalAttributeChain() => getOptionalAttributes()
---
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 13da025..9666db5 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
@@ -492,7 +492,7 @@
for (AttributeType attr : providedAttrsToDelete)
{
if(ocToDelete.getRequiredAttributes().contains(attr) ||
- ocToDelete.getOptionalAttributeChain().contains(attr))
+ ocToDelete.getOptionalAttributes().contains(attr))
{
containsAttribute = true;
break;
@@ -637,7 +637,7 @@
{
dependentClasses.add(oc);
}
- else if (oc.getOptionalAttributeChain().contains(attr))
+ else if (oc.getOptionalAttributes().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 d533eaa..3865bed 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
@@ -160,7 +160,7 @@
{
boolean containsAttribute =
ocToDelete.getRequiredAttributes().contains(oldAttribute) ||
- ocToDelete.getOptionalAttributeChain().contains(oldAttribute);
+ ocToDelete.getOptionalAttributes().contains(oldAttribute);
if (containsAttribute)
{
ArrayList<String> allNames = new ArrayList<>(ocToDelete.getNormalizedNames());
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 4a4428c..63aa7b2 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
@@ -1279,7 +1279,7 @@
private boolean mustAddAttributeName(ObjectClass oc, String f, Object filterType)
{
Set<AttributeType> definedAttrs = FILTER_REQUIRED_ATTRIBUTES.equals(filterType) ? oc.getRequiredAttributes()
- : oc.getOptionalAttributeChain();
+ : oc.getOptionalAttributes();
return mustAddAttributeName(f, definedAttrs);
}
@@ -1601,7 +1601,7 @@
{
dependentClasses.add(o.getNameOrOID());
}
- else if (o.getOptionalAttributeChain().contains(attribute))
+ else if (o.getOptionalAttributes().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 f6e7366..ee2a2ea 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
@@ -578,7 +578,7 @@
SortedSet<String> optionalByOcs = new TreeSet<>(lowerCaseComparator);
for (ObjectClass oc : schema.getObjectClasses().values())
{
- if (oc.getOptionalAttributeChain().contains(attr))
+ if (oc.getOptionalAttributes().contains(attr))
{
optionalByOcs.add(oc.getNameOrOID());
}
@@ -741,7 +741,7 @@
{
dependentClasses.add(o.getNameOrOID());
}
- else if (o.getOptionalAttributeChain().contains(attribute))
+ else if (o.getOptionalAttributes().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 56b1bf6..26b1116 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
@@ -1086,7 +1086,7 @@
for (ObjectClass p : getObjectClassSuperiors())
{
inheritedRequiredAttributes.addAll(p.getRequiredAttributes());
- inheritedOptionalAttributes.addAll(p.getOptionalAttributeChain());
+ inheritedOptionalAttributes.addAll(p.getOptionalAttributes());
}
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 c945e9e..7d7ed9c 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
@@ -465,7 +465,7 @@
for (ObjectClass oc : superiors.getSelectedSuperiors())
{
inheritedRequiredAttributes.addAll(oc.getRequiredAttributes());
- inheritedOptionalAttributes.addAll(oc.getOptionalAttributeChain());
+ inheritedOptionalAttributes.addAll(oc.getOptionalAttributes());
}
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 560e7d8..191b652 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
@@ -726,7 +726,7 @@
{
requiredAttributes.add(attr.getNameOrOID());
}
- for (AttributeType attr : objectClass.getOptionalAttributeChain())
+ for (AttributeType attr : objectClass.getOptionalAttributes())
{
allowedAttributes.add(attr.getNameOrOID());
}
@@ -1642,7 +1642,7 @@
{
attributes.add(attr.getNameOrOID().toLowerCase());
}
- for (AttributeType attr : objectClass.getOptionalAttributeChain())
+ for (AttributeType attr : objectClass.getOptionalAttributes())
{
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 c79076d..3e00ec3 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
@@ -296,7 +296,7 @@
SortedSet<String> optionalByOcs = new TreeSet<>(lowerCaseComparator);
for (ObjectClass oc : schema.getObjectClasses().values())
{
- if (oc.getOptionalAttributeChain().contains(attr))
+ if (oc.getOptionalAttributes().contains(attr))
{
optionalByOcs.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 5ec10f4..8825ebc 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
@@ -372,7 +372,7 @@
SortedSet<String> optionalAttrs = new TreeSet<>(lowerCaseComparator);
inheritedAttrs = new HashSet<>();
- for (AttributeType attr : oc.getOptionalAttributeChain())
+ for (AttributeType attr : oc.getOptionalAttributes())
{
optionalAttrs.add(attr.getNameOrOID());
}
@@ -380,7 +380,7 @@
{
for (ObjectClass parent : parents)
{
- for (AttributeType attr : parent.getOptionalAttributeChain())
+ for (AttributeType attr : parent.getOptionalAttributes())
{
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 6b6e501..dc354bb 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
@@ -631,7 +631,7 @@
}
requiredAttrs.add(lowerCase);
}
- for (AttributeType attr : objectClass.getOptionalAttributeChain())
+ for (AttributeType attr : objectClass.getOptionalAttributes())
{
String attrName = attr.getNameOrOID();
if (!addedAttrs.contains(attrName.toLowerCase()))
@@ -753,7 +753,7 @@
{
attributes.add(attr.getNameOrOID().toLowerCase());
}
- for (AttributeType attr : objectClass.getOptionalAttributeChain())
+ for (AttributeType attr : objectClass.getOptionalAttributes())
{
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 4db1d32..2983e46 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
@@ -104,7 +104,7 @@
newAttrs.add(at.getNameOrOID());
}
- for (final AttributeType at : oc.getOptionalAttributeChain())
+ for (final AttributeType at : oc.getOptionalAttributes())
{
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 e3ec136..8581707 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
@@ -4447,7 +4447,7 @@
{
expandedNames.add(at.getNameOrOID());
}
- for (AttributeType at : objectClass.getOptionalAttributeChain())
+ for (AttributeType at : objectClass.getOptionalAttributes())
{
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 c843fa4..34e8b63 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
@@ -497,7 +497,7 @@
}
}
- for (AttributeType t : c.getOptionalAttributeChain())
+ for (AttributeType t : c.getOptionalAttributes())
{
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 e745fd8..9b4d0a4 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
@@ -234,7 +234,7 @@
Set<AttributeType> tmp = new HashSet<>(this.optionalAttributes);
for(ObjectClass oc : this.superiorClasses)
{
- tmp.addAll(oc.getOptionalAttributeChain());
+ tmp.addAll(oc.getOptionalAttributes());
}
this.optionalAttributesChain = Collections.unmodifiableSet(tmp);
}
@@ -364,7 +364,7 @@
* attributes for this objectclass and any superior
* objectclasses that it might have.
*/
- public Set<AttributeType> getOptionalAttributeChain() {
+ public Set<AttributeType> getOptionalAttributes() {
return optionalAttributesChain;
}
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 6ee3640..6fafa87 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
@@ -415,7 +415,7 @@
/**
- * Check the {@link ObjectClass#getOptionalAttributeChain()} method
+ * Check the {@link ObjectClass#getOptionalAttributes()} method
* with no superior and no optional attributes.
*
* @throws Exception
@@ -427,13 +427,13 @@
ObjectClassBuilder builder = new ObjectClassBuilder("testType",
"1.2.3");
ObjectClass c = builder.getInstance();
- Assert.assertTrue(c.getOptionalAttributeChain().isEmpty());
+ Assert.assertTrue(c.getOptionalAttributes().isEmpty());
}
/**
- * Check the {@link ObjectClass#getOptionalAttributeChain()} method
+ * Check the {@link ObjectClass#getOptionalAttributes()} method
* with no superior and some optional attributes.
*
* @throws Exception
@@ -447,7 +447,7 @@
builder.addOptionalAttributeTypes(types[0], types[1], types[2]);
ObjectClass c = builder.getInstance();
- Set<AttributeType> chain = c.getOptionalAttributeChain();
+ Set<AttributeType> chain = c.getOptionalAttributes();
Assert.assertEquals(chain.size(), 3);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -457,7 +457,7 @@
/**
- * Check the {@link ObjectClass#getOptionalAttributeChain()} method
+ * Check the {@link ObjectClass#getOptionalAttributes()} method
* with a superior but no optional attributes of its own.
*
* @throws Exception
@@ -474,7 +474,7 @@
builder.setSuperior(Collections.singleton(parent));
ObjectClass child = builder.getInstance();
- Set<AttributeType> chain = child.getOptionalAttributeChain();
+ Set<AttributeType> chain = child.getOptionalAttributes();
Assert.assertEquals(chain.size(), 3);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -484,7 +484,7 @@
/**
- * Check the {@link ObjectClass#getOptionalAttributeChain()} method
+ * Check the {@link ObjectClass#getOptionalAttributes()} method
* with multiple superiors but no optional attributes of its own.
*
* @throws Exception
@@ -507,7 +507,7 @@
builder3.setSuperior(superiors);
ObjectClass child = builder3.getInstance();
- Set<AttributeType> chain = child.getOptionalAttributeChain();
+ Set<AttributeType> chain = child.getOptionalAttributes();
Assert.assertEquals(chain.size(), 6);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -520,7 +520,7 @@
/**
- * Check the {@link ObjectClass#getOptionalAttributeChain()} method
+ * Check the {@link ObjectClass#getOptionalAttributes()} method
* with a superior and some optional attributes of its own.
*
* @throws Exception
@@ -538,7 +538,7 @@
builder.setSuperior(Collections.singleton(parent));
ObjectClass child = builder.getInstance();
- Set<AttributeType> chain = child.getOptionalAttributeChain();
+ Set<AttributeType> chain = child.getOptionalAttributes();
Assert.assertEquals(chain.size(), 6);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -551,7 +551,7 @@
/**
- * Check the {@link ObjectClass#getOptionalAttributeChain()} method
+ * Check the {@link ObjectClass#getOptionalAttributes()} method
* with multiple superiors and some optional attributes of its own.
*
* @throws Exception
@@ -575,7 +575,7 @@
builder3.setSuperior(superiors);
ObjectClass child = builder3.getInstance();
- Set<AttributeType> chain = child.getOptionalAttributeChain();
+ Set<AttributeType> chain = child.getOptionalAttributes();
Assert.assertEquals(chain.size(), 9);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
--
Gitblit v1.10.0