From 609077ed606e3b094e303f298e8dca10567bc3e2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:42:07 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 2099c45..160e745 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -54,7 +54,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-import javax.naming.NamingException;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.ImageIcon;
@@ -128,6 +127,7 @@
 import org.opends.server.core.LockFileManager;
 import org.opends.server.core.ServerContext;
 import org.opends.server.schema.SchemaConstants;
+import org.opends.server.types.HostPort;
 import org.opends.server.types.OpenDsException;
 import org.opends.server.types.Schema;
 import org.opends.server.util.SchemaUtils;
@@ -2115,16 +2115,14 @@
    * @param bindDN the base DN to be used to bind.
    * @param pwd the password to be used to bind.
    * @return the connection to the server.
-   * @throws NamingException if there was a problem connecting to the server
-   * or the provided credentials do not have enough rights.
    * @throws IOException if there was a problem connecting to the server
    * or the provided credentials do not have enough rights.
    * @throws ConfigReadException if there is an error reading the configuration.
    */
   public static ConnectionWrapper getAdminDirContext(ControlPanelInfo controlInfo, DN bindDN, String pwd)
-      throws NamingException, IOException, ConfigReadException
+      throws IOException, ConfigReadException
   {
-    return createConnection(controlInfo.getAdminConnectorURL(), LDAPS, bindDN, pwd, controlInfo);
+    return createConnection(controlInfo.getAdminConnectorHostPort(), LDAPS, bindDN, pwd, controlInfo);
   }
 
   /**
@@ -2136,38 +2134,36 @@
    * @param bindDN the base DN to be used to bind.
    * @param pwd the password to be used to bind.
    * @return the connection to the server.
-   * @throws NamingException if there was a problem connecting to the server
-   * or the provided credentials do not have enough rights.
    * @throws IOException if there was a problem connecting to the server
    * or the provided credentials do not have enough rights.
    * @throws ConfigReadException if there is an error reading the configuration.
    */
   public static ConnectionWrapper getUserDataDirContext(ControlPanelInfo controlInfo,
-      DN bindDN, String pwd) throws NamingException, IOException, ConfigReadException
+      DN bindDN, String pwd) throws IOException, ConfigReadException
   {
     if (controlInfo.connectUsingStartTLS())
     {
-      return createConnection(controlInfo.getStartTLSURL(), START_TLS, bindDN, pwd, controlInfo);
+      return createConnection(controlInfo.getStartTlsHostPort(), START_TLS, bindDN, pwd, controlInfo);
     }
     else if (controlInfo.connectUsingLDAPS())
     {
-      return createConnection(controlInfo.getLDAPSURL(), LDAPS, bindDN, pwd, controlInfo);
+      return createConnection(controlInfo.getLdapsHostPort(), LDAPS, bindDN, pwd, controlInfo);
     }
     else
     {
-      return createConnection(controlInfo.getLDAPURL(), LDAP, bindDN, pwd, controlInfo);
+      return createConnection(controlInfo.getLdapHostPort(), LDAP, bindDN, pwd, controlInfo);
     }
   }
 
-  private static ConnectionWrapper createConnection(String usedUrl, Type connectionType, DN bindDN, String bindPwd,
-      ControlPanelInfo controlInfo) throws NamingException, IOException, ConfigReadException
+  private static ConnectionWrapper createConnection(HostPort hostPort, Type connectionType, DN bindDN, String bindPwd,
+      ControlPanelInfo controlInfo) throws IOException, ConfigReadException
   {
-    if (usedUrl == null)
+    if (hostPort == null)
     {
       throw new ConfigReadException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
     }
 
-    ConnectionWrapper conn = new ConnectionWrapper(usedUrl, connectionType,
+    ConnectionWrapper conn = new ConnectionWrapper(hostPort, connectionType,
         bindDN, bindPwd, controlInfo.getConnectTimeout(), controlInfo.getTrustManager());
     checkCanReadConfig(conn);
     return conn;
@@ -2195,10 +2191,8 @@
    *
    * @param connWrapper
    *          the connection to be "pinged".
-   * @throws NamingException
-   *           if the ping could not be performed.
    */
-  public static void ping(ConnectionWrapper connWrapper) throws NamingException
+  public static void ping(ConnectionWrapper connWrapper)
   {
     SearchRequest request = newSearchRequest("", BASE_OBJECT, "objectClass=*", NO_ATTRIBUTES)
         .setSizeLimit(0)

--
Gitblit v1.10.0