You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/01/10 11:42:48 UTC
svn commit: r1431266 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/intercept/ webbeans-impl/src/main/resources/META-INF/openwebbeans/ webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ webbeans-impl/src/test/res...

Author: struberg
Date: Thu Jan 10 10:42:47 2013
New Revision: 1431266

URL: http://svn.apache.org/viewvc?rev=1431266&view=rev
Log:
OWB-344 more TODO and deprecations (and some resurrections)

Added:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java
      - copied, changed from r1431198, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java
      - copied, changed from r1431198, openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java
Removed:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java
Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
    openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java
    openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
    openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java (from r1431198, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java&r1=1431198&r2=1431266&rev=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java Thu Jan 10 10:42:47 2013
@@ -29,9 +29,11 @@ import org.apache.webbeans.component.Owb
  * 
  * <p>Since there is only one single contextual instance of an &#064;ApplicationScoped bean,
  * we can simply cache this instance inside our bean. We only need to reload this instance
- * if it is null. This happens at the first usage and after the MethodHandler got deserialized</p> 
+ * if it is null. This happens at the first usage and after the MethodHandler got deserialized</p>
+ *
+ * TODO: move caching to new InterceptorHandler logic
  */
-public class ApplicationScopedBeanInterceptorHandlerRemove extends NormalScopedBeanInterceptorHandlerRemove
+public class ApplicationScopedBeanInterceptorHandler extends NormalScopedBeanInterceptorHandlerRemove
 {
     /**default serial id*/
     private static final long serialVersionUID = 1L;
@@ -55,7 +57,7 @@ public class ApplicationScopedBeanInterc
      * @param bean bean
      * @param creationalContext creaitonal context
      */
-    public ApplicationScopedBeanInterceptorHandlerRemove(OwbBean<?> bean, CreationalContext<?> creationalContext)
+    public ApplicationScopedBeanInterceptorHandler(OwbBean<?> bean, CreationalContext<?> creationalContext)
     {
         super(bean, creationalContext);
     }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java?rev=1431266&r1=1431265&r2=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java Thu Jan 10 10:42:47 2013
@@ -28,6 +28,9 @@ import javax.enterprise.inject.spi.Inter
 
 import org.apache.webbeans.component.AbstractOwbBean;
 
+/**
+ * @deprecated we directly use Interceptor<T> now
+ */
 public interface OwbInterceptor<T> extends Interceptor<T>
 {
     public AbstractOwbBean<T> getDelegate();

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java?rev=1431266&r1=1431265&r2=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java Thu Jan 10 10:42:47 2013
@@ -58,6 +58,8 @@ import java.util.logging.Logger;
  * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
  * @version $Rev$ $Date$
  * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove
+ *
+ * @deprecated this class can most probably get removed. All important logic is contained in {@link InterceptorResolution}
  */
 public final class WebBeansInterceptorConfig
 {

Modified: openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1431266&r1=1431265&r2=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 10 10:42:47 2013
@@ -115,5 +115,5 @@ org.apache.webbeans.javassist.useClassLo
 # typically sub classes of NormalScopedBeanInterceptorHandler
 #
 # org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandlerRemove
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler
 ################################################################################################

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java?rev=1431266&r1=1431265&r2=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java Thu Jan 10 10:42:47 2013
@@ -20,7 +20,7 @@ package org.apache.webbeans.newtests.pro
 
 
 import javassist.util.proxy.ProxyObject;
-import org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandlerRemove;
+import org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler;
 import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove;
 import org.apache.webbeans.newtests.AbstractUnitTest;
 import org.apache.webbeans.newtests.proxy.beans.ApplicationBean;
@@ -59,7 +59,7 @@ public class ProxyMappingTest extends Ab
         Assert.assertNotNull(applicationBean);
         Assert.assertTrue(applicationBean instanceof ProxyObject);
         Assert.assertNotNull(((ProxyObject) applicationBean).getHandler());
-        Assert.assertEquals(((ProxyObject) applicationBean).getHandler().getClass(), ApplicationScopedBeanInterceptorHandlerRemove.class);
+        Assert.assertEquals(((ProxyObject) applicationBean).getHandler().getClass(), ApplicationScopedBeanInterceptorHandler.class);
 
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1431266&r1=1431265&r2=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 10 10:42:47 2013
@@ -31,4 +31,4 @@ org.apache.webbeans.spi.deployer.MetaDat
 # specific proxy mapping which should get tested
 
 org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandlerRemove
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1431266&r1=1431265&r2=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java (original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java Thu Jan 10 10:42:47 2013
@@ -32,7 +32,7 @@ import org.apache.webbeans.conversation.
 import org.apache.webbeans.el.ELContextStore;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.spi.FailOverService;
-import org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandlerRemove;
+import org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.ContextException;
@@ -127,7 +127,7 @@ public class WebContextsService extends 
         applicationContexts.remove();
         conversationContexts.remove();
         singletonContexts.remove();
-        RequestScopedBeanInterceptorHandlerRemove.removeThreadLocals();
+        RequestScopedBeanInterceptorHandler.removeThreadLocals();
     }
     
     /**
@@ -395,7 +395,7 @@ public class WebContextsService extends 
         requestContexts.set(null);
         requestContexts.remove();
 
-        RequestScopedBeanInterceptorHandlerRemove.removeThreadLocals();
+        RequestScopedBeanInterceptorHandler.removeThreadLocals();
     }
 
     private void cleanupConversations()

Copied: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java (from r1431198, openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java?p2=openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java&p1=openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java&r1=1431198&r2=1431266&rev=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java (original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java Thu Jan 10 10:42:47 2013
@@ -32,8 +32,10 @@ import java.util.HashMap;
  * <p>Since there is only one single contextual instance of an &#064;RequestScoped bean per thread,
  * we can simply cache this instance inside our bean. We only need to reload this instance
  * if it is null or if the thread ends.</p>
+ *
+ * TODO: move caching to new InterceptorHandler logic
  */
-public class RequestScopedBeanInterceptorHandlerRemove extends NormalScopedBeanInterceptorHandlerRemove
+public class RequestScopedBeanInterceptorHandler extends NormalScopedBeanInterceptorHandlerRemove
 {
     /**default serial id*/
     private static final long serialVersionUID = 1L;
@@ -55,7 +57,7 @@ public class RequestScopedBeanIntercepto
      * @param bean bean
      * @param creationalContext creaitonal context
      */
-    public RequestScopedBeanInterceptorHandlerRemove(OwbBean<?> bean, CreationalContext<?> creationalContext)
+    public RequestScopedBeanInterceptorHandler(OwbBean<?> bean, CreationalContext<?> creationalContext)
     {
         super(bean, creationalContext);
     }

Modified: openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1431266&r1=1431265&r2=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 10 10:42:47 2013
@@ -52,5 +52,5 @@ org.apache.webbeans.application.jsp=fals
 # This allows mapping a Scope Annotation class to a specific InterceptorProxy which are
 # typically sub classes of NormalScopedBeanInterceptorHandler
 #
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandlerRemove
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler
 ################################################################################################

Modified: openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1431266&r1=1431265&r2=1431266&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 10 10:42:47 2013
@@ -29,5 +29,5 @@ configuration.ordinal=15
 # typically sub classes of NormalScopedBeanInterceptorHandler
 # We need to register this with a higher ordinal again, since webbeans-impl/tests have ordinal 11 too!
 #
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandlerRemove
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler
 ################################################################################################