directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1063102 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ shared/trunk/dsml-parser/src/main/java/org/ap...
Date Tue, 25 Jan 2011 02:03:36 GMT
Author: akarasulu
Date: Tue Jan 25 02:03:35 2011
New Revision: 1063102

URL: http://svn.apache.org/viewvc?rev=1063102&view=rev
Log:
added encoding decorator to decouple CompareRequestImpl

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/CompareRequestDecorator.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/CompareRequestImpl.java
  (contents, props changed)
      - copied, changed from r1063086, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java
  (contents, props changed)
      - copied, changed from r1063063, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
Removed:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
    directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.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/CompareResponseImpl.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

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=1063102&r1=1063101&r2=1063102&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 02:03:35 2011
@@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.BindResponse;
 import org.apache.directory.shared.ldap.model.message.BindResponseImpl;
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
+import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
 import org.apache.directory.shared.ldap.model.message.CompareResponse;
 import org.apache.directory.shared.ldap.message.CompareResponseImpl;
 import org.apache.directory.shared.ldap.model.message.DeleteRequest;

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=1063102&r1=1063101&r2=1063102&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
(original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
Tue Jan 25 02:03:35 2011
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
+import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
 import org.apache.directory.shared.ldap.model.message.CompareResponse;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java?rev=1063102&r1=1063101&r2=1063102&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
(original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
Tue Jan 25 02:03:35 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml
 
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
+import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.dom4j.Element;
 

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1063102&r1=1063101&r2=1063102&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
(original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
Tue Jan 25 02:03:35 2011
@@ -63,7 +63,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.*;
 import org.apache.directory.shared.ldap.model.message.BindRequest;
 import org.apache.directory.shared.ldap.model.message.BindRequestImpl;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
+import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
 import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
 import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1063102&r1=1063101&r2=1063102&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
(original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Tue Jan 25 02:03:35 2011
@@ -86,7 +86,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.BindRequestImpl;
 import org.apache.directory.shared.ldap.model.message.BindResponse;
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
+import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
 import org.apache.directory.shared.ldap.model.message.CompareResponse;
 import org.apache.directory.shared.ldap.model.message.DeleteRequest;
 import org.apache.directory.shared.ldap.message.DeleteRequestImpl;

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=1063102&r1=1063101&r2=1063102&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 02:03:35 2011
@@ -80,7 +80,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.BindResponse;
 import org.apache.directory.shared.ldap.model.message.BindResponseImpl;
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
+import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
 import org.apache.directory.shared.ldap.model.message.CompareResponse;
 import org.apache.directory.shared.ldap.message.CompareResponseImpl;
 import org.apache.directory.shared.ldap.model.message.DeleteRequest;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java?rev=1063102&r1=1063101&r2=1063102&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
Tue Jan 25 02:03:35 2011
@@ -24,6 +24,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.CompareResponse;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 
+
 /**
  * CompareResponse implementation.
  * 

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=1063102&r1=1063101&r2=1063102&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 02:03:35 2011
@@ -608,8 +608,9 @@ public class LdapEncoder
      * 
      * @return The CompareRequest PDU's length
      */
-    private int computeCompareRequestLength( CompareRequestImpl compareRequest )
+    private int computeCompareRequestLength( CompareRequestDecorator decorator )
     {
+        CompareRequest compareRequest = decorator.getCompareRequest();
         // The entry Dn
         Dn entry = compareRequest.getName();
         int compareRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes(entry) ) + Dn.getNbBytes(entry);
@@ -617,7 +618,7 @@ public class LdapEncoder
         // The attribute value assertion
         byte[] attributeIdBytes = Strings.getBytesUtf8(compareRequest.getAttributeId());
         int avaLength = 1 + TLV.getNbBytes( attributeIdBytes.length ) + attributeIdBytes.length;
-        compareRequest.setAttrIdBytes( attributeIdBytes );
+        decorator.setAttrIdBytes( attributeIdBytes );
 
         org.apache.directory.shared.ldap.model.entry.Value assertionValue = compareRequest.getAssertionValue();
 
@@ -625,18 +626,18 @@ public class LdapEncoder
         {
             byte[] value = compareRequest.getAssertionValue().getBytes();
             avaLength += 1 + TLV.getNbBytes( value.length ) + value.length;
-            compareRequest.setAttrValBytes( value );
+            decorator.setAttrValBytes( value );
         }
         else
         {
             byte[] value = Strings.getBytesUtf8(compareRequest.getAssertionValue().getString());
             avaLength += 1 + TLV.getNbBytes( value.length ) + value.length;
-            compareRequest.setAttrValBytes( value );
+            decorator.setAttrValBytes( value );
         }
 
-        compareRequest.setAvaLength( avaLength );
+        decorator.setAvaLength( avaLength );
         compareRequestLength += 1 + TLV.getNbBytes( avaLength ) + avaLength;
-        compareRequest.setCompareRequestLength( compareRequestLength );
+        decorator.setCompareRequestLength( compareRequestLength );
 
         return 1 + TLV.getNbBytes( compareRequestLength ) + compareRequestLength;
 
@@ -1636,20 +1637,21 @@ public class LdapEncoder
      * 
      * @param buffer The buffer where to put the PDU
      */
-    private void encodeCompareRequest( ByteBuffer buffer, CompareRequestImpl compareRequest
) throws EncoderException
+    private void encodeCompareRequest( ByteBuffer buffer, CompareRequestDecorator decorator
) throws EncoderException
     {
+        CompareRequest compareRequest = decorator.getCompareRequest();
         try
         {
             // The CompareRequest Tag
             buffer.put( LdapConstants.COMPARE_REQUEST_TAG );
-            buffer.put( TLV.getBytes( compareRequest.getCompareRequestLength() ) );
+            buffer.put( TLV.getBytes( decorator.getCompareRequestLength() ) );
 
             // The entry
             Value.encode( buffer, Dn.getBytes(compareRequest.getName()) );
 
             // The attributeValueAssertion sequence Tag
             buffer.put( UniversalTag.SEQUENCE.getValue() );
-            buffer.put( TLV.getBytes( compareRequest.getAvaLength() ) );
+            buffer.put( TLV.getBytes( decorator.getAvaLength() ) );
         }
         catch ( BufferOverflowException boe )
         {
@@ -1657,10 +1659,10 @@ public class LdapEncoder
         }
 
         // The attributeDesc
-        Value.encode( buffer, compareRequest.getAttrIdBytes() );
+        Value.encode( buffer, decorator.getAttrIdBytes() );
 
         // The assertionValue
-        Value.encode( buffer, ( byte[] ) compareRequest.getAttrValBytes() );
+        Value.encode( buffer, ( byte[] ) decorator.getAttrValBytes() );
     }
 
 
@@ -2383,7 +2385,7 @@ public class LdapEncoder
                 return computeBindResponseLength( ( BindResponseDecorator ) decorator );
 
             case COMPARE_REQUEST:
-                return computeCompareRequestLength( ( CompareRequestImpl ) message );
+                return computeCompareRequestLength( ( CompareRequestDecorator ) decorator
);
 
             case COMPARE_RESPONSE:
                 return computeCompareResponseLength( ( CompareResponseImpl ) message );
@@ -2463,7 +2465,7 @@ public class LdapEncoder
                 break;
 
             case COMPARE_REQUEST:
-                encodeCompareRequest( bb, ( CompareRequestImpl ) message );
+                encodeCompareRequest( bb, ( CompareRequestDecorator ) decorator );
                 break;
 
             case COMPARE_RESPONSE:

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/CompareRequestDecorator.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/CompareRequestDecorator.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/CompareRequestDecorator.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java&r1=1063097&r2=1063102&rev=1063102&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/CompareRequestDecorator.java
Tue Jan 25 02:03:35 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.CompareRequest;
 
 
 /**
@@ -30,22 +28,116 @@ import java.util.List;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class FooDecorator extends MessageDecorator
+public class CompareRequestDecorator extends MessageDecorator
 {
+    /** The bytes of the attribute id used in the comparison */
+    private byte[] attrIdBytes;
+
+    /** The bytes of the attribute value used in the comparison */
+    private byte[] attrValBytes;
+
+    /** The compare request length */
+    private int compareRequestLength;
+
+    /** The attribute value assertion length */
+    private int avaLength;
+
 
     /**
-     * Makes a Foo encodable.
+     * Makes a CompareRequest encodable.
      *
-     * @param decoratedMessage the decorated Foo
+     * @param decoratedMessage the decorated CompareRequest
      */
-    public FooDecorator( AddRequest decoratedMessage )
+    public CompareRequestDecorator( CompareRequest decoratedMessage )
     {
         super( decoratedMessage );
     }
 
 
-    public AddRequest getAddRequest()
+    public CompareRequest getCompareRequest()
+    {
+        return ( CompareRequest ) getMessage();
+    }
+
+
+    /**
+     * Stores the encoded length for the CompareRequest
+     * @param compareRequestLength The encoded length
+     */
+    public void setCompareRequestLength( int compareRequestLength )
+    {
+        this.compareRequestLength = compareRequestLength;
+    }
+
+
+    /**
+     * @return The encoded CompareRequest length
+     */
+    public int getCompareRequestLength()
+    {
+        return compareRequestLength;
+    }
+
+
+    /**
+     * Stores the encoded length for the ava
+     * @param avaLength The encoded length
+     */
+    public void setAvaLength( int avaLength )
+    {
+        this.avaLength = avaLength;
+    }
+
+
+    /**
+     * @return The encoded ava length
+     */
+    public int getAvaLength()
+    {
+        return avaLength;
+    }
+
+
+    /**
+     * Gets the attribute id bytes use in making the comparison.
+     *
+     * @return the attribute id bytes used in comparison.
+     */
+    public byte[] getAttrIdBytes()
+    {
+        return attrIdBytes;
+    }
+
+
+    /**
+     * Sets the attribute id bytes used in the comparison.
+     *
+     * @param attrIdBytes the attribute id bytes used in comparison.
+     */
+    public void setAttrIdBytes( byte[] attrIdBytes )
+    {
+        this.attrIdBytes = attrIdBytes;
+    }
+
+
+    /**
+     * Gets the attribute value bytes use in making the comparison.
+     *
+     * @return the attribute value bytes used in comparison.
+     */
+    public byte[] getAttrValBytes()
+    {
+        return attrValBytes;
+    }
+
+
+    /**
+     * Sets the attribute value bytes used in the comparison.
+     *
+     * @param attrValBytes the attribute value bytes used in comparison.
+     */
+    public void setAttrValBytes( byte[] attrValBytes )
     {
-        return ( AddRequest ) getMessage();
+        this.attrValBytes = attrValBytes;
     }
 }

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=1063102&r1=1063101&r2=1063102&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 02:03:35 2011
@@ -59,6 +59,8 @@ public class MessageDecorator
                 return new BindRequestDecorator( ( BindRequest ) decoratedMessage );
             case BIND_RESPONSE:
                 return new BindResponseDecorator( ( BindResponse ) decoratedMessage );
+            case COMPARE_REQUEST:
+                return new CompareRequestDecorator( ( CompareRequest ) decoratedMessage );
             default:
                 return new MessageDecorator( decoratedMessage );
         }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
(from r1063086, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java&r1=1063086&r2=1063102&rev=1063102&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
Tue Jan 25 02:03:35 2011
@@ -17,9 +17,10 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.model.message;
 
 
+import org.apache.directory.shared.ldap.message.CompareResponseImpl;
 import org.apache.directory.shared.ldap.model.message.*;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
@@ -43,24 +44,12 @@ public class CompareRequestImpl extends 
     /** The id of the attribute used in the comparison */
     private String attrId;
 
-    /** The bytes of the attribute id used in the comparison */
-    private byte[] attrIdBytes;
-
     /** The value of the attribute used in the comparison */
     private Value<?> attrVal;
 
-    /** The bytes of the attribute value used in the comparison */
-    private byte[] attrValBytes;
-
     /** The associated response */
     private CompareResponse response;
 
-    /** The compare request length */
-    private int compareRequestLength;
-
-    /** The attribute value assertion length */
-    private int avaLength;
-
 
     // ------------------------------------------------------------------------
     // Constructors
@@ -177,54 +166,11 @@ public class CompareRequestImpl extends 
     }
 
 
-    /**
-     * Gets the attribute id bytes use in making the comparison.
-     * 
-     * @return the attribute id bytes used in comparison.
-     */
-    /*No qualifier*/byte[] getAttrIdBytes()
-    {
-        return attrIdBytes;
-    }
-
-
-    /**
-     * Sets the attribute id bytes used in the comparison.
-     * 
-     * @param attrIdBytes the attribute id bytes used in comparison.
-     */
-    /*No qualifier*/void setAttrIdBytes( byte[] attrIdBytes )
-    {
-        this.attrIdBytes = attrIdBytes;
-    }
-
-
-    /**
-     * Gets the attribute value bytes use in making the comparison.
-     * 
-     * @return the attribute value bytes used in comparison.
-     */
-    /*No qualifier*/byte[] getAttrValBytes()
-    {
-        return attrValBytes;
-    }
-
-
-    /**
-     * Sets the attribute value bytes used in the comparison.
-     * 
-     * @param attrValBytes the attribute value bytes used in comparison.
-     */
-    /*No qualifier*/void setAttrValBytes( byte[] attrValBytes )
-    {
-        this.attrValBytes = attrValBytes;
-    }
-
-
     // ------------------------------------------------------------------------
     // SingleReplyRequest Interface Method Implementations
     // ------------------------------------------------------------------------
 
+
     /**
      * Gets the protocol response message type for this request which produces
      * at least one response.
@@ -254,44 +200,6 @@ public class CompareRequestImpl extends 
 
 
     /**
-     * Stores the encoded length for the CompareRequest
-     * @param compareRequestLength The encoded length
-     */
-    /* No qualifier*/void setCompareRequestLength( int compareRequestLength )
-    {
-        this.compareRequestLength = compareRequestLength;
-    }
-
-
-    /**
-     * @return The encoded CompareRequest length
-     */
-    /* No qualifier */int getCompareRequestLength()
-    {
-        return compareRequestLength;
-    }
-
-
-    /**
-     * Stores the encoded length for the ava
-     * @param avaLength The encoded length
-     */
-    /* No qualifier*/void setAvaLength( int avaLength )
-    {
-        this.avaLength = avaLength;
-    }
-
-
-    /**
-     * @return The encoded ava length
-     */
-    /* No qualifier */int getAvaLength()
-    {
-        return avaLength;
-    }
-
-
-    /**
      * {@inheritDoc}
      */
     @Override

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java
(from r1063063, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java&r1=1063063&r2=1063102&rev=1063102&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java
Tue Jan 25 02:03:35 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.model.message;
 
 
 import static org.junit.Assert.assertFalse;

Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message