directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1778706 - in /directory/apacheds/branches/apacheds-value: core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/ interceptors/authn/s...
Date Sat, 14 Jan 2017 01:56:01 GMT
Author: elecharny
Date: Sat Jan 14 01:56:01 2017
New Revision: 1778706

URL: http://svn.apache.org/viewvc?rev=1778706&view=rev
Log:
Used Strings.EMPTY_BYTES instead of StringConstants.EMPTY_BYTES

Modified:
    directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
    directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenameIT.java
    directory/apacheds/branches/apacheds-value/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java

Modified: directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java?rev=1778706&r1=1778705&r2=1778706&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
(original)
+++ directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
Sat Jan 14 01:56:01 2017
@@ -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,6 @@ 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;
@@ -356,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 );
@@ -549,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 );

Modified: directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenameIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenameIT.java?rev=1778706&r1=1778705&r2=1778706&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenameIT.java
(original)
+++ directory/apacheds/branches/apacheds-value/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenameIT.java
Sat Jan 14 01:56:01 2017
@@ -26,11 +26,8 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertEquals;
 
-import org.apache.commons.lang.SystemUtils;
-import org.apache.directory.api.ldap.model.cursor.EntryCursor;
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.entry.Entry;
-import org.apache.directory.api.ldap.model.message.SearchScope;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.ContextEntry;

Modified: directory/apacheds/branches/apacheds-value/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1778706&r1=1778705&r2=1778706&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-value/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Sat Jan 14 01:56:01 2017
@@ -70,7 +70,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;
@@ -521,7 +520,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
);



Mime
View raw message