From 13d1b7c788ad8f598589fc5e2116e114831ec9e8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Oct 2014 14:30:57 +0000
Subject: [PATCH] AutoRefactored for the use of Collection.addAll().
---
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java | 4 +---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java | 9 +++------
opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java | 4 +---
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
index fb0e7e0..d489eda 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
@@ -2073,20 +2073,17 @@
registerSetModification(pd, newValues, previousValues);
} else {
// Split into two operations: remove and add
- SortedSet<T> removedValues = new TreeSet<T>();
- removedValues.addAll(previousValues);
+ SortedSet<T> removedValues = new TreeSet<T>(previousValues);
removedValues.removeAll(newValues);
PropertyEditorModification<T> removeMod = PropertyEditorModification.createRemoveModification(pd,
removedValues, previousValues);
addModification(removeMod);
- SortedSet<T> retainedValues = new TreeSet<T>();
- retainedValues.addAll(previousValues);
+ SortedSet<T> retainedValues = new TreeSet<T>(previousValues);
retainedValues.retainAll(newValues);
- SortedSet<T> addedValues = new TreeSet<T>();
- addedValues.addAll(newValues);
+ SortedSet<T> addedValues = new TreeSet<T>(newValues);
addedValues.removeAll(retainedValues);
PropertyEditorModification<T> addMod = PropertyEditorModification.createAddModification(pd,
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
index 188daff..6ad1ba4 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
@@ -287,9 +287,7 @@
if (isEmpty()) {
if (missingValues != null) {
- for (final T value : values) {
- missingValues.add(value);
- }
+ missingValues.addAll(values);
}
return false;
}
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java
index 8fa74f6..4f447a4 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java
@@ -89,9 +89,7 @@
this.reason = reason;
final EnumSet<Type> tmp = EnumSet.noneOf(Type.class);
- for (final Type type : types) {
- tmp.add(type);
- }
+ tmp.addAll(types);
this.types = Collections.unmodifiableSet(tmp);
}
--
Gitblit v1.10.0