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 2014/03/19 09:15:35 UTC
svn commit: r1579165 - in /directory:
apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/
apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/
shared/trunk/ldap/extras/cod...
Author: elecharny
Date: Wed Mar 19 08:15:34 2014
New Revision: 1579165
URL: http://svn.apache.org/r1579165
Log:
o Removed the useless PasswordModifyRequest/Response classes
o Renamed the PwdModifyRequest/Response classes
Added:
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequest.java
- copied, changed from r1578548, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequestImpl.java
- copied, changed from r1578968, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponse.java
- copied, changed from r1578361, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponseImpl.java
- copied, changed from r1578968, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java
Removed:
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequest.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponse.java
Modified:
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/PwdModifyHandler.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecoder.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecoder.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java
directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyRequestTest.java
directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyResponseTest.java
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/PwdModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/PwdModifyHandler.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/PwdModifyHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/PwdModifyHandler.java Wed Mar 19 08:15:34 2014
@@ -25,9 +25,9 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequest;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponse;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponseImpl;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequest;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponseImpl;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultModification;
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PwdModifyHandler implements ExtendedOperationHandler<PwdModifyRequest, PwdModifyResponse>
+public class PwdModifyHandler implements ExtendedOperationHandler<PasswordModifyRequest, PasswordModifyResponse>
{
private static final Logger LOG = LoggerFactory.getLogger( PwdModifyHandler.class );
public static final Set<String> EXTENSION_OIDS;
@@ -74,8 +74,8 @@ public class PwdModifyHandler implements
static
{
Set<String> set = new HashSet<String>( 2 );
- set.add( PwdModifyRequest.EXTENSION_OID );
- set.add( PwdModifyResponse.EXTENSION_OID );
+ set.add( PasswordModifyRequest.EXTENSION_OID );
+ set.add( PasswordModifyResponse.EXTENSION_OID );
EXTENSION_OIDS = Collections.unmodifiableSet( set );
}
@@ -85,7 +85,7 @@ public class PwdModifyHandler implements
*/
public String getOid()
{
- return PwdModifyRequest.EXTENSION_OID;
+ return PasswordModifyRequest.EXTENSION_OID;
}
@@ -93,7 +93,7 @@ public class PwdModifyHandler implements
* Modify the user's credentials.
*/
private void modifyUserPassword( CoreSession userSession, IoSession ioPipe, Dn userDn, byte[] oldPassword, byte[] newPassword,
- PwdModifyRequest req )
+ PasswordModifyRequest req )
{
// First, check that the user exists
try
@@ -104,7 +104,7 @@ public class PwdModifyHandler implements
{
LOG.error( "Cannot find an entry for DN " + userDn );
// We can't find the entry in the DIT
- ioPipe.write( new PwdModifyResponseImpl(
+ ioPipe.write( new PasswordModifyResponseImpl(
req.getMessageId(), ResultCodeEnum.NO_SUCH_OBJECT, "Cannot find an entry for DN " + userDn ) );
return;
@@ -128,7 +128,7 @@ public class PwdModifyHandler implements
LOG.error( "Cannot find an entry for DN " + userDn + ", exception : " + le.getMessage() );
// We can't find the entry in the DIT
ioPipe.write(
- new PwdModifyResponseImpl(
+ new PasswordModifyResponseImpl(
req.getMessageId(), ResultCodeEnum.NO_SUCH_OBJECT, "Cannot find an entry for DN " + userDn ) );
return;
@@ -176,7 +176,7 @@ public class PwdModifyHandler implements
LOG.error( "Cannot create a new password for user " + userDn + ", exception : " + userDn );
// We can't modify the password
- ioPipe.write( new PwdModifyResponseImpl(
+ ioPipe.write( new PasswordModifyResponseImpl(
req.getMessageId(), ResultCodeEnum.UNWILLING_TO_PERFORM, "Cannot generate a new password for user "
+ userDn ) );
@@ -193,7 +193,7 @@ public class PwdModifyHandler implements
LOG.debug( "Password modified for user " + userDn );
// Ok, all done
- PwdModifyResponseImpl pmrl = new PwdModifyResponseImpl(
+ PasswordModifyResponseImpl pmrl = new PasswordModifyResponseImpl(
req.getMessageId(), ResultCodeEnum.SUCCESS );
ppolicyControl = modifyRequest.getResultResponse().getControl( PasswordPolicy.OID );
@@ -221,7 +221,7 @@ public class PwdModifyHandler implements
// We can't modify the password
LOG.error( "Cannot modify the password for user " + userDn + ", exception : " + errorMessage );
- PwdModifyResponseImpl errorPmrl = new PwdModifyResponseImpl(
+ PasswordModifyResponseImpl errorPmrl = new PasswordModifyResponseImpl(
req.getMessageId(), errorCode, "Cannot modify the password for user "
+ userDn + ", exception : " + errorMessage );
@@ -239,7 +239,7 @@ public class PwdModifyHandler implements
/**
* {@inheritDoc}
*/
- public void handleExtendedOperation( LdapSession requestor, PwdModifyRequest req ) throws Exception
+ public void handleExtendedOperation( LdapSession requestor, PasswordModifyRequest req ) throws Exception
{
LOG.debug( "Password modification requested" );
@@ -259,7 +259,7 @@ public class PwdModifyHandler implements
{
LOG.error( "The user DN is invalid : " + userDn );
// The userIdentity is not a DN : return with an error code.
- requestor.getIoSession().write( new PwdModifyResponseImpl(
+ requestor.getIoSession().write( new PasswordModifyResponseImpl(
req.getMessageId(), ResultCodeEnum.INVALID_DN_SYNTAX, "The user DN is invalid : " + userDn ) );
return;
}
@@ -284,7 +284,7 @@ public class PwdModifyHandler implements
{
// No : error
LOG.error( "Non-admin user cannot access another user's password to modify it" );
- requestor.getIoSession().write( new PwdModifyResponseImpl(
+ requestor.getIoSession().write( new PasswordModifyResponseImpl(
req.getMessageId(), ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS,
"Non-admin user cannot access another user's password to modify it" ) );
}
@@ -316,7 +316,7 @@ public class PwdModifyHandler implements
{
// We can't bind with the provided information : we thus can't
// change the password...
- requestor.getIoSession().write( new PwdModifyResponseImpl(
+ requestor.getIoSession().write( new PasswordModifyResponseImpl(
req.getMessageId(), ResultCodeEnum.INVALID_CREDENTIALS ) );
return;
@@ -332,10 +332,10 @@ public class PwdModifyHandler implements
/**
* {@inheritDoc}
*/
- public static PwdModifyResponse getPwdModifyResponse()
+ public static PasswordModifyResponse getPwdModifyResponse()
{
// build the PwdModifyResponse message with replicationContexts
- return new PwdModifyResponseImpl();
+ return new PasswordModifyResponseImpl();
}
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyIT.java Wed Mar 19 08:15:34 2014
@@ -34,9 +34,9 @@ import org.apache.directory.api.ldap.ext
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequest;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequestImpl;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponse;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequest;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequestImpl;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse;
import org.apache.directory.api.ldap.model.constants.LdapSecurityConstants;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
@@ -219,11 +219,11 @@ public class PwdModifyIT extends Abstrac
userConnection.setTimeOut( 0L );
// Now change the password
- PwdModifyRequest pwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "secret1Bis" ) );
// Send the request
- PwdModifyResponse pwdModifyResponse = ( PwdModifyResponse ) userConnection.extended( pwdModifyRequest );
+ PasswordModifyResponse pwdModifyResponse = ( PasswordModifyResponse ) userConnection.extended( pwdModifyRequest );
assertEquals( ResultCodeEnum.SUCCESS, pwdModifyResponse.getLdapResult().getResultCode() );
@@ -262,13 +262,13 @@ public class PwdModifyIT extends Abstrac
anonymousConnection.setTimeOut( 0L );
// Now change the password
- PwdModifyRequest pwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( "cn=User2,ou=system" ) );
pwdModifyRequest.setOldPassword( Strings.getBytesUtf8( "secret2" ) );
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "secret2Bis" ) );
// Send the request
- PwdModifyResponse pwdModifyResponse = ( PwdModifyResponse ) anonymousConnection.extended( pwdModifyRequest );
+ PasswordModifyResponse pwdModifyResponse = ( PasswordModifyResponse ) anonymousConnection.extended( pwdModifyRequest );
assertEquals( ResultCodeEnum.SUCCESS, pwdModifyResponse.getLdapResult().getResultCode() );
@@ -315,13 +315,13 @@ public class PwdModifyIT extends Abstrac
anonymousConnection.setTimeOut( 0L );
// Now change the password
- PwdModifyRequest pwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( "cn=User3,ou=system" ) );
pwdModifyRequest.setOldPassword( Strings.getBytesUtf8( "secret3" ) );
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "secret3Bis" ) );
// Send the request
- PwdModifyResponse pwdModifyResponse = ( PwdModifyResponse ) anonymousConnection.extended( pwdModifyRequest );
+ PasswordModifyResponse pwdModifyResponse = ( PasswordModifyResponse ) anonymousConnection.extended( pwdModifyRequest );
assertEquals( ResultCodeEnum.SUCCESS, pwdModifyResponse.getLdapResult().getResultCode() );
@@ -355,12 +355,12 @@ public class PwdModifyIT extends Abstrac
// Modify the user with the admin account
// Now change the password
- PwdModifyRequest pwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( "cn=User4,ou=system" ) );
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "secret4Bis" ) );
// Send the request
- PwdModifyResponse pwdModifyResponse = ( PwdModifyResponse ) adminConnection.extended( pwdModifyRequest );
+ PasswordModifyResponse pwdModifyResponse = ( PasswordModifyResponse ) adminConnection.extended( pwdModifyRequest );
assertEquals( ResultCodeEnum.SUCCESS, pwdModifyResponse.getLdapResult().getResultCode() );
@@ -389,12 +389,12 @@ public class PwdModifyIT extends Abstrac
// Modify the user with the admin account
// Now change the password
- PwdModifyRequest pwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( "cn=baduser,ou=system" ) );
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "secret5Bis" ) );
// Send the request
- PwdModifyResponse pwdModifyResponse = ( PwdModifyResponse ) adminConnection.extended( pwdModifyRequest );
+ PasswordModifyResponse pwdModifyResponse = ( PasswordModifyResponse ) adminConnection.extended( pwdModifyRequest );
assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, pwdModifyResponse.getLdapResult().getResultCode() );
assertEquals( "Cannot find an entry for DN cn=baduser,ou=system", pwdModifyResponse.getLdapResult()
@@ -417,11 +417,11 @@ public class PwdModifyIT extends Abstrac
// Modify the user with the admin account
// Now request a new password
- PwdModifyRequest pwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( "cn=User6,ou=system" ) );
// Send the request
- PwdModifyResponse pwdModifyResponse = ( PwdModifyResponse ) adminConnection.extended( pwdModifyRequest );
+ PasswordModifyResponse pwdModifyResponse = ( PasswordModifyResponse ) adminConnection.extended( pwdModifyRequest );
// We should not be allowed to do that, as the operation is not yet implemented
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, pwdModifyResponse.getLdapResult().getResultCode() );
@@ -449,17 +449,17 @@ public class PwdModifyIT extends Abstrac
Attribute attribute = userEntry.get( "pwdHistory" );
assertEquals( 1, attribute.size() );
- PwdModifyRequest pwdModifyRequest = null;
- PwdModifyResponse pwdModifyResponse = null;
+ PasswordModifyRequest pwdModifyRequest = null;
+ PasswordModifyResponse pwdModifyResponse = null;
// Fail modify user with user account
try
{
userConnection = getNetworkConnectionAs( getLdapServer(), "cn=User7,ou=system", "secret7" );
- pwdModifyRequest = new PwdModifyRequestImpl();
+ pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( "cn=User7,ou=system" ) );
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "secret4Bis" ) );
- pwdModifyResponse = ( PwdModifyResponse ) userConnection.extended( pwdModifyRequest );
+ pwdModifyResponse = ( PasswordModifyResponse ) userConnection.extended( pwdModifyRequest );
assertNotEquals( ResultCodeEnum.SUCCESS, pwdModifyResponse.getLdapResult().getResultCode() );
}
finally
@@ -468,10 +468,10 @@ public class PwdModifyIT extends Abstrac
}
// Modify the user with the admin account
- pwdModifyRequest = new PwdModifyRequestImpl();
+ pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setUserIdentity( Strings.getBytesUtf8( "cn=User7,ou=system" ) );
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "secret4Bis" ) );
- pwdModifyResponse = ( PwdModifyResponse ) adminConnection.extended( pwdModifyRequest );
+ pwdModifyResponse = ( PasswordModifyResponse ) adminConnection.extended( pwdModifyRequest );
assertEquals( ResultCodeEnum.SUCCESS, pwdModifyResponse.getLdapResult().getResultCode() );
userEntry = adminConnection.lookup( "cn=User7,ou=system", "*", "+" );
attribute = userEntry.get( "pwdHistory" );
@@ -514,14 +514,14 @@ public class PwdModifyIT extends Abstrac
userConnection = getNetworkConnectionAs( ldapServer, userDn.toString(), "secret3" );
PasswordPolicyDecorator passwordPolicyRequestControl =
new PasswordPolicyDecorator( LdapApiServiceFactory.getSingleton(), new PasswordPolicyImpl() );
- PwdModifyRequest selfPwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest selfPwdModifyRequest = new PasswordModifyRequestImpl();
selfPwdModifyRequest.setUserIdentity( Dn.getBytes( userDn ) );
selfPwdModifyRequest.setOldPassword( Strings.getBytesUtf8( "secret3" ) );
selfPwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "1234567" ) );
selfPwdModifyRequest.addControl( passwordPolicyRequestControl );
// Send the request to update own password
- PwdModifyResponse pwdModifyResponse = ( PwdModifyResponse ) userConnection.extended( selfPwdModifyRequest );
+ PasswordModifyResponse pwdModifyResponse = ( PasswordModifyResponse ) userConnection.extended( selfPwdModifyRequest );
// passwordTooShort is a constraint violation
assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, pwdModifyResponse.getLdapResult().getResultCode() );
Control passwordPolicyResponseControl = pwdModifyResponse
@@ -534,11 +534,11 @@ public class PwdModifyIT extends Abstrac
addUser( adminConnection, "UserZZ", "secret4" );
Dn otherUserDn = new Dn( "cn=UserZZ,ou=system" );
- PwdModifyRequest pwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setUserIdentity( Dn.getBytes( otherUserDn ) );
pwdModifyRequest.setOldPassword( Strings.getBytesUtf8( "secret4" ) );
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "1234567" ) );
- pwdModifyResponse = ( PwdModifyResponse ) userConnection.extended( pwdModifyRequest );
+ pwdModifyResponse = ( PasswordModifyResponse ) userConnection.extended( pwdModifyRequest );
assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, pwdModifyResponse.getLdapResult().getResultCode() );
}
finally
@@ -566,12 +566,12 @@ public class PwdModifyIT extends Abstrac
userConnection.setTimeOut( 0L );
// Now change the password
- PwdModifyRequest pwdModifyRequest = new PwdModifyRequestImpl();
+ PasswordModifyRequest pwdModifyRequest = new PasswordModifyRequestImpl();
pwdModifyRequest.setOldPassword( password );
pwdModifyRequest.setNewPassword( Strings.getBytesUtf8( "secret1Bis" ) );
// Send the request
- PwdModifyResponse pwdModifyResponse = ( PwdModifyResponse ) userConnection.extended( pwdModifyRequest );
+ PasswordModifyResponse pwdModifyResponse = ( PasswordModifyResponse ) userConnection.extended( pwdModifyRequest );
assertEquals( ResultCodeEnum.SUCCESS, pwdModifyResponse.getLdapResult().getResultCode() );
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequest.java (from r1578548, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequest.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequest.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java&r1=1578548&r2=1579165&rev=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequest.java Wed Mar 19 08:15:34 2014
@@ -35,7 +35,7 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface PwdModifyRequest extends ExtendedRequest
+public interface PasswordModifyRequest extends ExtendedRequest
{
/** The OID for the pwdModify extended operation request. */
String EXTENSION_OID = "1.3.6.1.4.1.4203.1.11.1";
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequestImpl.java (from r1578968, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequestImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequestImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java&r1=1578968&r2=1579165&rev=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyRequestImpl.java Wed Mar 19 08:15:34 2014
@@ -36,7 +36,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PwdModifyRequestImpl extends AbstractExtendedRequest implements PwdModifyRequest
+public class PasswordModifyRequestImpl extends AbstractExtendedRequest implements PasswordModifyRequest
{
/** The user identity */
private byte[] userIdentity;
@@ -51,7 +51,7 @@ public class PwdModifyRequestImpl extend
/**
* Create a new instance of the PwdModifyRequest extended operation
*/
- public PwdModifyRequestImpl()
+ public PasswordModifyRequestImpl()
{
setRequestName( EXTENSION_OID );
}
@@ -62,7 +62,7 @@ public class PwdModifyRequestImpl extend
*
* @param messageId The message ID
*/
- public PwdModifyRequestImpl( int messageId )
+ public PasswordModifyRequestImpl( int messageId )
{
super( messageId );
setRequestName( EXTENSION_OID );
@@ -127,14 +127,14 @@ public class PwdModifyRequestImpl extend
* {@inheritDoc}
*/
@Override
- public PwdModifyResponse getResultResponse()
+ public PasswordModifyResponse getResultResponse()
{
if ( response == null )
{
- response = new PwdModifyResponseImpl( getMessageId() );
+ response = new PasswordModifyResponseImpl( getMessageId() );
}
- return ( PwdModifyResponse ) response;
+ return ( PasswordModifyResponse ) response;
}
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponse.java (from r1578361, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponse.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponse.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java&r1=1578361&r2=1579165&rev=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponse.java Wed Mar 19 08:15:34 2014
@@ -33,10 +33,10 @@ import org.apache.directory.api.ldap.mod
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface PwdModifyResponse extends ExtendedResponse
+public interface PasswordModifyResponse extends ExtendedResponse
{
/** The OID for the PwdModify extended operation response. */
- String EXTENSION_OID = PwdModifyRequest.EXTENSION_OID;
+ String EXTENSION_OID = PasswordModifyRequest.EXTENSION_OID;
/**
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponseImpl.java (from r1578968, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponseImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponseImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java&r1=1578968&r2=1579165&rev=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PasswordModifyResponseImpl.java Wed Mar 19 08:15:34 2014
@@ -35,7 +35,7 @@ import org.apache.directory.api.util.Str
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PwdModifyResponseImpl extends ExtendedResponseImpl implements PwdModifyResponse
+public class PasswordModifyResponseImpl extends ExtendedResponseImpl implements PasswordModifyResponse
{
/** The generated password */
private byte[] genPassword;
@@ -47,7 +47,7 @@ public class PwdModifyResponseImpl exten
* @param rcode The result code
* @param diagnosticMessage The diagnostic message
*/
- public PwdModifyResponseImpl( int messageId, ResultCodeEnum rcode, String diagnosticMessage )
+ public PasswordModifyResponseImpl( int messageId, ResultCodeEnum rcode, String diagnosticMessage )
{
super( messageId, EXTENSION_OID );
@@ -62,7 +62,7 @@ public class PwdModifyResponseImpl exten
* @param messageId The Message ID
* @param rcode The result code
*/
- public PwdModifyResponseImpl( int messageId, ResultCodeEnum rcode )
+ public PasswordModifyResponseImpl( int messageId, ResultCodeEnum rcode )
{
super( messageId, EXTENSION_OID );
@@ -76,7 +76,7 @@ public class PwdModifyResponseImpl exten
*
* @param messageId the message id
*/
- public PwdModifyResponseImpl( int messageId )
+ public PasswordModifyResponseImpl( int messageId )
{
super( messageId, EXTENSION_OID );
super.getLdapResult().setMatchedDn( null );
@@ -87,7 +87,7 @@ public class PwdModifyResponseImpl exten
/**
* Instantiates a new password Modify response.
*/
- public PwdModifyResponseImpl()
+ public PasswordModifyResponseImpl()
{
super( EXTENSION_OID );
super.getLdapResult().setMatchedDn( null );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java Wed Mar 19 08:15:34 2014
@@ -30,10 +30,10 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequest;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequestImpl;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponse;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponseImpl;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequest;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequestImpl;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponseImpl;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.ExtendedRequest;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
@@ -62,17 +62,17 @@ public class PasswordModifyFactory imple
*/
public String getOid()
{
- return PwdModifyRequest.EXTENSION_OID;
+ return PasswordModifyRequest.EXTENSION_OID;
}
/**
* {@inheritDoc}
*/
- public PwdModifyResponse newResponse( byte[] encodedValue ) throws DecoderException
+ public PasswordModifyResponse newResponse( byte[] encodedValue ) throws DecoderException
{
PasswordModifyResponseDecorator response = new PasswordModifyResponseDecorator( codec,
- new PwdModifyResponseImpl() );
+ new PasswordModifyResponseImpl() );
response.setResponseValue( encodedValue );
return response;
}
@@ -81,9 +81,9 @@ public class PasswordModifyFactory imple
/**
* {@inheritDoc}
*/
- public PwdModifyRequest newRequest( byte[] value )
+ public PasswordModifyRequest newRequest( byte[] value )
{
- PasswordModifyRequestDecorator req = new PasswordModifyRequestDecorator( codec, new PwdModifyRequestImpl() );
+ PasswordModifyRequestDecorator req = new PasswordModifyRequestDecorator( codec, new PasswordModifyRequestImpl() );
if ( value != null )
{
@@ -104,7 +104,7 @@ public class PasswordModifyFactory imple
return ( PasswordModifyRequestDecorator ) modelRequest;
}
- return new PasswordModifyRequestDecorator( codec, ( PwdModifyRequest ) modelRequest );
+ return new PasswordModifyRequestDecorator( codec, ( PasswordModifyRequest ) modelRequest );
}
@@ -118,9 +118,9 @@ public class PasswordModifyFactory imple
return ( PasswordModifyResponseDecorator ) decoratedResponse;
}
- if ( decoratedResponse instanceof PwdModifyResponse )
+ if ( decoratedResponse instanceof PasswordModifyResponse )
{
- return new PasswordModifyResponseDecorator( codec, ( PwdModifyResponse ) decoratedResponse );
+ return new PasswordModifyResponseDecorator( codec, ( PasswordModifyResponse ) decoratedResponse );
}
// It's an opaque extended operation
@@ -133,7 +133,7 @@ public class PasswordModifyFactory imple
ByteBuffer buffer = ByteBuffer.wrap( value );
PasswordModifyResponseContainer container = new PasswordModifyResponseContainer();
- PwdModifyResponse pwdModifyResponse = null;
+ PasswordModifyResponse pwdModifyResponse = null;
try
{
@@ -154,7 +154,7 @@ public class PasswordModifyFactory imple
String stackTrace = sw.toString();
// Error while decoding the value.
- pwdModifyResponse = new PwdModifyResponseImpl(
+ pwdModifyResponse = new PasswordModifyResponseImpl(
decoratedResponse.getMessageId(),
ResultCodeEnum.OPERATIONS_ERROR,
stackTrace );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestContainer.java Wed Mar 19 08:15:34 2014
@@ -21,7 +21,6 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.ber.AbstractContainer;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequest;
/**
@@ -32,7 +31,7 @@ import org.apache.directory.api.ldap.ext
public class PasswordModifyRequestContainer extends AbstractContainer
{
/** PasswordModifyRequest decorator*/
- private PasswordModifyRequestDecorator passwordModifyRequestDecorator;
+ private PasswordModifyRequestDecorator passwordModifyRequest;
/**
@@ -50,9 +49,9 @@ public class PasswordModifyRequestContai
/**
* @return Returns the PwdModifyRequest instance.
*/
- public PwdModifyRequest getPwdModifyRequest()
+ public PasswordModifyRequestDecorator getPwdModifyRequest()
{
- return passwordModifyRequestDecorator;
+ return passwordModifyRequest;
}
@@ -64,7 +63,7 @@ public class PasswordModifyRequestContai
*/
public void setPasswordModifyRequest( PasswordModifyRequestDecorator passwordModifyRequestDecorator )
{
- this.passwordModifyRequestDecorator = passwordModifyRequestDecorator;
+ this.passwordModifyRequest = passwordModifyRequestDecorator;
}
@@ -74,6 +73,6 @@ public class PasswordModifyRequestContai
public void clean()
{
super.clean();
- passwordModifyRequestDecorator = null;
+ passwordModifyRequest = null;
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecoder.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecoder.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecoder.java Wed Mar 19 08:15:34 2014
@@ -22,10 +22,9 @@ package org.apache.directory.api.ldap.ex
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.Asn1Decoder;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequest;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequest;
/**
@@ -48,16 +47,16 @@ public class PasswordModifyRequestDecode
* @return a PwdModifyRequest object
* @throws org.apache.directory.api.asn1.DecoderException If the decoding failed
*/
- public Asn1Object decode( byte[] stream ) throws DecoderException
+ public PasswordModifyRequest decode( byte[] stream ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( stream );
PasswordModifyRequestContainer container = new PasswordModifyRequestContainer();
decoder.decode( bb, container );
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequestDecorator passwordModifyRequest = container.getPwdModifyRequest();
// Clean the container for the next decoding
container.clean();
- return ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest();
+ return passwordModifyRequest;
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestDecorator.java Wed Mar 19 08:15:34 2014
@@ -20,14 +20,18 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify;
+import java.nio.ByteBuffer;
+
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.EncoderException;
+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.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequest;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequestImpl;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponse;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequest;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,33 +41,27 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PasswordModifyRequestDecorator extends ExtendedRequestDecorator<PwdModifyRequest> implements
- PwdModifyRequest
+public class PasswordModifyRequestDecorator extends ExtendedRequestDecorator<PasswordModifyRequest>
+ implements PasswordModifyRequest
{
private static final Logger LOG = LoggerFactory.getLogger( PasswordModifyRequestDecorator.class );
/** The internal PasswordModifyRequest */
private PasswordModifyRequest passwordModifyRequest;
+ /** stores the length of the request*/
+ private int requestLength = 0;
+
/**
* Create a new decorator instance
* @param codec The codec service
* @param decoratedMessage The decorated PwdModifyRequest
*/
- public PasswordModifyRequestDecorator( LdapApiService codec, PwdModifyRequest decoratedMessage )
+ public PasswordModifyRequestDecorator( LdapApiService codec, PasswordModifyRequest decoratedMessage )
{
super( codec, decoratedMessage );
- passwordModifyRequest = new PasswordModifyRequest( decoratedMessage );
- }
-
-
- /**
- * @return The ASN1 object containing the PwdModifyRequest instance
- */
- public PasswordModifyRequest getPasswordModifyRequest()
- {
- return passwordModifyRequest;
+ passwordModifyRequest = decoratedMessage;
}
@@ -77,14 +75,8 @@ public class PasswordModifyRequestDecora
try
{
- passwordModifyRequest = ( PasswordModifyRequest ) decoder.decode( requestValue );
- ( ( PwdModifyRequestImpl ) getDecorated() ).setUserIdentity( passwordModifyRequest.getPwdModifyRequest()
- .getUserIdentity() );
- ( ( PwdModifyRequestImpl ) getDecorated() ).setOldPassword( passwordModifyRequest.getPwdModifyRequest()
- .getOldPassword() );
- ( ( PwdModifyRequestImpl ) getDecorated() ).setNewPassword( passwordModifyRequest.getPwdModifyRequest()
- .getNewPassword() );
-
+ passwordModifyRequest = decoder.decode( requestValue );
+
if ( requestValue != null )
{
this.requestValue = new byte[requestValue.length];
@@ -113,7 +105,7 @@ public class PasswordModifyRequestDecora
{
try
{
- requestValue = passwordModifyRequest.encode().array();
+ requestValue = encode().array();
}
catch ( EncoderException e )
{
@@ -122,14 +114,7 @@ public class PasswordModifyRequestDecora
}
}
- if ( requestValue == null )
- {
- return null;
- }
-
- final byte[] copy = new byte[requestValue.length];
- System.arraycopy( requestValue, 0, copy, 0, requestValue.length );
- return copy;
+ return requestValue;
}
@@ -137,9 +122,9 @@ public class PasswordModifyRequestDecora
* {@inheritDoc}
*/
@Override
- public PwdModifyResponse getResultResponse()
+ public PasswordModifyResponse getResultResponse()
{
- return ( PwdModifyResponse ) getDecorated().getResultResponse();
+ return ( PasswordModifyResponse ) passwordModifyRequest.getResultResponse();
}
@@ -148,7 +133,7 @@ public class PasswordModifyRequestDecora
*/
public byte[] getUserIdentity()
{
- return getDecorated().getUserIdentity();
+ return passwordModifyRequest.getUserIdentity();
}
@@ -157,7 +142,7 @@ public class PasswordModifyRequestDecora
*/
public void setUserIdentity( byte[] userIdentity )
{
- getDecorated().setUserIdentity( userIdentity );
+ passwordModifyRequest.setUserIdentity( userIdentity );
}
@@ -166,7 +151,7 @@ public class PasswordModifyRequestDecora
*/
public byte[] getOldPassword()
{
- return getDecorated().getOldPassword();
+ return passwordModifyRequest.getOldPassword();
}
@@ -175,7 +160,7 @@ public class PasswordModifyRequestDecora
*/
public void setOldPassword( byte[] oldPassword )
{
- getDecorated().setOldPassword( oldPassword );
+ passwordModifyRequest.setOldPassword( oldPassword );
}
@@ -184,7 +169,7 @@ public class PasswordModifyRequestDecora
*/
public byte[] getNewPassword()
{
- return ( ( PwdModifyRequestImpl ) getDecorated() ).getNewPassword();
+ return passwordModifyRequest.getNewPassword();
}
@@ -193,6 +178,87 @@ public class PasswordModifyRequestDecora
*/
public void setNewPassword( byte[] newPassword )
{
- ( ( PwdModifyRequestImpl ) getDecorated() ).setNewPassword( newPassword );
+ passwordModifyRequest.setNewPassword( newPassword );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public int computeLength()
+ {
+ requestLength = 0;
+
+ if ( passwordModifyRequest.getUserIdentity() != null )
+ {
+ int len = passwordModifyRequest.getUserIdentity().length;
+ requestLength = 1 + BerValue.getNbBytes( len ) + len;
+ }
+
+ if ( passwordModifyRequest.getOldPassword() != null )
+ {
+ int len = passwordModifyRequest.getOldPassword().length;
+ requestLength += 1 + BerValue.getNbBytes( len ) + len;
+ }
+
+ if ( passwordModifyRequest.getNewPassword() != null )
+ {
+ int len = passwordModifyRequest.getNewPassword().length;
+ requestLength += 1 + BerValue.getNbBytes( len ) + len;
+ }
+
+ return 1 + BerValue.getNbBytes( requestLength ) + requestLength;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ByteBuffer encode() throws EncoderException
+ {
+ ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+
+ return encode( bb );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ByteBuffer encode( ByteBuffer bb ) throws EncoderException
+ {
+ if ( bb == null )
+ {
+ throw new EncoderException( "Null ByteBuffer, cannot encode " + this );
+ }
+
+ bb.put( UniversalTag.SEQUENCE.getValue() );
+ bb.put( BerValue.getBytes( requestLength ) );
+
+ if ( passwordModifyRequest.getUserIdentity() != null )
+ {
+ byte[] userIdentity = passwordModifyRequest.getUserIdentity();
+ bb.put( ( byte ) PasswordModifyRequestConstants.USER_IDENTITY_TAG );
+ bb.put( TLV.getBytes( userIdentity.length ) );
+ bb.put( userIdentity );
+ }
+
+ if ( passwordModifyRequest.getOldPassword() != null )
+ {
+ byte[] oldPassword = passwordModifyRequest.getOldPassword();
+ bb.put( ( byte ) PasswordModifyRequestConstants.OLD_PASSWORD_TAG );
+ bb.put( TLV.getBytes( oldPassword.length ) );
+ bb.put( oldPassword );
+ }
+
+ if ( passwordModifyRequest.getNewPassword() != null )
+ {
+ byte[] newPassword = passwordModifyRequest.getNewPassword();
+ bb.put( ( byte ) PasswordModifyRequestConstants.NEW_PASSWORD_TAG );
+ bb.put( TLV.getBytes( newPassword.length ) );
+ bb.put( newPassword );
+ }
+
+ return bb;
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyRequestGrammar.java Wed Mar 19 08:15:34 2014
@@ -28,7 +28,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequestImpl;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequestImpl;
import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +89,7 @@ public class PasswordModifyRequestGramma
public void action( PasswordModifyRequestContainer container )
{
PasswordModifyRequestDecorator passwordModifyRequestDecorator = new PasswordModifyRequestDecorator(
- LdapApiServiceFactory.getSingleton(), new PwdModifyRequestImpl() );
+ LdapApiServiceFactory.getSingleton(), new PasswordModifyRequestImpl() );
container.setPasswordModifyRequest( passwordModifyRequestDecorator );
// We may have nothing left
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseContainer.java Wed Mar 19 08:15:34 2014
@@ -21,7 +21,6 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.ber.AbstractContainer;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponse;
/**
@@ -32,7 +31,7 @@ import org.apache.directory.api.ldap.ext
public class PasswordModifyResponseContainer extends AbstractContainer
{
/** PasswordModifyResponse decorator*/
- private PasswordModifyResponseDecorator passwordModifyResponseDecorator;
+ private PasswordModifyResponseDecorator passwordModifyResponse;
/**
@@ -50,9 +49,9 @@ public class PasswordModifyResponseConta
/**
* @return Returns the PwdModifyResponset instance.
*/
- public PwdModifyResponse getPwdModifyResponse()
+ public PasswordModifyResponseDecorator getPwdModifyResponse()
{
- return passwordModifyResponseDecorator;
+ return passwordModifyResponse;
}
@@ -64,7 +63,7 @@ public class PasswordModifyResponseConta
*/
public void setPasswordModifyResponse( PasswordModifyResponseDecorator passwordModifyResponseDecorator )
{
- this.passwordModifyResponseDecorator = passwordModifyResponseDecorator;
+ this.passwordModifyResponse = passwordModifyResponseDecorator;
}
@@ -74,6 +73,6 @@ public class PasswordModifyResponseConta
public void clean()
{
super.clean();
- passwordModifyResponseDecorator = null;
+ passwordModifyResponse = null;
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecoder.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecoder.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecoder.java Wed Mar 19 08:15:34 2014
@@ -22,10 +22,9 @@ package org.apache.directory.api.ldap.ex
import java.nio.ByteBuffer;
-import org.apache.directory.api.asn1.Asn1Object;
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.ber.Asn1Decoder;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponse;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse;
/**
@@ -48,16 +47,16 @@ public class PasswordModifyResponseDecod
* @return a PwdModifyRequest object
* @throws org.apache.directory.api.asn1.DecoderException If the decoding failed
*/
- public Asn1Object decode( byte[] stream ) throws DecoderException
+ public PasswordModifyResponse decode( byte[] stream ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( stream );
PasswordModifyResponseContainer container = new PasswordModifyResponseContainer();
decoder.decode( bb, container );
- PwdModifyResponse pwdModifyResponse = container.getPwdModifyResponse();
+ PasswordModifyResponseDecorator pwdModifyResponse = container.getPwdModifyResponse();
// Clean the container for the next decoding
container.clean();
- return ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).getPasswordModifyResponse();
+ return pwdModifyResponse;
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseDecorator.java Wed Mar 19 08:15:34 2014
@@ -20,13 +20,18 @@
package org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify;
+import java.nio.ByteBuffer;
+
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.asn1.EncoderException;
+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.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponse;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponseImpl;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponseImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,27 +41,21 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PasswordModifyResponseDecorator extends ExtendedResponseDecorator<PwdModifyResponse>
- implements PwdModifyResponse
+public class PasswordModifyResponseDecorator extends ExtendedResponseDecorator<PasswordModifyResponse>
+ implements PasswordModifyResponse
{
private static final Logger LOG = LoggerFactory.getLogger( PasswordModifyResponseDecorator.class );
private PasswordModifyResponse passwordModifyResponse;
-
- public PasswordModifyResponseDecorator( LdapApiService codec, PwdModifyResponse decoratedMessage )
- {
- super( codec, decoratedMessage );
- passwordModifyResponse = new PasswordModifyResponse( decoratedMessage );
- }
+ /** stores the length of the request*/
+ private int requestLength = 0;
- /**
- * @return The ASN1 object containing the PwdModifyResponse instance
- */
- public PasswordModifyResponse getPasswordModifyResponse()
+ public PasswordModifyResponseDecorator( LdapApiService codec, PasswordModifyResponse decoratedMessage )
{
- return passwordModifyResponse;
+ super( codec, decoratedMessage );
+ passwordModifyResponse = decoratedMessage;
}
@@ -70,9 +69,7 @@ public class PasswordModifyResponseDecor
try
{
- passwordModifyResponse = ( PasswordModifyResponse ) decoder.decode( responseValue );
- ( ( PwdModifyResponseImpl ) getDecorated() ).setGenPassword( passwordModifyResponse.getPwdModifyResponse()
- .getGenPassword() );
+ passwordModifyResponse = decoder.decode( responseValue );
if ( responseValue != null )
{
@@ -102,7 +99,7 @@ public class PasswordModifyResponseDecor
{
try
{
- responseValue = passwordModifyResponse.encode().array();
+ responseValue = encode().array();
if ( responseValue == null )
{
@@ -116,10 +113,7 @@ public class PasswordModifyResponseDecor
}
}
- final byte[] copy = new byte[responseValue.length];
- System.arraycopy( responseValue, 0, copy, 0, responseValue.length );
-
- return copy;
+ return responseValue;
}
@@ -137,7 +131,7 @@ public class PasswordModifyResponseDecor
*/
public void setGenPassword( byte[] genPassword )
{
- ( ( PwdModifyResponseImpl ) getDecorated() ).setGenPassword( genPassword );
+ ( ( PasswordModifyResponseImpl ) getDecorated() ).setGenPassword( genPassword );
}
@@ -149,4 +143,58 @@ public class PasswordModifyResponseDecor
{
return null;
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public int computeLength()
+ {
+ requestLength = 0;
+
+ if ( passwordModifyResponse.getGenPassword() != null )
+ {
+ int len = passwordModifyResponse.getGenPassword().length;
+ requestLength = 1 + BerValue.getNbBytes( len ) + len;
+ }
+
+ return 1 + BerValue.getNbBytes( requestLength ) + requestLength;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ByteBuffer encode() throws EncoderException
+ {
+ // Allocate the bytes buffer.
+ ByteBuffer bb = ByteBuffer.allocate( computeLength() );
+
+ return encode( bb );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ByteBuffer encode( ByteBuffer bb ) throws EncoderException
+ {
+ if ( bb == null )
+ {
+ throw new EncoderException( "Null ByteBuffer, cannot encode " + this );
+ }
+
+ bb.put( UniversalTag.SEQUENCE.getValue() );
+ bb.put( BerValue.getBytes( requestLength ) );
+
+ if ( passwordModifyResponse.getGenPassword() != null )
+ {
+ byte[] userIdentity = passwordModifyResponse.getGenPassword();
+ bb.put( ( byte ) PasswordModifyRequestConstants.USER_IDENTITY_TAG );
+ bb.put( TLV.getBytes( userIdentity.length ) );
+ bb.put( userIdentity );
+ }
+
+ return bb;
+ }
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyResponseGrammar.java Wed Mar 19 08:15:34 2014
@@ -28,7 +28,7 @@ import org.apache.directory.api.asn1.ber
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.asn1.ber.tlv.UniversalTag;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponseImpl;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponseImpl;
import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,7 +87,7 @@ public class PasswordModifyResponseGramm
public void action( PasswordModifyResponseContainer container )
{
PasswordModifyResponseDecorator passwordModifyResponse = new PasswordModifyResponseDecorator(
- LdapApiServiceFactory.getSingleton(), new PwdModifyResponseImpl() );
+ LdapApiServiceFactory.getSingleton(), new PasswordModifyResponseImpl() );
container.setPasswordModifyResponse( passwordModifyResponse );
// We may have nothing left
Modified: directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyRequestTest.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyRequestTest.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyRequestTest.java Wed Mar 19 08:15:34 2014
@@ -32,7 +32,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.Asn1Decoder;
import org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyRequestContainer;
import org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyRequestDecorator;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyRequest;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyRequest;
import org.apache.directory.api.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -77,20 +77,18 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNull( pwdModifyRequest.getUserIdentity() );
assertNull( pwdModifyRequest.getOldPassword() );
assertNull( pwdModifyRequest.getNewPassword() );
// Check the length
- assertEquals( 0x02, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x02, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -133,21 +131,19 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNotNull( pwdModifyRequest.getUserIdentity() );
assertEquals( 0, pwdModifyRequest.getUserIdentity().length );
assertNull( pwdModifyRequest.getOldPassword() );
assertNull( pwdModifyRequest.getNewPassword() );
// Check the length
- assertEquals( 0x04, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x04, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -194,21 +190,19 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNotNull( pwdModifyRequest.getUserIdentity() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getUserIdentity() ) );
assertNull( pwdModifyRequest.getOldPassword() );
assertNull( pwdModifyRequest.getNewPassword() );
// Check the length
- assertEquals( 0x08, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x08, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -258,7 +252,7 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNotNull( pwdModifyRequest.getUserIdentity() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getUserIdentity() ) );
assertNull( pwdModifyRequest.getOldPassword() );
@@ -266,14 +260,12 @@ public class PasswordModifyRequestTest
assertEquals( 0, pwdModifyRequest.getNewPassword().length );
// Check the length
- assertEquals( 0x0A, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x0A, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -327,7 +319,7 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNotNull( pwdModifyRequest.getUserIdentity() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getUserIdentity() ) );
assertNull( pwdModifyRequest.getOldPassword() );
@@ -335,14 +327,12 @@ public class PasswordModifyRequestTest
assertEquals( "efgh", Strings.utf8ToString( pwdModifyRequest.getNewPassword() ) );
// Check the length
- assertEquals( 0x0E, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x0E, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -391,7 +381,7 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNotNull( pwdModifyRequest.getUserIdentity() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getUserIdentity() ) );
assertNotNull( pwdModifyRequest.getOldPassword() );
@@ -399,14 +389,12 @@ public class PasswordModifyRequestTest
assertNull( pwdModifyRequest.getNewPassword() );
// Check the length
- assertEquals( 0x0A, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x0A, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -459,7 +447,7 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNotNull( pwdModifyRequest.getUserIdentity() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getUserIdentity() ) );
assertNotNull( pwdModifyRequest.getOldPassword() );
@@ -467,14 +455,12 @@ public class PasswordModifyRequestTest
assertNull( pwdModifyRequest.getNewPassword() );
// Check the length
- assertEquals( 0x0E, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x0E, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -530,7 +516,7 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNotNull( pwdModifyRequest.getUserIdentity() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getUserIdentity() ) );
assertNotNull( pwdModifyRequest.getOldPassword() );
@@ -539,14 +525,12 @@ public class PasswordModifyRequestTest
assertEquals( 0, pwdModifyRequest.getNewPassword().length );
// Check the length
- assertEquals( 0x10, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x10, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -606,7 +590,7 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNotNull( pwdModifyRequest.getUserIdentity() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getUserIdentity() ) );
assertNotNull( pwdModifyRequest.getOldPassword() );
@@ -615,14 +599,12 @@ public class PasswordModifyRequestTest
assertEquals( "ijkl", Strings.utf8ToString( pwdModifyRequest.getNewPassword() ) );
// Check the length
- assertEquals( 0x14, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x14, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -665,21 +647,19 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNull( pwdModifyRequest.getUserIdentity() );
assertNotNull( pwdModifyRequest.getOldPassword() );
assertEquals( 0, pwdModifyRequest.getOldPassword().length );
assertNull( pwdModifyRequest.getNewPassword() );
// Check the length
- assertEquals( 0x04, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x04, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -726,21 +706,19 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNull( pwdModifyRequest.getUserIdentity() );
assertNotNull( pwdModifyRequest.getOldPassword() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getOldPassword() ) );
assertNull( pwdModifyRequest.getNewPassword() );
// Check the length
- assertEquals( 0x08, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x08, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -790,7 +768,7 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNull( pwdModifyRequest.getUserIdentity() );
assertNotNull( pwdModifyRequest.getOldPassword() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getOldPassword() ) );
@@ -798,14 +776,12 @@ public class PasswordModifyRequestTest
assertEquals( 0, pwdModifyRequest.getNewPassword().length );
// Check the length
- assertEquals( 0x0A, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x0A, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -859,7 +835,7 @@ public class PasswordModifyRequestTest
fail( de.getMessage() );
}
- PwdModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
+ PasswordModifyRequest pwdModifyRequest = container.getPwdModifyRequest();
assertNull( pwdModifyRequest.getUserIdentity() );
assertNotNull( pwdModifyRequest.getOldPassword() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyRequest.getOldPassword() ) );
@@ -867,14 +843,12 @@ public class PasswordModifyRequestTest
assertEquals( "efgh", Strings.utf8ToString( pwdModifyRequest.getNewPassword() ) );
// Check the length
- assertEquals( 0x0E, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .computeLength() );
+ assertEquals( 0x0E, ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).getPasswordModifyRequest()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyRequestDecorator ) pwdModifyRequest ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
Modified: directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyResponseTest.java?rev=1579165&r1=1579164&r2=1579165&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyResponseTest.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/api/ldap/extras/extended/ads_impl/PasswordModifyResponseTest.java Wed Mar 19 08:15:34 2014
@@ -32,7 +32,7 @@ import org.apache.directory.api.asn1.Enc
import org.apache.directory.api.asn1.ber.Asn1Decoder;
import org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyResponseContainer;
import org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyResponseDecorator;
-import org.apache.directory.api.ldap.extras.extended.pwdModify.PwdModifyResponse;
+import org.apache.directory.api.ldap.extras.extended.pwdModify.PasswordModifyResponse;
import org.apache.directory.api.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -77,18 +77,16 @@ public class PasswordModifyResponseTest
fail( de.getMessage() );
}
- PwdModifyResponse pwdModifyResponse = container.getPwdModifyResponse();
+ PasswordModifyResponse pwdModifyResponse = container.getPwdModifyResponse();
assertNull( pwdModifyResponse.getGenPassword() );
// Check the length
- assertEquals( 0x02, ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).getPasswordModifyResponse()
- .computeLength() );
+ assertEquals( 0x02, ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).getPasswordModifyResponse()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -131,19 +129,17 @@ public class PasswordModifyResponseTest
fail( de.getMessage() );
}
- PwdModifyResponse pwdModifyResponse = container.getPwdModifyResponse();
+ PasswordModifyResponse pwdModifyResponse = container.getPwdModifyResponse();
assertNotNull( pwdModifyResponse.getGenPassword() );
assertEquals( 0, pwdModifyResponse.getGenPassword().length );
// Check the length
- assertEquals( 0x04, ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).getPasswordModifyResponse()
- .computeLength() );
+ assertEquals( 0x04, ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).getPasswordModifyResponse()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );
@@ -190,19 +186,17 @@ public class PasswordModifyResponseTest
fail( de.getMessage() );
}
- PwdModifyResponse pwdModifyResponse = container.getPwdModifyResponse();
+ PasswordModifyResponse pwdModifyResponse = container.getPwdModifyResponse();
assertNotNull( pwdModifyResponse.getGenPassword() );
assertEquals( "abcd", Strings.utf8ToString( pwdModifyResponse.getGenPassword() ) );
// Check the length
- assertEquals( 0x08, ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).getPasswordModifyResponse()
- .computeLength() );
+ assertEquals( 0x08, ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).computeLength() );
// Check the encoding
try
{
- ByteBuffer bb1 = ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).getPasswordModifyResponse()
- .encode();
+ ByteBuffer bb1 = ( ( PasswordModifyResponseDecorator ) pwdModifyResponse ).encode();
String encodedPdu = Strings.dumpBytes( bb1.array() );