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/06 20:58:42 UTC
svn commit: r1701514 - in
/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared:
catalog/GetCatalog.java kerberos/StoreUtils.java store/LdifFileLoader.java
Author: seelmann
Date: Sun Sep 6 18:58:41 2015
New Revision: 1701514
URL: http://svn.apache.org/r1701514
Log:
Fix checkstyle issues
Modified:
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=1701514&r1=1701513&r2=1701514&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Sun Sep 6 18:58:41 2015
@@ -33,7 +33,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.core.api.CoreSession;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.protocol.shared.store.DirectoryServiceOperation;
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java?rev=1701514&r1=1701513&r2=1701514&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java Sun Sep 6 18:58:41 2015
@@ -50,13 +50,18 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoreUtils
+public final class StoreUtils
{
/** Loggers for this class */
private static final Logger LOG = LoggerFactory.getLogger( StoreUtils.class );
private static final Logger LOG_KRB = LoggerFactory.getLogger( Loggers.KERBEROS_LOG.getName() );
+ private StoreUtils()
+ {
+ }
+
+
/**
* Creates a Entry for a PrincipalStoreEntry, doing what a state
* factory does but for Entry instead of Attributes.
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=1701514&r1=1701513&r2=1701514&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Sun Sep 6 18:58:41 2015
@@ -50,7 +50,7 @@ public class LdifFileLoader
/**
* the log for this class
*/
- private static final Logger log = LoggerFactory.getLogger( LdifFileLoader.class );
+ private static final Logger LOG = LoggerFactory.getLogger( LdifFileLoader.class );
/**
* a handle on the top core session
@@ -150,7 +150,7 @@ public class LdifFileLoader
}
catch ( LdapException e )
{
- log.warn( "filter " + filters.get( ii ) + " was bypassed due to failures", e );
+ LOG.warn( "filter " + filters.get( ii ) + " was bypassed due to failures", e );
}
// early bypass if entry is rejected
@@ -195,7 +195,7 @@ public class LdifFileLoader
try
{
coreSession.lookup( dn );
- log.info( "Found {}, will not create.", dn );
+ LOG.info( "Found {}, will not create.", dn );
}
catch ( Exception e )
{
@@ -205,11 +205,11 @@ public class LdifFileLoader
new DefaultEntry(
coreSession.getDirectoryService().getSchemaManager(), entry ) );
count++;
- log.info( "Created {}.", dn );
+ LOG.info( "Created {}.", dn );
}
catch ( LdapException e1 )
{
- log.info( "Could not create entry " + entry, e1 );
+ LOG.info( "Could not create entry " + entry, e1 );
}
}
}
@@ -221,11 +221,11 @@ public class LdifFileLoader
try
{
coreSession.modify( dn, items );
- log.info( "Modified: " + dn + " with modificationItems: " + items );
+ LOG.info( "Modified: " + dn + " with modificationItems: " + items );
}
catch ( LdapException e )
{
- log.info( "Could not modify: " + dn + " with modificationItems: " + items, e );
+ LOG.info( "Could not modify: " + dn + " with modificationItems: " + items, e );
}
}
}
@@ -240,18 +240,18 @@ public class LdifFileLoader
}
catch ( Exception e )
{
- log.error( I18n.err( I18n.ERR_175 ), e );
+ LOG.error( I18n.err( I18n.ERR_175 ), e );
}
}
}
}
catch ( FileNotFoundException fnfe )
{
- log.error( I18n.err( I18n.ERR_173 ) );
+ LOG.error( I18n.err( I18n.ERR_173 ) );
}
catch ( Exception ioe )
{
- log.error( I18n.err( I18n.ERR_174 ), ioe );
+ LOG.error( I18n.err( I18n.ERR_174 ), ioe );
}
return count;
@@ -266,18 +266,22 @@ public class LdifFileLoader
*/
private InputStream getLdifStream() throws FileNotFoundException
{
- InputStream in;
-
if ( ldif.exists() )
{
- in = new FileInputStream( ldif );
+ return new FileInputStream( ldif );
}
else
{
+ InputStream in;
+
// use ldif.getPath() to resolve the relative paths
- if ( loader != null && ( in = loader.getResourceAsStream( ldif.getPath() ) ) != null )
+ if ( loader != null )
{
- return in;
+ in = loader.getResourceAsStream( ldif.getPath() );
+ if ( in != null )
+ {
+ return in;
+ }
}
// if file not on system see if something is bundled with the jar ...
@@ -295,7 +299,5 @@ public class LdifFileLoader
throw new FileNotFoundException( I18n.err( I18n.ERR_173 ) );
}
-
- return in;
}
}