From 77f70f14c413a2e0145ba93e44671a04a7a32cb0 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 May 2016 09:54:56 +0000
Subject: [PATCH] OPENDJ-2987 ObjectClass.getRequiredAttributes() => getDeclaredRequiredAttributes()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java | 2 +-
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/test/java/org/opends/server/types/TestObjectClass.java | 16 ++++++++--------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.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/SchemaBackend.java | 4 ++--
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index 1e2ed1c..99a5c8c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -640,7 +640,7 @@
&& areEqual(oc1.getDescription(), oc2.getDescription())
&& areEqual(oc1.getObjectClassType(), oc2.getObjectClassType())
&& areEqual(oc1.getOptionalAttributes(), oc2.getOptionalAttributes())
- && areEqual(oc1.getRequiredAttributes(), oc2.getRequiredAttributes())
+ && areEqual(oc1.getDeclaredRequiredAttributes(), oc2.getDeclaredRequiredAttributes())
&& areEqual(oc1.getSuperiorClasses(), oc2.getSuperiorClasses())
&& areEqual(oc1.getExtraProperties().keySet(), oc2.getExtraProperties().keySet())
&& areEqual(toSet(oc1.getNormalizedNames()), toSet(oc2.getNormalizedNames()))
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 34d4970..e5e3fc4 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,14 +529,14 @@
Set<AttributeType> optional;
if (containsAttribute)
{
- required = new HashSet<>(ocToDelete.getRequiredAttributes());
+ required = new HashSet<>(ocToDelete.getDeclaredRequiredAttributes());
optional = new HashSet<>(ocToDelete.getOptionalAttributes());
required.removeAll(providedAttrsToDelete);
optional.removeAll(providedAttrsToDelete);
}
else
{
- required = ocToDelete.getRequiredAttributes();
+ required = ocToDelete.getDeclaredRequiredAttributes();
optional = ocToDelete.getOptionalAttributes();
}
return new ObjectClass("",
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 1e1a396..1facc76 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
@@ -166,7 +166,7 @@
ArrayList<String> allNames = new ArrayList<>(ocToDelete.getNormalizedNames());
Map<String, List<String>> extraProperties =
DeleteSchemaElementsTask.cloneExtraProperties(ocToDelete);
- Set<AttributeType> required = new HashSet<>(ocToDelete.getRequiredAttributes());
+ Set<AttributeType> required = new HashSet<>(ocToDelete.getDeclaredRequiredAttributes());
Set<AttributeType> optional = new HashSet<>(ocToDelete.getOptionalAttributes());
if (required.contains(oldAttribute))
{
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 c2dc769..00016c5 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
@@ -166,7 +166,7 @@
ocToDelete.getOID(),
ocToDelete.getDescription(),
newSups,
- ocToDelete.getRequiredAttributes(),
+ ocToDelete.getDeclaredRequiredAttributes(),
ocToDelete.getOptionalAttributes(),
ocToDelete.getObjectClassType(),
ocToDelete.isObsolete(),
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
index 40d33ae..e6c84ef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
@@ -419,7 +419,7 @@
appendIfTrue(buffer, " OBSOLETE", objectClass.isObsolete());
appendOIDs(buffer, "SUP", objectClassesToSchemaElements(objectClass.getSuperiorClasses()));
appendIfNotNull(buffer, " ", objectClass.getObjectClassType());
- appendOIDs(buffer, "MUST", attributeTypesToSchemaElements(objectClass.getRequiredAttributes()));
+ appendOIDs(buffer, "MUST", attributeTypesToSchemaElements(objectClass.getDeclaredRequiredAttributes()));
appendOIDs(buffer, "MAY", attributeTypesToSchemaElements(objectClass.getOptionalAttributes()));
appendExtraProperties(buffer, objectClass.getExtraProperties());
buffer.append(")");
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 7a76779..7350237 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
@@ -477,7 +477,7 @@
updateAttributesWithParent(false);
- for (AttributeType attr : oc.getRequiredAttributes())
+ for (AttributeType attr : oc.getDeclaredRequiredAttributes())
{
availableModel.remove(attr);
modelRequired.add(attr);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 8d5f805..7972691 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -1381,7 +1381,7 @@
// attribute type in any objectclass.
for (ObjectClass oc : schema.getObjectClasses().values())
{
- if (oc.getRequiredAttributes().contains(removeType) ||
+ if (oc.getDeclaredRequiredAttributes().contains(removeType) ||
oc.getOptionalAttributes().contains(removeType))
{
LocalizableMessage message = ERR_SCHEMA_MODIFY_REMOVE_AT_IN_OC.get(
@@ -1513,7 +1513,7 @@
}
}
- for (AttributeType at : objectClass.getRequiredAttributes())
+ for (AttributeType at : objectClass.getDeclaredRequiredAttributes())
{
if (! schema.hasAttributeType(at.getOID()))
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
index 40a71b4..dc38fc5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
@@ -1724,7 +1724,7 @@
}
}
- for (AttributeType t : o.getRequiredAttributes())
+ for (AttributeType t : o.getDeclaredRequiredAttributes())
{
if (!userAttributes.containsKey(t)
&& !operationalAttributes.containsKey(t)
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 0a3e4a7..8232b39 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
@@ -299,7 +299,7 @@
* @return Returns an unmodifiable view of the set of required
* attributes for this objectclass.
*/
- public Set<AttributeType> getRequiredAttributes() {
+ public Set<AttributeType> getDeclaredRequiredAttributes() {
return requiredAttributes;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
index b1895a4..413edb0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
@@ -1933,7 +1933,7 @@
for (ObjectClass oc : objectClasses.values())
{
- if (oc.getRequiredAttributes().contains(type) || oc.getOptionalAttributes().contains(type))
+ if (oc.getDeclaredRequiredAttributes().contains(type) || oc.getOptionalAttributes().contains(type))
{
ObjectClass newOC = recreateFromDefinition(oc);
deregisterObjectClass(oc);
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 3327bda..412a48d 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
@@ -859,7 +859,7 @@
/**
- * Check the {@link ObjectClass#getRequiredAttributes()} method with
+ * Check the {@link ObjectClass#getDeclaredRequiredAttributes()} method with
* no superior and no optional attributes.
*
* @throws Exception
@@ -871,13 +871,13 @@
ObjectClassBuilder builder = new ObjectClassBuilder("testType",
"1.2.3");
ObjectClass c = builder.getInstance();
- Assert.assertTrue(c.getRequiredAttributes().isEmpty());
+ Assert.assertTrue(c.getDeclaredRequiredAttributes().isEmpty());
}
/**
- * Check the {@link ObjectClass#getRequiredAttributes()} method with
+ * Check the {@link ObjectClass#getDeclaredRequiredAttributes()} method with
* no superior and some optional attributes.
*
* @throws Exception
@@ -890,7 +890,7 @@
builder.addRequiredAttributeTypes(types[0], types[1], types[2]);
ObjectClass c = builder.getInstance();
- Set<AttributeType> chain = c.getRequiredAttributes();
+ Set<AttributeType> chain = c.getDeclaredRequiredAttributes();
Assert.assertEquals(chain.size(), 3);
Assert.assertTrue(chain.contains(types[0]));
Assert.assertTrue(chain.contains(types[1]));
@@ -900,7 +900,7 @@
/**
- * Check the {@link ObjectClass#getRequiredAttributes()} method with
+ * Check the {@link ObjectClass#getDeclaredRequiredAttributes()} method with
* a superior but no optional attributes of its own.
*
* @throws Exception
@@ -917,13 +917,13 @@
builder.setSuperior(Collections.singleton(parent));
ObjectClass child = builder.getInstance();
- Assert.assertTrue(child.getRequiredAttributes().isEmpty());
+ Assert.assertTrue(child.getDeclaredRequiredAttributes().isEmpty());
}
/**
- * Check the {@link ObjectClass#getRequiredAttributes()} method with
+ * Check the {@link ObjectClass#getDeclaredRequiredAttributes()} method with
* a superior and some optional attributes of its own.
*
* @throws Exception
@@ -941,7 +941,7 @@
builder.setSuperior(Collections.singleton(parent));
ObjectClass child = builder.getInstance();
- Set<AttributeType> chain = child.getRequiredAttributes();
+ Set<AttributeType> chain = child.getDeclaredRequiredAttributes();
Assert.assertEquals(chain.size(), 3);
Assert.assertTrue(chain.contains(types[3]));
Assert.assertTrue(chain.contains(types[4]));
--
Gitblit v1.10.0