Issue 395 : add option to generate default-attribute-value in java class

jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/defaultvalueplugin/DefaultValuePlugin.java

@@ -29,6 +29,8 @@
 import com.sun.tools.xjc.outline.EnumOutline;
 import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.outline.Outline;
+import com.sun.xml.xsom.XmlString;
+import com.sun.xml.xsom.XSAttributeUse;
 import com.sun.xml.xsom.XSElementDecl;
 import com.sun.xml.xsom.XSParticle;
 import com.sun.xml.xsom.XSTerm;
@@ -62,6 +64,8 @@ public class DefaultValuePlugin
     extends Plugin
 {
 
+    private static final String OPTION_NAME_ALL = "-Xdefault-value:all";
+    private boolean all = false;
     /**
      * Name of Option to enable this plugin
      */
@@ -92,7 +96,9 @@ public String getOptionName() {
      */
     public String getUsage()
     {
-        return "  -"+OPTION_NAME+"    : enable rewriting of classes to set default values for fields as specified in XML schema";
+        return "  -"+OPTION_NAME+"    : enable rewriting of classes to set default values for fields as specified in XML schema\n"
+            + " [-"+OPTION_NAME+":all : enable rewriting of classes for default values of all fields and attributes]"
+            ;
     }
 
     /**
@@ -102,8 +108,7 @@ public String getUsage()
      * <li>Look for fields that:
      * <ul>
      * <li>Were generated from XSD description</li>
-     * <li>The XSD description is of type xsd:element (code level default values
-     *  are not necessary for fields generated from attributes)</li>
+     * <li>The XSD description is of type xsd:element (or xsd:attribute if all is set)</li>
      * <li>A default value is specified</li>
      * <li>Map to one of the supported types</li>
      * </ul>
@@ -123,24 +128,27 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler)
             // check all Fields in Class
             for (FieldOutline f : co.getDeclaredFields()) {
                 CPropertyInfo fieldInfo = f.getPropertyInfo();
-
-                // Do nothing if Field is not created from an xsd particle
-                if (!(fieldInfo.getSchemaComponent() instanceof XSParticle)) {
-                    continue;
-                }
-                XSTerm term = ((XSParticle) fieldInfo.getSchemaComponent()).getTerm();
-
-                // Default values only necessary for fields derived from an xsd:element
-                if (!term.isElementDecl()) {
+                XmlString xmlDefaultValue = null;
+                if (fieldInfo.getSchemaComponent() instanceof XSParticle) {
+                    XSTerm term = ((XSParticle) fieldInfo.getSchemaComponent()).getTerm();// Default values only necessary for fields derived from an xsd:element
+                    if (!term.isElementDecl()) {
+                        continue;
+                    }
+                    XSElementDecl element = term.asElementDecl();
+                    xmlDefaultValue = element.getDefaultValue();
+                } else if (all && fieldInfo.getSchemaComponent() instanceof XSAttributeUse) {
+                    XSAttributeUse attribute = ((XSAttributeUse) fieldInfo.getSchemaComponent());
+                    xmlDefaultValue = attribute.getDefaultValue();
+                } else {
+                    // Do nothing if Field is not created from an xsd particle
                     continue;
                 }
-                XSElementDecl element = term.asElementDecl();
 
                 // Do nothing if no default value
-                if (element.getDefaultValue() == null) {
+                if (xmlDefaultValue == null) {
                     continue;
                 }
-                String defaultValue = element.getDefaultValue().value;
+                String defaultValue = xmlDefaultValue.value;
 
                 // Get handle to JModel representing the field
                 Map<String, JFieldVar> fields = co.implClass.fields();
@@ -320,5 +328,16 @@ private JFieldVar installDtF(final JDefinedClass parentClass)
         }
     }
 
+    @Override
+    public int parseArgument(Options opt, String[] args, int i) {
+        // eg. -Xdefault-value:all
+        String arg = args[i].trim();
+        if (arg.startsWith(OPTION_NAME_ALL)) {
+            all = true;
+            return 1;
+        }
+        return 0;
+    }
+
 
 }

jaxb-plugins-parent/tests/defaultvalue/pom.xml

@@ -31,6 +31,7 @@
           <extension>true</extension>
           <args>
             <arg>-Xdefault-value</arg>
+            <arg>-Xdefault-value:all</arg>
           </args>
           <plugins>
             <plugin>

jaxb-plugins-parent/tests/defaultvalue/src/main/resources/Person.xsd

@@ -24,5 +24,7 @@
     <xs:element name="state" type="xs:string"/>
     <xs:element name="ZIP" type="xs:string"/>
   </xs:sequence>
+  <xs:attribute name="house" type="xs:boolean" default="true" />
+  <xs:attribute name="floor" type="xs:int" />
 </xs:complexType>
 </xs:schema>