Integrated JAXB v4.

dmak · Jan 22, 2023 · 63d7573 · 63d7573
1 parent 5617b84
commit 63d7573
Show file tree

Hide file tree

Showing 79 changed files with 1,314 additions and 1,133 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,8 +47,8 @@
 	</licenses>
 
 	<properties>
-		<jaxb-api.version>3.0.1</jaxb-api.version>
-		<jaxb-core.version>3.0.1</jaxb-core.version>
+		<jaxb-api.version>4.0.0</jaxb-api.version>
+		<jaxb-core.version>4.0.1</jaxb-core.version>
 
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
@@ -141,6 +141,12 @@
 				<artifactId>commons-beanutils</artifactId>
 				<version>1.9.4</version>
 			</dependency>
+			<!-- Remove this dependency management after https://github.com/highsource/jaxb2-basics/pull/119 is resolved -->
+			<dependency>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils</artifactId>
+				<version>1.9.4</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

diff --git a/src/main/java/com/sun/tools/xjc/addon/xew/CommonUtils.java b/src/main/java/com/sun/tools/xjc/addon/xew/CommonUtils.java
@@ -134,9 +134,9 @@ public static void addAnnotation(JVar field, JAnnotationUse annotation) {
 	}
 
 	/**
-	 * Check that given field property has name customization ({@code <jaxb:property name="..." />}). See also
-	 * {@code org.glassfish.jaxb.core.api.impl.NameUtil}.
+	 * Check that given field property has name customization ({@code <jaxb:property name="..." />}).
 	 * 
+	 * @see org.glassfish.jaxb.core.api.impl.NameUtil
 	 * @see com.sun.codemodel.JJavaName
 	 * @see com.sun.tools.xjc.reader.xmlschema.bindinfo.BIProperty#getCustomization(XSComponent)
 	 */

diff --git a/src/test/generated_resources/annotation_reference/ClassCommon.java b/src/test/generated_resources/annotation_reference/ClassCommon.java
@@ -12,17 +12,17 @@
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
- * <pre>
- * &lt;complexType name="class-common"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}byte"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
+ * <pre>{@code
+ * <complexType name="class-common">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}byte"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
  * 
  * 
  */

