[jboss-cvs] JBossAS SVN: r92802 - in projects/metadata/web/trunk/src: test/java/org/jboss/test/metadata/web and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 25 14:07:52 EDT 2009
Author: remy.maucherat at jboss.com
Date: 2009-08-25 14:07:52 -0400 (Tue, 25 Aug 2009)
New Revision: 92802
Added:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OrderingElementMetaData.java
Modified:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/NameMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OthersMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java
projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java
projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java
Log:
- Add an abstract object type for the ordering element, to make for much nicer code when reading the metadata.
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java 2009-08-25 17:23:27 UTC (rev 92801)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java 2009-08-25 18:07:52 UTC (rev 92802)
@@ -39,9 +39,9 @@
{
private static final long serialVersionUID = 1;
- public List<Object> ordering = new ArrayList<Object>();
+ public List<OrderingElementMetaData> ordering = new ArrayList<OrderingElementMetaData>();
- public List<Object> getOrdering() {
+ public List<OrderingElementMetaData> getOrdering() {
return ordering;
}
@@ -49,7 +49,7 @@
@XmlElement(name="name", type=NameMetaData.class),
@XmlElement(name="others", type=OthersMetaData.class)
})
- public void setOrdering(List<Object> ordering) {
+ public void setOrdering(List<OrderingElementMetaData> ordering) {
this.ordering = ordering;
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/NameMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/NameMetaData.java 2009-08-25 17:23:27 UTC (rev 92801)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/NameMetaData.java 2009-08-25 18:07:52 UTC (rev 92802)
@@ -23,13 +23,11 @@
import javax.xml.bind.annotation.XmlValue;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-
/**
* @author Scott.Stark at jboss.org
* @version $Revision: 83549 $
*/
-public class NameMetaData extends IdMetaDataImpl
+public class NameMetaData extends OrderingElementMetaData
{
private static final long serialVersionUID = 1;
@@ -44,5 +42,10 @@
{
this.name = name;
}
-
+
+ public boolean isOthers()
+ {
+ return false;
+ }
+
}
Added: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OrderingElementMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OrderingElementMetaData.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OrderingElementMetaData.java 2009-08-25 18:07:52 UTC (rev 92802)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.web.spec;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 83549 $
+ */
+public abstract class OrderingElementMetaData extends IdMetaDataImpl
+{
+ private static final long serialVersionUID = 1;
+
+ public abstract String getName();
+ public abstract boolean isOthers();
+
+}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OthersMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OthersMetaData.java 2009-08-25 17:23:27 UTC (rev 92801)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OthersMetaData.java 2009-08-25 18:07:52 UTC (rev 92802)
@@ -21,13 +21,25 @@
*/
package org.jboss.metadata.web.spec;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import javax.xml.bind.annotation.XmlType;
/**
* @author Scott.Stark at jboss.org
* @version $Revision: 83549 $
*/
-public class OthersMetaData extends IdMetaDataImpl
+ at XmlType(name="ordering-othersType", propOrder={})
+public class OthersMetaData extends OrderingElementMetaData
{
private static final long serialVersionUID = 1;
+
+ public String getName()
+ {
+ return null;
+ }
+
+ public boolean isOthers()
+ {
+ return true;
+ }
+
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java 2009-08-25 17:23:27 UTC (rev 92801)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java 2009-08-25 18:07:52 UTC (rev 92802)
@@ -39,9 +39,9 @@
{
private static final long serialVersionUID = 1;
- public List<Object> ordering = new ArrayList<Object>();
+ public List<OrderingElementMetaData> ordering = new ArrayList<OrderingElementMetaData>();
- public List<Object> getOrdering() {
+ public List<OrderingElementMetaData> getOrdering() {
return ordering;
}
@@ -49,7 +49,7 @@
@XmlElement(name="name", type=NameMetaData.class),
@XmlElement(name="others", type=OthersMetaData.class)
})
- public void setOrdering(List<Object> ordering) {
+ public void setOrdering(List<OrderingElementMetaData> ordering) {
this.ordering = ordering;
}
Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java 2009-08-25 17:23:27 UTC (rev 92801)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java 2009-08-25 18:07:52 UTC (rev 92802)
@@ -37,6 +37,7 @@
import org.jboss.metadata.web.spec.FilterMetaData;
import org.jboss.metadata.web.spec.FiltersMetaData;
import org.jboss.metadata.web.spec.NameMetaData;
+import org.jboss.metadata.web.spec.OrderingElementMetaData;
import org.jboss.metadata.web.spec.OthersMetaData;
import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
import org.jboss.metadata.web.spec.ServletMappingMetaData;
@@ -96,15 +97,16 @@
{
Web30MetaData webApp30 = (Web30MetaData) webApp;
AbsoluteOrderingMetaData absoluteOrdering = webApp30.getAbsoluteOrdering();
- List<Object> ordering = absoluteOrdering.getOrdering();
+ List<OrderingElementMetaData> ordering = absoluteOrdering.getOrdering();
assertEquals(4, ordering.size());
assertEquals(NameMetaData.class.getName(), ordering.get(0).getClass().getName());
- assertEquals("foo1", ((NameMetaData) ordering.get(0)).getName());
+ assertEquals("foo1", ordering.get(0).getName());
assertEquals(NameMetaData.class.getName(), ordering.get(1).getClass().getName());
- assertEquals("foo2", ((NameMetaData) ordering.get(1)).getName());
+ assertEquals("foo2", ordering.get(1).getName());
assertEquals(OthersMetaData.class.getName(), ordering.get(2).getClass().getName());
+ assertEquals(true, ordering.get(2).isOthers());
assertEquals(NameMetaData.class.getName(), ordering.get(3).getClass().getName());
- assertEquals("foo3", ((NameMetaData) ordering.get(3)).getName());
+ assertEquals("foo3", ordering.get(3).getName());
}
private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java 2009-08-25 17:23:27 UTC (rev 92801)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java 2009-08-25 18:07:52 UTC (rev 92802)
@@ -37,6 +37,7 @@
import org.jboss.metadata.web.spec.FilterMetaData;
import org.jboss.metadata.web.spec.FiltersMetaData;
import org.jboss.metadata.web.spec.NameMetaData;
+import org.jboss.metadata.web.spec.OrderingElementMetaData;
import org.jboss.metadata.web.spec.OrderingMetaData;
import org.jboss.metadata.web.spec.OthersMetaData;
import org.jboss.metadata.web.spec.RelativeOrderingMetaData;
@@ -103,19 +104,20 @@
OrderingMetaData absoluteOrdering = webApp30.getOrdering();
RelativeOrderingMetaData after = absoluteOrdering.getAfter();
RelativeOrderingMetaData before = absoluteOrdering.getBefore();
- List<Object> ordering = after.getOrdering();
+ List<OrderingElementMetaData> ordering = after.getOrdering();
assertEquals(1, ordering.size());
assertEquals(NameMetaData.class.getName(), ordering.get(0).getClass().getName());
- assertEquals("foo4", ((NameMetaData) ordering.get(0)).getName());
+ assertEquals("foo4", ordering.get(0).getName());
ordering = before.getOrdering();
assertEquals(4, ordering.size());
assertEquals(NameMetaData.class.getName(), ordering.get(0).getClass().getName());
- assertEquals("foo1", ((NameMetaData) ordering.get(0)).getName());
+ assertEquals("foo1", ordering.get(0).getName());
assertEquals(NameMetaData.class.getName(), ordering.get(1).getClass().getName());
- assertEquals("foo2", ((NameMetaData) ordering.get(1)).getName());
+ assertEquals("foo2", ordering.get(1).getName());
assertEquals(NameMetaData.class.getName(), ordering.get(2).getClass().getName());
- assertEquals("foo3", ((NameMetaData) ordering.get(2)).getName());
+ assertEquals("foo3", ordering.get(2).getName());
assertEquals(OthersMetaData.class.getName(), ordering.get(3).getClass().getName());
+ assertEquals(true, ordering.get(3).isOthers());
}
private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
More information about the jboss-cvs-commits
mailing list