[jboss-cvs] JBossAS SVN: r94046 - in projects/interceptors/trunk/src: main/java/org/jboss/interceptor/proxy and 1 other directories.

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

Author: marius.bogoevici
Date: 2009-09-27 00:56:19 -0400 (Sun, 27 Sep 2009)
New Revision: 94046

Modified:
   projects/interceptors/trunk/src/main/java/org/jboss/interceptor/model/InterceptionModelImpl.java
   projects/interceptors/trunk/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreator.java
   projects/interceptors/trunk/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java
   projects/interceptors/trunk/src/test/java/org/jboss/interceptors/FootballTeam.java
   projects/interceptors/trunk/src/test/java/org/jboss/interceptors/InterceptionTest.java
Log:
Code cleanup

Modified: projects/interceptors/trunk/src/main/java/org/jboss/interceptor/model/InterceptionModelImpl.java
===================================================================
--- projects/interceptors/trunk/src/main/java/org/jboss/interceptor/model/InterceptionModelImpl.java	2009-09-27 04:52:05 UTC (rev 94045)
+++ projects/interceptors/trunk/src/main/java/org/jboss/interceptor/model/InterceptionModelImpl.java	2009-09-27 04:56:19 UTC (rev 94046)
@@ -96,8 +96,7 @@
          }
          appendInterceptorClassesToList(interceptionType, interceptorsList, interceptors);
       }
-      for (Class<?> interceptorClass: interceptors )
-          allInterceptors.add(interceptorClass);
+      allInterceptors.addAll(Arrays.asList(interceptors));
    }
 
    private void appendInterceptorClassesToList(InterceptionType interceptionType, List<Class<?>> interceptorsList, Class<?>... interceptors)

Modified: projects/interceptors/trunk/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreator.java
===================================================================
--- projects/interceptors/trunk/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreator.java	2009-09-27 04:52:05 UTC (rev 94045)
+++ projects/interceptors/trunk/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreator.java	2009-09-27 04:56:19 UTC (rev 94046)
@@ -21,9 +21,9 @@
  * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
  */
 public interface InterceptorProxyCreator {
-    <T> T createProxyFromInstance(Object target, Class<T> proxyClass, Class<?>[] constructorTypes, Object[] constructorArguments) throws IllegalAccessException, InstantiationException;
+    <T> T createProxyFromInstance(Object target, Class<T> proxyClass, Class<?>[] constructorTypes, Object[] constructorArguments) ;
 
-    <T> T createInstrumentedInstance(Class<T> proxyClass, Class<?>[] constructorTypes, Object[] constructorArguments) throws IllegalAccessException, InstantiationException;
+    <T> T createInstrumentedInstance(Class<T> proxyClass, Class<?>[] constructorTypes, Object[] constructorArguments) ;
 
     <T> T createProxyFromInstance(Object target, Class<T> proxyClass) throws IllegalAccessException, InstantiationException;
 }

Modified: projects/interceptors/trunk/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java
===================================================================
--- projects/interceptors/trunk/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java	2009-09-27 04:52:05 UTC (rev 94045)
+++ projects/interceptors/trunk/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java	2009-09-27 04:56:19 UTC (rev 94046)
@@ -51,7 +51,7 @@
    }
 
 
-   public <T> T createProxyFromInstance(final Object target, Class<T> proxyClass, Class<?>[] constructorTypes, Object[] constructorArguments) throws IllegalAccessException, InstantiationException
+   public <T> T createProxyFromInstance(final Object target, Class<T> proxyClass, Class<?>[] constructorTypes, Object[] constructorArguments)
    {
       ProxyFactory proxyFactory = new ProxyFactory();
       if (proxyClass != null)
@@ -70,7 +70,7 @@
       }
    }
 
-   public <T> T createInstrumentedInstance(Class<T> proxyClass, Class<?>[] constructorTypes, Object[] constructorArguments) throws IllegalAccessException, InstantiationException
+   public <T> T createInstrumentedInstance(Class<T> proxyClass, Class<?>[] constructorTypes, Object[] constructorArguments)
    {
       ProxyFactory proxyFactory = new ProxyFactory();
       if (proxyClass != null)
@@ -132,7 +132,7 @@
          if (targetClass != null)
             this.targetClazz = targetClass;
          else
-            this.targetClazz = target.getClass();
+            this.targetClazz = this.target.getClass();
 
          this.registry = registry;
 

Modified: projects/interceptors/trunk/src/test/java/org/jboss/interceptors/FootballTeam.java
===================================================================
--- projects/interceptors/trunk/src/test/java/org/jboss/interceptors/FootballTeam.java	2009-09-27 04:52:05 UTC (rev 94045)
+++ projects/interceptors/trunk/src/test/java/org/jboss/interceptors/FootballTeam.java	2009-09-27 04:56:19 UTC (rev 94046)
@@ -24,8 +24,9 @@
  * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
  */
 public class FootballTeam {
-    private String teamName;
 
+   private String teamName;
+
     // an empty-argument constructor is required for proxifycation
     public FootballTeam() {
 

Modified: projects/interceptors/trunk/src/test/java/org/jboss/interceptors/InterceptionTest.java
===================================================================
--- projects/interceptors/trunk/src/test/java/org/jboss/interceptors/InterceptionTest.java	2009-09-27 04:52:05 UTC (rev 94045)
+++ projects/interceptors/trunk/src/test/java/org/jboss/interceptors/InterceptionTest.java	2009-09-27 04:56:19 UTC (rev 94046)
@@ -113,7 +113,7 @@
    {
 
       @AroundInvoke
-      private final Object doAround(InvocationContext invocationContext) throws Exception
+      private Object doAround(InvocationContext invocationContext) throws Exception
       {
          InterceptorTestLogger.add(MyFirstInterceptor.class, "aroundInvokeBefore");
          Object result = invocationContext.proceed();