[jboss-svn-commits] JBoss Common SVN: r2955 - in jbossxb/trunk/src: test/java/org/jboss/test/xb/builder and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2009-01-13 06:15:50 -0500 (Tue, 13 Jan 2009)
New Revision: 2955

Added:
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/schemarebuild/
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/schemarebuild/test/
   jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/schemarebuild/test/SchemaRebuildUnitTestCase.java
Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBBuilder.java
Log:
JBXB-171

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBBuilder.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBBuilder.java	2009-01-13 10:20:45 UTC (rev 2954)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBBuilder.java	2009-01-13 11:15:50 UTC (rev 2955)
@@ -109,10 +109,25 @@
     */
    public static SchemaBinding build(Class<?> root)
    {
+      return build(root, false);
+   }
+
+   /**
+    * Build the SchemaBinding from the class.
+    * If the SchemaBinding has previously been buil, cached and rebuild argument is false
+    * then the previously built SchemaBinding is returned. Otherwise, a new SchemaBinding instance
+    * is built and cached.
+    * 
+    * @param root
+    * @param rebuild
+    * @return
+    */
+   public static SchemaBinding build(Class<?> root, boolean rebuild)
+   {
       ClassInfo classInfo = JBossXBBuilder.configuration.getClassInfo(root);
 
       SchemaBinding binding = classInfo.getAttachment(SchemaBinding.class);
-      if (binding == null)
+      if (rebuild || binding == null)
       {
          JBossXBNoSchemaBuilder builder = new JBossXBNoSchemaBuilder(classInfo);
          binding = builder.build();

Added: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/schemarebuild/test/SchemaRebuildUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/schemarebuild/test/SchemaRebuildUnitTestCase.java	                        (rev 0)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/schemarebuild/test/SchemaRebuildUnitTestCase.java	2009-01-13 11:15:50 UTC (rev 2955)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * 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.test.xb.builder.schemarebuild.test;
+
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.test.xb.builder.AbstractBuilderTest;
+import org.jboss.xb.annotations.JBossXmlSchema;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
+import org.jboss.xb.builder.JBossXBBuilder;
+
+/**
+ * A SchemaRebuildUnitTestCase.
+ * 
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class SchemaRebuildUnitTestCase extends AbstractBuilderTest
+{
+   public SchemaRebuildUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testCache() throws Exception
+   {
+      SchemaBinding schema = JBossXBBuilder.build(MyClass.class, true);
+      assertEquals("ns1", schema.getNamespace("p1"));
+      assertEquals("ns2", schema.getNamespace("p2"));
+      
+      schema.addPrefixMapping("p2", "ns22");
+      
+      schema = JBossXBBuilder.build(MyClass.class);
+      assertEquals("ns1", schema.getNamespace("p1"));
+      assertEquals("ns22", schema.getNamespace("p2"));
+   }
+
+   public void testRebuild() throws Exception
+   {
+      SchemaBinding schema = JBossXBBuilder.build(MyClass.class, true);
+      assertEquals("ns1", schema.getNamespace("p1"));
+      assertEquals("ns2", schema.getNamespace("p2"));
+      
+      schema.addPrefixMapping("p2", "ns22");
+      
+      schema = JBossXBBuilder.build(MyClass.class, true);
+      assertEquals("ns1", schema.getNamespace("p1"));
+      assertEquals("ns2", schema.getNamespace("p2"));
+   }
+
+   @XmlRootElement()
+   @JBossXmlSchema(xmlns={@XmlNs(namespaceURI = "ns1", prefix = "p1"), @XmlNs(namespaceURI = "ns2", prefix = "p2")})
+   public static final class MyClass
+   {
+      
+   }
+}