From 63d7573e4fc6d8003dbb08fcdfa9629e302d67a7 Mon Sep 17 00:00:00 2001 From: Dmitry Katsubo Date: Tue, 10 Jan 2023 00:58:53 +0100 Subject: [PATCH] Integrated JAXB v4. --- pom.xml | 10 +- .../sun/tools/xjc/addon/xew/CommonUtils.java | 4 +- .../annotation_reference/ClassCommon.java | 22 +- .../annotation_reference/ClassExt.java | 24 +- .../annotation_reference/ClassesEu.java | 28 +- .../annotation_reference/ClassesUs.java | 28 +- .../annotation_reference/Markup.java | 32 +- .../annotation_reference/ObjectFactory.java | 20 +- .../annotation_reference/Para.java | 28 +- .../annotation_reference/SearchEu.java | 24 +- .../annotation_reference/SearchMulti.java | 46 +-- .../different_namespaces/BaseContainer.java | 18 +- .../different_namespaces/Container.java | 52 ++-- .../different_namespaces/Entry.java | 18 +- .../different_namespaces/ObjectFactory.java | 6 + .../element_any/Message.java | 24 +- .../element_any/ObjectFactory.java | 2 + .../element_any_type/Conversion.java | 28 +- .../element_any_type/Entry.java | 24 +- .../element_any_type/ObjectFactory.java | 8 +- .../Family.java | 30 +- .../FamilyMember.java | 74 ++--- .../ObjectFactory.java | 6 + .../Article.java | 24 +- .../Articles.java | 28 +- .../ArticlesCollections.java | 30 +- .../ObjectFactory.java | 8 + .../Publisher.java | 24 +- .../element_list_extended/Foo.java | 78 ++--- .../element_list_extended/ObjectFactory.java | 4 + .../element_mixed/AnyText.java | 32 +- .../generated_resources/element_mixed/B.java | 28 +- .../generated_resources/element_mixed/Br.java | 18 +- .../element_mixed/FormattedTextBr.java | 16 +- .../generated_resources/element_mixed/I.java | 28 +- .../element_mixed/ObjectFactory.java | 22 +- .../element_mixed/package-info.java | 4 +- .../element_name_collision/ObjectFactory.java | 8 + .../element_name_collision/Root.java | 288 +++++++++--------- .../element_reserved_word/Class.java | 32 +- .../element_reserved_word/Method.java | 24 +- .../element_reserved_word/ObjectFactory.java | 4 + .../element_scoped/ObjectFactory.java | 12 +- .../element_scoped/Return.java | 50 +-- .../element_scoped/SearchParameters.java | 24 +- .../element_with_adapter/Calendar.java | 46 +-- .../element_with_adapter/ObjectFactory.java | 2 + .../element_with_customization/Args.java | 28 +- .../ObjectFactory.java | 4 + .../PostOffice.java | 34 +-- .../element_with_parent/Alliance.java | 30 +- .../element_with_parent/Group.java | 74 ++--- .../element_with_parent/ObjectFactory.java | 8 + .../element_with_parent/Organization.java | 28 +- .../inner_element/Filesystem.java | 172 +++++------ .../inner_element/ObjectFactory.java | 10 + .../inner_element/Volumes.java | 74 ++--- .../inner_element_value_objects/Article.java | 24 +- .../inner_element_value_objects/Articles.java | 26 +- .../ArticlesCollections.java | 26 +- .../Filesystem.java | 122 ++++---- .../ObjectFactory.java | 14 + .../Publisher.java | 22 +- .../inner_element_value_objects/Volume.java | 24 +- .../impl/ArticlesCollectionsImpl.java | 4 +- .../impl/ArticlesImpl.java | 2 +- .../impl/FilesystemImpl.java | 6 +- .../impl/JAXBContextFactory.java | 23 +- .../impl/ObjectFactory.java | 14 + .../impl/PublisherImpl.java | 2 +- .../inner_scoped_element/Catalogue.java | 132 ++++---- .../inner_scoped_element/ObjectFactory.java | 8 +- .../substitution_groups/Address.java | 22 +- .../substitution_groups/ContactInfo.java | 16 +- .../substitution_groups/Customer.java | 44 +-- .../substitution_groups/ObjectFactory.java | 14 +- .../substitution_groups/PhoneNumber.java | 24 +- .../unqualified/ObjectFactory.java | 2 + .../unqualified/RootElement.java | 24 +- 79 files changed, 1314 insertions(+), 1133 deletions(-) diff --git a/pom.xml b/pom.xml index b0e1d5b..df5c27a 100644 --- a/pom.xml +++ b/pom.xml @@ -47,8 +47,8 @@ - 3.0.1 - 3.0.1 + 4.0.0 + 4.0.1 1.8 1.8 @@ -141,6 +141,12 @@ commons-beanutils 1.9.4 + + + commons-beanutils + commons-beanutils + 1.9.4 + 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 index 03ba540..eca1f53 100644 --- 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 }). See also - * {@code org.glassfish.jaxb.core.api.impl.NameUtil}. + * Check that given field property has name customization ({@code }). * + * @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 index 034e599..9066448 100644 --- a/src/test/generated_resources/annotation_reference/ClassCommon.java +++ b/src/test/generated_resources/annotation_reference/ClassCommon.java @@ -12,17 +12,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <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>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/annotation_reference/ClassExt.java b/src/test/generated_resources/annotation_reference/ClassExt.java index 89be332..5a02aa6 100644 --- a/src/test/generated_resources/annotation_reference/ClassExt.java +++ b/src/test/generated_resources/annotation_reference/ClassExt.java @@ -12,18 +12,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <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>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/annotation_reference/ClassesEu.java b/src/test/generated_resources/annotation_reference/ClassesEu.java index b4ffa83..11f50ce 100644 --- a/src/test/generated_resources/annotation_reference/ClassesEu.java +++ b/src/test/generated_resources/annotation_reference/ClassesEu.java @@ -14,17 +14,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <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>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -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 set method for the classEu property. + * This is why there is not a {@code set} method for the classEu property. * *

