[jboss-cvs] JBossAS SVN: r66329 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ejb/jboss and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 22 08:02:54 EDT 2007
Author: wolfc
Date: 2007-10-22 08:02:54 -0400 (Mon, 22 Oct 2007)
New Revision: 66329
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEjbJarMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
Log:
JBAS-4506: Generics
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEjbJarMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEjbJarMetaData.java 2007-10-22 12:02:33 UTC (rev 66328)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEjbJarMetaData.java 2007-10-22 12:02:54 UTC (rev 66329)
@@ -37,9 +37,9 @@
public boolean isEJB3x();
public String getEjbClientJar();
public void setEjbClientJar(String ejbClientJar);
- public IEnterpriseBeansMetaData getEnterpriseBeans();
+ public IEnterpriseBeansMetaData<?> getEnterpriseBeans();
public IEnterpriseBeanMetaData getEnterpriseBean(String name);
- public void setEnterpriseBeans(IEnterpriseBeansMetaData enterpriseBeans);
+ public void setEnterpriseBeans(IEnterpriseBeansMetaData<?> enterpriseBeans);
public RelationsMetaData getRelationships();
public void setRelationships(RelationsMetaData relationships);
public IAssemblyDescriptorMetaData getAssemblyDescriptor();
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java 2007-10-22 12:02:33 UTC (rev 66328)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java 2007-10-22 12:02:54 UTC (rev 66329)
@@ -104,12 +104,12 @@
public ServiceReferencesMetaData getServiceReferences();;
public MethodPermissionsMetaData getMethodPermissions();;
public ContainerTransactionsMetaData getContainerTransactions();;
- public TransAttributeType getMethodTransactionType(String methodName, Class[] params, MethodInterfaceType iface);
+ public TransAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface);
public TransAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface);
public InterceptorBindingMetaData getInterceptorBinding();;
public ExcludeListMetaData getExcludeList();
//public IEnterpriseBeansMetaData getEnterpriseBeansMetaData();
- public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData data);
+ public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<?> data);
//
public void merge(NamedMetaData merged, NamedMetaData original);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-22 12:02:33 UTC (rev 66328)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-22 12:02:54 UTC (rev 66329)
@@ -171,7 +171,7 @@
*
* @return the enterpriseBeansMetaData.
*/
- public IEnterpriseBeansMetaData getEnterpriseBeansMetaData()
+ public IEnterpriseBeansMetaData<?> getEnterpriseBeansMetaData()
{
return enterpriseBeansMetaData;
}
@@ -181,8 +181,10 @@
*
* @param enterpriseBeansMetaData the enterpriseBeansMetaData.
*/
- public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
+ assert enterpriseBeansMetaData != null : "enterpriseBeansMetaData is null";
+
this.enterpriseBeansMetaData = (JBossEnterpriseBeansMetaData) enterpriseBeansMetaData;
}
@@ -222,6 +224,8 @@
{
return jndiEnvironmentRefsGroup;
}
+
+ @XmlElement(type=JBossEnvironmentRefsGroupMetaData.class)
public void setJndiEnvironmentRefsGroup(EnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
{
this.jndiEnvironmentRefsGroup = (JBossEnvironmentRefsGroupMetaData) jndiEnvironmentRefsGroup;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-10-22 12:02:33 UTC (rev 66328)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-10-22 12:02:54 UTC (rev 66329)
@@ -111,7 +111,7 @@
* @param enterpriseBeansMetaData the enterpriseBeansMetaData.
*/
@XmlTransient
- public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
this.enterpriseBeansMetaData = (EnterpriseBeansMetaData) enterpriseBeansMetaData;
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-22 12:02:33 UTC (rev 66328)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-10-22 12:02:54 UTC (rev 66329)
@@ -90,6 +90,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("deprecation")
public abstract class AbstractEJBEverythingTest extends AbstractJavaEEEverythingTest
{
public AbstractEJBEverythingTest(String name)
@@ -175,7 +176,7 @@
assertFullMDB("mdb2", applicationMetaData);
}
- protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
throw new NotImplementedException();
}
@@ -187,7 +188,7 @@
* @param enterpriseBeansMetaData
* @return
*/
- private SessionBeanMetaData assertNullSession(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ private SessionBeanMetaData assertNullSession(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
SessionBeanMetaData session = assertSession(ejbName + "EjbName", enterpriseBeansMetaData);
assertEquals(ejbName+"EjbClass", session.getEjbClass());
@@ -290,12 +291,12 @@
return session;
}
- protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
throw new NotImplementedException();
}
- private EntityBeanMetaData assertNullEntity(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ private EntityBeanMetaData assertNullEntity(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
EntityBeanMetaData entity = assertEntity(ejbName + "EjbName", enterpriseBeansMetaData);
assertNullEntity(ejbName, entity);
@@ -329,7 +330,7 @@
assertNull(entity.getQueries());
}
- protected EntityBeanMetaData assertEntity(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ protected EntityBeanMetaData assertEntity(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
EntityBeanMetaData entity = assertEnterpriseBean(ejbName, enterpriseBeansMetaData, EntityBeanMetaData.class);
assertFalse(entity.isSession());
@@ -454,12 +455,12 @@
assertEquals(prefix + "Param" + count, params[count-1]);
}
- protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
throw new NotImplementedException();
}
- private MessageDrivenBeanMetaData assertNullMDB(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData)
+ private MessageDrivenBeanMetaData assertNullMDB(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
assertEquals(ejbName+"EjbClass", mdb.getEjbClass());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2007-10-22 12:02:33 UTC (rev 66328)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2007-10-22 12:02:54 UTC (rev 66329)
@@ -26,6 +26,7 @@
import junit.framework.Test;
import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.spec.ApplicationExceptionMetaData;
import org.jboss.metadata.ejb.spec.ApplicationExceptionsMetaData;
import org.jboss.metadata.ejb.spec.AroundInvokeMetaData;
@@ -114,19 +115,20 @@
public void assertEverythingWithAppMetaData(EjbJar3xMetaData ejbJarMetaData)
{
- ApplicationMetaData applicationMetaData = new ApplicationMetaData(ejbJarMetaData);
assertVersion(ejbJarMetaData);
- assertVersion(applicationMetaData);
assertMetaDataComplete(ejbJarMetaData);
assertId("ejb-jar", ejbJarMetaData);
assertEjbClientJar(ejbJarMetaData);
assertDescriptionGroup("ejb-jar", ejbJarMetaData.getDescriptionGroup());
assertEnterpriseBeans(ejbJarMetaData);
- assertEnterpriseBeans(applicationMetaData);
assertInterceptors(ejbJarMetaData);
assertRelationships(ejbJarMetaData);
+ assertAssemblyDescriptor(ejbJarMetaData);
+
+ ApplicationMetaData applicationMetaData = new ApplicationMetaData(ejbJarMetaData);
+ assertVersion(applicationMetaData);
+ assertEnterpriseBeans(applicationMetaData);
assertRelationships(applicationMetaData);
- assertAssemblyDescriptor(ejbJarMetaData);
assertAssemblyDescriptor(applicationMetaData);
}
@@ -152,13 +154,14 @@
assertEquals(true, ejbJar3xMetaData.isMetadataComplete());
}
- protected SessionBeanMetaData assertFullSession(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
+ @Override
+ protected SessionBeanMetaData assertFullSession(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
SessionBeanMetaData session = assertSession(ejbName + "EjbName", enterpriseBeansMetaData);
- assertFullSessionBean(ejbName, session);
+ assertFullSessionBean(ejbName, session);
return session;
}
-
+
public void assertFullSessionBean(String ejbName, SessionBeanMetaData session)
{
assertId(ejbName, session);
@@ -218,7 +221,8 @@
}
}
- protected EntityBeanMetaData assertFullEntity(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
+ @Override
+ protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
EntityBeanMetaData entity = assertEntity(ejbName + "EjbName", enterpriseBeansMetaData);
assertId(ejbName, entity);
@@ -287,7 +291,8 @@
assertMethodParams(ejbName + "QueryMethod", size, queryMethodMetaData.getMethodParams());
}
- protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
+ @Override
+ protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
{
MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
assertId(ejbName, mdb);
More information about the jboss-cvs-commits
mailing list