From c4850e7d55dd0e4d71a719fec745832ee526a875 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 29 Mar 2016 10:15:13 +0000
Subject: [PATCH] Prep work for OPENDJ-2803 Migrate Attribute
---
opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
index 4a6fe84..0949901 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
@@ -111,8 +111,6 @@
/** The attribute description for this attribute. */
private final AttributeDescription attributeDescription;
- /** The name of this attribute as provided by the end user. */
- private final String name;
/**
* The unmodifiable set of attribute values, which are lazily normalized.
* <p>
@@ -120,20 +118,9 @@
*/
private final Set<AttributeValue> values;
- /**
- * Creates a new real attribute.
- *
- * @param attributeDescription
- * The attribute description.
- * @param name
- * The user-provided attribute name.
- * @param values
- * The attribute values.
- */
- private RealAttribute(AttributeDescription attributeDescription, String name, Set<AttributeValue> values)
+ private RealAttribute(AttributeDescription attributeDescription, Set<AttributeValue> values)
{
this.attributeDescription = attributeDescription;
- this.name = name;
this.values = values;
}
@@ -233,7 +220,7 @@
@Override
public final String getName()
{
- return name;
+ return attributeDescription.getNameOrOID();
}
@Override
@@ -1465,19 +1452,19 @@
private Attribute toAttribute0()
{
- return new RealAttribute(toAttributeDescription(), name, values);
+ return new RealAttribute(toAttributeDescription(name), values);
}
- private AttributeDescription toAttributeDescription()
+ private AttributeDescription toAttributeDescription(String name)
{
switch (options.size())
{
case 0:
- return AttributeDescription.create(attributeType);
+ return AttributeDescription.create(name, attributeType);
case 1:
- return AttributeDescription.create(attributeType, options.firstElement);
+ return AttributeDescription.create(name, attributeType, options.firstElement);
default:
- return AttributeDescription.create(attributeType, options.elements);
+ return AttributeDescription.create(name, attributeType, options.elements);
}
}
--
Gitblit v1.10.0