* 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 getClassEu() { if (classEu == null) { - classEu = new ArrayList(); + 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 index 2b4b1aa..9e39620 100644 --- a/src/test/generated_resources/annotation_reference/ClassesUs.java +++ b/src/test/generated_resources/annotation_reference/ClassesUs.java @@ -14,17 +14,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <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>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -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 set method for the classUs property. + * This is why there is not a {@code set} method for the classUs property. * *

* 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 getClassUs() { if (classUs == null) { - classUs = new ArrayList(); + 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 index a79acfa..df190a0 100644 --- a/src/test/generated_resources/annotation_reference/Markup.java +++ b/src/test/generated_resources/annotation_reference/Markup.java @@ -16,19 +16,19 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <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>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -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 set method for the brOrPageOrPara property. + * This is why there is not a {@code set} method for the brOrPageOrPara property. * *

* 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 getBrOrPageOrPara() { if (brOrPageOrPara == null) { - brOrPageOrPara = new ArrayList(); + 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 index baebb94..3e49cb3 100644 --- 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 createBr(Object value) { - return new JAXBElement(_Br_QNAME, Object.class, null, value); + return new JAXBElement<>(_Br_QNAME, Object.class, null, value); } /** @@ -121,7 +137,7 @@ public JAXBElement createBr(Object value) { */ @XmlElementDecl(namespace = "", name = "page") public JAXBElement createPage(Object value) { - return new JAXBElement(_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 index 8aa1dc4..8aed8e2 100644 --- a/src/test/generated_resources/annotation_reference/Para.java +++ b/src/test/generated_resources/annotation_reference/Para.java @@ -15,17 +15,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="sub" type="{}markup" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -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 set method for the sub property. + * This is why there is not a {@code set} method for the sub property. * *

* 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 getSub() { if (sub == null) { - sub = new ArrayList(); + sub = new ArrayList<>(); } return this.sub; } diff --git a/src/test/generated_resources/annotation_reference/SearchEu.java b/src/test/generated_resources/annotation_reference/SearchEu.java index baaa6df..b7f3299 100644 --- a/src/test/generated_resources/annotation_reference/SearchEu.java +++ b/src/test/generated_resources/annotation_reference/SearchEu.java @@ -15,17 +15,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="search-eu">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="classes-eu" type="{}classes-eu"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -37,7 +37,7 @@ public class SearchEu { @XmlElementWrapper(name = "classes-eu", required = true, nillable = true) @XmlElement(name = "class-eu") - protected List classesEu = new ArrayList(); + protected List classesEu = new ArrayList<>(); public List getClassesEu() { return classesEu; diff --git a/src/test/generated_resources/annotation_reference/SearchMulti.java b/src/test/generated_resources/annotation_reference/SearchMulti.java index ec90da7..92f468e 100644 --- a/src/test/generated_resources/annotation_reference/SearchMulti.java +++ b/src/test/generated_resources/annotation_reference/SearchMulti.java @@ -16,26 +16,26 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="search-multi">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="classes-eu" type="{}classes-eu"/>
- *         <element name="classes-us" type="{}classes-us"/>
- *       </choice>
- *       <attribute name="mode" use="required" fixed="OTH">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <minLength value="3"/>
- *             <maxLength value="3"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *       
+ *         
+ *           
+ *             
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -64,7 +64,7 @@ public class SearchMulti { * 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 set method for the classesEuOrClassesUs property. + * This is why there is not a {@code set} method for the classesEuOrClassesUs property. * *

* For example, to add a new item, do as follows: @@ -79,10 +79,12 @@ public class SearchMulti { * {@link ClassesUs } * * + * @return + * The value of the classesEuOrClassesUs property. */ public List getClassesEuOrClassesUs() { if (classesEuOrClassesUs == null) { - classesEuOrClassesUs = new ArrayList(); + classesEuOrClassesUs = new ArrayList<>(); } return this.classesEuOrClassesUs; } diff --git a/src/test/generated_resources/different_namespaces/BaseContainer.java b/src/test/generated_resources/different_namespaces/BaseContainer.java index 39d4d64..510a838 100644 --- a/src/test/generated_resources/different_namespaces/BaseContainer.java +++ b/src/test/generated_resources/different_namespaces/BaseContainer.java @@ -14,15 +14,15 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="base_container">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/different_namespaces/Container.java b/src/test/generated_resources/different_namespaces/Container.java index b53b2ed..b27df8a 100644 --- a/src/test/generated_resources/different_namespaces/Container.java +++ b/src/test/generated_resources/different_namespaces/Container.java @@ -16,29 +16,29 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <extension base="{http://example.com/container}base_container">
- *       <sequence>
- *         <element ref="{http://example.com/entries}entries" minOccurs="0"/>
- *         <element ref="{http://example.com/items}items"/>
- *         <element name="tests" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="test" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -65,7 +65,7 @@ public class Container public List getEntries() { if (entries == null) { - entries = new LinkedList(); + entries = new LinkedList<>(); } return entries; } @@ -76,7 +76,7 @@ public void setEntries(List entries) { public List getItems() { if (items == null) { - items = new LinkedList(); + items = new LinkedList<>(); } return items; } @@ -87,7 +87,7 @@ public void setItems(List items) { public List getTests() { if (tests == null) { - tests = new LinkedList(); + tests = new LinkedList<>(); } return tests; } diff --git a/src/test/generated_resources/different_namespaces/Entry.java b/src/test/generated_resources/different_namespaces/Entry.java index 2bf1781..9fb36e0 100644 --- a/src/test/generated_resources/different_namespaces/Entry.java +++ b/src/test/generated_resources/different_namespaces/Entry.java @@ -14,15 +14,15 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/different_namespaces/ObjectFactory.java b/src/test/generated_resources/different_namespaces/ObjectFactory.java index d6c5559..bf3cfd1 100644 --- a/src/test/generated_resources/different_namespaces/ObjectFactory.java +++ b/src/test/generated_resources/different_namespaces/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Container } * + * @return + * the new instance of {@link Container } */ public Container createContainer() { return new Container(); @@ -40,6 +42,8 @@ public Container createContainer() { /** * Create an instance of {@link BaseContainer } * + * @return + * the new instance of {@link BaseContainer } */ public BaseContainer createBaseContainer() { return new BaseContainer(); @@ -48,6 +52,8 @@ public BaseContainer createBaseContainer() { /** * Create an instance of {@link Entry } * + * @return + * the new instance of {@link Entry } */ public Entry createEntry() { return new Entry(); diff --git a/src/test/generated_resources/element_any/Message.java b/src/test/generated_resources/element_any/Message.java index b92ee6b..04379ed 100644 --- a/src/test/generated_resources/element_any/Message.java +++ b/src/test/generated_resources/element_any/Message.java @@ -16,17 +16,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}item"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -39,7 +39,7 @@ public class Message { @XmlElementWrapper(name = "item", required = true) @XmlAnyElement(lax = true) - protected List items = new ArrayList(); + protected List items = new ArrayList<>(); public List getItems() { return items; diff --git a/src/test/generated_resources/element_any/ObjectFactory.java b/src/test/generated_resources/element_any/ObjectFactory.java index da82b45..773c335 100644 --- a/src/test/generated_resources/element_any/ObjectFactory.java +++ b/src/test/generated_resources/element_any/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Message } * + * @return + * the new instance of {@link Message } */ public Message createMessage() { return new Message(); diff --git a/src/test/generated_resources/element_any_type/Conversion.java b/src/test/generated_resources/element_any_type/Conversion.java index 0c566bd..ed4f1bb 100644 --- a/src/test/generated_resources/element_any_type/Conversion.java +++ b/src/test/generated_resources/element_any_type/Conversion.java @@ -16,18 +16,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="accept" type="{}List"/>
- *         <element name="return" type="{}Map"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -41,10 +41,10 @@ public class Conversion { @XmlElementWrapper(name = "accept", required = true) @XmlElement(name = "elements", nillable = true) - protected List accepts = new ArrayList(); + protected List accepts = new ArrayList<>(); @XmlElementWrapper(name = "return", required = true) @XmlElement(name = "entry", nillable = true) - protected List returns = new ArrayList(); + protected List returns = new ArrayList<>(); public List getAccepts() { return accepts; diff --git a/src/test/generated_resources/element_any_type/Entry.java b/src/test/generated_resources/element_any_type/Entry.java index 4d1fe14..67557b0 100644 --- a/src/test/generated_resources/element_any_type/Entry.java +++ b/src/test/generated_resources/element_any_type/Entry.java @@ -13,18 +13,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="Entry">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="key" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *         <element name="value" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/element_any_type/ObjectFactory.java b/src/test/generated_resources/element_any_type/ObjectFactory.java index 6c2c56d..8ca6d9a 100644 --- a/src/test/generated_resources/element_any_type/ObjectFactory.java +++ b/src/test/generated_resources/element_any_type/ObjectFactory.java @@ -37,6 +37,8 @@ public ObjectFactory() { /** * Create an instance of {@link Conversion } * + * @return + * the new instance of {@link Conversion } */ public Conversion createConversion() { return new Conversion(); @@ -45,6 +47,8 @@ public Conversion createConversion() { /** * Create an instance of {@link Entry } * + * @return + * the new instance of {@link Entry } */ public Entry createEntry() { return new Entry(); @@ -60,7 +64,7 @@ public Entry createEntry() { */ @XmlElementDecl(namespace = "", name = "key", scope = Entry.class) public JAXBElement createEntryKey(Object value) { - return new JAXBElement(_EntryKey_QNAME, Object.class, Entry.class, value); + return new JAXBElement<>(_EntryKey_QNAME, Object.class, Entry.class, value); } /** @@ -73,7 +77,7 @@ public JAXBElement createEntryKey(Object value) { */ @XmlElementDecl(namespace = "", name = "value", scope = Entry.class) public JAXBElement createEntryValue(Object value) { - return new JAXBElement(_EntryValue_QNAME, Object.class, Entry.class, value); + return new JAXBElement<>(_EntryValue_QNAME, Object.class, Entry.class, value); } } diff --git a/src/test/generated_resources/element_as_parametrisation_family/Family.java b/src/test/generated_resources/element_as_parametrisation_family/Family.java index e7f337c..84c4522 100644 --- a/src/test/generated_resources/element_as_parametrisation_family/Family.java +++ b/src/test/generated_resources/element_as_parametrisation_family/Family.java @@ -14,18 +14,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="family">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="family-member" type="{}family-member" maxOccurs="unbounded"/>
- *         <element name="parent" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -47,7 +47,7 @@ public class Family { * 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 set method for the familyMember property. + * This is why there is not a {@code set} method for the familyMember property. * *

* For example, to add a new item, do as follows: @@ -61,10 +61,12 @@ public class Family { * {@link FamilyMember } * * + * @return + * The value of the familyMember property. */ public List getFamilyMember() { if (familyMember == null) { - familyMember = new ArrayList(); + familyMember = new ArrayList<>(); } return this.familyMember; } diff --git a/src/test/generated_resources/element_as_parametrisation_family/FamilyMember.java b/src/test/generated_resources/element_as_parametrisation_family/FamilyMember.java index d30f6a5..15ab683 100644 --- a/src/test/generated_resources/element_as_parametrisation_family/FamilyMember.java +++ b/src/test/generated_resources/element_as_parametrisation_family/FamilyMember.java @@ -14,28 +14,28 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="family-member">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="id" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="number" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *                   <element name="type" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -55,7 +55,7 @@ public class FamilyMember { * 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 set method for the id property. + * This is why there is not a {@code set} method for the id property. * *

* For example, to add a new item, do as follows: @@ -69,10 +69,12 @@ public class FamilyMember { * {@link FamilyMember.Id } * * + * @return + * The value of the id property. */ public List getId() { if (id == null) { - id = new ArrayList(); + id = new ArrayList<>(); } return this.id; } @@ -83,18 +85,18 @@ public List getId() { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="number" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
-     *         <element name="type" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
+ * 
{@code
+     * 
+     *   
+     *     
+     *       
+     *         
+     *         
+     *       
+     *     
+     *   
+     * 
+     * }
* * */ diff --git a/src/test/generated_resources/element_as_parametrisation_family/ObjectFactory.java b/src/test/generated_resources/element_as_parametrisation_family/ObjectFactory.java index 30ff6e9..b776ad0 100644 --- a/src/test/generated_resources/element_as_parametrisation_family/ObjectFactory.java +++ b/src/test/generated_resources/element_as_parametrisation_family/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link FamilyMember } * + * @return + * the new instance of {@link FamilyMember } */ public FamilyMember createFamilyMember() { return new FamilyMember(); @@ -40,6 +42,8 @@ public FamilyMember createFamilyMember() { /** * Create an instance of {@link Family } * + * @return + * the new instance of {@link Family } */ public Family createFamily() { return new Family(); @@ -48,6 +52,8 @@ public Family createFamily() { /** * Create an instance of {@link FamilyMember.Id } * + * @return + * the new instance of {@link FamilyMember.Id } */ public FamilyMember.Id createFamilyMemberId() { return new FamilyMember.Id(); diff --git a/src/test/generated_resources/element_as_parametrisation_publisher/Article.java b/src/test/generated_resources/element_as_parametrisation_publisher/Article.java index d6837c8..90da809 100644 --- a/src/test/generated_resources/element_as_parametrisation_publisher/Article.java +++ b/src/test/generated_resources/element_as_parametrisation_publisher/Article.java @@ -12,18 +12,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="article">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="title" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="author" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/element_as_parametrisation_publisher/Articles.java b/src/test/generated_resources/element_as_parametrisation_publisher/Articles.java index c990ffd..ffec855 100644 --- a/src/test/generated_resources/element_as_parametrisation_publisher/Articles.java +++ b/src/test/generated_resources/element_as_parametrisation_publisher/Articles.java @@ -14,17 +14,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="articles">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="article" type="{}article" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -44,7 +44,7 @@ public class Articles { * 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 set method for the article property. + * This is why there is not a {@code set} method for the article property. * *

* For example, to add a new item, do as follows: @@ -58,10 +58,12 @@ public class Articles { * {@link Article } * * + * @return + * The value of the article property. */ public List

getArticle() { if (article == null) { - article = new ArrayList
(); + article = new ArrayList<>(); } return this.article; } diff --git a/src/test/generated_resources/element_as_parametrisation_publisher/ArticlesCollections.java b/src/test/generated_resources/element_as_parametrisation_publisher/ArticlesCollections.java index 14126dc..ef486db 100644 --- a/src/test/generated_resources/element_as_parametrisation_publisher/ArticlesCollections.java +++ b/src/test/generated_resources/element_as_parametrisation_publisher/ArticlesCollections.java @@ -14,17 +14,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="articles-collections">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="articles" type="{}articles" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -35,7 +35,7 @@ public class ArticlesCollections { @XmlElement(required = true) - protected List articles = new Vector(); + protected List articles = new Vector<>(); /** * Gets the value of the articles property. @@ -44,7 +44,7 @@ public class ArticlesCollections { * 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 set method for the articles property. + * This is why there is not a {@code set} method for the articles property. * *

* For example, to add a new item, do as follows: @@ -58,10 +58,12 @@ public class ArticlesCollections { * {@link Articles } * * + * @return + * The value of the articles property. */ public List getArticles() { if (articles == null) { - articles = new Vector(); + articles = new Vector<>(); } return this.articles; } diff --git a/src/test/generated_resources/element_as_parametrisation_publisher/ObjectFactory.java b/src/test/generated_resources/element_as_parametrisation_publisher/ObjectFactory.java index 2153333..6cb68a3 100644 --- a/src/test/generated_resources/element_as_parametrisation_publisher/ObjectFactory.java +++ b/src/test/generated_resources/element_as_parametrisation_publisher/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Article } * + * @return + * the new instance of {@link Article } */ public Article createArticle() { return new Article(); @@ -40,6 +42,8 @@ public Article createArticle() { /** * Create an instance of {@link Articles } * + * @return + * the new instance of {@link Articles } */ public Articles createArticles() { return new Articles(); @@ -48,6 +52,8 @@ public Articles createArticles() { /** * Create an instance of {@link ArticlesCollections } * + * @return + * the new instance of {@link ArticlesCollections } */ public ArticlesCollections createArticlesCollections() { return new ArticlesCollections(); @@ -56,6 +62,8 @@ public ArticlesCollections createArticlesCollections() { /** * Create an instance of {@link Publisher } * + * @return + * the new instance of {@link Publisher } */ public Publisher createPublisher() { return new Publisher(); diff --git a/src/test/generated_resources/element_as_parametrisation_publisher/Publisher.java b/src/test/generated_resources/element_as_parametrisation_publisher/Publisher.java index fefc97a..f8c30ee 100644 --- a/src/test/generated_resources/element_as_parametrisation_publisher/Publisher.java +++ b/src/test/generated_resources/element_as_parametrisation_publisher/Publisher.java @@ -15,17 +15,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="publisher">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="articles" type="{}articles"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -37,7 +37,7 @@ public class Publisher { @XmlElementWrapper(required = true) @XmlElement(name = "article") - protected List
articles = new ArrayList
(); + protected List
articles = new ArrayList<>(); public List
getArticles() { return articles; diff --git a/src/test/generated_resources/element_list_extended/Foo.java b/src/test/generated_resources/element_list_extended/Foo.java index 4af7355..e39989d 100644 --- a/src/test/generated_resources/element_list_extended/Foo.java +++ b/src/test/generated_resources/element_list_extended/Foo.java @@ -17,35 +17,35 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="bar">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="e" maxOccurs="unbounded" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                     
+ *                       
+ *                         
+ *                           
+ *                         
+ *                       
+ *                     
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -58,7 +58,7 @@ public class Foo { @XmlElementWrapper(name = "bar", required = true) @XmlElement(name = "e") - protected Set bars = new HashSet(); + protected Set bars = new HashSet<>(); public Set getBars() { return bars; @@ -74,15 +74,15 @@ public void setBars(Set bars) { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
+ * 
{@code
+     * 
+     *   
+     *     
+     *       
+     *     
+     *   
+     * 
+     * }
* * */ diff --git a/src/test/generated_resources/element_list_extended/ObjectFactory.java b/src/test/generated_resources/element_list_extended/ObjectFactory.java index 46ba9c9..f4a7487 100644 --- a/src/test/generated_resources/element_list_extended/ObjectFactory.java +++ b/src/test/generated_resources/element_list_extended/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Foo } * + * @return + * the new instance of {@link Foo } */ public Foo createFoo() { return new Foo(); @@ -40,6 +42,8 @@ public Foo createFoo() { /** * Create an instance of {@link Foo.E } * + * @return + * the new instance of {@link Foo.E } */ public Foo.E createFooE() { return new Foo.E(); diff --git a/src/test/generated_resources/element_mixed/AnyText.java b/src/test/generated_resources/element_mixed/AnyText.java index 675a4f2..071201e 100644 --- a/src/test/generated_resources/element_mixed/AnyText.java +++ b/src/test/generated_resources/element_mixed/AnyText.java @@ -22,19 +22,19 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="formatted-text" type="{http://foo.org/}formatted-text"/>
- *         <element name="fixed-text" type="{http://foo.org/}fixed-text"/>
- *         <element name="prefixed-text" type="{http://foo.org/}prefixed-text"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -53,21 +53,21 @@ public class AnyText { @XmlElement(name = "b", type = B.class, namespace = "http://foo.org/"), @XmlElement(name = "br", type = FormattedTextBr.class, namespace = "http://foo.org/") }) - protected List formattedText = new ArrayList(); + protected List formattedText = new ArrayList<>(); @XmlElementWrapper(name = "fixed-text", required = true) @XmlMixed @XmlElementRefs({ @XmlElementRef(name = "title", namespace = "http://foo.org/", type = JAXBElement.class, required = false), @XmlElementRef(name = "year", namespace = "http://foo.org/", type = JAXBElement.class, required = false) }) - protected List fixedText = new ArrayList(); + protected List fixedText = new ArrayList<>(); @XmlElementWrapper(name = "prefixed-text", required = true) @XmlElementRefs({ @XmlElementRef(name = "prefix", namespace = "http://foo.org/", type = JAXBElement.class, required = false), @XmlElementRef(name = "title", namespace = "http://foo.org/", type = JAXBElement.class, required = false), @XmlElementRef(name = "suffix", namespace = "http://foo.org/", type = JAXBElement.class, required = false) }) - protected List> prefixedText = new ArrayList>(); + protected List> prefixedText = new ArrayList<>(); public List getFormattedText() { return formattedText; diff --git a/src/test/generated_resources/element_mixed/B.java b/src/test/generated_resources/element_mixed/B.java index f447e55..c5c0c03 100644 --- a/src/test/generated_resources/element_mixed/B.java +++ b/src/test/generated_resources/element_mixed/B.java @@ -17,17 +17,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="b">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="i" type="{http://foo.org/}i"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -48,7 +48,7 @@ public class B { * 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 set method for the content property. + * This is why there is not a {@code set} method for the content property. * *

* For example, to add a new item, do as follows: @@ -63,10 +63,12 @@ public class B { * {@link String } * * + * @return + * The value of the content property. */ public List getContent() { if (content == null) { - content = new ArrayList(); + content = new ArrayList<>(); } return this.content; } diff --git a/src/test/generated_resources/element_mixed/Br.java b/src/test/generated_resources/element_mixed/Br.java index 91d4c8f..3aa3964 100644 --- a/src/test/generated_resources/element_mixed/Br.java +++ b/src/test/generated_resources/element_mixed/Br.java @@ -12,15 +12,15 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="br">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="mode" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/element_mixed/FormattedTextBr.java b/src/test/generated_resources/element_mixed/FormattedTextBr.java index cfd9033..c0cdbff 100644 --- a/src/test/generated_resources/element_mixed/FormattedTextBr.java +++ b/src/test/generated_resources/element_mixed/FormattedTextBr.java @@ -11,14 +11,14 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/element_mixed/I.java b/src/test/generated_resources/element_mixed/I.java index e6e9dda..2c5dbfe 100644 --- a/src/test/generated_resources/element_mixed/I.java +++ b/src/test/generated_resources/element_mixed/I.java @@ -17,17 +17,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="i">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="b" type="{http://foo.org/}b"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -48,7 +48,7 @@ public class I { * 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 set method for the content property. + * This is why there is not a {@code set} method for the content property. * *

* For example, to add a new item, do as follows: @@ -63,10 +63,12 @@ public class I { * {@link String } * * + * @return + * The value of the content property. */ public List getContent() { if (content == null) { - content = new ArrayList(); + content = new ArrayList<>(); } return this.content; } diff --git a/src/test/generated_resources/element_mixed/ObjectFactory.java b/src/test/generated_resources/element_mixed/ObjectFactory.java index f55ff5d..4d7d2e7 100644 --- a/src/test/generated_resources/element_mixed/ObjectFactory.java +++ b/src/test/generated_resources/element_mixed/ObjectFactory.java @@ -41,6 +41,8 @@ public ObjectFactory() { /** * Create an instance of {@link AnyText } * + * @return + * the new instance of {@link AnyText } */ public AnyText createAnyText() { return new AnyText(); @@ -49,6 +51,8 @@ public AnyText createAnyText() { /** * Create an instance of {@link B } * + * @return + * the new instance of {@link B } */ public B createB() { return new B(); @@ -57,6 +61,8 @@ public B createB() { /** * Create an instance of {@link I } * + * @return + * the new instance of {@link I } */ public I createI() { return new I(); @@ -65,6 +71,8 @@ public I createI() { /** * Create an instance of {@link Br } * + * @return + * the new instance of {@link Br } */ public Br createBr() { return new Br(); @@ -73,6 +81,8 @@ public Br createBr() { /** * Create an instance of {@link FormattedTextBr } * + * @return + * the new instance of {@link FormattedTextBr } */ public FormattedTextBr createFormattedTextBr() { return new FormattedTextBr(); @@ -88,7 +98,7 @@ public FormattedTextBr createFormattedTextBr() { */ @XmlElementDecl(namespace = "http://foo.org/", name = "b", scope = I.class) public JAXBElement createIB(B value) { - return new JAXBElement(_IB_QNAME, B.class, I.class, value); + return new JAXBElement<>(_IB_QNAME, B.class, I.class, value); } /** @@ -101,27 +111,27 @@ public JAXBElement createIB(B value) { */ @XmlElementDecl(namespace = "http://foo.org/", name = "i", scope = B.class) public JAXBElement createBI(I value) { - return new JAXBElement(_BI_QNAME, I.class, B.class, value); + return new JAXBElement<>(_BI_QNAME, I.class, B.class, value); } @XmlElementDecl(namespace = "http://foo.org/", name = "title", scope = AnyText.class) public JAXBElement createAnyTextTitle(String value) { - return new JAXBElement(new QName("http://foo.org/", "title"), String.class, AnyText.class, value); + return new JAXBElement<>(new QName("http://foo.org/", "title"), String.class, AnyText.class, value); } @XmlElementDecl(namespace = "http://foo.org/", name = "year", scope = AnyText.class) public JAXBElement createAnyTextYear(Integer value) { - return new JAXBElement(new QName("http://foo.org/", "year"), Integer.class, AnyText.class, value); + return new JAXBElement<>(new QName("http://foo.org/", "year"), Integer.class, AnyText.class, value); } @XmlElementDecl(namespace = "http://foo.org/", name = "prefix", scope = AnyText.class) public JAXBElement createAnyTextPrefix(String value) { - return new JAXBElement(new QName("http://foo.org/", "prefix"), String.class, AnyText.class, value); + return new JAXBElement<>(new QName("http://foo.org/", "prefix"), String.class, AnyText.class, value); } @XmlElementDecl(namespace = "http://foo.org/", name = "suffix", scope = AnyText.class) public JAXBElement createAnyTextSuffix(String value) { - return new JAXBElement(new QName("http://foo.org/", "suffix"), String.class, AnyText.class, value); + return new JAXBElement<>(new QName("http://foo.org/", "suffix"), String.class, AnyText.class, value); } } diff --git a/src/test/generated_resources/element_mixed/package-info.java b/src/test/generated_resources/element_mixed/package-info.java index 9ecb253..efd55a9 100644 --- a/src/test/generated_resources/element_mixed/package-info.java +++ b/src/test/generated_resources/element_mixed/package-info.java @@ -1,2 +1,2 @@ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://foo.org/", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) -package element_mixed; +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://foo.org/", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +package element_mixed; diff --git a/src/test/generated_resources/element_name_collision/ObjectFactory.java b/src/test/generated_resources/element_name_collision/ObjectFactory.java index 03def9e..f894a02 100644 --- a/src/test/generated_resources/element_name_collision/ObjectFactory.java +++ b/src/test/generated_resources/element_name_collision/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Root } * + * @return + * the new instance of {@link Root } */ public Root createRoot() { return new Root(); @@ -40,6 +42,8 @@ public Root createRoot() { /** * Create an instance of {@link Root.Action } * + * @return + * the new instance of {@link Root.Action } */ public Root.Action createRootAction() { return new Root.Action(); @@ -48,6 +52,8 @@ public Root.Action createRootAction() { /** * Create an instance of {@link Root.Action.AddItem } * + * @return + * the new instance of {@link Root.Action.AddItem } */ public Root.Action.AddItem createRootActionAddItem() { return new Root.Action.AddItem(); @@ -56,6 +62,8 @@ public Root.Action.AddItem createRootActionAddItem() { /** * Create an instance of {@link Root.Action.Item } * + * @return + * the new instance of {@link Root.Action.Item } */ public Root.Action.Item createRootActionItem() { return new Root.Action.Item(); diff --git a/src/test/generated_resources/element_name_collision/Root.java b/src/test/generated_resources/element_name_collision/Root.java index 74ced9c..e80ff64 100644 --- a/src/test/generated_resources/element_name_collision/Root.java +++ b/src/test/generated_resources/element_name_collision/Root.java @@ -16,70 +16,70 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="action">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element name="update">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="item" maxOccurs="unbounded" minOccurs="0">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <all>
- *                                       <element name="key" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                                       <element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                                     </all>
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="add">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="item" maxOccurs="unbounded" minOccurs="0">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <all>
- *                                       <element name="key" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                                       <element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                                     </all>
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </choice>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                     
+ *                       
+ *                         
+ *                           
+ *                             
+ *                               
+ *                                 
+ *                                   
+ *                                     
+ *                                       
+ *                                       
+ *                                     
+ *                                   
+ *                                 
+ *                               
+ *                             
+ *                           
+ *                         
+ *                       
+ *                     
+ *                   
+ *                   
+ *                     
+ *                       
+ *                         
+ *                           
+ *                             
+ *                               
+ *                                 
+ *                                   
+ *                                     
+ *                                       
+ *                                       
+ *                                     
+ *                                   
+ *                                 
+ *                               
+ *                             
+ *                           
+ *                         
+ *                       
+ *                     
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -123,60 +123,60 @@ public void setAction(Root.Action value) { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element name="update">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="item" maxOccurs="unbounded" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <all>
-     *                             <element name="key" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                             <element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                           </all>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="add">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="item" maxOccurs="unbounded" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <all>
-     *                             <element name="key" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                             <element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                           </all>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </choice>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
+ * 
{@code
+     * 
+     *   
+     *     
+     *       
+     *         
+     *           
+     *             
+     *               
+     *                 
+     *                   
+     *                     
+     *                       
+     *                         
+     *                           
+     *                             
+     *                             
+     *                           
+     *                         
+     *                       
+     *                     
+     *                   
+     *                 
+     *               
+     *             
+     *           
+     *         
+     *         
+     *           
+     *             
+     *               
+     *                 
+     *                   
+     *                     
+     *                       
+     *                         
+     *                           
+     *                             
+     *                             
+     *                           
+     *                         
+     *                       
+     *                     
+     *                   
+     *                 
+     *               
+     *             
+     *           
+     *         
+     *       
+     *     
+     *   
+     * 
+     * }
* * */ @@ -196,7 +196,7 @@ public static class Action { public List getUpdate() { if (update == null) { - update = new ArrayList(); + update = new ArrayList<>(); } return update; } @@ -207,7 +207,7 @@ public void setUpdate(List update) { public List getAdd() { if (add == null) { - add = new ArrayList(); + add = new ArrayList<>(); } return add; } @@ -222,18 +222,18 @@ public void setAdd(List add) { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <all>
-         *         <element name="key" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *         <element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *       </all>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         *
+ * 
{@code
+         * 
+         *   
+         *     
+         *       
+         *         
+         *         
+         *       
+         *     
+         *   
+         * 
+         * }
* * */ @@ -304,18 +304,18 @@ public void setValue(String value) { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <all>
-         *         <element name="key" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *         <element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *       </all>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         *
+ * 
{@code
+         * 
+         *   
+         *     
+         *       
+         *         
+         *         
+         *       
+         *     
+         *   
+         * 
+         * }
* * */ diff --git a/src/test/generated_resources/element_reserved_word/Class.java b/src/test/generated_resources/element_reserved_word/Class.java index 97a20a5..e3ab627 100644 --- a/src/test/generated_resources/element_reserved_word/Class.java +++ b/src/test/generated_resources/element_reserved_word/Class.java @@ -17,19 +17,19 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="class">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="extends" type="{}types"/>
- *         <element name="implements" type="{}types"/>
- *         <element name="methods" type="{}methods"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -46,16 +46,16 @@ public class Class { @XmlElement(name = "type", type = String.class), @XmlElement(name = "primitive", type = Byte.class) }) - protected List _extends = new ArrayList(); + protected List _extends = new ArrayList<>(); @XmlElementWrapper(name = "implements", required = true) @XmlElements({ @XmlElement(name = "type", type = String.class), @XmlElement(name = "primitive", type = Byte.class) }) - protected List _implements = new ArrayList(); + protected List _implements = new ArrayList<>(); @XmlElementWrapper(required = true) @XmlElement(name = "method") - protected List methods = new ArrayList(); + protected List methods = new ArrayList<>(); public List getExtends() { return _extends; diff --git a/src/test/generated_resources/element_reserved_word/Method.java b/src/test/generated_resources/element_reserved_word/Method.java index 075b6dc..f877202 100644 --- a/src/test/generated_resources/element_reserved_word/Method.java +++ b/src/test/generated_resources/element_reserved_word/Method.java @@ -17,17 +17,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{}types"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -42,7 +42,7 @@ public class Method { @XmlElement(name = "type", type = String.class), @XmlElement(name = "primitive", type = Byte.class) }) - protected List _return = new ArrayList(); + protected List _return = new ArrayList<>(); public List getReturn() { return _return; diff --git a/src/test/generated_resources/element_reserved_word/ObjectFactory.java b/src/test/generated_resources/element_reserved_word/ObjectFactory.java index 3803d89..56e89c7 100644 --- a/src/test/generated_resources/element_reserved_word/ObjectFactory.java +++ b/src/test/generated_resources/element_reserved_word/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Class } * + * @return + * the new instance of {@link Class } */ public Class createClass() { return new Class(); @@ -40,6 +42,8 @@ public Class createClass() { /** * Create an instance of {@link Method } * + * @return + * the new instance of {@link Method } */ public Method createMethod() { return new Method(); diff --git a/src/test/generated_resources/element_scoped/ObjectFactory.java b/src/test/generated_resources/element_scoped/ObjectFactory.java index 77b2222..c513f4c 100644 --- a/src/test/generated_resources/element_scoped/ObjectFactory.java +++ b/src/test/generated_resources/element_scoped/ObjectFactory.java @@ -40,6 +40,8 @@ public ObjectFactory() { /** * Create an instance of {@link Return } * + * @return + * the new instance of {@link Return } */ public Return createReturn() { return new Return(); @@ -48,6 +50,8 @@ public Return createReturn() { /** * Create an instance of {@link SearchParameters } * + * @return + * the new instance of {@link SearchParameters } */ public SearchParameters createSearchParameters() { return new SearchParameters(); @@ -63,22 +67,22 @@ public SearchParameters createSearchParameters() { */ @XmlElementDecl(namespace = "http://example.com/extra", name = "age") public JAXBElement createAge(String value) { - return new JAXBElement(_Age_QNAME, String.class, null, value); + return new JAXBElement<>(_Age_QNAME, String.class, null, value); } @XmlElementDecl(namespace = "http://example.com/scope", name = "name", scope = Return.class) public JAXBElement createReturnName(String value) { - return new JAXBElement(new QName("http://example.com/scope", "name"), String.class, Return.class, value); + return new JAXBElement<>(new QName("http://example.com/scope", "name"), String.class, Return.class, value); } @XmlElementDecl(namespace = "http://example.com/scope", name = "age", scope = Return.class) public JAXBElement createReturnAge(String value) { - return new JAXBElement(new QName("http://example.com/scope", "age"), String.class, Return.class, value); + return new JAXBElement<>(new QName("http://example.com/scope", "age"), String.class, Return.class, value); } @XmlElementDecl(namespace = "http://example.com/scope", name = "id", scope = SearchParameters.class) public JAXBElement> createSearchParametersId(List value) { - return new JAXBElement>(new QName("http://example.com/scope", "id"), ((Class) List.class), SearchParameters.class, value); + return new JAXBElement<>(new QName("http://example.com/scope", "id"), ((Class) List.class), SearchParameters.class, value); } } diff --git a/src/test/generated_resources/element_scoped/Return.java b/src/test/generated_resources/element_scoped/Return.java index f9d2a17..4c37925 100644 --- a/src/test/generated_resources/element_scoped/Return.java +++ b/src/test/generated_resources/element_scoped/Return.java @@ -19,30 +19,30 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="users">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence maxOccurs="unbounded">
- *                   <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                   <element name="age" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{http://example.com/extra}age"/>
- *         <element name="search-parameters" type="{http://example.com/scope}search-parameters"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -60,7 +60,7 @@ public class Return { @XmlElementRef(name = "name", namespace = "http://example.com/scope", type = JAXBElement.class), @XmlElementRef(name = "age", namespace = "http://example.com/scope", type = JAXBElement.class) }) - protected List> users = new ArrayList>(); + protected List> users = new ArrayList<>(); @XmlElement(namespace = "http://example.com/extra") protected String age; @XmlElement(name = "search-parameters") diff --git a/src/test/generated_resources/element_scoped/SearchParameters.java b/src/test/generated_resources/element_scoped/SearchParameters.java index ff143e3..8cffea8 100644 --- a/src/test/generated_resources/element_scoped/SearchParameters.java +++ b/src/test/generated_resources/element_scoped/SearchParameters.java @@ -16,17 +16,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="search-parameters">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="provider-ids" type="{http://example.com/scope}id-list" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -38,7 +38,7 @@ public class SearchParameters { @XmlElementWrapper(name = "provider-ids") @XmlElementRef(name = "id", namespace = "http://example.com/scope", type = JAXBElement.class) - protected List>> providerIds = new ArrayList>>(); + protected List>> providerIds = new ArrayList<>(); public List>> getProviderIds() { return providerIds; diff --git a/src/test/generated_resources/element_with_adapter/Calendar.java b/src/test/generated_resources/element_with_adapter/Calendar.java index 1fd125e..a540a63 100644 --- a/src/test/generated_resources/element_with_adapter/Calendar.java +++ b/src/test/generated_resources/element_with_adapter/Calendar.java @@ -18,28 +18,28 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="calendar">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="url" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         <element name="appointments" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="appointment" type="{http://www.w3.org/2001/XMLSchema}dateTime" maxOccurs="unbounded"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -56,7 +56,7 @@ public class Calendar { @XmlElementWrapper(name = "appointments") @XmlElement(name = "appointment", type = String.class) @XmlJavaTypeAdapter(Adapter1 .class) - protected Collection itemsAppointed = new ArrayList(); + protected Collection itemsAppointed = new ArrayList<>(); /** * Gets the value of the url property. diff --git a/src/test/generated_resources/element_with_adapter/ObjectFactory.java b/src/test/generated_resources/element_with_adapter/ObjectFactory.java index 400d108..265591d 100644 --- a/src/test/generated_resources/element_with_adapter/ObjectFactory.java +++ b/src/test/generated_resources/element_with_adapter/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Calendar } * + * @return + * the new instance of {@link Calendar } */ public Calendar createCalendar() { return new Calendar(); diff --git a/src/test/generated_resources/element_with_customization/Args.java b/src/test/generated_resources/element_with_customization/Args.java index 25e5de5..f9f6c54 100644 --- a/src/test/generated_resources/element_with_customization/Args.java +++ b/src/test/generated_resources/element_with_customization/Args.java @@ -15,17 +15,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="arg" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -46,7 +46,7 @@ public class Args { * 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 set method for the arg property. + * This is why there is not a {@code set} method for the arg property. * *

* For example, to add a new item, do as follows: @@ -60,10 +60,12 @@ public class Args { * {@link String } * * + * @return + * The value of the arg property. */ public List getArg() { if (arg == null) { - arg = new ArrayList(); + arg = new ArrayList<>(); } return this.arg; } diff --git a/src/test/generated_resources/element_with_customization/ObjectFactory.java b/src/test/generated_resources/element_with_customization/ObjectFactory.java index f0bde97..75c1535 100644 --- a/src/test/generated_resources/element_with_customization/ObjectFactory.java +++ b/src/test/generated_resources/element_with_customization/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link PostOffice } * + * @return + * the new instance of {@link PostOffice } */ public PostOffice createPostOffice() { return new PostOffice(); @@ -40,6 +42,8 @@ public PostOffice createPostOffice() { /** * Create an instance of {@link Args } * + * @return + * the new instance of {@link Args } */ public Args createArgs() { return new Args(); diff --git a/src/test/generated_resources/element_with_customization/PostOffice.java b/src/test/generated_resources/element_with_customization/PostOffice.java index dd761a2..0f02394 100644 --- a/src/test/generated_resources/element_with_customization/PostOffice.java +++ b/src/test/generated_resources/element_with_customization/PostOffice.java @@ -18,20 +18,20 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}type-of-message"/>
- *         <element ref="{}args"/>
- *         <element ref="{}class"/>
- *         <element ref="{}misc" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -49,13 +49,13 @@ public class PostOffice { protected Args args; @XmlElementWrapper(name = "class", required = true) @XmlElement(name = "name") - protected Collection classes = new Vector(); + protected Collection classes = new Vector<>(); @XmlElementWrapper(name = "misc") @XmlAnyElement(lax = true) - protected Collection misc = new LinkedList(); + protected Collection misc = new LinkedList<>(); @XmlElementWrapper(name = "type-of-message", required = true) @XmlElement(name = "type") - protected Collection typeOfMessages = new LinkedList(); + protected Collection typeOfMessages = new LinkedList<>(); /** * Gets the value of the args property. diff --git a/src/test/generated_resources/element_with_parent/Alliance.java b/src/test/generated_resources/element_with_parent/Alliance.java index 1839492..4ebe143 100644 --- a/src/test/generated_resources/element_with_parent/Alliance.java +++ b/src/test/generated_resources/element_with_parent/Alliance.java @@ -18,18 +18,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="organization" type="{}organization"/>
- *         <element name="group" type="{}group"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -57,7 +57,7 @@ public class Alliance * 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 set method for the organizationOrGroup property. + * This is why there is not a {@code set} method for the organizationOrGroup property. * *

* For example, to add a new item, do as follows: @@ -72,10 +72,12 @@ public class Alliance * {@link Organization } * * + * @return + * The value of the organizationOrGroup property. */ public List getOrganizationOrGroup() { if (organizationOrGroup == null) { - organizationOrGroup = new ArrayList(); + organizationOrGroup = new ArrayList<>(); } return this.organizationOrGroup; } diff --git a/src/test/generated_resources/element_with_parent/Group.java b/src/test/generated_resources/element_with_parent/Group.java index 22c1719..94d3602 100644 --- a/src/test/generated_resources/element_with_parent/Group.java +++ b/src/test/generated_resources/element_with_parent/Group.java @@ -17,28 +17,28 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="group">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="person" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <all>
- *                   <element name="first-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                   <element name="second-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                 </all>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -65,7 +65,7 @@ public class Group * 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 set method for the person property. + * This is why there is not a {@code set} method for the person property. * *

* For example, to add a new item, do as follows: @@ -79,10 +79,12 @@ public class Group * {@link Group.Person } * * + * @return + * The value of the person property. */ public List getPerson() { if (person == null) { - person = new ArrayList(); + person = new ArrayList<>(); } return this.person; } @@ -93,18 +95,18 @@ public List getPerson() { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <all>
-     *         <element name="first-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *         <element name="second-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *       </all>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
+ * 
{@code
+     * 
+     *   
+     *     
+     *       
+     *         
+     *         
+     *       
+     *     
+     *   
+     * 
+     * }
* * */ diff --git a/src/test/generated_resources/element_with_parent/ObjectFactory.java b/src/test/generated_resources/element_with_parent/ObjectFactory.java index 7b28c5a..4f43abe 100644 --- a/src/test/generated_resources/element_with_parent/ObjectFactory.java +++ b/src/test/generated_resources/element_with_parent/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Group } * + * @return + * the new instance of {@link Group } */ public Group createGroup() { return new Group(); @@ -40,6 +42,8 @@ public Group createGroup() { /** * Create an instance of {@link Alliance } * + * @return + * the new instance of {@link Alliance } */ public Alliance createAlliance() { return new Alliance(); @@ -48,6 +52,8 @@ public Alliance createAlliance() { /** * Create an instance of {@link Organization } * + * @return + * the new instance of {@link Organization } */ public Organization createOrganization() { return new Organization(); @@ -56,6 +62,8 @@ public Organization createOrganization() { /** * Create an instance of {@link Group.Person } * + * @return + * the new instance of {@link Group.Person } */ public Group.Person createGroupPerson() { return new Group.Person(); diff --git a/src/test/generated_resources/element_with_parent/Organization.java b/src/test/generated_resources/element_with_parent/Organization.java index b77936c..2a1fed3 100644 --- a/src/test/generated_resources/element_with_parent/Organization.java +++ b/src/test/generated_resources/element_with_parent/Organization.java @@ -15,17 +15,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="organization">
- *   <complexContent>
- *     <extension base="{}group">
- *       <sequence>
- *         <element name="address" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -49,7 +49,7 @@ public class Organization * 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 set method for the address property. + * This is why there is not a {@code set} method for the address property. * *

* For example, to add a new item, do as follows: @@ -63,10 +63,12 @@ public class Organization * {@link String } * * + * @return + * The value of the address property. */ public List getAddress() { if (address == null) { - address = new ArrayList(); + address = new ArrayList<>(); } return this.address; } diff --git a/src/test/generated_resources/inner_element/Filesystem.java b/src/test/generated_resources/inner_element/Filesystem.java index 490274b..e4bd07f 100644 --- a/src/test/generated_resources/inner_element/Filesystem.java +++ b/src/test/generated_resources/inner_element/Filesystem.java @@ -17,55 +17,55 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="file-listing">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="file-item" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <all>
- *                             <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                             <element name="size" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *                           </all>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="directory-listing">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="directory-item" maxOccurs="unbounded">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="volumes" type="{}volumes"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                     
+ *                       
+ *                         
+ *                           
+ *                             
+ *                             
+ *                           
+ *                         
+ *                       
+ *                     
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                     
+ *                       
+ *                       
+ *                     
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -151,28 +151,28 @@ public void setDirectoryListing(List directoryListing) { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="file-item" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <all>
-     *                   <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                   <element name="size" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *                 </all>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
+ * 
{@code
+     * 
+     *   
+     *     
+     *       
+     *         
+     *           
+     *             
+     *               
+     *                 
+     *                   
+     *                   
+     *                 
+     *               
+     *             
+     *           
+     *         
+     *       
+     *     
+     *   
+     * 
+     * }
* * */ @@ -195,7 +195,7 @@ public static class FileListing * 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 set method for the fileItem property. + * This is why there is not a {@code set} method for the fileItem property. * *

* For example, to add a new item, do as follows: @@ -209,10 +209,12 @@ public static class FileListing * {@link Filesystem.FileListing.FileItem } * * + * @return + * The value of the fileItem property. */ public List getFileItem() { if (fileItem == null) { - fileItem = new ArrayList(); + fileItem = new ArrayList<>(); } return this.fileItem; } @@ -223,18 +225,18 @@ public List getFileItem() { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <all>
-         *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *         <element name="size" type="{http://www.w3.org/2001/XMLSchema}int"/>
-         *       </all>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         *
+ * 
{@code
+         * 
+         *   
+         *     
+         *       
+         *         
+         *         
+         *       
+         *     
+         *   
+         * 
+         * }
* * */ diff --git a/src/test/generated_resources/inner_element/ObjectFactory.java b/src/test/generated_resources/inner_element/ObjectFactory.java index 6c53010..bdcac91 100644 --- a/src/test/generated_resources/inner_element/ObjectFactory.java +++ b/src/test/generated_resources/inner_element/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link Filesystem } * + * @return + * the new instance of {@link Filesystem } */ public Filesystem createFilesystem() { return new Filesystem(); @@ -40,6 +42,8 @@ public Filesystem createFilesystem() { /** * Create an instance of {@link Volumes } * + * @return + * the new instance of {@link Volumes } */ public Volumes createVolumes() { return new Volumes(); @@ -48,6 +52,8 @@ public Volumes createVolumes() { /** * Create an instance of {@link Filesystem.FileListing } * + * @return + * the new instance of {@link Filesystem.FileListing } */ public Filesystem.FileListing createFilesystemFileListing() { return new Filesystem.FileListing(); @@ -56,6 +62,8 @@ public Filesystem.FileListing createFilesystemFileListing() { /** * Create an instance of {@link Volumes.Volume } * + * @return + * the new instance of {@link Volumes.Volume } */ public Volumes.Volume createVolumesVolume() { return new Volumes.Volume(); @@ -64,6 +72,8 @@ public Volumes.Volume createVolumesVolume() { /** * Create an instance of {@link Filesystem.FileListing.FileItem } * + * @return + * the new instance of {@link Filesystem.FileListing.FileItem } */ public Filesystem.FileListing.FileItem createFilesystemFileListingFileItem() { return new Filesystem.FileListing.FileItem(); diff --git a/src/test/generated_resources/inner_element/Volumes.java b/src/test/generated_resources/inner_element/Volumes.java index e4db53b..9b9c805 100644 --- a/src/test/generated_resources/inner_element/Volumes.java +++ b/src/test/generated_resources/inner_element/Volumes.java @@ -15,28 +15,28 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="volumes">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="volume" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <all>
- *                   <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                   <element name="capacity" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *                 </all>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -59,7 +59,7 @@ public class Volumes * 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 set method for the volume property. + * This is why there is not a {@code set} method for the volume property. * *

* For example, to add a new item, do as follows: @@ -73,10 +73,12 @@ public class Volumes * {@link Volumes.Volume } * * + * @return + * The value of the volume property. */ public List getVolume() { if (volume == null) { - volume = new ArrayList(); + volume = new ArrayList<>(); } return this.volume; } @@ -87,18 +89,18 @@ public List getVolume() { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <all>
-     *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *         <element name="capacity" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *       </all>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
+ * 
{@code
+     * 
+     *   
+     *     
+     *       
+     *         
+     *         
+     *       
+     *     
+     *   
+     * 
+     * }
* * */ diff --git a/src/test/generated_resources/inner_element_value_objects/Article.java b/src/test/generated_resources/inner_element_value_objects/Article.java index ed156b2..d172415 100644 --- a/src/test/generated_resources/inner_element_value_objects/Article.java +++ b/src/test/generated_resources/inner_element_value_objects/Article.java @@ -9,18 +9,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="article">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="title" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="author" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/inner_element_value_objects/Articles.java b/src/test/generated_resources/inner_element_value_objects/Articles.java index 48e6b67..580e67a 100644 --- a/src/test/generated_resources/inner_element_value_objects/Articles.java +++ b/src/test/generated_resources/inner_element_value_objects/Articles.java @@ -10,17 +10,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="articles">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="article" type="{}article" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -35,7 +35,7 @@ public interface Articles extends Serializable * 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 set method for the article property. + * This is why there is not a {@code set} method for the article property. * *

* For example, to add a new item, do as follows: @@ -49,6 +49,8 @@ public interface Articles extends Serializable * {@link Article } * * + * @return + * The value of the article property. */ List

getArticle(); diff --git a/src/test/generated_resources/inner_element_value_objects/ArticlesCollections.java b/src/test/generated_resources/inner_element_value_objects/ArticlesCollections.java index ff4d78b..b187bf0 100644 --- a/src/test/generated_resources/inner_element_value_objects/ArticlesCollections.java +++ b/src/test/generated_resources/inner_element_value_objects/ArticlesCollections.java @@ -10,17 +10,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="articles-collections">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="articles" type="{}articles" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -35,7 +35,7 @@ public interface ArticlesCollections extends Serializable * 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 set method for the articles property. + * This is why there is not a {@code set} method for the articles property. * *

* For example, to add a new item, do as follows: @@ -49,6 +49,8 @@ public interface ArticlesCollections extends Serializable * {@link Articles } * * + * @return + * The value of the articles property. */ List getArticles(); diff --git a/src/test/generated_resources/inner_element_value_objects/Filesystem.java b/src/test/generated_resources/inner_element_value_objects/Filesystem.java index 839bfdf..87f8006 100644 --- a/src/test/generated_resources/inner_element_value_objects/Filesystem.java +++ b/src/test/generated_resources/inner_element_value_objects/Filesystem.java @@ -10,55 +10,55 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="file-listing">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="file-item" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <all>
- *                             <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                             <element name="size" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *                           </all>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="directory-listing">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="directory-item" maxOccurs="unbounded">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="volumes" type="{}volumes"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                     
+ *                       
+ *                         
+ *                           
+ *                             
+ *                             
+ *                           
+ *                         
+ *                       
+ *                     
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                     
+ *                       
+ *                       
+ *                     
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -85,18 +85,18 @@ public interface Filesystem * *

The following schema fragment specifies the expected content contained within this class. * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <all>
-     *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *         <element name="size" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *       </all>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
+ * 
{@code
+     * 
+     *   
+     *     
+     *       
+     *         
+     *         
+     *       
+     *     
+     *   
+     * 
+     * }
* * */ diff --git a/src/test/generated_resources/inner_element_value_objects/ObjectFactory.java b/src/test/generated_resources/inner_element_value_objects/ObjectFactory.java index ba90990..cac63fb 100644 --- a/src/test/generated_resources/inner_element_value_objects/ObjectFactory.java +++ b/src/test/generated_resources/inner_element_value_objects/ObjectFactory.java @@ -39,6 +39,8 @@ public ObjectFactory() { /** * Create an instance of {@link Filesystem } * + * @return + * the new instance of {@link Filesystem } */ public Filesystem createFilesystem() { return new FilesystemImpl(); @@ -47,6 +49,8 @@ public Filesystem createFilesystem() { /** * Create an instance of {@link Article } * + * @return + * the new instance of {@link Article } */ public Article createArticle() { return new ArticleImpl(); @@ -55,6 +59,8 @@ public Article createArticle() { /** * Create an instance of {@link Articles } * + * @return + * the new instance of {@link Articles } */ public Articles createArticles() { return new ArticlesImpl(); @@ -63,6 +69,8 @@ public Articles createArticles() { /** * Create an instance of {@link ArticlesCollections } * + * @return + * the new instance of {@link ArticlesCollections } */ public ArticlesCollections createArticlesCollections() { return new ArticlesCollectionsImpl(); @@ -71,6 +79,8 @@ public ArticlesCollections createArticlesCollections() { /** * Create an instance of {@link Publisher } * + * @return + * the new instance of {@link Publisher } */ public Publisher createPublisher() { return new PublisherImpl(); @@ -79,6 +89,8 @@ public Publisher createPublisher() { /** * Create an instance of {@link Volume } * + * @return + * the new instance of {@link Volume } */ public Volume createVolume() { return new VolumeImpl(); @@ -87,6 +99,8 @@ public Volume createVolume() { /** * Create an instance of {@link Filesystem.FileItem } * + * @return + * the new instance of {@link Filesystem.FileItem } */ public Filesystem.FileItem createFilesystemFileItem() { return new FilesystemImpl.FileItemImpl(); diff --git a/src/test/generated_resources/inner_element_value_objects/Publisher.java b/src/test/generated_resources/inner_element_value_objects/Publisher.java index cf9e5d1..a2bfef0 100644 --- a/src/test/generated_resources/inner_element_value_objects/Publisher.java +++ b/src/test/generated_resources/inner_element_value_objects/Publisher.java @@ -10,17 +10,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="publisher">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="articles" type="{}articles"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/inner_element_value_objects/Volume.java b/src/test/generated_resources/inner_element_value_objects/Volume.java index 19147c4..e0d38cc 100644 --- a/src/test/generated_resources/inner_element_value_objects/Volume.java +++ b/src/test/generated_resources/inner_element_value_objects/Volume.java @@ -9,18 +9,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <all>
- *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="capacity" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *       </all>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/inner_element_value_objects/impl/ArticlesCollectionsImpl.java b/src/test/generated_resources/inner_element_value_objects/impl/ArticlesCollectionsImpl.java index 51b22d5..a55e72e 100644 --- a/src/test/generated_resources/inner_element_value_objects/impl/ArticlesCollectionsImpl.java +++ b/src/test/generated_resources/inner_element_value_objects/impl/ArticlesCollectionsImpl.java @@ -18,11 +18,11 @@ public class ArticlesCollectionsImpl implements ArticlesCollections { @XmlElement(required = true, type = ArticlesImpl.class) - protected List articles = new Vector(); + protected List articles = new Vector<>(); public List getArticles() { if (articles == null) { - articles = new Vector(); + articles = new Vector<>(); } return this.articles; } diff --git a/src/test/generated_resources/inner_element_value_objects/impl/ArticlesImpl.java b/src/test/generated_resources/inner_element_value_objects/impl/ArticlesImpl.java index 90f3183..945613a 100644 --- a/src/test/generated_resources/inner_element_value_objects/impl/ArticlesImpl.java +++ b/src/test/generated_resources/inner_element_value_objects/impl/ArticlesImpl.java @@ -22,7 +22,7 @@ public class ArticlesImpl implements Articles public List
getArticle() { if (article == null) { - article = new ArrayList
(); + article = new ArrayList<>(); } return this.article; } diff --git a/src/test/generated_resources/inner_element_value_objects/impl/FilesystemImpl.java b/src/test/generated_resources/inner_element_value_objects/impl/FilesystemImpl.java index 17267ac..483f26b 100644 --- a/src/test/generated_resources/inner_element_value_objects/impl/FilesystemImpl.java +++ b/src/test/generated_resources/inner_element_value_objects/impl/FilesystemImpl.java @@ -24,13 +24,13 @@ public class FilesystemImpl implements Filesystem @XmlElementWrapper(name = "file-listing", required = true) @XmlElement(name = "file-item", type = FilesystemImpl.FileItemImpl.class) - protected List fileListing = new ArrayList(); + protected List fileListing = new ArrayList<>(); @XmlElementWrapper(name = "directory-listing", required = true) @XmlElement(name = "directory-item", defaultValue = "SPAM") - protected List directoryListing = new ArrayList(); + protected List directoryListing = new ArrayList<>(); @XmlElementWrapper(required = true) @XmlElement(name = "volume", type = VolumeImpl.class) - protected List volumes = new ArrayList(); + protected List volumes = new ArrayList<>(); public List getFileListing() { return fileListing; diff --git a/src/test/generated_resources/inner_element_value_objects/impl/JAXBContextFactory.java b/src/test/generated_resources/inner_element_value_objects/impl/JAXBContextFactory.java index c8f3885..1049c95 100644 --- a/src/test/generated_resources/inner_element_value_objects/impl/JAXBContextFactory.java +++ b/src/test/generated_resources/inner_element_value_objects/impl/JAXBContextFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -63,14 +63,14 @@ public class JAXBContextFactory { /** * The JAXB API will invoke this method via reflection */ - public static JAXBContext createContext( Class[] classes, Map properties ) throws JAXBException { - Class[] r = new Class[classes.length]; + public static JAXBContext createContext( Class[] classes, Map properties ) throws JAXBException { + Class[] r = new Class[classes.length]; boolean modified = false; // find any reference to our 'public' ObjectFactory and // replace that to our 'private' ObjectFactory. for( int i=0; i c = classes[i]; String name = c.getName(); if(name.endsWith(DOT_OBJECT_FACTORY) && !name.endsWith(IMPL_DOT_OBJECT_FACTORY)) { @@ -117,9 +117,9 @@ public static JAXBContext createContext( Class[] classes, Map properties ) throw * The JAXB API will invoke this method via reflection */ public static JAXBContext createContext( String contextPath, - ClassLoader classLoader, Map properties ) throws JAXBException { + ClassLoader classLoader, Map properties ) throws JAXBException { - List classes = new ArrayList(); + List> classes = new ArrayList<>(); StringTokenizer tokens = new StringTokenizer(contextPath,":"); // each package should be pointing to a JAXB RI generated @@ -136,16 +136,17 @@ public static JAXBContext createContext( String contextPath, } // delegate to the JAXB provider in the system - return JAXBContext.newInstance(classes.toArray(new Class[classes.size()]),properties); + return JAXBContext.newInstance(classes.toArray(new Class[0]),properties); } - private static ClassLoader getClassClassLoader(final Class c) { + private static ClassLoader getClassClassLoader(final Class c) { if (System.getSecurityManager() == null) { return c.getClassLoader(); } else { - return (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public java.lang.Object run() { + return java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction<>() { + @Override + public ClassLoader run() { return c.getClassLoader(); } }); diff --git a/src/test/generated_resources/inner_element_value_objects/impl/ObjectFactory.java b/src/test/generated_resources/inner_element_value_objects/impl/ObjectFactory.java index 85804fb..c37f556 100644 --- a/src/test/generated_resources/inner_element_value_objects/impl/ObjectFactory.java +++ b/src/test/generated_resources/inner_element_value_objects/impl/ObjectFactory.java @@ -38,6 +38,8 @@ public ObjectFactory() { /** * Create an instance of {@link Filesystem } * + * @return + * the new instance of {@link Filesystem } */ public FilesystemImpl createFilesystem() { return new FilesystemImpl(); @@ -46,6 +48,8 @@ public FilesystemImpl createFilesystem() { /** * Create an instance of {@link Article } * + * @return + * the new instance of {@link Article } */ public ArticleImpl createArticle() { return new ArticleImpl(); @@ -54,6 +58,8 @@ public ArticleImpl createArticle() { /** * Create an instance of {@link Articles } * + * @return + * the new instance of {@link Articles } */ public ArticlesImpl createArticles() { return new ArticlesImpl(); @@ -62,6 +68,8 @@ public ArticlesImpl createArticles() { /** * Create an instance of {@link ArticlesCollections } * + * @return + * the new instance of {@link ArticlesCollections } */ public ArticlesCollectionsImpl createArticlesCollections() { return new ArticlesCollectionsImpl(); @@ -70,6 +78,8 @@ public ArticlesCollectionsImpl createArticlesCollections() { /** * Create an instance of {@link Publisher } * + * @return + * the new instance of {@link Publisher } */ public PublisherImpl createPublisher() { return new PublisherImpl(); @@ -78,6 +88,8 @@ public PublisherImpl createPublisher() { /** * Create an instance of {@link Volume } * + * @return + * the new instance of {@link Volume } */ public VolumeImpl createVolume() { return new VolumeImpl(); @@ -86,6 +98,8 @@ public VolumeImpl createVolume() { /** * Create an instance of {@link Filesystem.FileItem } * + * @return + * the new instance of {@link Filesystem.FileItem } */ public FilesystemImpl.FileItemImpl createFilesystemFileItem() { return new FilesystemImpl.FileItemImpl(); diff --git a/src/test/generated_resources/inner_element_value_objects/impl/PublisherImpl.java b/src/test/generated_resources/inner_element_value_objects/impl/PublisherImpl.java index 6bb4d66..5f5a0e0 100644 --- a/src/test/generated_resources/inner_element_value_objects/impl/PublisherImpl.java +++ b/src/test/generated_resources/inner_element_value_objects/impl/PublisherImpl.java @@ -20,7 +20,7 @@ public class PublisherImpl implements Publisher @XmlElementWrapper(required = true) @XmlElement(name = "article", type = ArticleImpl.class) - protected List
articles = new ArrayList
(); + protected List
articles = new ArrayList<>(); public List
getArticles() { return articles; diff --git a/src/test/generated_resources/inner_scoped_element/Catalogue.java b/src/test/generated_resources/inner_scoped_element/Catalogue.java index da83bf3..c2d42a3 100644 --- a/src/test/generated_resources/inner_scoped_element/Catalogue.java +++ b/src/test/generated_resources/inner_scoped_element/Catalogue.java @@ -19,48 +19,48 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="stockage_collection">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence minOccurs="0">
- *                   <element name="stockage" maxOccurs="unbounded" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <all>
- *                             <element name="collection" minOccurs="0">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <sequence maxOccurs="unbounded" minOccurs="0">
- *                                       <element name="effect" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                                       <element name="term" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                                     </sequence>
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </all>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                     
+ *                       
+ *                         
+ *                           
+ *                             
+ *                               
+ *                                 
+ *                                   
+ *                                     
+ *                                       
+ *                                       
+ *                                     
+ *                                   
+ *                                 
+ *                               
+ *                             
+ *                           
+ *                         
+ *                       
+ *                     
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -73,7 +73,7 @@ public class Catalogue { @XmlElementWrapper(name = "stockage_collection", required = true) @XmlElement(name = "stockage") - protected List stockageCollection = new ArrayList(); + protected List stockageCollection = new ArrayList<>(); public List getStockageCollection() { return stockageCollection; @@ -89,28 +89,28 @@ public void setStockageCollection(List stockageCollection) { * *

The following schema fragment specifies the expected content contained within this class. * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <all>
-     *         <element name="collection" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence maxOccurs="unbounded" minOccurs="0">
-     *                   <element name="effect" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                   <element name="term" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </all>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
+ * 
{@code
+     * 
+     *   
+     *     
+     *       
+     *         
+     *           
+     *             
+     *               
+     *                 
+     *                   
+     *                   
+     *                 
+     *               
+     *             
+     *           
+     *         
+     *       
+     *     
+     *   
+     * 
+     * }
* * */ @@ -125,7 +125,7 @@ public static class Stockage { @XmlElementRef(name = "effect", type = JAXBElement.class, required = false), @XmlElementRef(name = "term", type = JAXBElement.class, required = false) }) - protected List> collection = new ArrayList>(); + protected List> collection = new ArrayList<>(); public List> getCollection() { return collection; diff --git a/src/test/generated_resources/inner_scoped_element/ObjectFactory.java b/src/test/generated_resources/inner_scoped_element/ObjectFactory.java index 685a398..c79cb2e 100644 --- a/src/test/generated_resources/inner_scoped_element/ObjectFactory.java +++ b/src/test/generated_resources/inner_scoped_element/ObjectFactory.java @@ -37,6 +37,8 @@ public ObjectFactory() { /** * Create an instance of {@link Catalogue } * + * @return + * the new instance of {@link Catalogue } */ public Catalogue createCatalogue() { return new Catalogue(); @@ -45,6 +47,8 @@ public Catalogue createCatalogue() { /** * Create an instance of {@link Catalogue.Stockage } * + * @return + * the new instance of {@link Catalogue.Stockage } */ public Catalogue.Stockage createCatalogueStockage() { return new Catalogue.Stockage(); @@ -52,12 +56,12 @@ public Catalogue.Stockage createCatalogueStockage() { @XmlElementDecl(namespace = "", name = "effect", scope = Catalogue.Stockage.class) public JAXBElement createCatalogueStockageEffect(String value) { - return new JAXBElement(new QName("", "effect"), String.class, Catalogue.Stockage.class, value); + return new JAXBElement<>(new QName("", "effect"), String.class, Catalogue.Stockage.class, value); } @XmlElementDecl(namespace = "", name = "term", scope = Catalogue.Stockage.class) public JAXBElement createCatalogueStockageTerm(String value) { - return new JAXBElement(new QName("", "term"), String.class, Catalogue.Stockage.class, value); + return new JAXBElement<>(new QName("", "term"), String.class, Catalogue.Stockage.class, value); } } diff --git a/src/test/generated_resources/substitution_groups/Address.java b/src/test/generated_resources/substitution_groups/Address.java index 5afaa2e..eff015e 100644 --- a/src/test/generated_resources/substitution_groups/Address.java +++ b/src/test/generated_resources/substitution_groups/Address.java @@ -12,17 +12,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="addressType">
- *   <complexContent>
- *     <extension base="{}contactInfoType">
- *       <sequence>
- *         <element name="street" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/substitution_groups/ContactInfo.java b/src/test/generated_resources/substitution_groups/ContactInfo.java index 3e40f03..f386fd6 100644 --- a/src/test/generated_resources/substitution_groups/ContactInfo.java +++ b/src/test/generated_resources/substitution_groups/ContactInfo.java @@ -12,14 +12,14 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="contactInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/substitution_groups/Customer.java b/src/test/generated_resources/substitution_groups/Customer.java index 587386c..c5be18c 100644 --- a/src/test/generated_resources/substitution_groups/Customer.java +++ b/src/test/generated_resources/substitution_groups/Customer.java @@ -16,27 +16,27 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="customerType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="contact-infos" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element ref="{}contact-info" maxOccurs="unbounded" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *           
+ *             
+ *               
+ *                 
+ *                   
+ *                 
+ *               
+ *             
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -48,7 +48,7 @@ public class Customer { @XmlElementWrapper(name = "contact-infos") @XmlElementRef(name = "contact-info", type = JAXBElement.class, required = false) - protected List> contactInfos = new ArrayList>(); + protected List> contactInfos = new ArrayList<>(); public List> getContactInfos() { return contactInfos; diff --git a/src/test/generated_resources/substitution_groups/ObjectFactory.java b/src/test/generated_resources/substitution_groups/ObjectFactory.java index 6f6781a..9f1eff4 100644 --- a/src/test/generated_resources/substitution_groups/ObjectFactory.java +++ b/src/test/generated_resources/substitution_groups/ObjectFactory.java @@ -39,6 +39,8 @@ public ObjectFactory() { /** * Create an instance of {@link Customer } * + * @return + * the new instance of {@link Customer } */ public Customer createCustomer() { return new Customer(); @@ -47,6 +49,8 @@ public Customer createCustomer() { /** * Create an instance of {@link Address } * + * @return + * the new instance of {@link Address } */ public Address createAddress() { return new Address(); @@ -55,6 +59,8 @@ public Address createAddress() { /** * Create an instance of {@link PhoneNumber } * + * @return + * the new instance of {@link PhoneNumber } */ public PhoneNumber createPhoneNumber() { return new PhoneNumber(); @@ -70,7 +76,7 @@ public PhoneNumber createPhoneNumber() { */ @XmlElementDecl(namespace = "", name = "customer") public JAXBElement createCustomer(Customer value) { - return new JAXBElement(_Customer_QNAME, Customer.class, null, value); + return new JAXBElement<>(_Customer_QNAME, Customer.class, null, value); } /** @@ -83,7 +89,7 @@ public JAXBElement createCustomer(Customer value) { */ @XmlElementDecl(namespace = "", name = "contact-info") public JAXBElement createContactInfo(ContactInfo value) { - return new JAXBElement(_ContactInfo_QNAME, ContactInfo.class, null, value); + return new JAXBElement<>(_ContactInfo_QNAME, ContactInfo.class, null, value); } /** @@ -96,7 +102,7 @@ public JAXBElement createContactInfo(ContactInfo value) { */ @XmlElementDecl(namespace = "", name = "address", substitutionHeadNamespace = "", substitutionHeadName = "contact-info") public JAXBElement
createAddress(Address value) { - return new JAXBElement
(_Address_QNAME, Address.class, null, value); + return new JAXBElement<>(_Address_QNAME, Address.class, null, value); } /** @@ -109,7 +115,7 @@ public JAXBElement
createAddress(Address value) { */ @XmlElementDecl(namespace = "", name = "phone-number", substitutionHeadNamespace = "", substitutionHeadName = "contact-info") public JAXBElement createPhoneNumber(PhoneNumber value) { - return new JAXBElement(_PhoneNumber_QNAME, PhoneNumber.class, null, value); + return new JAXBElement<>(_PhoneNumber_QNAME, PhoneNumber.class, null, value); } } diff --git a/src/test/generated_resources/substitution_groups/PhoneNumber.java b/src/test/generated_resources/substitution_groups/PhoneNumber.java index 67ec011..4a81569 100644 --- a/src/test/generated_resources/substitution_groups/PhoneNumber.java +++ b/src/test/generated_resources/substitution_groups/PhoneNumber.java @@ -12,18 +12,18 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType name="phoneNumberType">
- *   <complexContent>
- *     <extension base="{}contactInfoType">
- *       <sequence>
- *         <element name="area-number" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="phone-number" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ diff --git a/src/test/generated_resources/unqualified/ObjectFactory.java b/src/test/generated_resources/unqualified/ObjectFactory.java index 978ba1c..efd34c5 100644 --- a/src/test/generated_resources/unqualified/ObjectFactory.java +++ b/src/test/generated_resources/unqualified/ObjectFactory.java @@ -32,6 +32,8 @@ public ObjectFactory() { /** * Create an instance of {@link RootElement } * + * @return + * the new instance of {@link RootElement } */ public RootElement createRootElement() { return new RootElement(); diff --git a/src/test/generated_resources/unqualified/RootElement.java b/src/test/generated_resources/unqualified/RootElement.java index 96e11dd..e608219 100644 --- a/src/test/generated_resources/unqualified/RootElement.java +++ b/src/test/generated_resources/unqualified/RootElement.java @@ -16,17 +16,17 @@ * *

The following schema fragment specifies the expected content contained within this class. * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="stringList" type="{testNamespace}StringListType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
+ * 
{@code
+ * 
+ *   
+ *     
+ *       
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
* * */ @@ -39,7 +39,7 @@ public class RootElement { @XmlElementWrapper(required = true) @XmlElement(name = "listItem") - protected List stringList = new ArrayList(); + protected List stringList = new ArrayList<>(); public List getStringList() { return stringList;