From b8f523c95f4fd5fc705f2c6c2a2d98217b9da450 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 21 Apr 2015 20:10:37 +0000
Subject: [PATCH] Converted use of Collection.size() to Collection.isEmpty().
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java | 85 ++++++++++++++++++------------------------
1 files changed, 37 insertions(+), 48 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
index 305d164..e75feb6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
@@ -24,7 +24,6 @@
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2014 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.datamodel;
import java.io.File;
@@ -969,62 +968,33 @@
private static String getURL(ServerDescriptor server,
ConnectionHandlerDescriptor.Protocol protocol)
{
+ String sProtocol = toString(protocol);
+
String url = null;
-
- String sProtocol = null;
- switch (protocol)
- {
- case LDAP:
- sProtocol = "ldap";
- break;
- case LDAPS:
- sProtocol = "ldaps";
- break;
- case LDAP_STARTTLS:
- sProtocol = "ldap";
- break;
- case JMX:
- sProtocol = "jmx";
- break;
- case JMXS:
- sProtocol = "jmxs";
- break;
- }
-
for (ConnectionHandlerDescriptor desc : server.getConnectionHandlers())
{
if ((desc.getState() == ConnectionHandlerDescriptor.State.ENABLED) &&
(desc.getProtocol() == protocol))
{
int port = desc.getPort();
- SortedSet<InetAddress> addresses = desc.getAddresses();
- if (addresses.size() == 0)
+ if (port > 0)
{
- if (port > 0)
+ if (server.isLocal())
{
- if (server.isLocal())
+ SortedSet<InetAddress> addresses = desc.getAddresses();
+ if (addresses.isEmpty())
{
url = sProtocol +"://localhost:"+port;
}
else
{
- url = sProtocol + "://" + getHostNameForLdapUrl(server.getHostname()) + ":" + port;
- }
- }
- }
- else
- {
- if (port > 0)
- {
- if (server.isLocal())
- {
InetAddress address = addresses.first();
url = sProtocol + "://" + getHostNameForLdapUrl(address.getHostAddress()) + ":" + port;
}
- else
- {
- url = sProtocol + "://" + getHostNameForLdapUrl(server.getHostname()) + ":" + port;
- }
+ }
+ else
+ {
+ url = sProtocol + "://" + getHostNameForLdapUrl(server.getHostname()) + ":" + port;
}
}
}
@@ -1032,6 +1002,25 @@
return url;
}
+ private static String toString(ConnectionHandlerDescriptor.Protocol protocol)
+ {
+ switch (protocol)
+ {
+ case LDAP:
+ return "ldap";
+ case LDAPS:
+ return "ldaps";
+ case LDAP_STARTTLS:
+ return "ldap";
+ case JMX:
+ return "jmx";
+ case JMXS:
+ return "jmxs";
+ default:
+ return null;
+ }
+ }
+
/**
* Returns the Administration Connector URL.
* It returns <CODE>null</CODE> if URL for the
@@ -1045,15 +1034,15 @@
{
int port = desc.getPort();
SortedSet<InetAddress> addresses = desc.getAddresses();
- if (addresses.size() == 0) {
- if (port > 0) {
- return getLDAPUrl("localhost", port, true);
+ if (port > 0) {
+ if (!addresses.isEmpty())
+ {
+ String hostAddr = addresses.first().getHostAddress();
+ return getLDAPUrl(hostAddr, port, true);
}
- } else {
- if (port > 0) {
- InetAddress address = addresses.first();
- String a = address.getHostAddress();
- return getLDAPUrl(a, port, true);
+ else
+ {
+ return getLDAPUrl("localhost", port, true);
}
}
}
--
Gitblit v1.10.0