From 9ddd1c3c61e88d6b0eaac1394b95f0fafa07a216 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 13 Jul 2015 09:59:22 +0000
Subject: [PATCH] Used CollectionUtils.newArrayList() and newLinkedList().
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
index 76a6f5e..44caf3d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
@@ -41,6 +41,7 @@
import org.opends.quicksetup.installer.NewSuffixOptions;
import org.opends.quicksetup.installer.SuffixesToReplicateOptions;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.util.CollectionUtils;
import com.forgerock.opendj.cli.CliConstants;
@@ -51,50 +52,30 @@
public class UserData
{
private String serverLocation;
-
private String hostName;
-
private int serverPort;
-
private int adminConnectorPort;
-
private String directoryManagerDn;
-
private String directoryManagerPwd;
-
private String globalAdministratorUID;
-
private String globalAdministratorPassword;
-
private SecurityOptions securityOptions;
private int serverJMXPort = -1;
private boolean startServer;
-
private boolean stopServer;
-
private boolean enableWindowsService;
+ private boolean createAdministrator;
+ private boolean quiet;
+ private boolean verbose;
+ private boolean interactive;
+ private boolean forceOnError;
private ManagedObjectDefinition<? extends BackendCfgClient, ? extends BackendCfg> backendType;
-
private NewSuffixOptions newSuffixOptions;
-
private DataReplicationOptions replicationOptions;
-
- private boolean createAdministrator;
-
private SuffixesToReplicateOptions suffixesToReplicateOptions;
-
- private final Map<ServerDescriptor, AuthenticationData>
- remoteWithNoReplicationPort;
-
- private boolean quiet;
-
- private boolean verbose;
-
- private boolean interactive;
-
- private boolean forceOnError;
+ private final Map<ServerDescriptor, AuthenticationData> remoteWithNoReplicationPort;
private Map<String, JavaArguments> hmJavaArguments;
private Map<String, JavaArguments> hmDefaultJavaArguments;
@@ -124,8 +105,7 @@
forceOnError = true;
verbose = false;
- LinkedList<String> baseDn = new LinkedList<>();
- baseDn.add("dc=example,dc=com");
+ LinkedList<String> baseDn = CollectionUtils.newLinkedList("dc=example,dc=com");
NewSuffixOptions defaultNewSuffixOptions = NewSuffixOptions.createEmpty(baseDn);
setNewSuffixOptions(defaultNewSuffixOptions);
--
Gitblit v1.10.0