From e79461c53adce17f83f30954f8a03d67bb761a1f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 06 Jul 2015 15:42:24 +0000
Subject: [PATCH] AutoRefactor'ed Use Diamond Operator
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 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 d721a0c..62da6e5 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
@@ -153,7 +153,7 @@
final File importLDIFPath = new File(binPath, isWindows() ? Installation.WINDOWS_IMPORT_LDIF
: Installation.UNIX_IMPORT_LDIF);
- final ArrayList<String> argList = new ArrayList<String>();
+ final ArrayList<String> argList = new ArrayList<>();
argList.add(Utils.getScriptPath(importLDIFPath.getAbsolutePath()));
argList.addAll(Arrays.asList(args));
logger.info(LocalizableMessage.raw("import-ldif arg list: " + argList));
@@ -387,12 +387,7 @@
RootCfgClient root = mCtx.getRootConfiguration();
BackendCfgClient backend = root.createBackend(backendType, backendName, null);
backend.setEnabled(true);
- Set<DN> setBaseDNs = new HashSet<DN>();
- for (String baseDN : baseDNs)
- {
- setBaseDNs.add(DN.valueOf(baseDN));
- }
- backend.setBaseDN(setBaseDNs);
+ backend.setBaseDN(toByteStrings(baseDNs));
backend.setBackendId(backendName);
backend.setWritabilityMode(BackendCfgDefn.WritabilityMode.ENABLED);
backend.commit();
@@ -404,6 +399,16 @@
}
}
+ private Set<DN> toByteStrings(Set<String> strings) throws DirectoryException
+ {
+ Set<DN> results = new HashSet<>();
+ for (String s : strings)
+ {
+ results.add(DN.valueOf(s));
+ }
+ return results;
+ }
+
/**
* Sets the base DNs on a given backend.
* @param ctx the connection to the server.
@@ -425,12 +430,7 @@
JNDIDirContextAdaptor.adapt(ctx));
RootCfgClient root = mCtx.getRootConfiguration();
BackendCfgClient backend = root.getBackend(backendName);
- Set<DN> setBaseDNs = new HashSet<DN>();
- for (String baseDN : baseDNs)
- {
- setBaseDNs.add(DN.valueOf(baseDN));
- }
- backend.setBaseDN(setBaseDNs);
+ backend.setBaseDN(toByteStrings(baseDNs));
backend.commit();
}
catch (Throwable t)
@@ -565,9 +565,9 @@
Set<String> servers = replicationServer.getReplicationServer();
if (servers == null)
{
- servers = new HashSet<String>();
+ servers = new HashSet<>();
}
- Set<String> oldServers = new HashSet<String>(servers);
+ Set<String> oldServers = new HashSet<>(servers);
for (Set<String> rs : replicationServers.values())
{
servers.addAll(rs);
@@ -586,7 +586,7 @@
{
domainNames = new String[]{};
}
- Set<ConfiguredDomain> domainsConf = new HashSet<ConfiguredDomain>();
+ Set<ConfiguredDomain> domainsConf = new HashSet<>();
ReplicationDomainCfgClient[] domains =
new ReplicationDomainCfgClient[domainNames.length];
for (int i=0; i<domains.length; i++)
@@ -626,7 +626,7 @@
oldServers = domain.getReplicationServer();
if (oldServers == null)
{
- oldServers = new TreeSet<String>();
+ oldServers = new TreeSet<>();
}
servers = replicationServers.get(dn);
domain.setReplicationServer(servers);
@@ -654,7 +654,7 @@
private Set<String> intersect(Set<String> set1, Set<String> set2)
{
- Set<String> result = new TreeSet<String>(set1);
+ Set<String> result = new TreeSet<>(set1);
result.removeAll(set2);
return result;
}
@@ -908,7 +908,7 @@
// Try to transform things if necessary. The following map has as key
// the original JavaArgument object and as value the 'transformed' JavaArgument.
- Map<JavaArguments, JavaArguments> hmJavaArguments = new HashMap<JavaArguments, JavaArguments>();
+ Map<JavaArguments, JavaArguments> hmJavaArguments = new HashMap<>();
for (String script : uData.getScriptNamesForJavaArguments())
{
JavaArguments origJavaArguments = uData.getJavaArguments(script);
@@ -931,8 +931,8 @@
}
Properties fileProperties = getJavaPropertiesFileContents(getPropertiesFileName(installPath));
- Map<String, JavaArguments> args = new HashMap<String, JavaArguments>();
- Map<String, String> otherProperties = new HashMap<String, String>();
+ Map<String, JavaArguments> args = new HashMap<>();
+ Map<String, String> otherProperties = new HashMap<>();
for (String script : uData.getScriptNamesForJavaArguments())
{
@@ -1048,7 +1048,7 @@
private List<String> getJavaPropertiesFileComments(String propertiesFile) throws IOException
{
- ArrayList<String> commentLines = new ArrayList<String>();
+ ArrayList<String> commentLines = new ArrayList<>();
BufferedReader reader = new BufferedReader(new FileReader(propertiesFile));
String line;
while ((line = reader.readLine()) != null)
--
Gitblit v1.10.0