From bff31c7e9267ee781127eb2f8bc91f339c4800e9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 Mar 2015 08:27:50 +0000
Subject: [PATCH] Installer.java: Deduplicated code a bit more by extracting another addCertificateArguments() method
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 75 ++++++++++++++-----------------------
1 files changed, 29 insertions(+), 46 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index c0a8c30..2143d9c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -26,6 +26,8 @@
*/
package org.opends.quicksetup.installer;
+import static com.forgerock.opendj.cli.Utils.*;
+
import static org.forgerock.util.Utils.*;
import static org.opends.admin.ads.ServerDescriptor.*;
import static org.opends.admin.ads.ServerDescriptor.ServerProperty.*;
@@ -34,8 +36,6 @@
import static org.opends.quicksetup.Step.*;
import static org.opends.quicksetup.util.Utils.*;
-import static com.forgerock.opendj.cli.Utils.*;
-
import java.awt.event.WindowEvent;
import java.io.BufferedWriter;
import java.io.File;
@@ -1051,56 +1051,20 @@
argList.add("cn=JKS,cn=Trust Manager Providers,cn=config");
break;
case JKS:
- argList.add("-k");
- argList.add("cn=JKS,cn=Key Manager Providers,cn=config");
- argList.add("-t");
- argList.add("cn=JKS,cn=Trust Manager Providers,cn=config");
- argList.add("-m");
- argList.add(sec.getKeystorePath());
- if (aliasInKeyStore != null)
- {
- argList.add("-a");
- argList.add(aliasInKeyStore);
- }
+ addCertificateArguments(argList, sec, aliasInKeyStore, "cn=JKS,cn=Key Manager Providers,cn=config",
+ "cn=JKS,cn=Trust Manager Providers,cn=config");
break;
case JCEKS:
- argList.add("-k");
- argList.add("cn=JCEKS,cn=Key Manager Providers,cn=config");
- argList.add("-t");
- argList.add("cn=JCEKS,cn=Trust Manager Providers,cn=config");
- argList.add("-m");
- argList.add(sec.getKeystorePath());
- if (aliasInKeyStore != null)
- {
- argList.add("-a");
- argList.add(aliasInKeyStore);
- }
+ addCertificateArguments(argList, sec, aliasInKeyStore, "cn=JCEKS,cn=Key Manager Providers,cn=config",
+ "cn=JCEKS,cn=Trust Manager Providers,cn=config");
break;
case PKCS12:
- argList.add("-k");
- argList.add("cn=PKCS12,cn=Key Manager Providers,cn=config");
- argList.add("-t");
- // We are going to import the PCKS12 certificate in a JKS trust store
- argList.add("cn=JKS,cn=Trust Manager Providers,cn=config");
- argList.add("-m");
- argList.add(sec.getKeystorePath());
- if (aliasInKeyStore != null)
- {
- argList.add("-a");
- argList.add(aliasInKeyStore);
- }
+ addCertificateArguments(argList, sec, aliasInKeyStore, "cn=PKCS12,cn=Key Manager Providers,cn=config",
+ "cn=JKS,cn=Trust Manager Providers,cn=config");
break;
case PKCS11:
- argList.add("-k");
- argList.add("cn=PKCS11,cn=Key Manager Providers,cn=config");
- argList.add("-t");
- // We are going to import the PCKS11 certificate in a JKS trust store
- argList.add("cn=JKS,cn=Trust Manager Providers,cn=config");
- if (aliasInKeyStore != null)
- {
- argList.add("-a");
- argList.add(aliasInKeyStore);
- }
+ addCertificateArguments(argList, null, aliasInKeyStore, "cn=PKCS11,cn=Key Manager Providers,cn=config",
+ "cn=JKS,cn=Trust Manager Providers,cn=config");
break;
case NO_CERTIFICATE:
// Nothing to do.
@@ -1110,6 +1074,25 @@
}
}
+ private void addCertificateArguments(List<String> argList, SecurityOptions sec, String aliasInKeyStore,
+ String keyStoreDN, String trustStoreDN)
+ {
+ argList.add("-k");
+ argList.add(keyStoreDN);
+ argList.add("-t");
+ argList.add(trustStoreDN);
+ if (sec != null)
+ {
+ argList.add("-m");
+ argList.add(sec.getKeystorePath());
+ }
+ if (aliasInKeyStore != null)
+ {
+ argList.add("-a");
+ argList.add(aliasInKeyStore);
+ }
+ }
+
/**
* This methods creates the base entry for the suffix based on the contents of
* the UserData object provided in the constructor.
--
Gitblit v1.10.0