From 22e546477803a07f661298b266504695f5648dcf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Aug 2016 07:31:26 +0000
Subject: [PATCH] Partial OPENDJ-3106 Migrate Entry
---
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
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 402b8f1..821de92 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
@@ -1021,7 +1021,7 @@
* @param duplicateValues
* A list to which any duplicate values will be added.
*/
- public void addAttribute(Attribute attribute, List<ByteString> duplicateValues)
+ public void addAttribute(Attribute attribute, Collection<? super ByteString> duplicateValues)
{
setAttribute(attribute, duplicateValues, false /* merge */);
}
@@ -1172,7 +1172,7 @@
* attribute, then this method will return {@code true}
* but will add those values to the provided list.
*/
- public boolean removeAttribute(Attribute attribute, List<ByteString> missingValues)
+ public boolean removeAttribute(Attribute attribute, Collection<? super ByteString> missingValues)
{
attachment = null;
@@ -1186,7 +1186,7 @@
return removeNonObjectClassAttribute(attribute, missingValues);
}
- private boolean removeObjectClassAttribute(Attribute attribute, List<ByteString> missingValues)
+ private boolean removeObjectClassAttribute(Attribute attribute, Collection<? super ByteString> missingValues)
{
AttributeType attrType = attribute.getAttributeDescription().getAttributeType();
if (attribute.isEmpty())
@@ -1218,7 +1218,7 @@
return allSuccessful;
}
- private boolean removeNonObjectClassAttribute(Attribute attribute, List<ByteString> missingValues)
+ private boolean removeNonObjectClassAttribute(Attribute attribute, Collection<? super ByteString> missingValues)
{
AttributeDescription attrDesc = attribute.getAttributeDescription();
AttributeType attrType = attrDesc.getAttributeType();
@@ -4185,7 +4185,7 @@
* existing attribute.
*/
private void setAttribute(Attribute attribute,
- List<ByteString> duplicateValues, boolean replace)
+ Collection<? super ByteString> duplicateValues, boolean replace)
{
attachment = null;
@@ -4199,7 +4199,8 @@
}
}
- private void setObjectClassAttribute(Attribute attribute, List<ByteString> duplicateValues, boolean replace)
+ private void setObjectClassAttribute(
+ Attribute attribute, Collection<? super ByteString> duplicateValues, boolean replace)
{
AttributeType attrType = attribute.getAttributeDescription().getAttributeType();
// We will not do any validation of the object classes - this is
@@ -4236,7 +4237,8 @@
}
}
- private void setNonObjectClassAttribute(Attribute attribute, List<ByteString> duplicateValues, boolean replace)
+ private void setNonObjectClassAttribute(
+ Attribute attribute, Collection<? super ByteString> duplicateValues, boolean replace)
{
AttributeDescription attrDesc = attribute.getAttributeDescription();
AttributeType attrType = attrDesc.getAttributeType();
--
Gitblit v1.10.0