[jboss-cvs] JBossAS SVN: r67346 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/ejb3 and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Nov 21 12:33:30 EST 2007


Author: wolfc
Date: 2007-11-21 12:33:30 -0500 (Wed, 21 Nov 2007)
New Revision: 67346

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
Log:
JBAS-4506: Fixed generics

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java	2007-11-21 17:23:33 UTC (rev 67345)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java	2007-11-21 17:33:30 UTC (rev 67346)
@@ -40,7 +40,7 @@
  * @version $Revision: $
  */
 public class EjbJar30Creator extends AbstractFinderUser
-   implements Creator<Collection<Class>, EjbJar30MetaData>
+   implements Creator<Collection<Class<?>>, EjbJar30MetaData>
 {
    private List<Processor<EjbJar3xMetaData, Class<?>>> processors;
    
@@ -56,7 +56,7 @@
       processors.add(new ApplicationExceptionProcessor(finder));
    }
    
-   public EjbJar30MetaData create(Collection<Class> classes)
+   public EjbJar30MetaData create(Collection<Class<?>> classes)
    {
       EjbJar30MetaData metaData = new EjbJar30MetaData();
       metaData.setVersion("3.0");

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2007-11-21 17:23:33 UTC (rev 67345)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java	2007-11-21 17:33:30 UTC (rev 67346)
@@ -33,9 +33,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
-
 import org.jboss.metadata.annotation.creator.ejb.EjbJar30Creator;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
@@ -83,7 +80,6 @@
 import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
 import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview21Remote;
 import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview3Remote;
-import org.jboss.test.metadata.annotation.ejb3.multiview.MultiviewBean;
 import org.jboss.test.metadata.annotation.ejb3.multiview.MultiviewHome;
 import org.jboss.test.metadata.annotation.ejb3.runas.InterMediate;
 import org.jboss.test.metadata.common.PackageScanner;
@@ -310,15 +306,15 @@
       assertEquals("java:/mdbs/MailMDB", bean.getMappedName());
    }
 
-   private Collection<Class> loadClassesFromCurrentClassDir()
+   private Collection<Class<?>> loadClassesFromCurrentClassDir()
    {
       return loadClassesFromRelativeClassDir(".");
    }
    
