From c8a1bec908f144ebacb97ba6c591eaf0f47779f6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Aug 2016 07:26:19 +0000
Subject: [PATCH] Replase use of String ldapUrl by HostPort
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java | 69 ++++++++++------------------------
1 files changed, 21 insertions(+), 48 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
index 2326c9f..b8a9e63 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
@@ -19,12 +19,9 @@
import java.util.Collections;
import java.util.Set;
+import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
-import org.forgerock.opendj.ldap.responses.SearchResultEntry;
-import org.opends.server.types.HostPort;
-
-import com.forgerock.opendj.cli.Utils;
/**
* Class providing some utilities to create LDAP connections using JNDI and
@@ -38,41 +35,17 @@
}
/**
- * Returns the LDAP URL for the provided parameters.
- * @param hostPort the host name and LDAP port.
- * @param useLdaps whether to use LDAPS.
- * @return the LDAP URL for the provided parameters.
- */
- public static String getLDAPUrl(HostPort hostPort, boolean useLdaps)
- {
- return getLDAPUrl(hostPort.getHost(), hostPort.getPort(), useLdaps);
- }
-
- /**
- * Returns the LDAP URL for the provided parameters.
- * @param host the host name.
- * @param port the LDAP port.
- * @param useLdaps whether to use LDAPS.
- * @return the LDAP URL for the provided parameters.
- */
- public static String getLDAPUrl(String host, int port, boolean useLdaps)
- {
- host = Utils.getHostNameForLdapUrl(host);
- return (useLdaps ? "ldaps" : "ldap") + "://" + host + ":" + port;
- }
-
- /**
* Returns the first attribute value in this attribute decoded as a UTF-8 string.
*
- * @param sr
- * the search result entry
+ * @param entry
+ * the entry
* @param attrDesc
* the attribute description
* @return The first attribute value in this attribute decoded as a UTF-8 string.
*/
- public static String firstValueAsString(Entry sr, String attrDesc)
+ public static String firstValueAsString(Entry entry, String attrDesc)
{
- org.forgerock.opendj.ldap.Attribute attr = sr.getAttribute(attrDesc);
+ Attribute attr = entry.getAttribute(attrDesc);
return (attr != null && !attr.isEmpty()) ? attr.firstValueAsString() : null;
}
@@ -80,15 +53,15 @@
* Returns the first value decoded as an Integer, or {@code null} if the attribute does not
* contain any values.
*
- * @param sr
- * the search result entry
+ * @param entry
+ * the entry
* @param attrDesc
* the attribute description
* @return The first value decoded as an Integer.
*/
- public static Integer asInteger(SearchResultEntry sr, String attrDesc)
+ public static Integer asInteger(Entry entry, String attrDesc)
{
- org.forgerock.opendj.ldap.Attribute attr = sr.getAttribute(attrDesc);
+ Attribute attr = entry.getAttribute(attrDesc);
return attr != null ? attr.parse().asInteger() : null;
}
@@ -96,47 +69,47 @@
* Returns the first value decoded as a Boolean, or {@code null} if the attribute does not contain
* any values.
*
- * @param sr
- * the search result entry
+ * @param entry
+ * the entry
* @param attrDesc
* the attribute description
* @return The first value decoded as an Boolean.
*/
- public static Boolean asBoolean(SearchResultEntry sr, String attrDesc)
+ public static Boolean asBoolean(Entry entry, String attrDesc)
{
- org.forgerock.opendj.ldap.Attribute attr = sr.getAttribute(attrDesc);
+ Attribute attr = entry.getAttribute(attrDesc);
return attr != null ? attr.parse().asBoolean() : null;
}
/**
* Returns the values decoded as a set of Strings.
*
- * @param sr
- * the search result entry
+ * @param entry
+ * the entry
* @param attrDesc
* the attribute description
* @return The values decoded as a set of Strings. Never {@code null} and never contains
* {@code null} values.
*/
- public static Set<String> asSetOfString(SearchResultEntry sr, String attrDesc)
+ public static Set<String> asSetOfString(Entry entry, String attrDesc)
{
- org.forgerock.opendj.ldap.Attribute attr = sr.getAttribute(attrDesc);
+ Attribute attr = entry.getAttribute(attrDesc);
return attr != null ? attr.parse().asSetOfString() : Collections.<String> emptySet();
}
/**
* Returns the values decoded as a set of DNs.
*
- * @param sr
- * the search result entry
+ * @param entry
+ * the entry
* @param attrDesc
* the attribute description
* @return The values decoded as a set of DNs. Never {@code null} and never contains {@code null}
* values.
*/
- public static Set<DN> asSetOfDN(SearchResultEntry sr, String attrDesc)
+ public static Set<DN> asSetOfDN(Entry entry, String attrDesc)
{
- org.forgerock.opendj.ldap.Attribute attr = sr.getAttribute(attrDesc);
+ Attribute attr = entry.getAttribute(attrDesc);
return attr != null ? attr.parse().asSetOfDN() : Collections.<DN> emptySet();
}
}
--
Gitblit v1.10.0