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 2004/11/03 00:35:18 UTC
svn commit: rev 56441 - in incubator/directory/eve/trunk/protocol/src: java/org/apache/eve/protocol test/org/apache/eve/protocol
Author: akarasulu
Date: Tue Nov 2 15:35:17 2004
New Revision: 56441
Modified:
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/AbandonHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/AddHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/BindHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/CompareHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/DeleteHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ExtendedHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/LdapProtocolProvider.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ModifyDnHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ModifyHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/SearchHandler.java
incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/UnbindHandler.java
incubator/directory/eve/trunk/protocol/src/test/org/apache/eve/protocol/LdapProtocolProviderTest.java
Log:
using abstract handlers and changed some signatures to take a client key
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/AbandonHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/AbandonHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/AbandonHandler.java Tue Nov 2 15:35:17 2004
@@ -17,11 +17,8 @@
package org.apache.eve.protocol;
-import java.util.Properties;
-
-import org.apache.seda.protocol.NoReplyHandler;
-import org.apache.seda.protocol.HandlerTypeEnum;
import org.apache.seda.listener.ClientKey;
+import org.apache.seda.protocol.AbstractNoReplyHandler;
import org.apache.ldap.common.NotImplementedException;
@@ -32,16 +29,10 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class AbandonHandler implements NoReplyHandler
+public class AbandonHandler extends AbstractNoReplyHandler
{
public void handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.AbandonHandler not implemented!" );
- }
-
-
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.NOREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/AddHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/AddHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/AddHandler.java Tue Nov 2 15:35:17 2004
@@ -17,9 +17,8 @@
package org.apache.eve.protocol;
-import org.apache.seda.protocol.HandlerTypeEnum;
-import org.apache.seda.protocol.SingleReplyHandler;
import org.apache.seda.listener.ClientKey;
+import org.apache.seda.protocol.AbstractSingleReplyHandler;
import org.apache.ldap.common.NotImplementedException;
@@ -30,24 +29,10 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class AddHandler implements SingleReplyHandler
+public class AddHandler extends AbstractSingleReplyHandler
{
- /**
- * @see SingleReplyHandler#handle(ClientKey,Object)
- */
public Object handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.AddHandler not implemented!" );
- }
-
-
- /**
- * Gets HandlerTypeEnum.SINGLEREPLY always.
- *
- * @return HandlerTypeEnum.SINGLEREPLY always
- */
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.SINGLEREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/BindHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/BindHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/BindHandler.java Tue Nov 2 15:35:17 2004
@@ -17,9 +17,8 @@
package org.apache.eve.protocol;
-import org.apache.seda.protocol.HandlerTypeEnum;
-import org.apache.seda.protocol.SingleReplyHandler;
import org.apache.seda.listener.ClientKey;
+import org.apache.seda.protocol.AbstractSingleReplyHandler;
import org.apache.ldap.common.NotImplementedException;
@@ -30,7 +29,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class BindHandler implements SingleReplyHandler
+public class BindHandler extends AbstractSingleReplyHandler
{
/**
* @see org.apache.seda.protocol.SingleReplyHandler#handle(ClientKey,Object)
@@ -38,16 +37,5 @@
public Object handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.BindHandler not implemented!" );
- }
-
-
- /**
- * Gets HandlerTypeEnum.SINGLEREPLY always.
- *
- * @return HandlerTypeEnum.SINGLEREPLY always
- */
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.SINGLEREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/CompareHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/CompareHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/CompareHandler.java Tue Nov 2 15:35:17 2004
@@ -19,6 +19,7 @@
import org.apache.seda.protocol.HandlerTypeEnum;
import org.apache.seda.protocol.SingleReplyHandler;
+import org.apache.seda.protocol.AbstractSingleReplyHandler;
import org.apache.seda.listener.ClientKey;
import org.apache.ldap.common.NotImplementedException;
@@ -30,7 +31,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class CompareHandler implements SingleReplyHandler
+public class CompareHandler extends AbstractSingleReplyHandler
{
/**
* @see org.apache.seda.protocol.SingleReplyHandler#handle(ClientKey,Object)
@@ -38,16 +39,5 @@
public Object handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.CompareHandler not implemented!" );
- }
-
-
- /**
- * Gets HandlerTypeEnum.SINGLEREPLY always.
- *
- * @return HandlerTypeEnum.SINGLEREPLY always
- */
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.SINGLEREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/DeleteHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/DeleteHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/DeleteHandler.java Tue Nov 2 15:35:17 2004
@@ -17,9 +17,8 @@
package org.apache.eve.protocol;
-import org.apache.seda.protocol.HandlerTypeEnum;
-import org.apache.seda.protocol.SingleReplyHandler;
import org.apache.seda.listener.ClientKey;
+import org.apache.seda.protocol.AbstractSingleReplyHandler;
import org.apache.ldap.common.NotImplementedException;
@@ -30,7 +29,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class DeleteHandler implements SingleReplyHandler
+public class DeleteHandler extends AbstractSingleReplyHandler
{
/**
* @see org.apache.seda.protocol.SingleReplyHandler#handle(ClientKey,Object)
@@ -38,16 +37,5 @@
public Object handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.DeleteHandler not implemented!" );
- }
-
-
- /**
- * Gets HandlerTypeEnum.SINGLEREPLY always.
- *
- * @return HandlerTypeEnum.SINGLEREPLY always
- */
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.SINGLEREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ExtendedHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ExtendedHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ExtendedHandler.java Tue Nov 2 15:35:17 2004
@@ -17,9 +17,8 @@
package org.apache.eve.protocol;
-import org.apache.seda.protocol.HandlerTypeEnum;
-import org.apache.seda.protocol.SingleReplyHandler;
import org.apache.seda.listener.ClientKey;
+import org.apache.seda.protocol.AbstractSingleReplyHandler;
import org.apache.ldap.common.NotImplementedException;
@@ -30,7 +29,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ExtendedHandler implements SingleReplyHandler
+public class ExtendedHandler extends AbstractSingleReplyHandler
{
/**
* @see org.apache.seda.protocol.SingleReplyHandler#handle(ClientKey,Object)
@@ -38,16 +37,5 @@
public Object handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.ExtendedHandler not implemented!" );
- }
-
-
- /**
- * Gets HandlerTypeEnum.SINGLEREPLY always.
- *
- * @return HandlerTypeEnum.SINGLEREPLY always
- */
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.SINGLEREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/LdapProtocolProvider.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/LdapProtocolProvider.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/LdapProtocolProvider.java Tue Nov 2 15:35:17 2004
@@ -21,6 +21,7 @@
import org.apache.seda.protocol.ProtocolProvider;
import org.apache.seda.protocol.RequestHandler;
+import org.apache.seda.listener.ClientKey;
import org.apache.ldap.common.message.*;
import org.apache.ldap.common.exception.LdapNamingException;
@@ -237,9 +238,9 @@
/**
- * @see ProtocolProvider#getHandler(Object)
+ * @see ProtocolProvider#getHandler(ClientKey, Object)
*/
- public RequestHandler getHandler( Object request )
+ public RequestHandler getHandler( ClientKey key, Object request )
{
if ( this.handlers.containsKey( request.getClass().getName() ) )
{
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ModifyDnHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ModifyDnHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ModifyDnHandler.java Tue Nov 2 15:35:17 2004
@@ -17,9 +17,8 @@
package org.apache.eve.protocol;
-import org.apache.seda.protocol.HandlerTypeEnum;
-import org.apache.seda.protocol.SingleReplyHandler;
import org.apache.seda.listener.ClientKey;
+import org.apache.seda.protocol.AbstractSingleReplyHandler;
import org.apache.ldap.common.NotImplementedException;
@@ -30,7 +29,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ModifyDnHandler implements SingleReplyHandler
+public class ModifyDnHandler extends AbstractSingleReplyHandler
{
/**
* @see org.apache.seda.protocol.SingleReplyHandler#handle(ClientKey,Object)
@@ -38,16 +37,5 @@
public Object handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.ModifyDnHandler not implemented!" );
- }
-
-
- /**
- * Gets HandlerTypeEnum.SINGLEREPLY always.
- *
- * @return HandlerTypeEnum.SINGLEREPLY always
- */
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.SINGLEREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ModifyHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ModifyHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/ModifyHandler.java Tue Nov 2 15:35:17 2004
@@ -17,9 +17,8 @@
package org.apache.eve.protocol;
-import org.apache.seda.protocol.HandlerTypeEnum;
-import org.apache.seda.protocol.SingleReplyHandler;
import org.apache.seda.listener.ClientKey;
+import org.apache.seda.protocol.AbstractSingleReplyHandler;
import org.apache.ldap.common.NotImplementedException;
@@ -30,7 +29,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ModifyHandler implements SingleReplyHandler
+public class ModifyHandler extends AbstractSingleReplyHandler
{
/**
* @see org.apache.seda.protocol.SingleReplyHandler#handle(ClientKey,Object)
@@ -38,16 +37,5 @@
public Object handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.ModifyHandler not implemented!" );
- }
-
-
- /**
- * Gets HandlerTypeEnum.SINGLEREPLY always.
- *
- * @return HandlerTypeEnum.SINGLEREPLY always
- */
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.SINGLEREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/SearchHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/SearchHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/SearchHandler.java Tue Nov 2 15:35:17 2004
@@ -19,8 +19,7 @@
import java.util.Iterator;
-import org.apache.seda.protocol.ManyReplyHandler;
-import org.apache.seda.protocol.HandlerTypeEnum;
+import org.apache.seda.protocol.AbstractManyReplyHandler;
import org.apache.seda.listener.ClientKey;
import org.apache.ldap.common.NotImplementedException;
@@ -32,33 +31,16 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class SearchHandler implements ManyReplyHandler
+public class SearchHandler extends AbstractManyReplyHandler
{
- /**
- * @see ManyReplyHandler#handle(ClientKey,Object)
- */
- public Iterator handle( ClientKey key, Object request )
- {
- throw new NotImplementedException();
- }
-
-
- /**
- * @see ManyReplyHandler#isSequential()
- */
- public boolean isSequential()
+ public SearchHandler()
{
- return true;
+ super( true );
}
- /**
- * Gets HandlerTypeEnum.MANYREPLY always.
- *
- * @return HandlerTypeEnum.MANYREPLY always
- */
- public HandlerTypeEnum getHandlerType()
+ public Iterator handle( ClientKey key, Object request )
{
- return HandlerTypeEnum.MANYREPLY;
+ throw new NotImplementedException();
}
}
Modified: incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/UnbindHandler.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/UnbindHandler.java (original)
+++ incubator/directory/eve/trunk/protocol/src/java/org/apache/eve/protocol/UnbindHandler.java Tue Nov 2 15:35:17 2004
@@ -17,9 +17,9 @@
package org.apache.eve.protocol;
-import org.apache.seda.protocol.NoReplyHandler;
-import org.apache.seda.protocol.HandlerTypeEnum;
import org.apache.seda.listener.ClientKey;
+import org.apache.seda.protocol.AbstractNoReplyHandler;
+
import org.apache.ldap.common.NotImplementedException;
@@ -30,24 +30,10 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class UnbindHandler implements NoReplyHandler
+public class UnbindHandler extends AbstractNoReplyHandler
{
- /**
- * @see NoReplyHandler#handle(ClientKey,Object)
- */
public void handle( ClientKey key, Object request )
{
throw new NotImplementedException( "handle in org.apache.eve.protocol.UnbindHandler not implemented!" );
- }
-
-
- /**
- * Gets HandlerTypeEnum.NOREPLY always.
- *
- * @return HandlerTypeEnum.NOREPLY always
- */
- public HandlerTypeEnum getHandlerType()
- {
- return HandlerTypeEnum.NOREPLY;
}
}
Modified: incubator/directory/eve/trunk/protocol/src/test/org/apache/eve/protocol/LdapProtocolProviderTest.java
==============================================================================
--- incubator/directory/eve/trunk/protocol/src/test/org/apache/eve/protocol/LdapProtocolProviderTest.java (original)
+++ incubator/directory/eve/trunk/protocol/src/test/org/apache/eve/protocol/LdapProtocolProviderTest.java Tue Nov 2 15:35:17 2004
@@ -54,34 +54,34 @@
Object req = null;
req = new AbandonRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof AbandonHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof AbandonHandler );
req = new AddRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof AddHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof AddHandler );
req = new BindRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof BindHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof BindHandler );
req = new CompareRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof CompareHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof CompareHandler );
req = new DeleteRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof DeleteHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof DeleteHandler );
req = new ExtendedRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof ExtendedHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof ExtendedHandler );
req = new ModifyDnRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof ModifyDnHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof ModifyDnHandler );
req = new ModifyRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof ModifyHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof ModifyHandler );
req = new SearchRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof SearchHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof SearchHandler );
req = new UnbindRequestImpl( 0 );
- assertTrue( provider.getHandler( req ) instanceof UnbindHandler );
+ assertTrue( provider.getHandler( null, req ) instanceof UnbindHandler );
}
@@ -135,52 +135,52 @@
RequestHandler handler = null;
req = new AbandonRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.NOREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusAbandonHandler );
req = new AddRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.SINGLEREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusAddHandler );
req = new BindRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.SINGLEREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusBindHandler );
req = new CompareRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.SINGLEREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusCompareHandler );
req = new DeleteRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.SINGLEREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusDeleteHandler );
req = new ExtendedRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.SINGLEREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusExtendedHandler );
req = new ModifyDnRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.SINGLEREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusModifyDnHandler );
req = new ModifyRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.SINGLEREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusModifyHandler );
req = new SearchRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.MANYREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusSearchHandler );
req = new UnbindRequestImpl( 0 );
- handler = provider.getHandler( req );
+ handler = provider.getHandler( null, req );
assertEquals( HandlerTypeEnum.NOREPLY, handler.getHandlerType() );
assertTrue( handler instanceof BogusUnbindHandler );
}