From 98e8aab354a385055392de7154758c1890a3265a 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-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
index 700fbf9..132c9b2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/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.
--
Gitblit v1.10.0