You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/25 04:39:52 UTC
svn commit: r1063126 - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/
shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
shared/trunk/ldap/src/main/java/org/apache/directory/shared...
Author: akarasulu
Date: Tue Jan 25 03:39:51 2011
New Revision: 1063126
URL: http://svn.apache.org/viewvc?rev=1063126&view=rev
Log:
added encoding decorator to decouple ModifyResponseImpl
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyResponseDecorator.java
- copied, changed from r1063097, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java (contents, props changed)
- copied, changed from r1063086, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/nod/ModifyNoDResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Tue Jan 25 03:39:51 2011
@@ -73,7 +73,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.model.message.ResultResponseRequest;
import org.apache.directory.shared.ldap.model.message.SearchRequest;
import org.apache.directory.shared.ldap.message.SearchRequestImpl;
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Tue Jan 25 03:39:51 2011
@@ -58,7 +58,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.model.message.ModifyDnResponseImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.model.message.ReferralImpl;
import org.apache.directory.shared.ldap.model.message.Response;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java Tue Jan 25 03:39:51 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
import org.dom4j.Element;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Tue Jan 25 03:39:51 2011
@@ -100,7 +100,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.model.message.Referral;
import org.apache.directory.shared.ldap.model.message.ReferralImpl;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java Tue Jan 25 03:39:51 2011
@@ -958,11 +958,12 @@ public class LdapEncoder
* Length(ModifyResponse) = Length(0x67) + Length(L1) + L1
* </pre>
*/
- private int computeModifyResponseLength( ModifyResponseImpl modifyResponse )
+ private int computeModifyResponseLength( ModifyResponseDecorator decorator )
{
+ ModifyResponse modifyResponse = decorator.getModifyResponse();
int modifyResponseLength = computeLdapResultLength( modifyResponse.getLdapResult() );
- modifyResponse.setModifyResponseLength( modifyResponseLength );
+ decorator.setModifyResponseLength( modifyResponseLength );
return 1 + TLV.getNbBytes( modifyResponseLength ) + modifyResponseLength;
}
@@ -2030,13 +2031,14 @@ public class LdapEncoder
*
* @param buffer The buffer where to put the PDU
*/
- private void encodeModifyResponse( ByteBuffer buffer, ModifyResponseImpl modifyResponse ) throws EncoderException
+ private void encodeModifyResponse( ByteBuffer buffer, ModifyResponseDecorator decorator ) throws EncoderException
{
+ ModifyResponse modifyResponse = decorator.getModifyResponse();
try
{
// The ModifyResponse Tag
buffer.put( LdapConstants.MODIFY_RESPONSE_TAG );
- buffer.put( TLV.getBytes( modifyResponse.getModifyResponseLength() ) );
+ buffer.put( TLV.getBytes( decorator.getModifyResponseLength() ) );
// The LdapResult
encodeLdapResult( buffer, modifyResponse.getLdapResult() );
@@ -2429,7 +2431,7 @@ public class LdapEncoder
return computeModifyRequestLength( ( ModifyRequestDecorator ) decorator );
case MODIFY_RESPONSE:
- return computeModifyResponseLength( ( ModifyResponseImpl ) message );
+ return computeModifyResponseLength( ( ModifyResponseDecorator ) decorator );
case MODIFYDN_REQUEST:
return computeModifyDnRequestLength( ( ModifyDnRequestDecorator ) decorator );
@@ -2517,7 +2519,7 @@ public class LdapEncoder
break;
case MODIFY_RESPONSE:
- encodeModifyResponse( bb, ( ModifyResponseImpl ) message );
+ encodeModifyResponse( bb, ( ModifyResponseDecorator ) decorator );
break;
case MODIFYDN_REQUEST:
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java Tue Jan 25 03:39:51 2011
@@ -75,6 +75,8 @@ public class MessageDecorator
return new IntermediateResponseDecorator( ( IntermediateResponse ) decoratedMessage );
case MODIFY_REQUEST:
return new ModifyRequestDecorator( ( ModifyRequest ) decoratedMessage );
+ case MODIFY_RESPONSE:
+ return new ModifyResponseDecorator( ( ModifyResponse ) decoratedMessage );
case MODIFYDN_REQUEST:
return new ModifyDnRequestDecorator( ( ModifyDnRequest ) decoratedMessage );
case MODIFYDN_RESPONSE:
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyResponseDecorator.java (from r1063097, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyResponseDecorator.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyResponseDecorator.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java&r1=1063097&r2=1063126&rev=1063126&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyResponseDecorator.java Tue Jan 25 03:39:51 2011
@@ -20,9 +20,7 @@
package org.apache.directory.shared.ldap.message.decorators;
-import org.apache.directory.shared.ldap.model.message.AddRequest;
-
-import java.util.List;
+import org.apache.directory.shared.ldap.model.message.ModifyResponse;
/**
@@ -30,22 +28,44 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class FooDecorator extends MessageDecorator
+public class ModifyResponseDecorator extends MessageDecorator
{
+ /** The encoded modifyResponse length */
+ private int modifyResponseLength;
+
/**
- * Makes a Foo encodable.
+ * Makes a ModifyResponse encodable.
*
- * @param decoratedMessage the decorated Foo
+ * @param decoratedMessage the decorated ModifyResponse
*/
- public FooDecorator( AddRequest decoratedMessage )
+ public ModifyResponseDecorator( ModifyResponse decoratedMessage )
{
super( decoratedMessage );
}
- public AddRequest getAddRequest()
+ public ModifyResponse getModifyResponse()
+ {
+ return ( ModifyResponse ) getMessage();
+ }
+
+
+ /**
+ * Stores the encoded length for the ModifyResponse
+ * @param modifyResponseLength The encoded length
+ */
+ public void setModifyResponseLength( int modifyResponseLength )
+ {
+ this.modifyResponseLength = modifyResponseLength;
+ }
+
+
+ /**
+ * @return The encoded ModifyResponse's length
+ */
+ public int getModifyResponseLength()
{
- return ( AddRequest ) getMessage();
+ return modifyResponseLength;
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/nod/ModifyNoDResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/nod/ModifyNoDResponse.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/nod/ModifyNoDResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/nod/ModifyNoDResponse.java Tue Jan 25 03:39:51 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java Tue Jan 25 03:39:51 2011
@@ -26,8 +26,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
-import org.apache.directory.shared.ldap.model.message.*;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java (from r1063086, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java&r1=1063086&r2=1063126&rev=1063126&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java Tue Jan 25 03:39:51 2011
@@ -17,25 +17,19 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.model.message;
import org.apache.directory.shared.ldap.model.message.AbstractResultResponse;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
+
/**
* ModifyResponse implementation
*
*/
public class ModifyResponseImpl extends AbstractResultResponse implements ModifyResponse
{
- /** The encoded modifyResponse length */
- private int modifyResponseLength;
-
- // ------------------------------------------------------------------------
- // Constructors
- // ------------------------------------------------------------------------
-
static final long serialVersionUID = 4132526905748233730L;
@@ -60,25 +54,6 @@ public class ModifyResponseImpl extends
/**
- * Stores the encoded length for the ModifyResponse
- * @param modifyResponseLength The encoded length
- */
- /*No qualifier*/void setModifyResponseLength( int modifyResponseLength )
- {
- this.modifyResponseLength = modifyResponseLength;
- }
-
-
- /**
- * @return The encoded ModifyResponse's length
- */
- /*No qualifier*/int getModifyResponseLength()
- {
- return modifyResponseLength;
- }
-
-
- /**
* Get a String representation of a ModifyResponse
*
* @return A ModifyResponse String
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=1063126&r1=1063125&r2=1063126&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Tue Jan 25 03:39:51 2011
@@ -40,11 +40,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.Modification;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.message.LdapEncoder;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.Message;
-import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.message.*;
+import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -990,7 +987,7 @@ public class ModifyRequestTest
{
assertTrue( de instanceof ResponseCarryingException );
Message response = ( ( ResponseCarryingException ) de ).getResponse();
- assertTrue( response instanceof ModifyResponseImpl );
+ assertTrue( response instanceof ModifyResponseImpl);
assertEquals( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, ( ( ModifyResponseImpl ) response ).getLdapResult()
.getResultCode() );
return;