directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r984932 - in /directory: apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/repli...
Date Thu, 12 Aug 2010 19:52:32 GMT
Author: elecharny
Date: Thu Aug 12 19:52:31 2010
New Revision: 984932

URL: http://svn.apache.org/viewvc?rev=984932&view=rev
Log:
Renamed the SearchResponseEntry and SearchResponseReference classes

Added:
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java
      - copied, changed from r982962, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java
      - copied, changed from r982962, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.java
      - copied, changed from r982962, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.java
      - copied, changed from r982962, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseReference.java
Removed:
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseReference.java
Modified:
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
Thu Aug 12 19:52:31 2010
@@ -35,10 +35,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
+import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
 import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseEntry;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,7 +105,7 @@ public class PersistentSearchListener im
     }
     
     
-    private void setECResponseControl( InternalSearchResponseEntry response, ChangeOperationContext
opContext, ChangeType type )
+    private void setECResponseControl( InternalSearchResultEntry response, ChangeOperationContext
opContext, ChangeType type )
     {
         if ( control.isReturnECs() )
         {
@@ -134,7 +134,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
         respEntry.setObjectName( addContext.getDn() );
         respEntry.setEntry( addContext.getEntry() );
         setECResponseControl( respEntry, addContext, ChangeType.ADD );
@@ -149,7 +149,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
         respEntry.setObjectName( deleteContext.getDn() );
         respEntry.setEntry( deleteContext.getEntry() );
         setECResponseControl( respEntry, deleteContext, ChangeType.DELETE );
@@ -164,7 +164,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
         respEntry.setObjectName( modifyContext.getDn() );
         respEntry.setEntry( modifyContext.getAlteredEntry() );
         setECResponseControl( respEntry, modifyContext, ChangeType.MODIFY );
@@ -179,7 +179,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
         respEntry.setObjectName( moveContext.getDn() );
         respEntry.setEntry( moveContext.getEntry() );
         setECResponseControl( respEntry, moveContext, ChangeType.MODDN );
@@ -200,7 +200,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
         respEntry.setObjectName( renameContext.getModifiedEntry().getDn() );
         respEntry.setEntry( renameContext.getModifiedEntry() );
         setECResponseControl( respEntry, renameContext, ChangeType.MODDN );

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
Thu Aug 12 19:52:31 2010
@@ -59,16 +59,16 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.ReferralImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
-import org.apache.directory.shared.ldap.message.SearchResponseReferenceImpl;
+import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
+import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
 import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
 import org.apache.directory.shared.ldap.message.internal.InternalResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseEntry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseReference;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.LdapURL;
@@ -838,8 +838,8 @@ public class SearchHandler extends LdapR
         if ( ( ref != null ) && ! hasManageDsaItControl )
         {
             // The entry is a referral.
-            InternalSearchResponseReference respRef;
-            respRef = new SearchResponseReferenceImpl( req.getMessageId() );
+            InternalSearchResultReference respRef;
+            respRef = new SearchResultReferenceImpl( req.getMessageId() );
             respRef.setReferral( new ReferralImpl() );
 
             for ( Value<?> val : ref )
@@ -884,8 +884,8 @@ public class SearchHandler extends LdapR
         else
         {
             // The entry is not a referral, or the ManageDsaIt control is set
-            InternalSearchResponseEntry respEntry;
-            respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+            InternalSearchResultEntry respEntry;
+            respEntry = new SearchResultEntryImpl( req.getMessageId() );
             respEntry.setEntry( entry );
             respEntry.setObjectName( entry.getDn() );
 

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
Thu Aug 12 19:52:31 2010
@@ -72,8 +72,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.IntermediateResponseImpl;
 import org.apache.directory.shared.ldap.message.ReferralImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
-import org.apache.directory.shared.ldap.message.SearchResponseReferenceImpl;
+import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
+import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
@@ -82,8 +82,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.internal.InternalResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseEntry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseReference;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -604,8 +604,8 @@ public class SyncReplProvider implements
         if ( ( ref != null ) && !hasManageDsaItControl )
         {
             // The entry is a referral.
-            InternalSearchResponseReference respRef;
-            respRef = new SearchResponseReferenceImpl( req.getMessageId() );
+            InternalSearchResultReference respRef;
+            respRef = new SearchResultReferenceImpl( req.getMessageId() );
             respRef.setReferral( new ReferralImpl() );
 
             for ( Value<?> val : ref )
@@ -650,8 +650,8 @@ public class SyncReplProvider implements
         else
         {
             // The entry is not a referral, or the ManageDsaIt control is set
-            InternalSearchResponseEntry respEntry;
-            respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+            InternalSearchResultEntry respEntry;
+            respEntry = new SearchResultEntryImpl( req.getMessageId() );
             respEntry.setEntry( entry );
             respEntry.setObjectName( entry.getDn() );
 

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
Thu Aug 12 19:52:31 2010
@@ -36,12 +36,12 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
+import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
 import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseEntry;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.mina.core.future.WriteFuture;
 import org.slf4j.Logger;
@@ -141,7 +141,7 @@ public class SyncReplSearchListener impl
             if ( pushInRealTime )
             {
                 
-                InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
                 respEntry.setObjectName( entry.getDn() );
                 respEntry.setEntry( entry );
 
@@ -182,7 +182,7 @@ public class SyncReplSearchListener impl
         {
             if ( pushInRealTime )
             {
-                InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
                 respEntry.setObjectName( entry.getDn() );
                 respEntry.setEntry( entry );
 
@@ -221,7 +221,7 @@ public class SyncReplSearchListener impl
             if ( pushInRealTime )
             {
                 
-                InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
                 respEntry.setObjectName( modifyContext.getDn() );
                 respEntry.setEntry( alteredEntry );
 
@@ -269,7 +269,7 @@ public class SyncReplSearchListener impl
 
             if ( pushInRealTime )
             {
-                InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
                 respEntry.setObjectName( moveContext.getDn() );
                 respEntry.setEntry( entry );
 
@@ -320,7 +320,7 @@ public class SyncReplSearchListener impl
             {
                 Entry alteredEntry = moveAndRenameContext.getModifiedEntry();
                 
-                InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
                 respEntry.setObjectName( moveAndRenameContext.getModifiedEntry().getDn()
);
                 respEntry.setEntry( alteredEntry );
 
@@ -364,7 +364,7 @@ public class SyncReplSearchListener impl
 
             if ( pushInRealTime )
             {
-                InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
+                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId()
);
                 respEntry.setObjectName( entry.getDn() );
                 respEntry.setEntry( entry );
 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
Thu Aug 12 19:52:31 2010
@@ -70,8 +70,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.message.ReferralImpl;
 import org.apache.directory.shared.ldap.message.SearchRequestImpl;
-import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
-import org.apache.directory.shared.ldap.message.SearchResponseReferenceImpl;
+import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
+import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.message.extended.GracefulShutdownRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
@@ -701,7 +701,7 @@ public class LdapTransformer
      */
     private static LdapMessageCodec transformSearchResultEntry( InternalMessage internalMessage
)
     {
-        SearchResponseEntryImpl internalSearchResultResponse = ( SearchResponseEntryImpl
) internalMessage;
+        SearchResultEntryImpl internalSearchResultResponse = ( SearchResultEntryImpl ) internalMessage;
         SearchResultEntryCodec searchResultEntry = new SearchResultEntryCodec();
 
         // Internal : DN dn -> Codec : DN objectName
@@ -723,7 +723,7 @@ public class LdapTransformer
      */
     private static LdapMessageCodec transformSearchResultReference( InternalMessage internalMessage
)
     {
-        SearchResponseReferenceImpl internalSearchResponseReference = ( SearchResponseReferenceImpl
) internalMessage;
+        SearchResultReferenceImpl internalSearchResponseReference = ( SearchResultReferenceImpl
) internalMessage;
         SearchResultReferenceCodec searchResultReference = new SearchResultReferenceCodec();
 
         // Internal : Referral m_referral -> Codec: ArrayList

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
Thu Aug 12 19:52:31 2010
@@ -25,8 +25,6 @@ import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.exception.LdapException;
-
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
@@ -40,6 +38,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -116,7 +115,7 @@ public class SearchResultEntryCodec exte
         return MessageTypeEnum.SEARCH_RESULT_ENTRY;
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -177,7 +176,7 @@ public class SearchResultEntryCodec exte
      * @param type The attribute's name
      */
     // This will suppress PMD.EmptyCatchBlock warnings in this method
-    @SuppressWarnings( "PMD.EmptyCatchBlock" )
+    @SuppressWarnings("PMD.EmptyCatchBlock")
     public void addAttributeValues( String type )
     {
         currentAttributeValue = new DefaultEntryAttribute( type );

Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java
(from r982962, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java&r1=982962&r2=984932&rev=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java
Thu Aug 12 19:52:31 2010
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.internal.InternalAbstractResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseEntry;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SearchResponseEntryImpl extends InternalAbstractResponse implements InternalSearchResponseEntry
+public class SearchResultEntryImpl extends InternalAbstractResponse implements InternalSearchResultEntry
 {
     static final long serialVersionUID = -8357316233060886637L;
 
@@ -49,7 +49,7 @@ public class SearchResponseEntryImpl ext
      * 
      * @param id the session unique message id
      */
-    public SearchResponseEntryImpl( final int id )
+    public SearchResultEntryImpl( final int id )
     {
         super( id, TYPE );
     }
@@ -144,12 +144,12 @@ public class SearchResponseEntryImpl ext
             return false;
         }
 
-        if ( !( obj instanceof InternalSearchResponseEntry ) )
+        if ( !( obj instanceof InternalSearchResultEntry ) )
         {
             return false;
         }
 
-        InternalSearchResponseEntry resp = ( InternalSearchResponseEntry ) obj;
+        InternalSearchResultEntry resp = ( InternalSearchResultEntry ) obj;
 
         return entry.equals( resp.getEntry() );
     }

Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java
(from r982962, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java&r1=982962&r2=984932&rev=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java
Thu Aug 12 19:52:31 2010
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.message.internal.InternalAbstractResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseReference;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SearchResponseReferenceImpl extends InternalAbstractResponse implements InternalSearchResponseReference
+public class SearchResultReferenceImpl extends InternalAbstractResponse implements InternalSearchResultReference
 {
     static final long serialVersionUID = 7423807019951309810L;
 
@@ -49,7 +49,7 @@ public class SearchResponseReferenceImpl
      * @param id
      *            the session unique message id
      */
-    public SearchResponseReferenceImpl( final int id )
+    public SearchResultReferenceImpl( final int id )
     {
         super( id, TYPE );
     }
@@ -118,7 +118,7 @@ public class SearchResponseReferenceImpl
             return false;
         }
 
-        InternalSearchResponseReference resp = ( InternalSearchResponseReference ) obj;
+        InternalSearchResultReference resp = ( InternalSearchResultReference ) obj;
 
         if ( this.referral != null && resp.getReferral() == null )
         {

Modified: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
Thu Aug 12 19:52:31 2010
@@ -49,8 +49,8 @@ public interface InternalSearchRequest e
     MessageTypeEnum[] RESPONSE_TYPES =
         { 
         InternalSearchResultDone.TYPE, 
-        InternalSearchResponseEntry.TYPE, 
-        InternalSearchResponseReference.TYPE, 
+        InternalSearchResultEntry.TYPE, 
+        InternalSearchResultReference.TYPE, 
         InternalExtendedResponse.TYPE 
         };
 

Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.java
(from r982962, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java&r1=982962&r2=984932&rev=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.java
Thu Aug 12 19:52:31 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface InternalSearchResponseEntry extends InternalResponse
+public interface InternalSearchResultEntry extends InternalResponse
 {
     /** Search entry response message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RESULT_ENTRY;

Copied: directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.java
(from r982962, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseReference.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.java?p2=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.java&p1=directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseReference.java&r1=982962&r2=984932&rev=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseReference.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.java
Thu Aug 12 19:52:31 2010
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface InternalSearchResponseReference extends InternalResponse
+public interface InternalSearchResultReference extends InternalResponse
 {
     /** Search reference response message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RESULT_REFERENCE;

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
Thu Aug 12 19:52:31 2010
@@ -82,7 +82,7 @@ public class SearchResponseEntryImplTest
     @Test
     public void testEqualsSameObject()
     {
-        SearchResponseEntryImpl resp = new SearchResponseEntryImpl( 5 );
+        SearchResultEntryImpl resp = new SearchResultEntryImpl( 5 );
         assertTrue( "the same object should be equal", resp.equals( resp ) );
     }
 
@@ -93,11 +93,11 @@ public class SearchResponseEntryImplTest
     @Test
     public void testEqualsExactCopy() throws LdapException
     {
-        SearchResponseEntryImpl resp0 = new SearchResponseEntryImpl( 5 );
+        SearchResultEntryImpl resp0 = new SearchResultEntryImpl( 5 );
         resp0.setEntry( getEntry() );
         resp0.setObjectName( new DN( "dc=example,dc=com" ) );
 
-        SearchResponseEntryImpl resp1 = new SearchResponseEntryImpl( 5 );
+        SearchResultEntryImpl resp1 = new SearchResultEntryImpl( 5 );
         resp1.setEntry( getEntry() );
         resp1.setObjectName( new DN( "dc=example,dc=com" ) );
 
@@ -112,7 +112,7 @@ public class SearchResponseEntryImplTest
     @Test
     public void testHashCodeSameObject()
     {
-        SearchResponseEntryImpl resp = new SearchResponseEntryImpl( 5 );
+        SearchResultEntryImpl resp = new SearchResultEntryImpl( 5 );
         assertTrue( resp.hashCode() == resp.hashCode() );
     }
 
@@ -123,11 +123,11 @@ public class SearchResponseEntryImplTest
     @Test
     public void testHashCodeExactCopy() throws LdapException
     {
-        SearchResponseEntryImpl resp0 = new SearchResponseEntryImpl( 5 );
+        SearchResultEntryImpl resp0 = new SearchResultEntryImpl( 5 );
         resp0.setEntry( getEntry() );
         resp0.setObjectName( new DN( "dc=example,dc=com" ) );
 
-        SearchResponseEntryImpl resp1 = new SearchResponseEntryImpl( 5 );
+        SearchResultEntryImpl resp1 = new SearchResultEntryImpl( 5 );
         resp1.setEntry( getEntry() );
         resp1.setObjectName( new DN( "dc=example,dc=com" ) );
 
@@ -141,11 +141,11 @@ public class SearchResponseEntryImplTest
     @Test
     public void testNotEqualDiffObjectName() throws LdapException
     {
-        SearchResponseEntryImpl resp0 = new SearchResponseEntryImpl( 5 );
+        SearchResultEntryImpl resp0 = new SearchResultEntryImpl( 5 );
         resp0.setEntry( getEntry() );
         resp0.setObjectName( new DN( "dc=apache,dc=org" ) );
 
-        SearchResponseEntryImpl resp1 = new SearchResponseEntryImpl( 5 );
+        SearchResultEntryImpl resp1 = new SearchResultEntryImpl( 5 );
         resp1.setEntry( getEntry() );
         resp1.setObjectName( new DN( "dc=example,dc=com" ) );
 

Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java?rev=984932&r1=984931&r2=984932&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java
(original)
+++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java
Thu Aug 12 19:52:31 2010
@@ -31,7 +31,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseReference;
+import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -56,7 +56,7 @@ public class SearchResponseReferenceImpl
      *            the parent lockable
      * @return the newly created referral for testing
      */
-    private InternalReferral getReferral( InternalSearchResponseReference resp )
+    private InternalReferral getReferral( InternalSearchResultReference resp )
     {
         ReferralImpl ref = new ReferralImpl();
         resp.setReferral( ref );
@@ -73,7 +73,7 @@ public class SearchResponseReferenceImpl
     @Test
     public void testEqualsSameObject()
     {
-        SearchResponseReferenceImpl resp = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp = new SearchResultReferenceImpl( 5 );
         getReferral( resp );
         assertTrue( "the same object should be equal", resp.equals( resp ) );
     }
@@ -85,9 +85,9 @@ public class SearchResponseReferenceImpl
     @Test
     public void testEqualsExactCopy()
     {
-        SearchResponseReferenceImpl resp0 = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp0 = new SearchResultReferenceImpl( 5 );
         getReferral( resp0 );
-        SearchResponseReferenceImpl resp1 = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp1 = new SearchResultReferenceImpl( 5 );
         getReferral( resp1 );
 
         assertTrue( "exact copies should be equal", resp0.equals( resp1 ) );
@@ -101,7 +101,7 @@ public class SearchResponseReferenceImpl
     @Test
     public void testEqualsDiffImpl()
     {
-        InternalSearchResponseReference resp0 = new InternalSearchResponseReference()
+        InternalSearchResultReference resp0 = new InternalSearchResultReference()
         {
             public InternalReferral getReferral()
             {
@@ -193,7 +193,7 @@ public class SearchResponseReferenceImpl
             }
         };
 
-        SearchResponseReferenceImpl resp1 = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp1 = new SearchResultReferenceImpl( 5 );
         getReferral( resp1 );
 
         assertFalse( "using Object.equal() should NOT be equal", resp0.equals( resp1 ) );
@@ -207,7 +207,7 @@ public class SearchResponseReferenceImpl
     @Test
     public void testHashCodeSameObject()
     {
-        SearchResponseReferenceImpl resp = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp = new SearchResultReferenceImpl( 5 );
         getReferral( resp );
         assertTrue( resp.hashCode() == resp.hashCode() );
     }
@@ -219,9 +219,9 @@ public class SearchResponseReferenceImpl
     @Test
     public void testHashCodeExactCopy()
     {
-        SearchResponseReferenceImpl resp0 = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp0 = new SearchResultReferenceImpl( 5 );
         getReferral( resp0 );
-        SearchResponseReferenceImpl resp1 = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp1 = new SearchResultReferenceImpl( 5 );
         getReferral( resp1 );
 
         assertTrue( resp0.hashCode() == resp1.hashCode() );
@@ -234,9 +234,9 @@ public class SearchResponseReferenceImpl
     @Test
     public void testNotEqualDiffUrls()
     {
-        SearchResponseReferenceImpl resp0 = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp0 = new SearchResultReferenceImpl( 5 );
         getReferral( resp0 );
-        SearchResponseReferenceImpl resp1 = new SearchResponseReferenceImpl( 5 );
+        SearchResultReferenceImpl resp1 = new SearchResultReferenceImpl( 5 );
         getReferral( resp1 );
         resp1.getReferral().addLdapUrl( "ldap://asdf.com???" );
 



Mime
View raw message