[jboss-cvs] JBossAS SVN: r85851 - in projects/ejb3/trunk/proxy-impl/src: test/java/org/jboss/ejb3/test/proxy/impl/common/container and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-03-15 02:16:20 -0400 (Sun, 15 Mar 2009)
New Revision: 85851

Modified:
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/factory/session/stateful/StatefulSessionProxyFactoryBase.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/common/container/SessionContainer.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/spec_3_4_5/unit/SfsbProxyEqualityTestCase.java
Log:
[EJBTHREE-1774] Remove StatefulSessionProxy from proxy-impl

Modified: projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/factory/session/stateful/StatefulSessionProxyFactoryBase.java
===================================================================
--- projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/factory/session/stateful/StatefulSessionProxyFactoryBase.java	2009-03-15 06:06:57 UTC (rev 85850)
+++ projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/factory/session/stateful/StatefulSessionProxyFactoryBase.java	2009-03-15 06:16:20 UTC (rev 85851)
@@ -33,7 +33,6 @@
 import org.jboss.ejb3.proxy.impl.factory.session.SessionProxyFactoryBase;
 import org.jboss.ejb3.proxy.impl.handler.session.SessionProxyInvocationHandler;
 import org.jboss.ejb3.proxy.spi.container.StatefulSessionFactory;
-import org.jboss.ejb3.proxy.spi.intf.StatefulSessionProxy;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 
@@ -105,25 +104,6 @@
       return this.getReturnTypesFromCreateMethods(homeInterface, false);
    }
 
-   /**
-    * Returns Proxy interfaces common to all Proxies generated
-    * by this ProxyFactory
-    * 
-    * @return
-    */
-   @Override
-   protected Set<Class<?>> getCommonProxyInterfaces()
-   {
-      // Initialize
-      Set<Class<?>> interfaces = super.getCommonProxyInterfaces();
-
-      // Add
-      interfaces.add(StatefulSessionProxy.class);
-
-      // Return
-      return interfaces;
-   }
-
    // --------------------------------------------------------------------------------||
    // Overridden Implementations -----------------------------------------------------||
    // --------------------------------------------------------------------------------||

Modified: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/common/container/SessionContainer.java
===================================================================
--- projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/common/container/SessionContainer.java	2009-03-15 06:06:57 UTC (rev 85850)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/common/container/SessionContainer.java	2009-03-15 06:16:20 UTC (rev 85851)
@@ -49,7 +49,6 @@
 import org.jboss.ejb3.proxy.impl.remoting.StatefulSessionRemotingMetadata;
 import org.jboss.ejb3.proxy.spi.container.InvokableContext;
 import org.jboss.ejb3.proxy.spi.intf.SessionProxy;
-import org.jboss.ejb3.proxy.spi.intf.StatefulSessionProxy;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
@@ -271,20 +270,11 @@
    }
 
    //FIXME: Should be agnostic to Session IDs, SLSBs have none
-   public Object invokeBean(Object proxy, Method method, Object args[]) throws Throwable
+   public Object invokeBean(SessionProxy proxy, Method method, Object args[]) throws Throwable
    {
-      // Initialize a Session ID
-      Object sessionId = null;
+      // Get the Target (Session ID)
+      Object sessionId = proxy.getTarget();
 
-      // Obtain the InvocationHandler
-      if (proxy instanceof StatefulSessionProxy)
-      {
-         StatefulSessionProxy statefulProxy = (StatefulSessionProxy) proxy;
-
-         // Get the Session ID
-         sessionId = statefulProxy.getTarget();
-      }
-
       // Get the appropriate instance
       Object obj = this.getBeanInstance((Serializable) sessionId);
 

Modified: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/spec_3_4_5/unit/SfsbProxyEqualityTestCase.java
===================================================================
--- projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/spec_3_4_5/unit/SfsbProxyEqualityTestCase.java	2009-03-15 06:06:57 UTC (rev 85850)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/spec_3_4_5/unit/SfsbProxyEqualityTestCase.java	2009-03-15 06:16:20 UTC (rev 85851)
@@ -30,7 +30,7 @@
 import org.jboss.ejb3.proxy.impl.factory.session.SessionProxyFactory;
 import org.jboss.ejb3.proxy.impl.factory.session.stateful.StatefulSessionLocalProxyFactory;
 import org.jboss.ejb3.proxy.impl.factory.session.stateful.StatefulSessionRemoteProxyFactory;
-import org.jboss.ejb3.proxy.spi.intf.StatefulSessionProxy;
+import org.jboss.ejb3.proxy.spi.intf.SessionProxy;
 import org.jboss.ejb3.test.proxy.impl.common.Utils;
 import org.jboss.ejb3.test.proxy.impl.common.container.StatefulContainer;
 import org.jboss.ejb3.test.proxy.impl.common.ejb.sfsb.MyStatefulBean;
@@ -130,7 +130,7 @@
    private void setSessionIdOnProxy(Object proxy, Serializable id)
    {
       // Get the InvocationHander for the Proxy
-      StatefulSessionProxy handler = (StatefulSessionProxy) proxy;
+      SessionProxy handler = (SessionProxy) proxy;
       handler.setTarget(id);
    }