svn commit: r1078394 - in /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap: LdapServer.java handlers/ExtendedHandler.java

[se...@apache.org]

Author: seelmann
Date: Sun Mar  6 00:35:08 2011
New Revision: 1078394

URL: http://svn.apache.org/viewvc?rev=1078394&view=rev
Log:
Removed unnecessary generic constructs which caused compiler failure with Java 5.

Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1078394&r1=1078393&r2=1078394&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Sun Mar  6 00:35:08 2011
@@ -186,7 +186,7 @@ public class LdapServer extends Director
     private LdapRequestHandler<BindRequest> bindHandler;
     private LdapRequestHandler<CompareRequest> compareHandler;
     private LdapRequestHandler<DeleteRequest> deleteHandler;
-    private ExtendedHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse> extendedHandler;
+    private ExtendedHandler extendedHandler;
     private LdapRequestHandler<ModifyRequest> modifyHandler;
     private LdapRequestHandler<ModifyDnRequest> modifyDnHandler;
     private LdapRequestHandler<SearchRequest> searchHandler;
@@ -285,7 +285,7 @@ public class LdapServer extends Director
 
         if ( getExtendedHandler() == null )
         {
-            setExtendedHandler( new ExtendedHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse>() );
+            setExtendedHandler( new ExtendedHandler() );
         }
 
         if ( getModifyHandler() == null )
@@ -771,7 +771,7 @@ public class LdapServer extends Director
      * request handler
      * @return the exnteded operation handler
      */
-    public ExtendedOperationHandler<? extends ExtendedRequest<? extends ExtendedResponse>,? extends ExtendedResponse> 
+    public ExtendedOperationHandler<ExtendedRequest<ExtendedResponse>,ExtendedResponse> 
         getExtendedOperationHandler( String oid )
     {
         for ( ExtendedOperationHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse> h : extendedOperationHandlers )
@@ -1136,7 +1136,7 @@ public class LdapServer extends Director
      * @param extendedHandler The ExtendedRequest handler
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public void setExtendedHandler( ExtendedHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse> extendedHandler )
+    public void setExtendedHandler( ExtendedHandler extendedHandler )
     {
         this.handler.removeReceivedMessageHandler( ExtendedRequest.class );
         this.extendedHandler = extendedHandler;

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java?rev=1078394&r1=1078393&r2=1078394&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java Sun Mar  6 00:35:08 2011
@@ -34,13 +34,11 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ExtendedHandler<Q extends ExtendedRequest<R>, R extends ExtendedResponse> extends LdapRequestHandler<Q>
+public class ExtendedHandler extends LdapRequestHandler<ExtendedRequest<ExtendedResponse>>
 {
-    public void handle( LdapSession session, Q req ) throws Exception
+    public void handle( LdapSession session, ExtendedRequest<ExtendedResponse> req ) throws Exception
     {
-        @SuppressWarnings("unchecked")
-        ExtendedOperationHandler<Q, R> handler = 
-            ( ExtendedOperationHandler<Q, R> ) getLdapServer().getExtendedOperationHandler( req.getRequestName() );
+        ExtendedOperationHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse> handler = getLdapServer().getExtendedOperationHandler( req.getRequestName() );
 
         if ( handler == null )
         {