You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/12/23 06:05:52 UTC
svn commit: r1775791 - in /directory/apacheds/trunk:
core-integ/src/test/java/org/apache/directory/server/core/operations/modify/
interceptors/authn/src/main/java/org/apache/directory/server/core/authn/
jdbm-partition/src/main/java/org/apache/directory...
Author: elecharny
Date: Fri Dec 23 06:05:52 2016
New Revision: 1775791
URL: http://svn.apache.org/viewvc?rev=1775791&view=rev
Log:
o Use Strings.EMPTY_BYTES instead of StringConstants.EMPTY_BYTES
Modified:
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java Fri Dec 23 06:05:52 2016
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
import javax.naming.NoPermissionException;
import javax.naming.directory.Attribute;
import javax.naming.directory.AttributeInUseException;
@@ -41,7 +40,7 @@ import javax.naming.directory.Modificati
import javax.naming.directory.SchemaViolationException;
import javax.naming.ldap.LdapContext;
-import org.apache.directory.api.util.StringConstants;
+import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
@@ -355,7 +354,7 @@ public class ModifyAddIT extends Abstrac
// A valid AT not in MUST or MAY, but the extensibleObject OC is present in the OCs
// The value is empty
- Attributes attrs = new BasicAttributes( "crossCertificatePair", StringConstants.EMPTY_BYTES, true );
+ Attributes attrs = new BasicAttributes( "crossCertificatePair", Strings.EMPTY_BYTES, true );
// Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
@@ -364,7 +363,7 @@ public class ModifyAddIT extends Abstrac
attrs = sysRoot.getAttributes( "ou=testing01" );
Attribute attr = attrs.get( "crossCertificatePair" );
assertNotNull( attr );
- assertTrue( attr.contains( StringConstants.EMPTY_BYTES ) );
+ assertTrue( attr.contains( Strings.EMPTY_BYTES ) );
assertEquals( 1, attr.size() );
}
@@ -548,7 +547,7 @@ public class ModifyAddIT extends Abstrac
// Add the first Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
- attrs = new BasicAttributes( "crossCertificatePair", StringConstants.EMPTY_BYTES, true );
+ attrs = new BasicAttributes( "crossCertificatePair", Strings.EMPTY_BYTES, true );
// Add the second Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
@@ -558,7 +557,7 @@ public class ModifyAddIT extends Abstrac
Attribute attr = attrs.get( "crossCertificatePair" );
assertNotNull( attr );
assertTrue( attr.contains( "12345".getBytes() ) );
- assertTrue( attr.contains( StringConstants.EMPTY_BYTES ) );
+ assertTrue( attr.contains( Strings.EMPTY_BYTES ) );
assertEquals( 2, attr.size() );
}
Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Fri Dec 23 06:05:52 2016
@@ -71,7 +71,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.password.PasswordUtil;
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.util.DateUtils;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.api.CoreSession;
@@ -518,7 +517,7 @@ public class AuthenticationInterceptor e
// remove creds so there is no security risk
bindContext.setCredentials( null );
- clonedPrincipal.setUserPassword( StringConstants.EMPTY_BYTES );
+ clonedPrincipal.setUserPassword( Strings.EMPTY_BYTES );
// authentication was successful
CoreSession newSession = new DefaultCoreSession( clonedPrincipal, directoryService );
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Fri Dec 23 06:05:52 2016
@@ -40,6 +40,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator;
import org.apache.directory.api.util.StringConstants;
+import org.apache.directory.api.util.Strings;
import org.apache.directory.api.util.SynchronizedLRUMap;
import org.apache.directory.server.core.avltree.ArrayMarshaller;
import org.apache.directory.server.core.avltree.ArrayTree;
@@ -650,7 +651,7 @@ public class JdbmTable<K, V> extends Abs
}
BTree tree = getBTree( values.getBTreeRedirect() );
- replaced = ( V ) tree.insert( value, StringConstants.EMPTY_BYTES, true );
+ replaced = ( V ) tree.insert( value, Strings.EMPTY_BYTES, true );
if ( replaced == null )
{
@@ -1161,7 +1162,7 @@ public class JdbmTable<K, V> extends Abs
while ( keys.next() )
{
- bTree.insert( keys.get(), ( K ) StringConstants.EMPTY_BYTES, true );
+ bTree.insert( keys.get(), ( K ) Strings.EMPTY_BYTES, true );
}
keys.close();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java Fri Dec 23 06:05:52 2016
@@ -22,7 +22,6 @@ package org.apache.directory.shared.kerb
import java.util.Arrays;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
@@ -92,7 +91,7 @@ public class AuthorizationDataEntry
{
if ( Strings.isEmpty( adData ) )
{
- return StringConstants.EMPTY_BYTES;
+ return Strings.EMPTY_BYTES;
}
else
{
@@ -121,7 +120,7 @@ public class AuthorizationDataEntry
{
if ( Strings.isEmpty( adData ) )
{
- this.adData = StringConstants.EMPTY_BYTES;
+ this.adData = Strings.EMPTY_BYTES;
}
else
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java Fri Dec 23 06:05:52 2016
@@ -98,7 +98,6 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.kerberos.KerberosUtils;
@@ -399,7 +398,7 @@ public class PrincipalName implements As
}
else
{
- nameBytes.add( StringConstants.EMPTY_BYTES );
+ nameBytes.add( Strings.EMPTY_BYTES );
principalStringsSeqLength += 1 + 1;
}
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/BindRequestHandler.java Fri Dec 23 06:05:52 2016
@@ -36,7 +36,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.message.LdapResult;
import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.DirectoryService;
@@ -304,7 +303,7 @@ public class BindRequestHandler extends
// SaslServer will throw an exception if the credentials are null.
if ( bindRequest.getCredentials() == null )
{
- bindRequest.setCredentials( StringConstants.EMPTY_BYTES );
+ bindRequest.setCredentials( Strings.EMPTY_BYTES );
}
try
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/AbstractSaslServer.java Fri Dec 23 06:05:52 2016
@@ -24,7 +24,6 @@ import javax.security.sasl.SaslException
import javax.security.sasl.SaslServer;
import org.apache.directory.api.ldap.model.message.BindRequest;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.ldap.LdapSession;
@@ -63,7 +62,7 @@ public abstract class AbstractSaslServer
*/
public byte[] unwrap( byte[] incoming, int offset, int len ) throws SaslException
{
- return StringConstants.EMPTY_BYTES;
+ return Strings.EMPTY_BYTES;
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/gssapi/GssapiCallbackHandler.java Fri Dec 23 06:05:52 2016
@@ -28,7 +28,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.message.BindRequest;
import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.api.util.StringConstants;
+import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.LdapPrincipal;
import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
@@ -86,7 +86,7 @@ public class GssapiCallbackHandler exten
LdapPrincipal ldapPrincipal = new LdapPrincipal( adminSession.getDirectoryService().getSchemaManager(),
new Dn( entry.getDistinguishedName() ),
- AuthenticationLevel.STRONG, StringConstants.EMPTY_BYTES );
+ AuthenticationLevel.STRONG, Strings.EMPTY_BYTES );
ldapSession.putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal );
ldapSession.putSaslProperty( Context.SECURITY_PRINCIPAL, bindDn );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java?rev=1775791&r1=1775790&r2=1775791&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/plain/PlainSaslServer.java Fri Dec 23 06:05:52 2016
@@ -34,7 +34,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.message.BindRequest;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.api.ldap.model.schema.PrepareString;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.DirectoryService;
@@ -240,7 +239,7 @@ public class PlainSaslServer extends Abs
}
}
- return StringConstants.EMPTY_BYTES;
+ return Strings.EMPTY_BYTES;
}