Author: pete.muir(a)jboss.org Date: 2009-01-05 14:21:13 -0500 (Mon, 05 Jan 2009) New Revision: 780 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java Removed: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/SimpleBeanProxyMethodHandler.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java Log: Better name :-p Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java (from rev 779, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/SimpleBeanProxyMethodHandler.java) =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java 2009-01-05 19:21:13 UTC (rev 780) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.bean.proxy; + +import java.io.Serializable; +import java.lang.reflect.Method; + +import javassist.util.proxy.MethodHandler; + +import javax.webbeans.manager.Bean; +import javax.webbeans.manager.Context; + +import org.jboss.webbeans.CurrentManager; +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; +import org.jboss.webbeans.util.Reflections; + +/** + * A Javassist MethodHandler that delegates method calls to a proxied bean. If + * the transient bean has become null, it is looked up from the manager bean + * list before the invocation. + * + * @author Nicklas Karlsson + * + * @see org.jboss.webbeans.bean.proxy.ProxyPool + */ +public class ClientProxyMethodHandler implements MethodHandler, Serializable +{ + private static final long serialVersionUID = -5391564935097267888L; + // The log provider + private static transient LogProvider log = Logging.getLogProvider(ClientProxyMethodHandler.class); + // The bean + private transient Bean<?> bean; + // The bean index in the manager + private int beanIndex; + + /** + * Constructor + * + * @param bean The bean to proxy + * @param beanIndex The index to the bean in the manager bean list + */ + public ClientProxyMethodHandler(Bean<?> bean, int beanIndex) + { + this.bean = bean; + this.beanIndex = beanIndex; + log.trace("Created method handler for bean " + bean + " indexed as " + beanIndex); + } + + /** + * The method proxy + * + * Uses reflection to look up the corresponding method on the proxy and + * executes that method with the same parameters. + * + * @param self A reference to the proxy + * @param proxiedMethod The method to execute + * @param proceed The next method to proceed to + * @param args The method calling arguments + */ + public Object invoke(Object self, Method proxiedMethod, Method proceed, Object[] args) throws Throwable + { + // TODO account for child managers + if (bean == null) + { + bean = CurrentManager.rootManager().getBeans().get(beanIndex); + } + Context context = CurrentManager.rootManager().getContext(bean.getScopeType()); + Object proxiedInstance = context.get(bean, true); + Object returnValue = Reflections.lookupMethod(proxiedMethod, proxiedInstance).invoke(proxiedInstance, args); + log.trace("Executed method " + proxiedMethod + " on " + proxiedInstance + " with parameters " + args + " and got return value " + returnValue); + return returnValue; + } + + /** + * Gets a string representation + * + * @return The string representation + */ + @Override + public String toString() + { + StringBuilder buffer = new StringBuilder(); + String beanInfo = bean == null ? "null bean" : bean.toString(); + buffer.append("Proxy method handler for " + beanInfo + " with index " + beanIndex); + return buffer.toString(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyMethodHandler.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java 2009-01-05 19:20:31 UTC (rev 779) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java 2009-01-05 19:21:13 UTC (rev 780) @@ -76,7 +76,7 @@ try { - SimpleBeanProxyMethodHandler proxyMethodHandler = new SimpleBeanProxyMethodHandler(bean, beanIndex); + ClientProxyMethodHandler proxyMethodHandler = new ClientProxyMethodHandler(bean, beanIndex); Set<Type> classes = new HashSet<Type>(bean.getTypes()); classes.add(Serializable.class); ProxyFactory proxyFactory = Proxies.getProxyFactory(classes); Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/SimpleBeanProxyMethodHandler.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/SimpleBeanProxyMethodHandler.java 2009-01-05 19:20:31 UTC (rev 779) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/SimpleBeanProxyMethodHandler.java 2009-01-05 19:21:13 UTC (rev 780) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.webbeans.bean.proxy; - -import java.io.Serializable; -import java.lang.reflect.Method; - -import javassist.util.proxy.MethodHandler; - -import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Context; - -import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.log.LogProvider; -import org.jboss.webbeans.log.Logging; -import org.jboss.webbeans.util.Reflections; - -/** - * A Javassist MethodHandler that delegates method calls to a proxied bean. If - * the transient bean has become null, it is looked up from the manager bean - * list before the invocation. - * - * @author Nicklas Karlsson - * - * @see org.jboss.webbeans.bean.proxy.ProxyPool - */ -public class SimpleBeanProxyMethodHandler implements MethodHandler, Serializable -{ - private static final long serialVersionUID = -5391564935097267888L; - // The log provider - private static transient LogProvider log = Logging.getLogProvider(SimpleBeanProxyMethodHandler.class); - // The bean - private transient Bean<?> bean; - // The bean index in the manager - private int beanIndex; - - /** - * Constructor - * - * @param bean The bean to proxy - * @param beanIndex The index to the bean in the manager bean list - */ - public SimpleBeanProxyMethodHandler(Bean<?> bean, int beanIndex) - { - this.bean = bean; - this.beanIndex = beanIndex; - log.trace("Created method handler for bean " + bean + " indexed as " + beanIndex); - } - - /** - * The method proxy - * - * Uses reflection to look up the corresponding method on the proxy and - * executes that method with the same parameters. - * - * @param self A reference to the proxy - * @param proxiedMethod The method to execute - * @param proceed The next method to proceed to - * @param args The method calling arguments - */ - public Object invoke(Object self, Method proxiedMethod, Method proceed, Object[] args) throws Throwable - { - // TODO account for child managers - if (bean == null) - { - bean = CurrentManager.rootManager().getBeans().get(beanIndex); - } - Context context = CurrentManager.rootManager().getContext(bean.getScopeType()); - Object proxiedInstance = context.get(bean, true); - Object returnValue = Reflections.lookupMethod(proxiedMethod, proxiedInstance).invoke(proxiedInstance, args); - log.trace("Executed method " + proxiedMethod + " on " + proxiedInstance + " with parameters " + args + " and got return value " + returnValue); - return returnValue; - } - - /** - * Gets a string representation - * - * @return The string representation - */ - @Override - public String toString() - { - StringBuilder buffer = new StringBuilder(); - String beanInfo = bean == null ? "null bean" : bean.toString(); - buffer.append("Proxy method handler for " + beanInfo + " with index " + beanIndex); - return buffer.toString(); - } - -}