[jboss-cvs] JBossAS SVN: r93633 - in projects/ejb3/trunk/core/src: test/java/org/jboss/ejb3/core/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 17 05:11:18 EDT 2009
Author: wolfc
Date: 2009-09-17 05:11:17 -0400 (Thu, 17 Sep 2009)
New Revision: 93633
Added:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/DummyInterceptor.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/unit/
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/unit/AddAnnotationTestCase.java
Modified:
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/aop/annotation/CachingAnnotationRepository.java
Log:
EJBTHREE-1925: fixed addAnnotation with a String value
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/aop/annotation/CachingAnnotationRepository.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/aop/annotation/CachingAnnotationRepository.java 2009-09-17 06:18:06 UTC (rev 93632)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/aop/annotation/CachingAnnotationRepository.java 2009-09-17 09:11:17 UTC (rev 93633)
@@ -81,7 +81,7 @@
@Override
public void addAnnotation(Member m, String annotation, Object value)
{
- addAnnotation(m, loadClass(annotation), value);
+ addAnnotation(m, loadClass(annotation), initAnnotation(value));
}
@Override
@@ -190,11 +190,20 @@
}
// See AnnotationRepositoryToMetaData.initAnnotation
- protected Annotation initAnnotation(String annotationValue)
+ protected Annotation initAnnotation(Object annotation)
{
+ if (annotation == null)
+ throw new IllegalArgumentException("Null annotation");
+
+ if (annotation instanceof Annotation)
+ return (Annotation) annotation;
+
+ if (annotation instanceof String == false)
+ throw new IllegalArgumentException("Not an annotation: " + annotation);
+
try
{
- return (Annotation) AnnotationCreator.createAnnotation(annotationValue, classLoader);
+ return (Annotation) AnnotationCreator.createAnnotation((String) annotation, classLoader);
}
catch (RuntimeException e)
{
@@ -202,7 +211,7 @@
}
catch (Exception e)
{
- throw new RuntimeException("Error creating annotation: " + annotationValue, e);
+ throw new RuntimeException("Error creating annotation: " + annotation, e);
}
}
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/DummyInterceptor.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/DummyInterceptor.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/DummyInterceptor.java 2009-09-17 09:11:17 UTC (rev 93633)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.core.test.ejbthree1925;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class DummyInterceptor
+{
+
+}
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/unit/AddAnnotationTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/unit/AddAnnotationTestCase.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1925/unit/AddAnnotationTestCase.java 2009-09-17 09:11:17 UTC (rev 93633)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.core.test.ejbthree1925.unit;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import java.lang.reflect.Method;
+
+import javax.interceptor.Interceptors;
+
+import org.jboss.aop.annotation.AnnotationRepository;
+import org.jboss.ejb3.aop.annotation.CachingAnnotationRepository;
+import org.jboss.ejb3.core.test.ejbthree1582.GreeterBean;
+import org.jboss.ejb3.core.test.ejbthree1925.DummyInterceptor;
+import org.jboss.ejb3.metadata.annotation.AnnotationRepositoryToMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class AddAnnotationTestCase
+{
+ @Test
+ public void testAddAnnotationWithString() throws Exception
+ {
+ Class<?> beanClass = GreeterBean.class;
+ JBossEnterpriseBeanMetaData beanMetaData = null;
+ String canonicalObjectName = "GreeterBean";
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
+ AnnotationRepositoryToMetaData delegate = new AnnotationRepositoryToMetaData(beanClass, beanMetaData, canonicalObjectName, classLoader);
+ AnnotationRepository repository = new CachingAnnotationRepository(delegate, classLoader);
+
+ Method member = beanClass.getDeclaredMethod("sayHi", String.class);
+ String annotation = "javax.interceptor.Interceptors";
+ String value = "@javax.interceptor.Interceptors (value={" + DummyInterceptor.class.getName() + ".class})";
+ repository.addAnnotation(member, annotation, value);
+
+ Interceptors interceptors = (Interceptors) repository.resolveAnnotation(member, Interceptors.class);
+ assertArrayEquals(new Class[] { DummyInterceptor.class }, interceptors.value());
+ }
+}
More information about the jboss-cvs-commits
mailing list