diff --git a/src/test/generated_resources/annotation_reference/ClassExt.java b/src/test/generated_resources/annotation_reference/ClassExt.java
@@ -12,18 +12,18 @@
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
- * <pre>
- * &lt;complexType name="class-ext"&gt;
- *   &lt;complexContent&gt;
- *     &lt;extension base="{}class-common"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="country" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *         &lt;element name="code" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/extension&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
+ * <pre>{@code
+ * <complexType name="class-ext">
+ *   <complexContent>
+ *     <extension base="{}class-common">
+ *       <sequence>
+ *         <element name="country" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="code" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
  * 
  * 
  */

diff --git a/src/test/generated_resources/annotation_reference/ClassesEu.java b/src/test/generated_resources/annotation_reference/ClassesEu.java
@@ -14,17 +14,17 @@
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
- * <pre>
- * &lt;complexType name="classes-eu"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="class-eu" type="{}class-common" maxOccurs="unbounded"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
+ * <pre>{@code
+ * <complexType name="classes-eu">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="class-eu" type="{}class-common" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
  * 
  * 
  */
@@ -44,7 +44,7 @@ public class ClassesEu {
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the Jakarta XML Binding object.
-     * This is why there is not a <CODE>set</CODE> method for the classEu property.
+     * This is why there is not a {@code set} method for the classEu property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -58,10 +58,12 @@ public class ClassesEu {
      * {@link ClassCommon }
      * 
      * 
+     * @return
+     *     The value of the classEu property.
      */
     public List<ClassCommon> getClassEu() {
         if (classEu == null) {
-            classEu = new ArrayList<ClassCommon>();
+            classEu = new ArrayList<>();
         }
         return this.classEu;
     }

diff --git a/src/test/generated_resources/annotation_reference/ClassesUs.java b/src/test/generated_resources/annotation_reference/ClassesUs.java
@@ -14,17 +14,17 @@
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
- * <pre>
- * &lt;complexType name="classes-us"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="class-us" type="{}class-ext" maxOccurs="unbounded"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
+ * <pre>{@code
+ * <complexType name="classes-us">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="class-us" type="{}class-ext" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
  * 
  * 
  */
@@ -44,7 +44,7 @@ public class ClassesUs {
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the Jakarta XML Binding object.
-     * This is why there is not a <CODE>set</CODE> method for the classUs property.
+     * This is why there is not a {@code set} method for the classUs property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -58,10 +58,12 @@ public class ClassesUs {
      * {@link ClassExt }
      * 
      * 
+     * @return
+     *     The value of the classUs property.
      */
     public List<ClassExt> getClassUs() {
         if (classUs == null) {
-            classUs = new ArrayList<ClassExt>();
+            classUs = new ArrayList<>();
         }
         return this.classUs;
     }

diff --git a/src/test/generated_resources/annotation_reference/Markup.java b/src/test/generated_resources/annotation_reference/Markup.java
@@ -16,19 +16,19 @@
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
- * <pre>
- * &lt;complexType name="markup"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;choice maxOccurs="unbounded" minOccurs="0"&gt;
- *         &lt;element ref="{}br"/&gt;
- *         &lt;element ref="{}page"/&gt;
- *         &lt;element ref="{}para"/&gt;
- *       &lt;/choice&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
+ * <pre>{@code
+ * <complexType name="markup">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{}br"/>
+ *         <element ref="{}page"/>
+ *         <element ref="{}para"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
  * 
  * 
  */
@@ -52,7 +52,7 @@ public class Markup {
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the Jakarta XML Binding object.
-     * This is why there is not a <CODE>set</CODE> method for the brOrPageOrPara property.
+     * This is why there is not a {@code set} method for the brOrPageOrPara property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -68,10 +68,12 @@ public class Markup {
      * {@link JAXBElement }{@code <}{@link Object }{@code >}
      * 
      * 
+     * @return
+     *     The value of the brOrPageOrPara property.
      */
     public List<Object> getBrOrPageOrPara() {
         if (brOrPageOrPara == null) {
-            brOrPageOrPara = new ArrayList<Object>();
+            brOrPageOrPara = new ArrayList<>();
         }
         return this.brOrPageOrPara;
     }

diff --git a/src/test/generated_resources/annotation_reference/ObjectFactory.java b/src/test/generated_resources/annotation_reference/ObjectFactory.java
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link Para }
      * 
+     * @return
+     *     the new instance of {@link Para }
      */
     public Para createPara() {
         return new Para();
@@ -45,6 +47,8 @@ public Para createPara() {
     /**
      * Create an instance of {@link Markup }
      * 
+     * @return
+     *     the new instance of {@link Markup }
      */
     public Markup createMarkup() {
         return new Markup();
@@ -53,6 +57,8 @@ public Markup createMarkup() {
     /**
      * Create an instance of {@link SearchEu }
      * 
+     * @return
+     *     the new instance of {@link SearchEu }
      */
     public SearchEu createSearchEu() {
         return new SearchEu();
@@ -61,6 +67,8 @@ public SearchEu createSearchEu() {
     /**
      * Create an instance of {@link SearchMulti }
      * 
+     * @return
+     *     the new instance of {@link SearchMulti }
      */
     public SearchMulti createSearchMulti() {
         return new SearchMulti();
@@ -69,6 +77,8 @@ public SearchMulti createSearchMulti() {
     /**
      * Create an instance of {@link ClassCommon }
      * 
+     * @return
+     *     the new instance of {@link ClassCommon }
      */
     public ClassCommon createClassCommon() {
         return new ClassCommon();
@@ -77,6 +87,8 @@ public ClassCommon createClassCommon() {
     /**
      * Create an instance of {@link ClassExt }
      * 
+     * @return
+     *     the new instance of {@link ClassExt }
      */
     public ClassExt createClassExt() {
         return new ClassExt();
@@ -85,6 +97,8 @@ public ClassExt createClassExt() {
     /**
      * Create an instance of {@link ClassesEu }
      * 
+     * @return
+     *     the new instance of {@link ClassesEu }
      */
     public ClassesEu createClassesEu() {
         return new ClassesEu();
@@ -93,6 +107,8 @@ public ClassesEu createClassesEu() {
     /**
      * Create an instance of {@link ClassesUs }
      * 
+     * @return
+     *     the new instance of {@link ClassesUs }
      */
     public ClassesUs createClassesUs() {
         return new ClassesUs();
@@ -108,7 +124,7 @@ public ClassesUs createClassesUs() {
      */
     @XmlElementDecl(namespace = "", name = "br")
     public JAXBElement<Object> createBr(Object value) {
-        return new JAXBElement<Object>(_Br_QNAME, Object.class, null, value);
+        return new JAXBElement<>(_Br_QNAME, Object.class, null, value);
     }
 
     /**
@@ -121,7 +137,7 @@ public JAXBElement<Object> createBr(Object value) {
      */
     @XmlElementDecl(namespace = "", name = "page")
     public JAXBElement<Object> createPage(Object value) {
-        return new JAXBElement<Object>(_Page_QNAME, Object.class, null, value);
+        return new JAXBElement<>(_Page_QNAME, Object.class, null, value);
     }
 
 }
diff --git a/src/test/generated_resources/annotation_reference/Para.java b/src/test/generated_resources/annotation_reference/Para.java
@@ -15,17 +15,17 @@
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
- * <pre>
- * &lt;complexType&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="sub" type="{}markup" maxOccurs="unbounded"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="sub" type="{}markup" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
  * 
  * 
  */
@@ -46,7 +46,7 @@ public class Para {
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the Jakarta XML Binding object.
-     * This is why there is not a <CODE>set</CODE> method for the sub property.
+     * This is why there is not a {@code set} method for the sub property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -60,10 +60,12 @@ public class Para {
      * {@link Markup }
      * 
      * 
+     * @return
+     *     The value of the sub property.
      */
     public List<Markup> getSub() {
         if (sub == null) {
-            sub = new ArrayList<Markup>();
+            sub = new ArrayList<>();
         }
         return this.sub;
     }