From f298aaee8802d3eaad4ff712ed088546586388d8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 24 Oct 2014 09:47:16 +0000
Subject: [PATCH] More code cleanup of ReplicationCliMain Removed utility methods that are just forwarding to other utility methods. Removed methods that have been ported to com.forgerock.opendj.cli.Utils.
---
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ServerLoader.java | 114 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ServerLoader.java b/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ServerLoader.java
index fc5e8d6..8880b91 100644
--- a/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ServerLoader.java
+++ b/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ServerLoader.java
@@ -24,16 +24,12 @@
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2013-2014 ForgeRock AS.
*/
-
package org.opends.admin.ads.util;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
import javax.naming.AuthenticationException;
import javax.naming.NamingException;
import javax.naming.NoPermissionException;
@@ -41,13 +37,18 @@
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapName;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.admin.ads.ADSContext;
+import org.opends.admin.ads.ADSContext.ServerProperty;
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.TopologyCacheException;
+import org.opends.admin.ads.TopologyCacheException.Type;
import org.opends.admin.ads.TopologyCacheFilter;
-import org.opends.admin.ads.ADSContext.ServerProperty;
-import static org.opends.server.util.StaticUtils.close;
+import com.forgerock.opendj.cli.Utils;
+
+import static org.opends.server.util.StaticUtils.*;
/**
* Class used to load the configuration of a server. Basically the code
@@ -129,9 +130,8 @@
return lastException;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void interrupt()
{
if (!isOver)
@@ -158,6 +158,7 @@
/**
* The method where we try to generate the ServerDescriptor object.
*/
+ @Override
public void run()
{
lastException = null;
@@ -209,20 +210,11 @@
{
logger.warn(LocalizableMessage.raw(
"NamingException error reading server: "+getLastLdapUrl(), ne));
- if (ctx == null)
- {
- lastException =
- new TopologyCacheException(
- TopologyCacheException.Type.GENERIC_CREATING_CONNECTION, ne,
- trustManager, getLastLdapUrl());
- }
- else
- {
- lastException =
- new TopologyCacheException(
- TopologyCacheException.Type.GENERIC_READING_SERVER, ne,
- trustManager, getLastLdapUrl());
- }
+ Type type = ctx == null
+ ? TopologyCacheException.Type.GENERIC_CREATING_CONNECTION
+ : TopologyCacheException.Type.GENERIC_READING_SERVER;
+ lastException = new TopologyCacheException(
+ type, ne, trustManager, getLastLdapUrl());
}
catch (Throwable t)
{
@@ -311,15 +303,12 @@
*/
private String getLdapUrl(Map<ServerProperty,Object> serverProperties)
{
- String ldapUrl = null;
- Object v = serverProperties.get(ServerProperty.LDAP_ENABLED);
- boolean ldapEnabled = (v != null) && "true".equalsIgnoreCase(v.toString());
- if (ldapEnabled)
+ if (isLdapEnabled(serverProperties))
{
- ldapUrl = "ldap://"+getHostNameForLdapUrl(serverProperties)+":"+
- serverProperties.get(ServerProperty.LDAP_PORT);
+ return "ldap://" + getHostNameForLdapUrl(serverProperties) + ":"
+ + serverProperties.get(ServerProperty.LDAP_PORT);
}
- return ldapUrl;
+ return null;
}
/**
@@ -332,18 +321,12 @@
*/
private String getStartTlsLdapUrl(Map<ServerProperty,Object> serverProperties)
{
- String ldapUrl = null;
- Object v = serverProperties.get(ServerProperty.LDAP_ENABLED);
- boolean ldapEnabled = (v != null) && "true".equalsIgnoreCase(v.toString());
- v = serverProperties.get(ServerProperty.STARTTLS_ENABLED);
- boolean startTLSEnabled = (v != null) &&
- "true".equalsIgnoreCase(v.toString());
- if (ldapEnabled && startTLSEnabled)
+ if (isLdapEnabled(serverProperties) && isStartTlsEnabled(serverProperties))
{
- ldapUrl = "ldap://"+getHostNameForLdapUrl(serverProperties)+":"+
- serverProperties.get(ServerProperty.LDAP_PORT);
+ return "ldap://" + getHostNameForLdapUrl(serverProperties) + ":"
+ + serverProperties.get(ServerProperty.LDAP_PORT);
}
- return ldapUrl;
+ return null;
}
/**
@@ -356,15 +339,13 @@
*/
private String getLdapsUrl(Map<ServerProperty,Object> serverProperties)
{
- String ldapsUrl = null;
- Object v = serverProperties.get(ServerProperty.LDAPS_ENABLED);
- boolean ldapsEnabled = (v != null) && "true".equalsIgnoreCase(v.toString());
+ boolean ldapsEnabled = isLdapsEnabled(serverProperties);
if (ldapsEnabled)
{
- ldapsUrl = "ldaps://"+getHostNameForLdapUrl(serverProperties)+":"+
- serverProperties.get(ServerProperty.LDAPS_PORT);
+ return "ldaps://" + getHostNameForLdapUrl(serverProperties) + ":"
+ + serverProperties.get(ServerProperty.LDAPS_PORT);
}
- return ldapsUrl;
+ return null;
}
/**
@@ -378,26 +359,44 @@
private String getAdminConnectorUrl(
Map<ServerProperty,Object> serverProperties)
{
- String adminUrl = null;
boolean portDefined;
-
- Object v = serverProperties.get(ServerProperty.ADMIN_ENABLED);
- if ((v != null) && "true".equalsIgnoreCase(String.valueOf(v)))
+ if (isPropertyEnabled(serverProperties, ServerProperty.ADMIN_ENABLED))
{
- v = serverProperties.get(ServerProperty.ADMIN_PORT);
+ Object v = serverProperties.get(ServerProperty.ADMIN_PORT);
portDefined = v != null;
}
else
{
portDefined = false;
}
+
if (portDefined)
{
- adminUrl = "ldaps://"+getHostNameForLdapUrl(serverProperties)+":"+
- serverProperties.get(ServerProperty.ADMIN_PORT);
+ return "ldaps://" + getHostNameForLdapUrl(serverProperties) + ":"
+ + serverProperties.get(ServerProperty.ADMIN_PORT);
}
+ return null;
+ }
- return adminUrl;
+ private boolean isLdapEnabled(Map<ServerProperty, Object> serverProperties)
+ {
+ return isPropertyEnabled(serverProperties, ServerProperty.LDAP_ENABLED);
+ }
+
+ private boolean isLdapsEnabled(Map<ServerProperty, Object> serverProperties)
+ {
+ return isPropertyEnabled(serverProperties, ServerProperty.LDAPS_ENABLED);
+ }
+
+ private boolean isStartTlsEnabled(Map<ServerProperty, Object> serverProperties)
+ {
+ return isPropertyEnabled(serverProperties, ServerProperty.STARTTLS_ENABLED);
+ }
+
+ private boolean isPropertyEnabled(Map<ServerProperty, Object> serverProperties, ServerProperty property)
+ {
+ Object v = serverProperties.get(property);
+ return v != null && "true".equalsIgnoreCase(v.toString());
}
/**
@@ -411,7 +410,7 @@
Map<ServerProperty,Object> serverProperties)
{
String host = (String)serverProperties.get(ServerProperty.HOST_NAME);
- return ConnectionUtils.getHostNameForLdapUrl(host);
+ return Utils.getHostNameForLdapUrl(host);
}
/**
@@ -422,19 +421,18 @@
*/
private boolean isAdministratorDn()
{
- boolean isAdministratorDn = false;
try
{
LdapName theDn = new LdapName(dn);
LdapName containerDn =
new LdapName(ADSContext.getAdministratorContainerDN());
- isAdministratorDn = theDn.startsWith(containerDn);
+ return theDn.startsWith(containerDn);
}
catch (Throwable t)
{
logger.warn(LocalizableMessage.raw("Error parsing authentication DNs.", t));
}
- return isAdministratorDn;
+ return false;
}
/**
--
Gitblit v1.10.0