-   private Collection<Class> loadClassesFromRelativeClassDir(String dir)
+   private Collection<Class<?>> loadClassesFromRelativeClassDir(String dir)
    {
       // In real life the deployer will pass probably pass a class scanner
-      Collection<Class> classes = new ArrayList<Class>();
+      Collection<Class<?>> classes = new ArrayList<Class<?>>();
       URL currentClassDirURL = getClass().getResource(dir);
       File currentDir;
       try
@@ -365,7 +361,7 @@
    {
       AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
       
-      Collection<Class> classes = loadClassesFromCurrentClassDir();
+      Collection<Class<?>> classes = loadClassesFromCurrentClassDir();
       System.out.println("Processing classes: "+classes);
 
       enableTrace("org.jboss.metadata.annotation.creator");
@@ -499,10 +495,10 @@
    public void testXmlMerge()
       throws Exception
    {
-      Class[] beanClasses = {
+      Class<?>[] beanClasses = {
             InterMediate.class
       };
-      List<Class> classes = Arrays.asList(beanClasses);
+      List<Class<?>> classes = Arrays.asList(beanClasses);
       AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
       EjbJar30Creator creator = new EjbJar30Creator(finder);
       EjbJar30MetaData metaData = creator.create(classes);
@@ -530,7 +526,7 @@
    {
       AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
       
-      Collection<Class> classes = (Collection<Class>) PackageScanner.loadClasses();
+      Collection<Class<?>> classes = PackageScanner.loadClasses();
       System.out.println("Processing classes: "+classes);
       
       enableTrace("org.jboss.metadata.annotation.creator");

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java	2007-11-21 17:23:33 UTC (rev 67345)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java	2007-11-21 17:33:30 UTC (rev 67346)
@@ -84,10 +84,10 @@
    public void testXmlAnnotationMerge()
       throws Exception
    {
-      Class[] beanClasses = {
+      Class<?>[] beanClasses = {
             InterMediate.class
       };
-      List<Class> classes = Arrays.asList(beanClasses);
+      List<Class<?>> classes = Arrays.asList(beanClasses);
       MetaData scopeMetaData = createMetaDataFromAnnotations("ejb0.jar", classes);
    
       JBossMetaData xmlMetaData = unmarshal("jboss.xml", JBossMetaData.class, null);
@@ -99,7 +99,7 @@
       assertNotNull(InterMediateBean);
    }
 
-   protected MetaData createMetaDataFromAnnotations(String jarName, Collection<Class> classes)
+   protected MetaData createMetaDataFromAnnotations(String jarName, Collection<Class<?>> classes)
    {
       ScopeKey jarKey = new ScopeKey(CommonLevels.DEPLOYMENT, jarName);
       MemoryMetaDataLoader loader = new MemoryMetaDataLoader(jarKey);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java	2007-11-21 17:23:33 UTC (rev 67345)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java	2007-11-21 17:33:30 UTC (rev 67346)
@@ -83,11 +83,11 @@
       throws Exception
    {
       enableTrace("org.jboss.metadata.annotation.creator");
-      Class[] beanClasses = {
+      Class<?>[] beanClasses = {
             Class.forName("org.jboss.test.metadata.annotation.ejb3.MyStatelessBean"),
             Class.forName("org.jboss.test.metadata.annotation.ejb3.MyStatefulBean")
       };
-      List<Class> classes = Arrays.asList(beanClasses);
+      List<Class<?>> classes = Arrays.asList(beanClasses);
       createMetaDataFromAnnotations("ejb0.jar", classes);
 
       ScopeKey jarKey = new ScopeKey(CommonLevels.DEPLOYMENT, "ejb0.jar");
@@ -161,11 +161,11 @@
    public void testAnnotationMetaData()
       throws Exception
    {
-      Class[] beanClasses = {
+      Class<?>[] beanClasses = {
             Class.forName("org.jboss.test.metadata.annotation.ejb3.MyStatelessBean"),
             Class.forName("org.jboss.test.metadata.annotation.ejb3.MyStatefulBean")
       };
-      List<Class> classes = Arrays.asList(beanClasses);
+      List<Class<?>> classes = Arrays.asList(beanClasses);
       MetaData scopeMetaData = createMetaDataFromAnnotations("ejb0.jar", classes);
 
       JBossMetaData xmlMetaData = new JBossMetaData();
@@ -178,7 +178,7 @@
       assertEquals(SessionType.Stateless, sbeanMD.getSessionType());
    }
 
-   protected MetaData createMetaDataFromAnnotations(String jarName, Collection<Class> classes)
+   protected MetaData createMetaDataFromAnnotations(String jarName, Collection<Class<?>> classes)
    {
       ScopeKey jarKey = new ScopeKey(CommonLevels.DEPLOYMENT, jarName);
       MemoryMetaDataLoader loader = new MemoryMetaDataLoader(jarKey);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java	2007-11-21 17:23:33 UTC (rev 67345)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java	2007-11-21 17:33:30 UTC (rev 67346)
@@ -146,7 +146,7 @@
       //Parse the EJB3 Beans to get the EJB3 MetaData 
       AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
       
-      Collection<Class> classes = loadClassesFromCurrentClassDir();
+      Collection<Class<?>> classes = loadClassesFromCurrentClassDir();
       System.out.println("Processing classes: "+classes);
 
       //enableTrace("org.jboss.metadata.annotation.creator");
@@ -174,10 +174,10 @@
       assertNotNull(specResult.getEnterpriseBean("BusinessBean")); 
    }
 
-   private Collection<Class> loadClassesFromCurrentClassDir()
+   private Collection<Class<?>> loadClassesFromCurrentClassDir()
    {
       // In real life the deployer will pass probably pass a class scanner
-      Collection<Class> classes = new ArrayList<Class>();
+      Collection<Class<?>> classes = new ArrayList<Class<?>>();
       URL currentClassDirURL = getClass().getResource(".");
       File currentDir;
       try




More information about the jboss-cvs-commits mailing list