[jboss-cvs] JBossAS SVN: r107602 - in projects/interceptors/trunk: jboss-interceptor/src/main/java/org/jboss/interceptor/proxy and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 13 16:12:39 EDT 2010
Author: marius.bogoevici
Date: 2010-08-13 16:12:38 -0400 (Fri, 13 Aug 2010)
New Revision: 107602
Added:
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/util/Ejb3InterceptorModelExtractor.java
Modified:
projects/interceptors/trunk/jboss-interceptor-api/src/main/java/org/jboss/interceptor/spi/model/InterceptionModel.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/BuildableInterceptionModel.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/InterceptionModelBuilder.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/InterceptionModelImpl.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorMethodHandler.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/ReflectiveClassMetadata.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/ReflectiveMethodMetadata.java
projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/customInvocationContext/CustomInvocationContextTest.java
projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java
projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/SubclassingInterceptionTestCase.java
Log:
removed one of the generic parameters of InterceptionModel, the interceptor will always be ClassMetadata
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/BuildableInterceptionModel.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/BuildableInterceptionModel.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/BuildableInterceptionModel.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -2,6 +2,7 @@
import java.lang.reflect.Method;
+import org.jboss.interceptor.spi.metadata.ClassMetadata;
import org.jboss.interceptor.spi.model.InterceptionModel;
import org.jboss.interceptor.spi.model.InterceptionType;
@@ -10,11 +11,11 @@
*
* @author Marius Bogoevici
*/
-public interface BuildableInterceptionModel<T,I> extends InterceptionModel<T, I>
+public interface BuildableInterceptionModel<T> extends InterceptionModel<T>
{
void setIgnoresGlobals(Method m, boolean b);
- void appendInterceptors(InterceptionType interceptionType, Method method, I[] interceptors);
+ void appendInterceptors(InterceptionType interceptionType, Method method, ClassMetadata<?>... interceptors);
}
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/InterceptionModelBuilder.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/InterceptionModelBuilder.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/InterceptionModelBuilder.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -23,6 +23,7 @@
import java.lang.reflect.Method;
+import org.jboss.interceptor.spi.metadata.ClassMetadata;
import org.jboss.interceptor.spi.model.InterceptionModel;
import org.jboss.interceptor.spi.model.InterceptionType;
@@ -30,20 +31,20 @@
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
-public class InterceptionModelBuilder<T, I>
+public class InterceptionModelBuilder<T>
{
- private BuildableInterceptionModel<T, I> interceptionModel;
+ private BuildableInterceptionModel<T> interceptionModel;
private T interceptedEntity;
private InterceptionModelBuilder(T interceptedEntity)
{
this.interceptedEntity = interceptedEntity;
- this.interceptionModel = new InterceptionModelImpl<T, I>(interceptedEntity);
+ this.interceptionModel = new InterceptionModelImpl<T>(interceptedEntity);
}
- private InterceptionModelBuilder(BuildableInterceptionModel<T, I> interceptionModel)
+ private InterceptionModelBuilder(BuildableInterceptionModel<T> interceptionModel)
{
if (interceptionModel == null)
{
@@ -53,12 +54,12 @@
this.interceptionModel = interceptionModel;
}
- public static <T,I> InterceptionModelBuilder<T,I> newBuilderFor(T entity, Class<I> interceptorType)
+ public static <T> InterceptionModelBuilder<T> newBuilderFor(T entity)
{
- return new InterceptionModelBuilder<T, I>(entity);
+ return new InterceptionModelBuilder<T>(entity);
}
- public static <T, I> InterceptionModelBuilder<T, I> changeBuilderFor(BuildableInterceptionModel<T,I> interceptionModel)
+ public static <T> InterceptionModelBuilder<T> changeBuilderFor(BuildableInterceptionModel<T> interceptionModel)
{
return new InterceptionModelBuilder(interceptionModel);
}
@@ -68,7 +69,7 @@
return interceptedEntity;
}
- public InterceptionModel<T, I> build()
+ public InterceptionModel<T> build()
{
return interceptionModel;
}
@@ -125,7 +126,7 @@
this.interceptionTypes = interceptionType;
}
- public void with(I... interceptors)
+ public void with(ClassMetadata<?> ... interceptors)
{
for (InterceptionType interceptionType: interceptionTypes)
{
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/InterceptionModelImpl.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/InterceptionModelImpl.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/InterceptionModelImpl.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -29,21 +29,22 @@
import java.util.Set;
import org.jboss.interceptor.proxy.InterceptorException;
+import org.jboss.interceptor.spi.metadata.ClassMetadata;
import org.jboss.interceptor.spi.model.InterceptionType;
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
-class InterceptionModelImpl<T, I> implements BuildableInterceptionModel<T, I>
+class InterceptionModelImpl<T> implements BuildableInterceptionModel<T>
{
- private Map<InterceptionType, List<I>> globalInterceptors = new HashMap<InterceptionType, List<I>>();
+ private Map<InterceptionType, List<ClassMetadata<?>>> globalInterceptors = new HashMap<InterceptionType, List<ClassMetadata<?>>>();
- private Map<InterceptionType, Map<MethodReference, List<I>>> methodBoundInterceptors = new HashMap<InterceptionType, Map<MethodReference, List<I>>>();
+ private Map<InterceptionType, Map<MethodReference, List<ClassMetadata<?>>>> methodBoundInterceptors = new HashMap<InterceptionType, Map<MethodReference, List<ClassMetadata<?>>>>();
private Set<MethodReference> methodsIgnoringGlobals = new HashSet<MethodReference>();
- private Set<I> allInterceptors = new LinkedHashSet<I>();
+ private Set<ClassMetadata<?>> allInterceptors = new LinkedHashSet<ClassMetadata<?>>();
private T interceptedEntity;
@@ -52,7 +53,7 @@
this.interceptedEntity = interceptedEntity;
}
- public List<I> getInterceptors(InterceptionType interceptionType, Method method)
+ public List<ClassMetadata<?>> getInterceptors(InterceptionType interceptionType, Method method)
{
if (interceptionType.isLifecycleCallback() && method != null)
{
@@ -73,7 +74,7 @@
}
else
{
- ArrayList<I> returnedInterceptors = new ArrayList<I>();
+ ArrayList<ClassMetadata<?>> returnedInterceptors = new ArrayList<ClassMetadata<?>>();
if (!methodsIgnoringGlobals.contains(methodHolder(method)) && globalInterceptors.containsKey(interceptionType))
{
returnedInterceptors.addAll(globalInterceptors.get(interceptionType));
@@ -87,7 +88,7 @@
return Collections.EMPTY_LIST;
}
- public Set<I> getAllInterceptors()
+ public Set<ClassMetadata<?>> getAllInterceptors()
{
return Collections.unmodifiableSet(allInterceptors);
}
@@ -109,14 +110,14 @@
}
}
- public void appendInterceptors(InterceptionType interceptionType, Method method, I... interceptors)
+ public void appendInterceptors(InterceptionType interceptionType, Method method, ClassMetadata<?>... interceptors)
{
if (null == method)
{
- List<I> interceptorsList = globalInterceptors.get(interceptionType);
+ List<ClassMetadata<?>> interceptorsList = globalInterceptors.get(interceptionType);
if (interceptorsList == null)
{
- interceptorsList = new ArrayList<I>();
+ interceptorsList = new ArrayList<ClassMetadata<?>>();
globalInterceptors.put(interceptionType, interceptorsList);
}
appendInterceptorClassesToList(interceptionType, interceptorsList, interceptors);
@@ -125,12 +126,12 @@
{
if (null == methodBoundInterceptors.get(interceptionType))
{
- methodBoundInterceptors.put(interceptionType, new HashMap<MethodReference, List<I>>());
+ methodBoundInterceptors.put(interceptionType, new HashMap<MethodReference, List<ClassMetadata<?>>>());
}
- List<I> interceptorsList = methodBoundInterceptors.get(interceptionType).get(methodHolder(method));
+ List<ClassMetadata<?>> interceptorsList = methodBoundInterceptors.get(interceptionType).get(methodHolder(method));
if (interceptorsList == null)
{
- interceptorsList = new ArrayList<I>();
+ interceptorsList = new ArrayList<ClassMetadata<?>>();
methodBoundInterceptors.get(interceptionType).put(methodHolder(method), interceptorsList);
}
if (globalInterceptors.containsKey(interceptionType))
@@ -142,15 +143,15 @@
allInterceptors.addAll(Arrays.asList(interceptors));
}
- private void appendInterceptorClassesToList(InterceptionType interceptionType, List<I> interceptorsList, I... interceptors)
+ private void appendInterceptorClassesToList(InterceptionType interceptionType, List<ClassMetadata<?>> interceptorsList, ClassMetadata<?>... interceptors)
{
validateDuplicateInterceptors(interceptionType, interceptorsList, interceptors);
interceptorsList.addAll(Arrays.asList(interceptors));
}
- private void validateDuplicateInterceptors(InterceptionType interceptionType, List<I> interceptorsList, I[] interceptors)
+ private void validateDuplicateInterceptors(InterceptionType interceptionType, List<ClassMetadata<?>> interceptorsList, ClassMetadata<?>[] interceptors)
{
- for (I interceptor : interceptors)
+ for (ClassMetadata<?> interceptor : interceptors)
{
if (interceptorsList.contains(interceptor))
{
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorMethodHandler.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorMethodHandler.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorMethodHandler.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -42,13 +42,13 @@
private Map<ClassMetadata<?>, Object> interceptorHandlerInstances = new HashMap<ClassMetadata<?>, Object>();
private InterceptorMetadata targetClassInterceptorMetadata;
- private InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ private InterceptionModel<ClassMetadata<?>> interceptionModel;
private Object targetInstance;
private InvocationContextFactory invocationContextFactory;
public InterceptorMethodHandler(Object targetInstance,
ClassMetadata<?> targetClassMetadata,
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel,
+ InterceptionModel<ClassMetadata<?>> interceptionModel,
InterceptorInstantiator<ClassMetadata<?>, ?> interceptorInstantiator,
InvocationContextFactory invocationContextFactory )
{
@@ -118,7 +118,7 @@
private Object executeInterception(Object self, Method proceedingMethod, Method thisMethod, Object[] args, InterceptionType interceptionType) throws Throwable
{
- List<ClassMetadata> interceptorList = interceptionModel.getInterceptors(interceptionType, thisMethod);
+ List<ClassMetadata<?>> interceptorList = interceptionModel.getInterceptors(interceptionType, thisMethod);
Collection<InterceptorInvocation<?>> interceptorInvocations = new ArrayList<InterceptorInvocation<?>>();
for (ClassMetadata<?> interceptorReference : interceptorList)
{
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorProxyCreatorImpl.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -39,11 +39,11 @@
{
private InvocationContextFactory invocationContextFactory;
- private InterceptionModel<ClassMetadata<?>,ClassMetadata> interceptionModel;
+ private InterceptionModel<ClassMetadata<?>> interceptionModel;
private InterceptorInstantiator<ClassMetadata<?>, Object> interceptorInstantiator;
- public InterceptorProxyCreatorImpl(InterceptorInstantiator<ClassMetadata<?>, Object> interceptorInstantiator, InvocationContextFactory invocationContextFactory, InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel)
+ public InterceptorProxyCreatorImpl(InterceptorInstantiator<ClassMetadata<?>, Object> interceptorInstantiator, InvocationContextFactory invocationContextFactory, InterceptionModel<ClassMetadata<?>> interceptionModel)
{
this.interceptorInstantiator = interceptorInstantiator;
this.invocationContextFactory = invocationContextFactory;
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/ReflectiveClassMetadata.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/ReflectiveClassMetadata.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/ReflectiveClassMetadata.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -32,6 +32,8 @@
public class ReflectiveClassMetadata<T> implements ClassMetadata<T>, Serializable
{
+ private static final long serialVersionUID = -2088679292389273922L;
+
private Class<T> clazz;
private ReflectiveClassMetadata(Class<T> clazz)
@@ -41,7 +43,7 @@
public static <T> ClassMetadata<T> of(Class<T> clazz)
{
- return new ReflectiveClassMetadata(clazz);
+ return new ReflectiveClassMetadata<T>(clazz);
}
public String getClassName()
@@ -55,7 +57,7 @@
{
public Iterator<MethodMetadata> iterator()
{
- return new ImmutableIteratorWrapper<Method>(new ArrayIterator(ReflectiveClassMetadata.this.clazz.getDeclaredMethods()))
+ return new ImmutableIteratorWrapper<Method>(new ArrayIterator<Method>(ReflectiveClassMetadata.this.clazz.getDeclaredMethods()))
{
@Override
protected MethodMetadata wrapObject(Method method)
@@ -72,10 +74,42 @@
return clazz;
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public ClassMetadata<?> getSuperclass()
{
Class<?> superClass = clazz.getSuperclass();
return superClass == null? null : new ReflectiveClassMetadata(superClass);
}
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((clazz == null) ? 0 : clazz.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ ReflectiveClassMetadata<?> other = (ReflectiveClassMetadata<?>) obj;
+ if (clazz == null)
+ {
+ if (other.clazz != null)
+ return false;
+ }
+ else if (!clazz.equals(other.clazz))
+ return false;
+ return true;
+ }
+
+
+
}
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/ReflectiveMethodMetadata.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/ReflectiveMethodMetadata.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/ReflectiveMethodMetadata.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -29,6 +29,9 @@
*/
public class ReflectiveMethodMetadata implements MethodMetadata, Serializable
{
+
+ private static final long serialVersionUID = -4538617003189564552L;
+
private Method javaMethod;
private ReflectiveMethodMetadata(Method method)
@@ -56,4 +59,33 @@
return ReflectiveClassMetadata.of(javaMethod.getReturnType());
}
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((javaMethod == null) ? 0 : javaMethod.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ ReflectiveMethodMetadata other = (ReflectiveMethodMetadata) obj;
+ if (javaMethod == null)
+ {
+ if (other.javaMethod != null)
+ return false;
+ }
+ else if (!javaMethod.equals(other.javaMethod))
+ return false;
+ return true;
+ }
+
}
Added: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/util/Ejb3InterceptorModelExtractor.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/util/Ejb3InterceptorModelExtractor.java (rev 0)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/util/Ejb3InterceptorModelExtractor.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.interceptor.util;
+
+import org.jboss.interceptor.builder.InterceptionModelBuilder;
+import org.jboss.interceptor.spi.metadata.ClassMetadata;
+import org.jboss.interceptor.spi.model.InterceptionModel;
+
+/**
+ * Parses a class and extracts the {@link InterceptionModel} according to the
+ * @author Marius Bogoevici
+ *
+ */
+public class Ejb3InterceptorModelExtractor
+{
+
+ InterceptionModel<ClassMetadata<?>> extractInterceptionModel(ClassMetadata<?> classMetadata)
+ {
+ InterceptionModelBuilder<ClassMetadata<?>> builder = InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(classMetadata);
+
+ return builder.build();
+ }
+}
Property changes on: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/util/Ejb3InterceptorModelExtractor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/customInvocationContext/CustomInvocationContextTest.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/customInvocationContext/CustomInvocationContextTest.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/customInvocationContext/CustomInvocationContextTest.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -32,6 +32,7 @@
CustomInterceptor.invocationCount = 0;
InterceptorInstantiator<ClassMetadata<?>, Object> interceptorInstantiator = new DirectClassInterceptorInstantiator();
+
InvocationContextFactory invocationContextFactory = new InvocationContextFactory()
{
@@ -43,9 +44,10 @@
};
ClassMetadata<Service> serviceClassMetadata = ReflectiveClassMetadata.of(Service.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder = InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(serviceClassMetadata, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder = InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(serviceClassMetadata);
builder.interceptAll().with(ReflectiveClassMetadata.of(CustomInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel = builder.build();
+ InterceptionModel<ClassMetadata<?>> interceptionModel = builder.build();
+
InterceptorProxyCreatorImpl interceptorProxyCreator = new InterceptorProxyCreatorImpl(interceptorInstantiator, invocationContextFactory, interceptionModel);
Service serviceInstance = interceptorProxyCreator.createSubclassingProxy(serviceClassMetadata, new Class<?>[]{}, new Object[]{} );
Modified: projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/InterceptionTestCase.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -96,7 +96,7 @@
"org.jboss.interceptors.proxy.FootballTeam_getName",
};
- private Map<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>> interceptionModelRegistry;
+ private Map<Class<?>, InterceptionModel<ClassMetadata<?>>> interceptionModelRegistry;
private DirectClassInterceptorInstantiator interceptionHandlerFactory;
@@ -110,15 +110,15 @@
{
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("getName")).with(
ReflectiveClassMetadata.of(FirstInterceptor.class), ReflectiveClassMetadata.of(SecondInterceptor.class));
builder.interceptPostConstruct().with(ReflectiveClassMetadata.of(FirstInterceptor.class));
builder.interceptPreDestroy().with(ReflectiveClassMetadata.of(SecondInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
}
@@ -128,13 +128,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAll().with(ReflectiveClassMetadata.of(FirstInterceptor.class), ReflectiveClassMetadata.of(SecondInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>, ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
}
@@ -144,14 +144,14 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAll().with(ReflectiveClassMetadata.of(FirstInterceptor.class));
builder.interceptPreDestroy().with(ReflectiveClassMetadata.of(SecondInterceptor.class));
builder.interceptAroundInvoke(FootballTeam.class.getMethod("getName")).with(ReflectiveClassMetadata.of(SecondInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
}
@@ -161,15 +161,15 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAll().with(ReflectiveClassMetadata.of(FirstInterceptor.class));
builder.interceptPreDestroy().with(ReflectiveClassMetadata.of(SecondInterceptor.class));
builder.interceptAroundInvoke(FootballTeam.class.getMethod("getName")).with(ReflectiveClassMetadata.of(SecondInterceptor.class));
builder.ignoreGlobalInterceptors(FootballTeam.class.getMethod("getName"));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
}
@@ -261,12 +261,12 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echo", String.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -279,13 +279,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoInt", int.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithInteger.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -298,13 +298,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoLongAsObject", Long.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithInteger.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -317,13 +317,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoLongAsObject", Long.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithLong.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -336,13 +336,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoLong", long.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithInteger.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -355,13 +355,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoInt", int.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithLong.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -374,13 +374,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoObjectArray", Object[].class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithLongArray.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -393,13 +393,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoStringArray", String[].class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithLongArray.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -413,13 +413,13 @@
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echo2", ValueBearer.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptor2.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
Modified: projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/SubclassingInterceptionTestCase.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/SubclassingInterceptionTestCase.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor/src/test/java/org/jboss/interceptors/proxy/SubclassingInterceptionTestCase.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -92,7 +92,7 @@
"org.jboss.interceptors.proxy.FootballTeam_getName",
};
- private Map<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>> interceptionModelRegistry;
+ private Map<Class<?>, InterceptionModel<ClassMetadata<?>>> interceptionModelRegistry;
private DirectClassInterceptorInstantiator interceptionHandlerFactory;
private DefaultInvocationContextFactory invocationContextFactory;
@@ -107,15 +107,15 @@
{
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("getName")).with(
ReflectiveClassMetadata.of(FirstInterceptor.class), ReflectiveClassMetadata.of(SecondInterceptor.class));
builder.interceptPostConstruct().with(ReflectiveClassMetadata.of(FirstInterceptor.class));
builder.interceptPreDestroy().with(ReflectiveClassMetadata.of(SecondInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
}
@@ -125,13 +125,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAll().with(ReflectiveClassMetadata.of(FirstInterceptor.class), ReflectiveClassMetadata.of(SecondInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>, ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
}
@@ -141,14 +141,14 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAll().with(ReflectiveClassMetadata.of(FirstInterceptor.class));
builder.interceptPreDestroy().with(ReflectiveClassMetadata.of(SecondInterceptor.class));
builder.interceptAroundInvoke(FootballTeam.class.getMethod("getName")).with(ReflectiveClassMetadata.of(SecondInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
}
@@ -158,15 +158,15 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAll().with(ReflectiveClassMetadata.of(FirstInterceptor.class));
builder.interceptPreDestroy().with(ReflectiveClassMetadata.of(SecondInterceptor.class));
builder.interceptAroundInvoke(FootballTeam.class.getMethod("getName")).with(ReflectiveClassMetadata.of(SecondInterceptor.class));
builder.ignoreGlobalInterceptors(FootballTeam.class.getMethod("getName"));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
}
@@ -258,12 +258,12 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echo", String.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptor.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -276,13 +276,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoInt", int.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithInteger.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -295,13 +295,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoLongAsObject", Long.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithInteger.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -314,13 +314,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoLongAsObject", Long.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithLong.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -333,13 +333,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoLong", long.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithInteger.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -352,13 +352,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoInt", int.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithLong.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -371,13 +371,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoObjectArray", Object[].class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithLongArray.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -390,13 +390,13 @@
InterceptorTestLogger.reset();
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echoStringArray", String[].class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptorWithLongArray.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -410,13 +410,13 @@
ClassMetadata<?> footballTeamClass = ReflectiveClassMetadata.of(FootballTeam.class);
- InterceptionModelBuilder<ClassMetadata<?>, ClassMetadata> builder =
- InterceptionModelBuilder.<ClassMetadata<?>,ClassMetadata>newBuilderFor(footballTeamClass, ClassMetadata.class);
+ InterceptionModelBuilder<ClassMetadata<?>> builder =
+ InterceptionModelBuilder.<ClassMetadata<?>>newBuilderFor(footballTeamClass);
builder.interceptAroundInvoke(FootballTeam.class.getMethod("echo2", ValueBearer.class)).with(ReflectiveClassMetadata.of(ParameterOverridingInterceptor2.class));
- InterceptionModel<ClassMetadata<?>, ClassMetadata> interceptionModel;
+ InterceptionModel<ClassMetadata<?>> interceptionModel;
interceptionModel = builder.build();
- this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>,ClassMetadata>>();
+ this.interceptionModelRegistry = new HashMap<Class<?>, InterceptionModel<ClassMetadata<?>>>();
this.interceptionModelRegistry.put(FootballTeam.class, interceptionModel);
FootballTeam proxy = createAdvisedInstance(FootballTeam.class, TEAM_NAME);
@@ -445,7 +445,7 @@
private <T> T createAdvisedInstance(Class<? extends T> targetClass, Object... args) throws Exception
{
- InterceptionModel<ClassMetadata<?>, ClassMetadata> classMetadataInterceptionModel = interceptionModelRegistry.get(targetClass);
+ InterceptionModel<ClassMetadata<?>> classMetadataInterceptionModel = interceptionModelRegistry.get(targetClass);
invocationContextFactory = new DefaultInvocationContextFactory();
InterceptorProxyCreatorImpl ipc = new InterceptorProxyCreatorImpl(interceptionHandlerFactory, invocationContextFactory, classMetadataInterceptionModel);
return ipc.createSubclassingProxy(ReflectiveClassMetadata.of((Class<? extends T>) targetClass), new Class<?>[]{String.class}, args);
Modified: projects/interceptors/trunk/jboss-interceptor-api/src/main/java/org/jboss/interceptor/spi/model/InterceptionModel.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor-api/src/main/java/org/jboss/interceptor/spi/model/InterceptionModel.java 2010-08-13 18:54:30 UTC (rev 107601)
+++ projects/interceptors/trunk/jboss-interceptor-api/src/main/java/org/jboss/interceptor/spi/model/InterceptionModel.java 2010-08-13 20:12:38 UTC (rev 107602)
@@ -22,6 +22,8 @@
import java.util.Set;
import java.io.Serializable;
+import org.jboss.interceptor.spi.metadata.ClassMetadata;
+
/**
* Describes the interceptors that apply to a particular entity.
*
@@ -29,7 +31,7 @@
*
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
-public interface InterceptionModel<T, I> extends Serializable
+public interface InterceptionModel<T> extends Serializable
{
/**
@@ -41,13 +43,13 @@
* @throws IllegalArgumentException if interceptionType is business method or around timeout
* but method is null, as well as if interceptionType is callback and method is not null
*/
- public List<I> getInterceptors(InterceptionType interceptionType, Method method);
+ public List<ClassMetadata<?>> getInterceptors(InterceptionType interceptionType, Method method);
/**
* Returns all interceptor classes that are applicable to the given intercepted entity
* @return all interceptors
*/
- public Set<I> getAllInterceptors();
+ public Set<ClassMetadata<?>> getAllInterceptors();
/**
*
More information about the jboss-cvs-commits
mailing list