From e24ba76011872ec6d9beb79c1d89410a18353d75 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 13 Feb 2015 16:40:03 +0000
Subject: [PATCH] AutoRefactor: use Collection.addAll()
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java | 8
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java | 22 ++-
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ReplicaDescriptor.java | 6
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java | 8
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java | 4
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java | 28 +--
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java | 22 ---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 32 ++---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 7
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 17 --
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java | 7 -
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 13 -
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java | 14 --
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java | 7
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 7 -
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java | 9 -
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java | 5
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java | 12 -
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java | 11 -
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java | 41 +-----
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java | 5
32 files changed, 103 insertions(+), 237 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ReplicaDescriptor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ReplicaDescriptor.java
index 23c127e..c56dea3 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ReplicaDescriptor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ReplicaDescriptor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock, AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.admin.ads;
@@ -135,9 +135,7 @@
*/
public Set<String> getReplicationServers()
{
- HashSet<String> copy = new HashSet<String>();
- copy.addAll(replicationServers);
- return copy;
+ return new HashSet<String>(replicationServers);
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
index b87b352..1bb309b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
@@ -133,9 +133,7 @@
*/
public Set<ReplicaDescriptor> getReplicas()
{
- Set<ReplicaDescriptor> copy = new HashSet<ReplicaDescriptor>();
- copy.addAll(replicas);
- return copy;
+ return new HashSet<ReplicaDescriptor>(replicas);
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java
index 0d41021..43f88c8 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.admin.ads;
@@ -64,9 +65,7 @@
*/
public Set<ReplicaDescriptor> getReplicas()
{
- Set<ReplicaDescriptor> copy = new HashSet<ReplicaDescriptor>();
- copy.addAll(replicas);
- return copy;
+ return new HashSet<ReplicaDescriptor>(replicas);
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
index e6dbb55..352dd2e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -139,10 +139,7 @@
TreeSet<TaskEntry> sortedSet = new TreeSet<TaskEntry>(this);
sortedSet.addAll(data);
dataSourceArray.clear();
- for (TaskEntry task : sortedSet)
- {
- dataSourceArray.add(task);
- }
+ dataSourceArray.addAll(sortedSet);
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
index 008802e..954de08 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -196,8 +196,7 @@
{
getProgressDialog().appendProgressHtml("<br><br>");
}
- ArrayList<String> args = new ArrayList<String>();
- args.addAll(getObfuscatedCommandLineArguments(arguments));
+ ArrayList<String> args = new ArrayList<String>(getObfuscatedCommandLineArguments(arguments));
printEquivalentCommandLine(getCommandLinePath("manage-tasks"),
args, INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CANCEL_TASK.get(
task.getId()));
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
index 45fa3a9..1549ad7 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -449,8 +449,7 @@
{
oldBaseDNs.add(baseDN.getDn());
}
- LinkedList<DN> newBaseDNs = new LinkedList<DN>();
- newBaseDNs.addAll(oldBaseDNs);
+ LinkedList<DN> newBaseDNs = new LinkedList<DN>(oldBaseDNs);
ArrayList<DN> dnsToRemove = new ArrayList<DN>();
for (BaseDNDescriptor baseDN : baseDNs)
{
@@ -490,8 +489,7 @@
(LocalDBBackendCfgClient)root.getBackend(
baseDNs.iterator().next().getBackend().getBackendID());
SortedSet<DN> oldBaseDNs = backend.getBaseDN();
- SortedSet<DN> newBaseDNs = new TreeSet<DN>();
- newBaseDNs.addAll(oldBaseDNs);
+ SortedSet<DN> newBaseDNs = new TreeSet<DN>(oldBaseDNs);
ArrayList<DN> dnsToRemove = new ArrayList<DN>();
for (BaseDNDescriptor baseDN : baseDNs)
{
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 7a92662..5de9116 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -518,8 +518,7 @@
*/
private void printEquivalentCommandToDelete(DN dn, boolean usingControl)
{
- ArrayList<String> args = new ArrayList<String>();
- args.addAll(getObfuscatedCommandLineArguments(
+ ArrayList<String> args = new ArrayList<String>(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
args.add(getNoPropertiesFileArgument());
if (usingControl)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index 0a153a7..1916d3a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -311,8 +311,7 @@
*/
private void printEquivalentCommand()
{
- ArrayList<String> args = new ArrayList<String>();
- args.addAll(getObfuscatedCommandLineArguments(
+ ArrayList<String> args = new ArrayList<String>(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
args.add(getNoPropertiesFileArgument());
args.add("--defaultAdd");
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
index e7e2ba6..51efcd1 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -939,8 +939,7 @@
protected void printEquivalentCommandToModify(String dn,
Collection<ModificationItem> mods, boolean useAdminCtx)
{
- ArrayList<String> args = new ArrayList<String>();
- args.addAll(getObfuscatedCommandLineArguments(
+ ArrayList<String> args = new ArrayList<String>(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
args.add(getNoPropertiesFileArgument());
String equiv = getEquivalentCommandLine(getCommandLinePath("ldapmodify"),
@@ -1081,8 +1080,7 @@
protected void printEquivalentRenameCommand(DN oldDN, DN newDN,
boolean useAdminCtx)
{
- ArrayList<String> args = new ArrayList<String>();
- args.addAll(getObfuscatedCommandLineArguments(
+ ArrayList<String> args = new ArrayList<String>(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
args.add(getNoPropertiesFileArgument());
String equiv = getEquivalentCommandLine(getCommandLinePath("ldapmodify"),
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 9954175..93f5a91 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -789,8 +789,7 @@
for (int i=0; i<combos.length; i++)
{
DefaultComboBoxModel model = (DefaultComboBoxModel)combos[i].getModel();
- ArrayList<Object> el = new ArrayList<Object>();
- el.addAll(ruleNames.get(i));
+ ArrayList<Object> el = new ArrayList<Object>(ruleNames.get(i));
if (model.getSize() == 0)
{
el.add(0, NO_MATCHING_RULE);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index 9b5bc05..e9dba41 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
@@ -1005,23 +1004,24 @@
private Set<AttributeType> getRequiredAttributes()
{
- HashSet<AttributeType> attrs = new HashSet<AttributeType>();
- attrs.addAll(attributes.getSelectedListModel1().getData());
- attrs.removeAll(inheritedRequiredAttributes);
- return attrs;
+ return intersect(attributes.getSelectedListModel1().getData(), inheritedRequiredAttributes);
}
private Set<AttributeType> getOptionalAttributes()
{
- HashSet<AttributeType> attrs = new HashSet<AttributeType>();
- attrs.addAll(attributes.getSelectedListModel2().getData());
- attrs.removeAll(inheritedOptionalAttributes);
+ return intersect(attributes.getSelectedListModel2().getData(), inheritedOptionalAttributes);
+ }
+
+ private Set<AttributeType> intersect(Set<AttributeType> set1, Set<AttributeType> set2)
+ {
+ HashSet<AttributeType> attrs = new HashSet<AttributeType>(set1);
+ attrs.removeAll(set2);
return attrs;
}
private ObjectClass getNewObjectClass()
{
- ObjectClass newObjectClass = new ObjectClass("",
+ return new ObjectClass("",
getObjectClassName(),
getAllNames(),
getOID(),
@@ -1032,8 +1032,6 @@
getObjectClassType(),
obsolete.isSelected(),
getExtraProperties());
-
- return newObjectClass;
}
private void updateAttributes()
@@ -1132,14 +1130,8 @@
inheritedRequiredAttributes.clear();
for (ObjectClass p : getObjectClassSuperiors())
{
- for (AttributeType attr : p.getRequiredAttributeChain())
- {
- inheritedRequiredAttributes.add(attr);
- }
- for (AttributeType attr : p.getOptionalAttributeChain())
- {
- inheritedOptionalAttributes.add(attr);
- }
+ inheritedRequiredAttributes.addAll(p.getRequiredAttributeChain());
+ inheritedOptionalAttributes.addAll(p.getOptionalAttributeChain());
}
for (AttributeType attr : inheritedRequiredAttributes)
{
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
index ea7ff35..92fac4d 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -127,12 +127,9 @@
* @param attributes the attributes that will be proposed to the user.
*
*/
- protected MonitoringAttributesViewPanel(
- LinkedHashSet<T> attributes)
+ protected MonitoringAttributesViewPanel(LinkedHashSet<T> attributes)
{
- super();
- monitoringAttributes = new LinkedHashSet<T>();
- monitoringAttributes.addAll(attributes);
+ monitoringAttributes = new LinkedHashSet<T>(attributes);
createLayout();
}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index 6a0b676..a8fe3a8 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -297,8 +297,7 @@
for (int i=0; i<combos.length; i++)
{
DefaultComboBoxModel model = (DefaultComboBoxModel)combos[i].getModel();
- ArrayList<Object> el = new ArrayList<Object>();
- el.addAll(ruleNames.get(i));
+ ArrayList<Object> el = new ArrayList<Object>(ruleNames.get(i));
if (model.getSize() == 0)
{
el.add(0, NO_MATCHING_RULE);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index d99722b..340982d 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -378,8 +378,7 @@
sortedBackends.add(backend.getBackendID());
}
}
- ArrayList<Object> newElements = new ArrayList<Object>();
- newElements.addAll(sortedBackends);
+ ArrayList<Object> newElements = new ArrayList<Object>(sortedBackends);
if (sortedBackends.size() > 0)
{
newElements.add(COMBO_SEPARATOR);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
index 01ad7d4..65d4666 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -501,14 +501,8 @@
inheritedRequiredAttributes.clear();
for (ObjectClass oc : superiors.getSelectedSuperiors())
{
- for (AttributeType attr : oc.getRequiredAttributeChain())
- {
- inheritedRequiredAttributes.add(attr);
- }
- for (AttributeType attr : oc.getOptionalAttributeChain())
- {
- inheritedOptionalAttributes.add(attr);
- }
+ inheritedRequiredAttributes.addAll(oc.getRequiredAttributeChain());
+ inheritedOptionalAttributes.addAll(oc.getOptionalAttributeChain());
}
for (AttributeType attr : inheritedRequiredAttributes)
{
@@ -752,24 +746,24 @@
private Set<AttributeType> getRequiredAttributes()
{
- HashSet<AttributeType> attrs = new HashSet<AttributeType>();
- attrs.addAll(attributes.getSelectedListModel1().getData());
- attrs.removeAll(inheritedRequiredAttributes);
- return attrs;
+ return intersect(attributes.getSelectedListModel1().getData(), inheritedRequiredAttributes);
}
private Set<AttributeType> getOptionalAttributes()
{
- HashSet<AttributeType> attrs = new HashSet<AttributeType>();
- attrs.addAll(attributes.getSelectedListModel2().getData());
- attrs.removeAll(inheritedOptionalAttributes);
+ return intersect(attributes.getSelectedListModel2().getData(), inheritedOptionalAttributes);
+ }
+
+ private Set<AttributeType> intersect(Set<AttributeType> set1, Set<AttributeType> set2)
+ {
+ HashSet<AttributeType> attrs = new HashSet<AttributeType>(set1);
+ attrs.removeAll(set2);
return attrs;
}
/**
* A renderer for the attribute lists. The renderer basically marks the
* inherited attributes with an asterisk.
- *
*/
private class AttributeTypeCellRenderer implements ListCellRenderer
{
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
index 846d438..47ee01b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -158,8 +158,7 @@
public void okClicked()
{
String struct = (String) structural.getSelectedItem();
- TreeSet<String> aux = new TreeSet<String>();
- aux.addAll(auxiliary.getSelectedListModel().getData());
+ TreeSet<String> aux = new TreeSet<String>(auxiliary.getSelectedListModel().getData());
aux.add("top");
ObjectClassValue newValue = new ObjectClassValue(struct, aux);
valueChanged = !newValue.equals(value);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index 9be1c94..11c9171 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.ui;
@@ -708,9 +708,7 @@
// Get all attributes that the entry can have
Set<String> attributes = new LinkedHashSet<String>();
- ArrayList<String> entryAttrs = new ArrayList<String>();
- entryAttrs.addAll(sr.getAttributeNames());
-
+ ArrayList<String> entryAttrs = new ArrayList<String>(sr.getAttributeNames());
ArrayList<String> attrsWithNoOptions = new ArrayList<String>();
for (String attr : entryAttrs)
{
@@ -823,11 +821,7 @@
attrsWithNoOptions, false);
- for (String attr : entryAttrs)
- {
- attributes.add(attr);
- }
-
+ attributes.addAll(entryAttrs);
attributes.add("aci");
// In read-only mode display only the attributes with values
@@ -1574,10 +1568,7 @@
Object value = comp.getValue();
if (value instanceof Collection<?>)
{
- for (Object o : (Collection<?>)value)
- {
- values.add(o);
- }
+ values.addAll((Collection<?>) value);
}
else
{
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index 95ad731..2a42e2b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -806,10 +806,7 @@
{
if (valuePair.value instanceof Collection<?>)
{
- for (Object o : (Collection<?>)valuePair.value)
- {
- values.add(o);
- }
+ values.addAll((Collection<?>) valuePair.value);
}
else
{
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
index a58a2d3..9f5a0ef 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.components;
@@ -192,8 +192,7 @@
LocalizableMessageBuilder sb = new LocalizableMessageBuilder();
if (value != null)
{
- Set<String> aux = new TreeSet<String>();
- aux.addAll(value.getAuxiliary());
+ Set<String> aux = new TreeSet<String>(value.getAuxiliary());
aux.remove("top");
if (value.getStructural() != null)
{
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
index 9b72aec..2d37736 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.util;
@@ -94,14 +94,8 @@
attributesToKeep.add(attr);
}
}
- for (MatchingRule mr : sc.getMatchingRules().values())
- {
- matchingRulesToKeep.add(mr);
- }
- for (AttributeSyntax<?> syntax : sc.getSyntaxes().values())
- {
- syntaxesToKeep.add(syntax);
- }
+ matchingRulesToKeep.addAll(sc.getMatchingRules().values());
+ syntaxesToKeep.addAll(sc.getSyntaxes().values());
}
private static String getSchemaDirectoryPath()
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
index 700fbf9..132c9b2 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.quicksetup.installer;
@@ -573,8 +573,7 @@
{
servers = new HashSet<String>();
}
- Set<String> oldServers = new HashSet<String>();
- oldServers.addAll(servers);
+ Set<String> oldServers = new HashSet<String>(servers);
for (Set<String> rs : replicationServers.values())
{
servers.addAll(rs);
@@ -583,9 +582,7 @@
replicationServer.setReplicationServer(servers);
replicationServer.commit();
- Set<String> newReplicationServers = new HashSet<String>();
- newReplicationServers.addAll(servers);
- newReplicationServers.removeAll(oldServers);
+ Set<String> newReplicationServers = intersect(servers, oldServers);
/*
* Create the domains
@@ -642,9 +639,7 @@
usedServerIds.add(domain.getServerId());
domain.commit();
- Set<String> addedServers = new TreeSet<String>();
- addedServers.addAll(servers);
- addedServers.removeAll(oldServers);
+ Set<String> addedServers = intersect(servers, oldServers);
ConfiguredDomain domainConf = new ConfiguredDomain(domainName,
isCreated, addedServers);
domainsConf.add(domainConf);
@@ -663,9 +658,16 @@
}
}
+ private Set<String> intersect(Set<String> set1, Set<String> set2)
+ {
+ Set<String> result = new TreeSet<String>(set1);
+ result.removeAll(set2);
+ return result;
+ }
+
/**
* Configures the replication on a given server.
- * @param remoteCtx the conection to the server where we want to configure
+ * @param remoteCtx the connection to the server where we want to configure
* the replication.
* @param replConf the object describing what was configured.
* @param serverDisplay the server display.
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
index 47e636c..bfce0d1 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
@@ -137,10 +138,7 @@
*/
public Set<SuffixDescriptor> getAvailableSuffixes()
{
- LinkedHashSet<SuffixDescriptor> copy =
- new LinkedHashSet<SuffixDescriptor>();
- copy.addAll(availableSuffixes);
- return copy;
+ return new LinkedHashSet<SuffixDescriptor>(availableSuffixes);
}
/**
@@ -151,10 +149,7 @@
*/
public Set<SuffixDescriptor> getSuffixes()
{
- LinkedHashSet<SuffixDescriptor> copy =
- new LinkedHashSet<SuffixDescriptor>();
- copy.addAll(suffixesToReplicate);
- return copy;
+ return new LinkedHashSet<SuffixDescriptor>(suffixesToReplicate);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
index a6dc569..c15638f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.backends.task;
@@ -1156,8 +1156,7 @@
{
if (DirectoryServer.mailServerConfigured())
{
- LinkedHashSet<String> recipients = new LinkedHashSet<String>();
- recipients.addAll(notifyOnCompletion);
+ LinkedHashSet<String> recipients = new LinkedHashSet<String>(notifyOnCompletion);
if (! TaskState.isSuccessful(taskState))
{
recipients.addAll(notifyOnError);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java
index 55ac481..8a87b93 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.config;
import org.forgerock.i18n.LocalizableMessage;
@@ -563,20 +563,8 @@
// Create a temporary set of values that we will use for this change. It
// may not actually be applied if an error occurs for some reason.
- LinkedHashSet<ByteString> tempValues;
- if (requiresAdminAction && hasPendingValues)
- {
- tempValues =
- new LinkedHashSet<ByteString>(pendingValues.size() + numValues);
- tempValues.addAll(pendingValues);
- }
- else
- {
- tempValues =
- new LinkedHashSet<ByteString>(activeValues.size() + numValues);
- tempValues.addAll(activeValues);
- }
-
+ final LinkedHashSet<ByteString> vals = getValues();
+ LinkedHashSet<ByteString> tempValues = new LinkedHashSet<ByteString>(vals.size() + numValues);
// Iterate through all of the provided values. Make sure that each is
// acceptable for use and that it is not already contained in the value set.
@@ -612,7 +600,12 @@
}
}
-
+ private LinkedHashSet<ByteString> getValues()
+ {
+ return requiresAdminAction && hasPendingValues
+ ? pendingValues
+ : activeValues;
+ }
/**
* Attempts to remove the set of values from this configuration attribute.
@@ -624,23 +617,11 @@
* value set, or if this is a required attribute and
* the resulting value list would be empty.
*/
- protected void removeValues(List<ByteString> values)
- throws ConfigException
+ protected void removeValues(List<ByteString> values) throws ConfigException
{
// Create a temporary set of values that we will use for this change. It
// may not actually be applied if an error occurs for some reason.
- LinkedHashSet<ByteString> tempValues;
- if (requiresAdminAction && hasPendingValues)
- {
- tempValues = new LinkedHashSet<ByteString>(pendingValues.size());
- tempValues.addAll(pendingValues);
- }
- else
- {
- tempValues = new LinkedHashSet<ByteString>(activeValues.size());
- tempValues.addAll(activeValues);
- }
-
+ LinkedHashSet<ByteString> tempValues = new LinkedHashSet<ByteString>(getValues());
// Iterate through all the provided values and make sure that they are
// contained in the list. If not, then throw an exception. If so, then
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 291331a..e93a7ab 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -1093,12 +1093,7 @@
private Collection<ByteString> toAttributeValues(Collection<ByteString> values)
{
- Set<ByteString> results = new LinkedHashSet<ByteString>(values.size());
- for (ByteString s : values)
- {
- results.add(s);
- }
- return results;
+ return new LinkedHashSet<ByteString>(values);
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index c0c3aa8..ea5a110 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -206,19 +206,10 @@
final ConfigChangeResult ccr = new ConfigChangeResult();
//Load base DNs from new configuration.
- LinkedHashSet<DN> newConfiguredBaseDNs = new LinkedHashSet<DN>();
- for(DN baseDN : newConfiguration.getBaseDN())
- {
- newConfiguredBaseDNs.add(baseDN);
- }
-
+ LinkedHashSet<DN> newConfiguredBaseDNs = new LinkedHashSet<DN>(newConfiguration.getBaseDN());
//Load attribute types from new configuration.
LinkedHashSet<AttributeType> newAttributeTypes =
- new LinkedHashSet<AttributeType>();
- for (AttributeType type : newConfiguration.getAttributeType())
- {
- newAttributeTypes.add(type);
- }
+ new LinkedHashSet<AttributeType>(newConfiguration.getAttributeType());
// Load the attribute-filter mapping
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
index 9d98eac..61b9cd6 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
@@ -758,10 +758,7 @@
{
// Iterate through the set of backends and pick out those that were
// requested.
- HashSet<String> requestedBackends =
- new HashSet<String>(backendList.size());
- requestedBackends.addAll(backendID.getValues());
-
+ HashSet<String> requestedBackends = new HashSet<String>(backendID.getValues());
for (int i=0; i < numBackends; i++)
{
Backend<?> b = backendList.get(i);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
index 4525d7b..73cf63a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
@@ -679,10 +679,7 @@
}
ArrayList<String> trailingArgs = argParser.getTrailingArguments();
- for(String s : trailingArgs)
- {
- dnStrings.add(s);
- }
+ dnStrings.addAll(trailingArgs);
// Set the connection options.
// Parse the SASL properties.
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
index 1627a8c..c072b8d 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
@@ -1117,12 +1117,7 @@
return CLIENT_SIDE_PARAM_ERROR;
}
}
- // The rest are attributes
- for(String s : filterAndAttributeStrings)
- {
- attributes.add(s);
- }
-
+ attributes.addAll(filterAndAttributeStrings);
}
if(bindPassword.isPresent() && bindPasswordFile.isPresent())
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
index 3316ea9..263eacc 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
@@ -82,10 +82,7 @@
this.attributes = new ArrayList<Attribute>(attributes.size());
for (List<Attribute> list : attributes.values())
{
- for (Attribute a : list)
- {
- this.attributes.add(a);
- }
+ this.attributes.addAll(list);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
index 11587c9..4aebee9 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
@@ -834,8 +834,7 @@
public Object[][] invalidAcis() throws Exception {
TestCaseUtils.startServer(); // This appears to be necessary since the DataProviders can be called before @BeforeClass.
- List<String> invalid = new ArrayList<String>();
- invalid.addAll(Arrays.asList(INVALID_ACIS));
+ List<String> invalid = new ArrayList<String>(Arrays.asList(INVALID_ACIS));
for (String[] aciAndMask: INVALID_ACIS_IF_ANY_CHAR_REMOVED) {
invalid.addAll(getAciMissingCharCombos(aciAndMask[0], aciAndMask[1]));
}
@@ -1737,22 +1736,6 @@
}
}
- private List<SingleSearchParams> explodeTestParams() throws Exception {
- List<SingleSearchParams> explodedTests = new ArrayList<SingleSearchParams>();
-
- for (SingleSearchParams searchTest: _searchTests) {
- // Add the search test as is.
- explodedTests.add(searchTest);
-
- // Enabling this doubles the number of test cases without much benefit, so we disable it for now
- // And add it with the ACIs merged into the initial import
- // String ditWithAcis = applyChangesToLdif(searchTest._initialDitLdif, searchTest._aciLdif);
- // explodedTests.add(searchTest.clone(ditWithAcis, ""));
- }
-
- return explodedTests;
- }
-
/**
* @return the LDIF result of applying changesLdif to changesLdif
*/
@@ -1780,8 +1763,7 @@
List<Object[]> allTestParams = new ArrayList<Object[]>();
for (SearchTestParams testParams: SEARCH_TEST_PARAMS) {
- List<SingleSearchParams> explodedTests = testParams.explodeTestParams();
- for (SingleSearchParams singleTest: explodedTests) {
+ for (SingleSearchParams singleTest: testParams._searchTests) {
allTestParams.add(new Object[]{singleTest});
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
index 2b42ea7..b866a04 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
@@ -36,14 +36,11 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.util.Platform;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
-
-
/**
* This class defines a set of tests for the org.opends.server.core.DN
* class.
@@ -568,15 +565,8 @@
@DataProvider(name = "namingContexts")
public Object[][] getNamingContexts() {
ArrayList<DN> contextList = new ArrayList<DN>();
- for (DN baseDN : DirectoryServer.getPublicNamingContexts().keySet())
- {
- contextList.add(baseDN);
- }
-
- for (DN baseDN : DirectoryServer.getPrivateNamingContexts().keySet())
- {
- contextList.add(baseDN);
- }
+ contextList.addAll(DirectoryServer.getPublicNamingContexts().keySet());
+ contextList.addAll(DirectoryServer.getPrivateNamingContexts().keySet());
Object[][] contextArray = new Object[contextList.size()][1];
for (int i=0; i < contextArray.length; i++)
--
Gitblit v1.10.0