You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/09/09 23:58:43 UTC
svn commit: r1702121 - in /directory/apacheds/trunk:
interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/
interceptors/admin/src/main/java/org/apache/directory/server/core/admin/
ldap-client-test/src/main/java/org/apache/direct...
Author: seelmann
Date: Wed Sep 9 21:58:43 2015
New Revision: 1702121
URL: http://svn.apache.org/r1702121
Log:
Fix checkstyle issues
Modified:
directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/trunk/interceptors/admin/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java
directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HashInterceptorBean.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java
directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/UberjarMain.java
Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Wed Sep 9 21:58:43 2015
@@ -44,7 +44,6 @@ import org.apache.directory.api.util.Str
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.entry.ClonedServerEntry;
import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
-import org.apache.directory.server.core.api.interceptor.Interceptor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -136,8 +135,7 @@ public class KeyDerivationInterceptor ex
Entry entry = addContext.getEntry();
- if ( ( entry.get( USER_PASSWORD_AT ) != null ) &&
- ( entry.get( KRB5_PRINCIPAL_NAME_AT ) != null ) )
+ if ( ( entry.get( USER_PASSWORD_AT ) != null ) && ( entry.get( KRB5_PRINCIPAL_NAME_AT ) != null ) )
{
LOG.debug( "Adding the entry '{}' for Dn '{}'.", entry, normName.getName() );
@@ -248,6 +246,9 @@ public class KeyDerivationInterceptor ex
case REPLACE_ATTRIBUTE:
operation = "Replacing";
break;
+
+ default:
+ throw new IllegalArgumentException( "Unexpected modify operation " + mod.getOperation() );
}
}
Modified: directory/apacheds/trunk/interceptors/admin/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/admin/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/admin/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/admin/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java Wed Sep 9 21:58:43 2015
@@ -20,7 +20,6 @@
package org.apache.directory.server.core.admin;
-import java.net.Authenticator;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
Modified: directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java Wed Sep 9 21:58:43 2015
@@ -37,7 +37,7 @@ import org.apache.directory.server.ldap.
/**
* The Class LdapApiIntegrationUtils.
*/
-public class LdapApiIntegrationUtils
+public final class LdapApiIntegrationUtils
{
/** The Constant DEFAULT_HOST. */
private static final String DEFAULT_HOST = "localhost";
@@ -49,7 +49,12 @@ public class LdapApiIntegrationUtils
private static final String DEFAULT_PASSWORD = "secret";
/** The pools. */
- private static Map<Integer, LdapConnectionPool> pools = new HashMap<Integer, LdapConnectionPool>();
+ private static final Map<Integer, LdapConnectionPool> POOLS = new HashMap<Integer, LdapConnectionPool>();
+
+
+ private LdapApiIntegrationUtils()
+ {
+ }
/**
@@ -131,7 +136,7 @@ public class LdapApiIntegrationUtils
{
int port = ldapServer.getPort();
- if ( !pools.containsKey( port ) )
+ if ( !POOLS.containsKey( port ) )
{
LdapConnectionConfig config = new LdapConnectionConfig();
config.setLdapHost( DEFAULT_HOST );
@@ -141,10 +146,10 @@ public class LdapApiIntegrationUtils
DefaultPoolableLdapConnectionFactory factory = new DefaultPoolableLdapConnectionFactory( config );
LdapConnectionPool pool = new LdapConnectionPool( factory );
pool.setTestOnBorrow( true );
- pools.put( port, pool );
+ POOLS.put( port, pool );
}
- return pools.get( port );
+ return POOLS.get( port );
}
Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java Wed Sep 9 21:58:43 2015
@@ -62,8 +62,13 @@ import org.junit.runner.Description;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ServerAnnotationProcessor
+public final class ServerAnnotationProcessor
{
+ private ServerAnnotationProcessor()
+ {
+ }
+
+
private static void createTransports( LdapServer ldapServer, CreateTransport[] transportBuilders )
{
if ( transportBuilders.length != 0 )
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Wed Sep 9 21:58:43 2015
@@ -183,9 +183,9 @@ public class ConfigPartitionReader
// Now, let's instantiate the associated bean. Get rid of the 'ads-' in front of the name,
// and uppercase the first letter. Finally add "Bean" at the end and add the package.
//String beanName = this.getClass().getPackage().getName() + "org.apache.directory.server.config.beans." + Character.toUpperCase( objectClassName.charAt( 4 ) ) + objectClassName.substring( 5 ) + "Bean";
- String beanName = this.getClass().getPackage().getName() + ".beans." +
- Character.toUpperCase( objectClassName.charAt( ADS_PREFIX.length() ) ) +
- objectClassName.substring( ADS_PREFIX.length() + 1 ) + ADS_SUFFIX;
+ String beanName = this.getClass().getPackage().getName() + ".beans."
+ + Character.toUpperCase( objectClassName.charAt( ADS_PREFIX.length() ) )
+ + objectClassName.substring( ADS_PREFIX.length() + 1 ) + ADS_SUFFIX;
try
{
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java Wed Sep 9 21:58:43 2015
@@ -222,7 +222,7 @@ public class ConfigWriter
}
else
{
- // TODO: throw an exception
+ throw new IllegalStateException( "Missing object class " + objectClass );
}
}
@@ -243,9 +243,9 @@ public class ConfigWriter
ObjectClass objectClass ) throws LdapException
{
ObjectClass topObjectClass = schemaManager.lookupObjectClassRegistry( SchemaConstants.TOP_OC );
- if ( topObjectClass != null )
+ if ( topObjectClass == null )
{
- // TODO throw new exception (there should be a top object class
+ throw new IllegalStateException( "Missing top object class." );
}
if ( topObjectClass.equals( objectClass ) )
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Wed Sep 9 21:58:43 2015
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LdifConfigExtractor
+public final class LdifConfigExtractor
{
public static final String LDIF_CONFIG_FILE = "config.ldif";
@@ -65,6 +65,11 @@ public class LdifConfigExtractor
+ "[/\\Q\\\\E]" + "ou=config.*\\.ldif" );
+ private LdifConfigExtractor()
+ {
+ }
+
+
/**
* Extracts the LDIF files from a Jar file or copies exploded LDIF resources.
*
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HashInterceptorBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HashInterceptorBean.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HashInterceptorBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HashInterceptorBean.java Wed Sep 9 21:58:43 2015
@@ -106,7 +106,8 @@ public class HashInterceptorBean extends
sb.append( tabs ).append( "HashInterceptor :\n" );
sb.append( super.toString( tabs + " " ) );
- if ( hashAlgorithm != null ) {
+ if ( hashAlgorithm != null )
+ {
sb.append( tabs ).append( " hashAlgorithm : " )
.append( hashAlgorithm ).append( "\n" );
}
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java Wed Sep 9 21:58:43 2015
@@ -442,10 +442,10 @@ public class PasswordPolicyBean extends
/**
* @return gives the FQCN of the password validator
*/
- public String getPwdValidator()
+ public String getPwdValidator()
{
- return pwdValidator;
- }
+ return pwdValidator;
+ }
/**
@@ -453,13 +453,13 @@ public class PasswordPolicyBean extends
*
* @param pwdValidator the FQCN of the password validator
*/
- public void setPwdValidator(String pwdValidator)
- {
- this.pwdValidator = pwdValidator;
- }
+ public void setPwdValidator( String pwdValidator )
+ {
+ this.pwdValidator = pwdValidator;
+ }
- /**
+ /**
* {@inheritDoc}
*/
public String toString( String tabs )
Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Wed Sep 9 21:58:43 2015
@@ -29,8 +29,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Entry;
@@ -291,24 +289,25 @@ public class ApacheDS
*/
private Dn buildProtectedFileEntryDn( File ldif ) throws Exception
{
- String fileSep = File.separatorChar == '\\' ?
- ApacheSchemaConstants.WINDOWS_FILE_AT :
- ApacheSchemaConstants.UNIX_FILE_AT;
-
- return new Dn( fileSep +
- "=" +
- Strings.dumpHexPairs( Strings.getBytesUtf8( getCanonical( ldif ) ) ) +
- "," +
- ServerDNConstants.LDIF_FILES_DN );
+ String fileSep = File.separatorChar == '\\'
+ ? ApacheSchemaConstants.WINDOWS_FILE_AT
+ : ApacheSchemaConstants.UNIX_FILE_AT;
+
+ return new Dn( fileSep
+ + "="
+ + Strings.dumpHexPairs( Strings.getBytesUtf8( getCanonical( ldif ) ) )
+ + ","
+ + ServerDNConstants.LDIF_FILES_DN );
}
private void addFileEntry( File ldif ) throws Exception
{
- String rdnAttr = File.separatorChar == '\\' ?
- ApacheSchemaConstants.WINDOWS_FILE_AT :
- ApacheSchemaConstants.UNIX_FILE_AT;
- String oc = File.separatorChar == '\\' ? ApacheSchemaConstants.WINDOWS_FILE_OC
+ String rdnAttr = File.separatorChar == '\\'
+ ? ApacheSchemaConstants.WINDOWS_FILE_AT
+ : ApacheSchemaConstants.UNIX_FILE_AT;
+ String oc = File.separatorChar == '\\'
+ ? ApacheSchemaConstants.WINDOWS_FILE_OC
: ApacheSchemaConstants.UNIX_FILE_OC;
Entry entry = directoryService.newEntry( buildProtectedFileEntryDn( ldif ) );
Modified: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java (original)
+++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java Wed Sep 9 21:58:43 2015
@@ -33,7 +33,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.api.ldap.model.ldif.LdapLdifException;
@@ -47,7 +46,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.util.Strings;
-import org.apache.directory.server.config.ConfigSchemaConstants;
import org.apache.directory.server.config.ConfigurationException;
import org.apache.directory.server.config.beans.AuthenticationInterceptorBean;
import org.apache.directory.server.config.beans.AuthenticatorBean;
@@ -104,6 +102,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.impl.btree.mavibot.MavibotIndex;
import org.apache.directory.server.core.partition.impl.btree.mavibot.MavibotPartition;
import org.apache.directory.server.core.partition.impl.btree.mavibot.MavibotRdnIndex;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.integration.http.HttpServer;
import org.apache.directory.server.integration.http.WebApp;
import org.apache.directory.server.kerberos.ChangePasswordConfig;
@@ -135,7 +134,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ServiceBuilder
+public final class ServiceBuilder
{
/** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ServiceBuilder.class );
@@ -155,6 +154,11 @@ public class ServiceBuilder
};
+ private ServiceBuilder()
+ {
+ }
+
+
/**
* Creates the Interceptor instances from the configuration
*
@@ -186,11 +190,13 @@ public class ServiceBuilder
interceptorBean.getInterceptorClassName() );
Class<?> clazz = Class.forName( interceptorBean.getInterceptorClassName() );
Interceptor interceptor = null;
- try {
+ try
+ {
Constructor<?> constructor = clazz.getDeclaredConstructor( interceptorBean.getClass() );
- interceptor = (Interceptor) constructor.newInstance( interceptorBean );
+ interceptor = ( Interceptor ) constructor.newInstance( interceptorBean );
}
- catch ( NoSuchMethodException e ) {
+ catch ( NoSuchMethodException e )
+ {
interceptor = ( Interceptor ) Class.forName( interceptorBean.getInterceptorClassName() )
.newInstance();
}
@@ -1241,13 +1247,13 @@ public class ServiceBuilder
boolean hasReverse = jdbmIndexBean.getIndexHasReverse();
- if ( jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT ) ||
- jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
+ if ( jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT )
+ || jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
{
index = new JdbmRdnIndex();
}
- else if ( jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT ) ||
- jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) )
+ else if ( jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT )
+ || jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) )
{
index = new JdbmDnIndex( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
}
@@ -1452,7 +1458,7 @@ public class ServiceBuilder
if ( systemPartition == null )
{
- //throw new Exception( I18n.err( I18n.ERR_505 ) );
+ throw new Exception( I18n.err( I18n.ERR_505 ) );
}
directoryService.setSystemPartition( systemPartition );
@@ -1499,13 +1505,9 @@ public class ServiceBuilder
}
// Enabled
- if ( !directoryServiceBean.isEnabled() )
- {
- // will only be useful if we ever allow more than one DS to be configured and
- // switch between them
- // decide which one to use based on this flag
- // TODO
- }
+ // if ( !directoryServiceBean.isEnabled() )
+ // TODO will only be useful if we ever allow more than one DS to be configured and
+ // switch between them decide which one to use based on this flag
return directoryService;
}
@@ -1589,13 +1591,13 @@ public class ServiceBuilder
boolean hasReverse = mavobotIndexBean.getIndexHasReverse();
- if ( mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT ) ||
- mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
+ if ( mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT )
+ || mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
{
index = new MavibotRdnIndex();
}
- else if ( mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT ) ||
- mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) )
+ else if ( mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT )
+ || mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) )
{
index = new MavibotDnIndex( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
}
Modified: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java (original)
+++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java Wed Sep 9 21:58:43 2015
@@ -162,14 +162,14 @@ public class ConfigChangeListener extend
{
bean = ( PasswordPolicyBean ) cpReader.readConfig( entry );
}
- catch( Exception e )
+ catch ( Exception e )
{
LOG.warn( "Failed to read the updated ppolicy configuration from {}", dn );
- LOG.warn("", e);
+ LOG.warn( "", e );
return;
}
- if( bean.isDisabled() )
+ if ( bean.isDisabled() )
{
LOG.debug( "Deleting disabled ppolicy config {}", dn );
ppolicyConfigContainer.removePolicyConfig( dn );
@@ -180,7 +180,7 @@ public class ConfigChangeListener extend
PasswordPolicyConfiguration existing = ppolicyConfigContainer.getPolicyConfig( dn );
- if( existing == null )
+ if ( existing == null )
{
LOG.debug( "Adding ppolicy config {}", dn );
}
Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/UberjarMain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/UberjarMain.java?rev=1702121&r1=1702120&r2=1702121&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/UberjarMain.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/UberjarMain.java Wed Sep 9 21:58:43 2015
@@ -59,13 +59,13 @@ public class UberjarMain
*/
public static void main( String[] args ) throws Exception
{
- if ( (args == null) || (args.length < 1) )
+ if ( ( args == null ) || ( args.length < 1 ) )
{
throw new IllegalArgumentException( "Instance directory argument is missing" );
}
String instanceDirectory = args[0];
- Action action = (args.length == 2) ? Action.fromString( args[1] ) : Action.START;
+ Action action = ( args.length == 2 ) ? Action.fromString( args[1] ) : Action.START;
UberjarMain instance = new UberjarMain();
@@ -76,16 +76,19 @@ public class UberjarMain
instance.start( instanceDirectory );
break;
-
+
case STOP:
LOG.debug( "Stopping runtime" );
InstanceLayout layout = new InstanceLayout( instanceDirectory );
- try (Socket socket = new Socket( "localhost", readShutdownPort( layout ) );
- PrintWriter writer = new PrintWriter( socket.getOutputStream() ))
+ try ( Socket socket = new Socket( "localhost", readShutdownPort( layout ) );
+ PrintWriter writer = new PrintWriter( socket.getOutputStream() ) )
{
writer.print( readShutdownPassword( layout ) );
}
break;
+
+ default:
+ throw new IllegalArgumentException( "Unexpected action " + action );
}
LOG.trace( "Exiting main" );
@@ -95,7 +98,7 @@ public class UberjarMain
private int getShutdownPort()
{
int shutdownPort = Integer.parseInt( System.getProperty( PROPERTY_SHUTDOWN_PORT, "0" ) );
- if ( shutdownPort < 0 || (shutdownPort > 0 && shutdownPort < 1024) || shutdownPort > 65536 )
+ if ( shutdownPort < 0 || ( shutdownPort > 0 && shutdownPort < 1024 ) || shutdownPort > 65536 )
{
throw new IllegalArgumentException( "Shutdown port [" + shutdownPort + "] is an illegal port number" );
}
@@ -185,7 +188,7 @@ public class UberjarMain
LOG.info( "Start the shutdown listener on port {}", shutdownSocket.getLocalPort() );
Socket socket;
- while ( (socket = shutdownSocket.accept()) != null )
+ while ( ( socket = shutdownSocket.accept() ) != null )
{
if ( shutdownPassword == null || shutdownPassword.isEmpty() )
{