poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kiwiwi...@apache.org
Subject svn commit: r1881778 [1/10] - in /xmlbeans/trunk: ./ src/main/java/org/apache/xmlbeans/ src/main/java/org/apache/xmlbeans/impl/common/ src/main/java/org/apache/xmlbeans/impl/schema/ src/main/java/org/apache/xmlbeans/impl/store/ src/main/java/org/apache...
Date Thu, 17 Sep 2020 00:04:39 GMT
Author: kiwiwings
Date: Thu Sep 17 00:04:39 2020
New Revision: 1881778

URL: http://svn.apache.org/viewvc?rev=1881778&view=rev
Log:
remove deprecated XmlInputStream API
remove javasources 1.4/1.5 options - defaults to 1.8 now
don't generate newInstance calls for abstract XmlBeans

Removed:
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/GenericXmlInputStream.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/xml/stream/BufferedXMLInputStream.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/xml/stream/ReferenceResolver.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/xml/stream/XMLInputStream.java
Modified:
    xmlbeans/trunk/build.xml
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeLoader.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBoolean.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlByte.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDate.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDateTime.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDecimal.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDouble.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDuration.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITY.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFactoryHook.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFloat.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGDay.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonth.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlID.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREF.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInt.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInteger.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLanguage.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLong.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNCName.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKEN.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNOTATION.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlName.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNegativeInteger.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonNegativeInteger.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonPositiveInteger.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNormalizedString.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptions.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlPositiveInteger.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlQName.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlShort.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlString.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlToken.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTokenSource.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedShort.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlObjectBase.java
    xmlbeans/trunk/src/test/java/random/common/Random.java
    xmlbeans/trunk/src/test/java/xmlobject/detailed/SoapFaultTest.java
    xmlbeans/trunk/src/test/java/xmltokensource/detailed/RoundTripLoaderTest.java

Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Thu Sep 17 00:04:39 2020
@@ -295,6 +295,10 @@
         <replaceHolder srcDir="build/bootstrap/generated-sources" rscDir="build/bootstrap/generated-resources" schemaName="sXMLTOOLS"/>
 
         <replace dir="build/bootstrap/generated-sources" token="schemaorg_apache_xmlbeans" value="org.apache.xmlbeans.metadata" includes="**/*.java"/>
+        <!-- remove deprecated and not supported XMLInputStream API -->
+        <replaceregexp match="^.*@deprecated.*XMLInputStream.*\r?\n.*\r?\n.*\r?\n.*\r?\n" replace="" flags="gm">
+            <fileset dir="build/bootstrap/generated-sources" includes="**/*.java"/>
+        </replaceregexp>
 
         <mkdir dir="build/classes"/>
         <mkdir dir="build/generated-sources"/>

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java Thu Sep 17 00:04:39 2020
@@ -15,20 +15,6 @@
 
 package org.apache.xmlbeans;
 
-import org.apache.xmlbeans.xml.stream.XMLInputStream;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.math.BigInteger;
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
 import org.w3c.dom.Node;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
@@ -36,6 +22,12 @@ import org.xml.sax.ext.LexicalHandler;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
+import java.io.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 /**
  * A FilterXmlObject delegates to some other XmlObject, which it can use as
@@ -50,763 +42,621 @@ import javax.xml.stream.XMLStreamReader;
  * non-transient fields), because subclasses may be serializable and
  * adding storage would break the serialization format.
  */
-public abstract class FilterXmlObject implements XmlObject, SimpleValue, DelegateXmlObject
-{
-    public SchemaType schemaType()
-    {
+public abstract class FilterXmlObject implements XmlObject, SimpleValue, DelegateXmlObject {
+    public SchemaType schemaType() {
         return underlyingXmlObject().schemaType();
     }
 
-    public boolean validate()
-    {
+    public boolean validate() {
         return underlyingXmlObject().validate();
     }
 
-    public boolean validate(XmlOptions options)
-    {
+    public boolean validate(XmlOptions options) {
         return underlyingXmlObject().validate(options);
     }
 
-    public XmlObject[] selectPath(String path)
-    {
+    public XmlObject[] selectPath(String path) {
         return underlyingXmlObject().selectPath(path);
     }
 
-    public XmlObject[] selectPath(String path, XmlOptions options)
-    {
+    public XmlObject[] selectPath(String path, XmlOptions options) {
         return underlyingXmlObject().selectPath(path, options);
     }
 
-    public XmlObject[] execQuery(String query)
-    {
+    public XmlObject[] execQuery(String query) {
         return underlyingXmlObject().execQuery(query);
     }
 
-    public XmlObject[] execQuery(String query, XmlOptions options)
-    {
+    public XmlObject[] execQuery(String query, XmlOptions options) {
         return underlyingXmlObject().execQuery(query, options);
     }
 
-    public XmlObject changeType(SchemaType newType)
-    {
+    public XmlObject changeType(SchemaType newType) {
         return underlyingXmlObject().changeType(newType);
     }
 
-    public boolean isNil()
-    {
+    public boolean isNil() {
         return underlyingXmlObject().isNil();
     }
 
-    public void setNil()
-    {
+    public void setNil() {
         underlyingXmlObject().setNil();
     }
 
-    public boolean isImmutable()
-    {
+    public boolean isImmutable() {
         return underlyingXmlObject().isImmutable();
     }
 
-    public XmlObject set(XmlObject srcObj)
-    {
+    public XmlObject set(XmlObject srcObj) {
         return underlyingXmlObject().set(srcObj);
     }
 
-    public XmlObject copy()
-    {
+    public XmlObject copy() {
         return underlyingXmlObject().copy();
     }
 
-    public XmlObject copy(XmlOptions options)
-    {
+    public XmlObject copy(XmlOptions options) {
         return underlyingXmlObject().copy(options);
     }
-    
-    public boolean valueEquals(XmlObject obj)
-    {
+
+    public boolean valueEquals(XmlObject obj) {
         return underlyingXmlObject().valueEquals(obj);
     }
 
-    public int valueHashCode()
-    {
+    public int valueHashCode() {
         return underlyingXmlObject().valueHashCode();
     }
 
-    public int compareTo(Object obj)
-    {
+    public int compareTo(Object obj) {
         return underlyingXmlObject().compareTo(obj);
     }
 
-    public int compareValue(XmlObject obj)
-    {
+    public int compareValue(XmlObject obj) {
         return underlyingXmlObject().compareValue(obj);
     }
 
-    public Object monitor()
-    {
+    public Object monitor() {
         return underlyingXmlObject().monitor();
     }
 
-    public XmlDocumentProperties documentProperties()
-    {
+    public XmlDocumentProperties documentProperties() {
         return underlyingXmlObject().documentProperties();
     }
 
-    public XmlCursor newCursor()
-    {
+    public XmlCursor newCursor() {
         return underlyingXmlObject().newCursor();
     }
 
-    /**
-     * @deprecated Deprecated by XMLStreamReader from STaX - jsr173 API.
-     */
-    public XMLInputStream newXMLInputStream()
-    {
-        return underlyingXmlObject().newXMLInputStream();
-    }
-
-    public XMLStreamReader newXMLStreamReader()
-    {
+    public XMLStreamReader newXMLStreamReader() {
         return underlyingXmlObject().newXMLStreamReader();
     }
 
-    public String xmlText()
-    {
+    public String xmlText() {
         return underlyingXmlObject().xmlText();
     }
 
-    public InputStream newInputStream()
-    {
+    public InputStream newInputStream() {
         return underlyingXmlObject().newInputStream();
     }
 
-    public Reader newReader()
-    {
+    public Reader newReader() {
         return underlyingXmlObject().newReader();
     }
 
-    public Node newDomNode()
-    {
+    public Node newDomNode() {
         return underlyingXmlObject().newDomNode();
     }
 
-    public Node getDomNode()
-    {
+    public Node getDomNode() {
         return underlyingXmlObject().getDomNode();
     }
 
-    public void save(ContentHandler ch, LexicalHandler lh) throws SAXException
-    {
+    public void save(ContentHandler ch, LexicalHandler lh) throws SAXException {
         underlyingXmlObject().save(ch, lh);
     }
 
-    public void save(File file) throws IOException
-    {
+    public void save(File file) throws IOException {
         underlyingXmlObject().save(file);
     }
 
-    public void save(OutputStream os) throws IOException
-    {
+    public void save(OutputStream os) throws IOException {
         underlyingXmlObject().save(os);
     }
 
-    public void save(Writer w) throws IOException
-    {
+    public void save(Writer w) throws IOException {
         underlyingXmlObject().save(w);
     }
 
-    /**
-     * @deprecated Deprecated by XMLStreamReader from STaX - jsr173 API.
-     */
-    public XMLInputStream newXMLInputStream(XmlOptions options)
-    {
-        return underlyingXmlObject().newXMLInputStream(options);
-    }
-
-    public XMLStreamReader newXMLStreamReader(XmlOptions options)
-    {
+    public XMLStreamReader newXMLStreamReader(XmlOptions options) {
         return underlyingXmlObject().newXMLStreamReader(options);
     }
 
-    public String xmlText(XmlOptions options)
-    {
+    public String xmlText(XmlOptions options) {
         return underlyingXmlObject().xmlText(options);
     }
 
-    public InputStream newInputStream(XmlOptions options)
-    {
+    public InputStream newInputStream(XmlOptions options) {
         return underlyingXmlObject().newInputStream(options);
     }
 
-    public Reader newReader(XmlOptions options)
-    {
+    public Reader newReader(XmlOptions options) {
         return underlyingXmlObject().newReader(options);
     }
 
-    public Node newDomNode(XmlOptions options)
-    {
+    public Node newDomNode(XmlOptions options) {
         return underlyingXmlObject().newDomNode(options);
     }
 
-    public void save(ContentHandler ch, LexicalHandler lh, XmlOptions options) throws SAXException
-    {
+    public void save(ContentHandler ch, LexicalHandler lh, XmlOptions options) throws SAXException {
         underlyingXmlObject().save(ch, lh, options);
     }
 
-    public void save(File file, XmlOptions options) throws IOException
-    {
+    public void save(File file, XmlOptions options) throws IOException {
         underlyingXmlObject().save(file, options);
     }
 
-    public void save(OutputStream os, XmlOptions options) throws IOException
-    {
+    public void save(OutputStream os, XmlOptions options) throws IOException {
         underlyingXmlObject().save(os, options);
     }
 
-    public void save(Writer w, XmlOptions options) throws IOException
-    {
+    public void save(Writer w, XmlOptions options) throws IOException {
         underlyingXmlObject().save(w, options);
     }
 
-    public SchemaType instanceType()
-    {
-        return ((SimpleValue)underlyingXmlObject()).instanceType();
+    public SchemaType instanceType() {
+        return ((SimpleValue) underlyingXmlObject()).instanceType();
     }
 
     /**
      * @deprecated replaced with {@link #getStringValue}
      */
-    public String stringValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).stringValue();
+    public String stringValue() {
+        return ((SimpleValue) underlyingXmlObject()).stringValue();
     }
 
     /**
      * @deprecated replaced with {@link #getBooleanValue}
      */
-    public boolean booleanValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).booleanValue();
+    public boolean booleanValue() {
+        return ((SimpleValue) underlyingXmlObject()).booleanValue();
     }
 
     /**
      * @deprecated replaced with {@link #getByteValue}
      */
-    public byte byteValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).byteValue();
+    public byte byteValue() {
+        return ((SimpleValue) underlyingXmlObject()).byteValue();
     }
 
     /**
      * @deprecated replaced with {@link #getShortValue}
      */
-    public short shortValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).shortValue();
+    public short shortValue() {
+        return ((SimpleValue) underlyingXmlObject()).shortValue();
     }
 
     /**
      * @deprecated replaced with {@link #getIntValue}
      */
-    public int intValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).intValue();
+    public int intValue() {
+        return ((SimpleValue) underlyingXmlObject()).intValue();
     }
 
     /**
      * @deprecated replaced with {@link #getLongValue}
      */
-    public long longValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).longValue();
+    public long longValue() {
+        return ((SimpleValue) underlyingXmlObject()).longValue();
     }
 
     /**
      * @deprecated replaced with {@link #getBigIntegerValue}
      */
-    public BigInteger bigIntegerValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).bigIntegerValue();
+    public BigInteger bigIntegerValue() {
+        return ((SimpleValue) underlyingXmlObject()).bigIntegerValue();
     }
 
     /**
      * @deprecated replaced with {@link #getBigDecimalValue}
      */
-    public BigDecimal bigDecimalValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).bigDecimalValue();
+    public BigDecimal bigDecimalValue() {
+        return ((SimpleValue) underlyingXmlObject()).bigDecimalValue();
     }
 
     /**
      * @deprecated replaced with {@link #getFloatValue}
      */
-    public float floatValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).floatValue();
+    public float floatValue() {
+        return ((SimpleValue) underlyingXmlObject()).floatValue();
     }
 
     /**
      * @deprecated replaced with {@link #getDoubleValue}
      */
-    public double doubleValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).doubleValue();
+    public double doubleValue() {
+        return ((SimpleValue) underlyingXmlObject()).doubleValue();
     }
 
     /**
      * @deprecated replaced with {@link #getByteArrayValue}
      */
-    public byte[] byteArrayValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).byteArrayValue();
+    public byte[] byteArrayValue() {
+        return ((SimpleValue) underlyingXmlObject()).byteArrayValue();
     }
 
     /**
      * @deprecated replaced with {@link #getEnumValue}
      */
-    public StringEnumAbstractBase enumValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).enumValue();
+    public StringEnumAbstractBase enumValue() {
+        return ((SimpleValue) underlyingXmlObject()).enumValue();
     }
 
     /**
      * @deprecated replaced with {@link #getCalendarValue}
      */
-    public Calendar calendarValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).calendarValue();
+    public Calendar calendarValue() {
+        return ((SimpleValue) underlyingXmlObject()).calendarValue();
     }
 
     /**
      * @deprecated replaced with {@link #getDateValue}
      */
-    public Date dateValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).dateValue();
+    public Date dateValue() {
+        return ((SimpleValue) underlyingXmlObject()).dateValue();
     }
 
     /**
      * @deprecated replaced with {@link #getGDateValue}
      */
-    public GDate gDateValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).gDateValue();
+    public GDate gDateValue() {
+        return ((SimpleValue) underlyingXmlObject()).gDateValue();
     }
 
     /**
      * @deprecated replaced with {@link #getGDurationValue}
      */
-    public GDuration gDurationValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).gDurationValue();
+    public GDuration gDurationValue() {
+        return ((SimpleValue) underlyingXmlObject()).gDurationValue();
     }
 
     /**
      * @deprecated replaced with {@link #getQNameValue}
      */
-    public QName qNameValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).qNameValue();
+    public QName qNameValue() {
+        return ((SimpleValue) underlyingXmlObject()).qNameValue();
     }
 
     /**
      * @deprecated replaced with {@link #getListValue}
      */
-    public List listValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).listValue();
+    public List listValue() {
+        return ((SimpleValue) underlyingXmlObject()).listValue();
     }
 
     /**
      * @deprecated replaced with {@link #getListValue}
      */
-    public List xlistValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).xlistValue();
+    public List xlistValue() {
+        return ((SimpleValue) underlyingXmlObject()).xlistValue();
     }
 
     /**
      * @deprecated replaced with {@link #getObjectValue}
      */
-    public Object objectValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).objectValue();
+    public Object objectValue() {
+        return ((SimpleValue) underlyingXmlObject()).objectValue();
     }
 
     /**
      * @deprecated replaced with {@link #setStringValue}
      */
-    public void set(String obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(String obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setBooleanValue}
      */
-    public void set(boolean v)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(v);
+    public void set(boolean v) {
+        ((SimpleValue) underlyingXmlObject()).set(v);
     }
 
     /**
      * @deprecated replaced with {@link #setByteValue}
      */
-    public void set(byte v)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(v);
+    public void set(byte v) {
+        ((SimpleValue) underlyingXmlObject()).set(v);
     }
 
     /**
      * @deprecated replaced with {@link #setShortValue}
      */
-    public void set(short v)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(v);
+    public void set(short v) {
+        ((SimpleValue) underlyingXmlObject()).set(v);
     }
 
     /**
      * @deprecated replaced with {@link #setIntValue}
      */
-    public void set(int v)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(v);
+    public void set(int v) {
+        ((SimpleValue) underlyingXmlObject()).set(v);
     }
 
     /**
      * @deprecated replaced with {@link #setLongValue}
      */
-    public void set(long v)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(v);
+    public void set(long v) {
+        ((SimpleValue) underlyingXmlObject()).set(v);
     }
 
     /**
      * @deprecated replaced with {@link #setBigIntegerValue}
      */
-    public void set(BigInteger obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(BigInteger obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setBigDecimalValue}
      */
-    public void set(BigDecimal obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(BigDecimal obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setFloatValue}
      */
-    public void set(float v)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(v);
+    public void set(float v) {
+        ((SimpleValue) underlyingXmlObject()).set(v);
     }
 
     /**
      * @deprecated replaced with {@link #setDoubleValue}
      */
-    public void set(double v)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(v);
+    public void set(double v) {
+        ((SimpleValue) underlyingXmlObject()).set(v);
     }
 
     /**
      * @deprecated replaced with {@link #setByteArrayValue}
      */
-    public void set(byte[] obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(byte[] obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setEnumValue}
      */
-    public void set(StringEnumAbstractBase obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(StringEnumAbstractBase obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setCalendarValue}
      */
-    public void set(Calendar obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(Calendar obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setDateValue}
      */
-    public void set(Date obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(Date obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setGDateValue}
      */
-    public void set(GDateSpecification obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(GDateSpecification obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setGDurationValue}
      */
-    public void set(GDurationSpecification obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(GDurationSpecification obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setQNameValue}
      */
-    public void set(QName obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(QName obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setListValue}
      */
-    public void set(List obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).set(obj);
+    public void set(List obj) {
+        ((SimpleValue) underlyingXmlObject()).set(obj);
     }
 
-    public String getStringValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getStringValue();
+    public String getStringValue() {
+        return ((SimpleValue) underlyingXmlObject()).getStringValue();
     }
 
-    public boolean getBooleanValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getBooleanValue();
+    public boolean getBooleanValue() {
+        return ((SimpleValue) underlyingXmlObject()).getBooleanValue();
     }
 
-    public byte getByteValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getByteValue();
+    public byte getByteValue() {
+        return ((SimpleValue) underlyingXmlObject()).getByteValue();
     }
 
-    public short getShortValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getShortValue();
+    public short getShortValue() {
+        return ((SimpleValue) underlyingXmlObject()).getShortValue();
     }
 
-    public int getIntValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getIntValue();
+    public int getIntValue() {
+        return ((SimpleValue) underlyingXmlObject()).getIntValue();
     }
 
-    public long getLongValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getLongValue();
+    public long getLongValue() {
+        return ((SimpleValue) underlyingXmlObject()).getLongValue();
     }
 
-    public BigInteger getBigIntegerValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getBigIntegerValue();
+    public BigInteger getBigIntegerValue() {
+        return ((SimpleValue) underlyingXmlObject()).getBigIntegerValue();
     }
 
-    public BigDecimal getBigDecimalValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getBigDecimalValue();
+    public BigDecimal getBigDecimalValue() {
+        return ((SimpleValue) underlyingXmlObject()).getBigDecimalValue();
     }
 
-    public float getFloatValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getFloatValue();
+    public float getFloatValue() {
+        return ((SimpleValue) underlyingXmlObject()).getFloatValue();
     }
 
-    public double getDoubleValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getDoubleValue();
+    public double getDoubleValue() {
+        return ((SimpleValue) underlyingXmlObject()).getDoubleValue();
     }
 
-    public byte[] getByteArrayValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getByteArrayValue();
+    public byte[] getByteArrayValue() {
+        return ((SimpleValue) underlyingXmlObject()).getByteArrayValue();
     }
 
-    public StringEnumAbstractBase getEnumValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getEnumValue();
+    public StringEnumAbstractBase getEnumValue() {
+        return ((SimpleValue) underlyingXmlObject()).getEnumValue();
     }
 
-    public Calendar getCalendarValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getCalendarValue();
+    public Calendar getCalendarValue() {
+        return ((SimpleValue) underlyingXmlObject()).getCalendarValue();
     }
 
-    public Date getDateValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getDateValue();
+    public Date getDateValue() {
+        return ((SimpleValue) underlyingXmlObject()).getDateValue();
     }
 
-    public GDate getGDateValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getGDateValue();
+    public GDate getGDateValue() {
+        return ((SimpleValue) underlyingXmlObject()).getGDateValue();
     }
 
-    public GDuration getGDurationValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getGDurationValue();
+    public GDuration getGDurationValue() {
+        return ((SimpleValue) underlyingXmlObject()).getGDurationValue();
     }
 
-    public QName getQNameValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getQNameValue();
+    public QName getQNameValue() {
+        return ((SimpleValue) underlyingXmlObject()).getQNameValue();
     }
 
-    public List getListValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getListValue();
+    public List getListValue() {
+        return ((SimpleValue) underlyingXmlObject()).getListValue();
     }
 
-    public List xgetListValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).xgetListValue();
+    public List xgetListValue() {
+        return ((SimpleValue) underlyingXmlObject()).xgetListValue();
     }
 
-    public Object getObjectValue()
-    {
-        return ((SimpleValue)underlyingXmlObject()).getObjectValue();
+    public Object getObjectValue() {
+        return ((SimpleValue) underlyingXmlObject()).getObjectValue();
     }
 
-    public void setStringValue(String obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setStringValue(obj);
+    public void setStringValue(String obj) {
+        ((SimpleValue) underlyingXmlObject()).setStringValue(obj);
     }
 
-    public void setBooleanValue(boolean v)
-    {
-        ((SimpleValue)underlyingXmlObject()).setBooleanValue(v);
+    public void setBooleanValue(boolean v) {
+        ((SimpleValue) underlyingXmlObject()).setBooleanValue(v);
     }
 
-    public void setByteValue(byte v)
-    {
-        ((SimpleValue)underlyingXmlObject()).setByteValue(v);
+    public void setByteValue(byte v) {
+        ((SimpleValue) underlyingXmlObject()).setByteValue(v);
     }
 
-    public void setShortValue(short v)
-    {
-        ((SimpleValue)underlyingXmlObject()).setShortValue(v);
+    public void setShortValue(short v) {
+        ((SimpleValue) underlyingXmlObject()).setShortValue(v);
     }
 
-    public void setIntValue(int v)
-    {
-        ((SimpleValue)underlyingXmlObject()).setIntValue(v);
+    public void setIntValue(int v) {
+        ((SimpleValue) underlyingXmlObject()).setIntValue(v);
     }
 
-    public void setLongValue(long v)
-    {
-        ((SimpleValue)underlyingXmlObject()).setLongValue(v);
+    public void setLongValue(long v) {
+        ((SimpleValue) underlyingXmlObject()).setLongValue(v);
     }
 
-    public void setBigIntegerValue(BigInteger obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setBigIntegerValue(obj);
+    public void setBigIntegerValue(BigInteger obj) {
+        ((SimpleValue) underlyingXmlObject()).setBigIntegerValue(obj);
     }
 
-    public void setBigDecimalValue(BigDecimal obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setBigDecimalValue(obj);
+    public void setBigDecimalValue(BigDecimal obj) {
+        ((SimpleValue) underlyingXmlObject()).setBigDecimalValue(obj);
     }
 
-    public void setFloatValue(float v)
-    {
-        ((SimpleValue)underlyingXmlObject()).setFloatValue(v);
+    public void setFloatValue(float v) {
+        ((SimpleValue) underlyingXmlObject()).setFloatValue(v);
     }
 
-    public void setDoubleValue(double v)
-    {
-        ((SimpleValue)underlyingXmlObject()).setDoubleValue(v);
+    public void setDoubleValue(double v) {
+        ((SimpleValue) underlyingXmlObject()).setDoubleValue(v);
     }
 
-    public void setByteArrayValue(byte[] obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setByteArrayValue(obj);
+    public void setByteArrayValue(byte[] obj) {
+        ((SimpleValue) underlyingXmlObject()).setByteArrayValue(obj);
     }
 
-    public void setEnumValue(StringEnumAbstractBase obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setEnumValue(obj);
+    public void setEnumValue(StringEnumAbstractBase obj) {
+        ((SimpleValue) underlyingXmlObject()).setEnumValue(obj);
     }
 
-    public void setCalendarValue(Calendar obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setCalendarValue(obj);
+    public void setCalendarValue(Calendar obj) {
+        ((SimpleValue) underlyingXmlObject()).setCalendarValue(obj);
     }
 
-    public void setDateValue(Date obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setDateValue(obj);
+    public void setDateValue(Date obj) {
+        ((SimpleValue) underlyingXmlObject()).setDateValue(obj);
     }
 
-    public void setGDateValue(GDate obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setGDateValue(obj);
+    public void setGDateValue(GDate obj) {
+        ((SimpleValue) underlyingXmlObject()).setGDateValue(obj);
     }
 
-    public void setGDurationValue(GDuration obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setGDurationValue(obj);
+    public void setGDurationValue(GDuration obj) {
+        ((SimpleValue) underlyingXmlObject()).setGDurationValue(obj);
     }
 
-    public void setQNameValue(QName obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setQNameValue(obj);
+    public void setQNameValue(QName obj) {
+        ((SimpleValue) underlyingXmlObject()).setQNameValue(obj);
     }
 
-    public void setListValue(List obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setListValue(obj);
+    public void setListValue(List obj) {
+        ((SimpleValue) underlyingXmlObject()).setListValue(obj);
     }
 
-    public void setObjectValue(Object obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).setObjectValue(obj);
+    public void setObjectValue(Object obj) {
+        ((SimpleValue) underlyingXmlObject()).setObjectValue(obj);
     }
 
     /**
      * @deprecated replaced with {@link #setObjectValue}
      **/
-    public void objectSet(Object obj)
-    {
-        ((SimpleValue)underlyingXmlObject()).objectSet(obj);
+    public void objectSet(Object obj) {
+        ((SimpleValue) underlyingXmlObject()).objectSet(obj);
     }
 
-    public XmlObject[] selectChildren(QName elementName)
-    {
+    public XmlObject[] selectChildren(QName elementName) {
         return underlyingXmlObject().selectChildren(elementName);
     }
 
-    public XmlObject[] selectChildren(String elementUri, String elementLocalName)
-    {
+    public XmlObject[] selectChildren(String elementUri, String elementLocalName) {
         return underlyingXmlObject().selectChildren(elementUri, elementLocalName);
     }
 
-    public XmlObject[] selectChildren(QNameSet elementNameSet)
-    {
+    public XmlObject[] selectChildren(QNameSet elementNameSet) {
         return underlyingXmlObject().selectChildren(elementNameSet);
     }
 
-    public XmlObject selectAttribute(QName attributeName)
-    {
+    public XmlObject selectAttribute(QName attributeName) {
         return underlyingXmlObject().selectAttribute(attributeName);
     }
 
-    public XmlObject selectAttribute(String attributeUri, String attributeLocalName)
-    {
+    public XmlObject selectAttribute(String attributeUri, String attributeLocalName) {
         return underlyingXmlObject().selectAttribute(attributeUri, attributeLocalName);
     }
 
-    public XmlObject[] selectAttributes(QNameSet attributeNameSet)
-    {
+    public XmlObject[] selectAttributes(QNameSet attributeNameSet) {
         return underlyingXmlObject().selectAttributes(attributeNameSet);
     }
 }

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeLoader.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeLoader.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeLoader.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeLoader.java Thu Sep 17 00:04:39 2020
@@ -15,21 +15,17 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.namespace.QName;
-import org.apache.xmlbeans.xml.stream.XMLInputStream;
-import org.apache.xmlbeans.xml.stream.XMLStreamException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Node;
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
 import java.net.URL;
 
-import javax.xml.stream.XMLStreamReader;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.DOMImplementation;
-
 /**
  * Represents a searchable set of XML Schema component definitions.
  * <p>
@@ -63,103 +59,165 @@ import org.w3c.dom.DOMImplementation;
  * A SchemaTypeLoader can be obtained by dynamically loading XSD files
  * using {@link XmlBeans#loadXsd}, or by assembling other SchemaTypeLoaders
  * or SchemaTypeSystems on a path using {@link XmlBeans#typeLoaderUnion}.
- * 
+ *
  * @see XmlBeans#loadXsd
  * @see XmlBeans#getContextTypeLoader
  * @see XmlBeans#typeLoaderUnion
  * @see SchemaTypeSystem
- */ 
-public interface SchemaTypeLoader
-{
-    /** Returns the type with the given name, or null if none. */
-    public SchemaType findType(QName name);
-
-    /** Returns the document type rooted at the given element name, or null if none. */
-    public SchemaType findDocumentType(QName name);
-    
-    /** Returns the attribute type containing the given attribute name, or null if none. */
-    public SchemaType findAttributeType(QName name);
-
-    /** Returns the global element defintion with the given name, or null if none. */
-    public SchemaGlobalElement findElement(QName name);
-
-    /** Returns the global attribute defintion with the given name, or null if none. */
-    public SchemaGlobalAttribute findAttribute(QName name);
-    
-    /** Returns the model group defintion with the given name, or null if none. */
-    public SchemaModelGroup findModelGroup(QName name);
-    
-    /** Returns the attribute group defintion with the given name, or null if none. */
-    public SchemaAttributeGroup findAttributeGroup(QName name);
-
-    /** True if the typeloader contains any definitions in the given namespace. */
-    public boolean isNamespaceDefined(String namespace);
-
-    /** Used for on-demand loading. */
-    public SchemaType.Ref findTypeRef(QName name);
-
-    /** Used for on-demand loading. */
-    public SchemaType.Ref findDocumentTypeRef(QName name);
-    
-    /** Used for on-demand loading. */
-    public SchemaType.Ref findAttributeTypeRef(QName name);
-
-    /** Used for on-demand loading. */
-    public SchemaGlobalElement.Ref findElementRef(QName name);
-
-    /** Used for on-demand loading. */
-    public SchemaGlobalAttribute.Ref findAttributeRef(QName name);
-    
-    /** Used for on-demand loading. */
-    public SchemaModelGroup.Ref findModelGroupRef(QName name);
-    
-    /** Used for on-demand loading. */
-    public SchemaAttributeGroup.Ref findAttributeGroupRef(QName name);
-
-    /** Used for on-demand loading. */
-    public SchemaIdentityConstraint.Ref findIdentityConstraintRef(QName name);
-
-    /** Finds a type for a given signature string */
-    public SchemaType typeForSignature(String signature);
-
-    /** Finds a type for a given fully-qualified XML Bean classname */
-    public SchemaType typeForClassname(String classname);
-
-    /** Loads original XSD source as a stream.  See {@link SchemaType#getSourceName}. */
-    public InputStream getSourceAsStream(String sourceName);
-    
-    /** Compiles an XPath */
-    public String compilePath(String pathExpr, XmlOptions options) throws XmlException;
-
-    /** Compiles an XQuery */
-    public String compileQuery(String queryExpr, XmlOptions options) throws XmlException;
-
-    /** Creates an instance of the given type. */
-    public XmlObject newInstance ( SchemaType type, XmlOptions options );
-    /** Parses an instance of the given type. */
-    public XmlObject parse ( String xmlText, SchemaType type, XmlOptions options ) throws XmlException;
-    /** Parses an instance of the given type. */
-    public XmlObject parse ( File file, SchemaType type, XmlOptions options ) throws XmlException, IOException;
-    /** Parses an instance of the given type. */
-    public XmlObject parse ( URL file, SchemaType type, XmlOptions options ) throws XmlException, IOException;
-    /** Parses an instance of the given type. */
-    public XmlObject parse ( InputStream jiois, SchemaType type, XmlOptions options ) throws XmlException, IOException;
-    /** Parses an instance of the given type. */
-    public XmlObject parse ( XMLStreamReader xsr, SchemaType type, XmlOptions options ) throws XmlException;
-    /** Parses an instance of the given type. */
-    public XmlObject parse ( Reader jior, SchemaType type, XmlOptions options ) throws XmlException, IOException;
-    /** Parses an instance of the given type. */
-    public XmlObject parse ( Node node, SchemaType type, XmlOptions options ) throws XmlException;
-    /** Parses an instance of the given type.
-     * @deprecated Deprecated by XMLStreamReader from STaX - jsr173 API.
-     */
-    public XmlObject parse ( XMLInputStream xis, SchemaType type, XmlOptions options ) throws XmlException, XMLStreamException;
-    /** Returns an XmlSaxHandler that can parse an instance of the given type. */
-    public XmlSaxHandler newXmlSaxHandler ( SchemaType type, XmlOptions options );
-    /** Returns a DOMImplementation. */
-    public DOMImplementation newDomImplementation ( XmlOptions options );
-    /** Returns a validating XMLInputStream that will throw an exception if the XML is not valid
-     * @deprecated Deprecated by XMLStreamReader from STaX - jsr173 API.
+ */
+public interface SchemaTypeLoader {
+    /**
+     * Returns the type with the given name, or null if none.
+     */
+    SchemaType findType(QName name);
+
+    /**
+     * Returns the document type rooted at the given element name, or null if none.
+     */
+    SchemaType findDocumentType(QName name);
+
+    /**
+     * Returns the attribute type containing the given attribute name, or null if none.
+     */
+    SchemaType findAttributeType(QName name);
+
+    /**
+     * Returns the global element defintion with the given name, or null if none.
+     */
+    SchemaGlobalElement findElement(QName name);
+
+    /**
+     * Returns the global attribute defintion with the given name, or null if none.
+     */
+    SchemaGlobalAttribute findAttribute(QName name);
+
+    /**
+     * Returns the model group defintion with the given name, or null if none.
+     */
+    SchemaModelGroup findModelGroup(QName name);
+
+    /**
+     * Returns the attribute group defintion with the given name, or null if none.
+     */
+    SchemaAttributeGroup findAttributeGroup(QName name);
+
+    /**
+     * True if the typeloader contains any definitions in the given namespace.
+     */
+    boolean isNamespaceDefined(String namespace);
+
+    /**
+     * Used for on-demand loading.
+     */
+    SchemaType.Ref findTypeRef(QName name);
+
+    /**
+     * Used for on-demand loading.
+     */
+    SchemaType.Ref findDocumentTypeRef(QName name);
+
+    /**
+     * Used for on-demand loading.
+     */
+    SchemaType.Ref findAttributeTypeRef(QName name);
+
+    /**
+     * Used for on-demand loading.
+     */
+    SchemaGlobalElement.Ref findElementRef(QName name);
+
+    /**
+     * Used for on-demand loading.
+     */
+    SchemaGlobalAttribute.Ref findAttributeRef(QName name);
+
+    /**
+     * Used for on-demand loading.
+     */
+    SchemaModelGroup.Ref findModelGroupRef(QName name);
+
+    /**
+     * Used for on-demand loading.
+     */
+    SchemaAttributeGroup.Ref findAttributeGroupRef(QName name);
+
+    /**
+     * Used for on-demand loading.
+     */
+    SchemaIdentityConstraint.Ref findIdentityConstraintRef(QName name);
+
+    /**
+     * Finds a type for a given signature string
+     */
+    SchemaType typeForSignature(String signature);
+
+    /**
+     * Finds a type for a given fully-qualified XML Bean classname
+     */
+    SchemaType typeForClassname(String classname);
+
+    /**
+     * Loads original XSD source as a stream.  See {@link SchemaType#getSourceName}.
+     */
+    InputStream getSourceAsStream(String sourceName);
+
+    /**
+     * Compiles an XPath
+     */
+    String compilePath(String pathExpr, XmlOptions options) throws XmlException;
+
+    /**
+     * Compiles an XQuery
+     */
+    String compileQuery(String queryExpr, XmlOptions options) throws XmlException;
+
+    /**
+     * Creates an instance of the given type.
+     */
+    XmlObject newInstance(SchemaType type, XmlOptions options);
+
+    /**
+     * Parses an instance of the given type.
+     */
+    XmlObject parse(String xmlText, SchemaType type, XmlOptions options) throws XmlException;
+
+    /**
+     * Parses an instance of the given type.
+     */
+    XmlObject parse(File file, SchemaType type, XmlOptions options) throws XmlException, IOException;
+
+    /**
+     * Parses an instance of the given type.
+     */
+    XmlObject parse(URL file, SchemaType type, XmlOptions options) throws XmlException, IOException;
+
+    /**
+     * Parses an instance of the given type.
+     */
+    XmlObject parse(InputStream jiois, SchemaType type, XmlOptions options) throws XmlException, IOException;
+
+    /**
+     * Parses an instance of the given type.
+     */
+    XmlObject parse(XMLStreamReader xsr, SchemaType type, XmlOptions options) throws XmlException;
+
+    /**
+     * Parses an instance of the given type.
+     */
+    XmlObject parse(Reader jior, SchemaType type, XmlOptions options) throws XmlException, IOException;
+
+    /**
+     * Parses an instance of the given type.
+     */
+    XmlObject parse(Node node, SchemaType type, XmlOptions options) throws XmlException;
+
+    /**
+     * Returns an XmlSaxHandler that can parse an instance of the given type.
+     */
+    XmlSaxHandler newXmlSaxHandler(SchemaType type, XmlOptions options);
+
+    /**
+     * Returns a DOMImplementation.
      */
-    public XMLInputStream newValidatingXMLInputStream ( XMLInputStream xis, SchemaType type, XmlOptions options ) throws XmlException, XMLStreamException;
+    DOMImplementation newDomImplementation(XmlOptions options);
 }

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java Thu Sep 17 00:04:39 2020
@@ -15,27 +15,28 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 /**
  * Corresponds to the XML Schema
  * <a target="_blank" href="http://www.w3.org/TR/xmlschema-1/#Simple_Type_Definition">xs:anySimpleType</a> type.
  * <p>
- * All simple types are convertible to {@link String}. 
- */ 
-public interface XmlAnySimpleType extends XmlObject
-{
-    /** The constant {@link SchemaType} object representing this schema type. */
-    public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_anySimpleType");
-    
+ * All simple types are convertible to {@link String}.
+ */
+public interface XmlAnySimpleType extends XmlObject {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_anySimpleType");
+
     /**
      * Returns the value as a {@link String}
+     *
      * @deprecated replaced by {@link #getStringValue}
      **/
     String stringValue();
+
     /**
      * Sets the value as a {@link String}
+     *
      * @deprecated replaced by {@link #setStringValue}
      **/
     void set(String s);
@@ -54,101 +55,129 @@ public interface XmlAnySimpleType extend
      * A class with methods for creating instances
      * of {@link XmlAnySimpleType}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlAnySimpleType} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlAnySimpleType}
+         */
         public static XmlAnySimpleType newInstance() {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().newInstance( type, null ); }
-        
-        /** Creates an empty instance of {@link XmlAnySimpleType} */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().newInstance(type, null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlAnySimpleType}
+         */
         public static XmlAnySimpleType newInstance(org.apache.xmlbeans.XmlOptions options) {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().newInstance( type, options ); }
-        
-        /** Creates an immutable {@link XmlAnySimpleType} value */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().newInstance(type, options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlAnySimpleType} value
+         */
         public static XmlAnySimpleType newValue(Object obj) {
-          return type.newValue( obj ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a String. For example: "<code>&lt;xml-fragment&gt;anything&lt;/xml-fragment&gt;</code>". */
+            return type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a String. For example: "<code>&lt;xml-fragment&gt;anything&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlAnySimpleType parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( s, type, null ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a String. For example: "<code>&lt;xml-fragment&gt;anything&lt;/xml-fragment&gt;</code>". */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(s, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a String. For example: "<code>&lt;xml-fragment&gt;anything&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlAnySimpleType parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( s, type, options ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a File. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(s, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a File.
+         */
         public static XmlAnySimpleType parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( f, type, null ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a File. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(f, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a File.
+         */
         public static XmlAnySimpleType parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( f, type, options ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a URL. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(f, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a URL.
+         */
         public static XmlAnySimpleType parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( u, type, null ); }
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(u, type, null);
+        }
 
-        /** Parses a {@link XmlAnySimpleType} fragment from a URL. */
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a URL.
+         */
         public static XmlAnySimpleType parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( u, type, options ); }
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(u, type, options);
+        }
 
-        /** Parses a {@link XmlAnySimpleType} fragment from an InputStream. */
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from an InputStream.
+         */
         public static XmlAnySimpleType parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( is, type, null ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from an InputStream. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(is, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from an InputStream.
+         */
         public static XmlAnySimpleType parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( is, type, options ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a Reader. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(is, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a Reader.
+         */
         public static XmlAnySimpleType parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( r, type, null ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a Reader. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(r, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a Reader.
+         */
         public static XmlAnySimpleType parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( r, type, options ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a DOM Node. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(r, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a DOM Node.
+         */
         public static XmlAnySimpleType parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( node, type, null ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from a DOM Node. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(node, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from a DOM Node.
+         */
         public static XmlAnySimpleType parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( node, type, options ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from an XMLInputStream.
-         * @deprecated Deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static XmlAnySimpleType parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( xis, type, null ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static XmlAnySimpleType parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( xis, type, options ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from an XMLStreamReader. */
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(node, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from an XMLStreamReader.
+         */
         public static XmlAnySimpleType parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); }
-        
-        /** Parses a {@link XmlAnySimpleType} fragment from an XMLStreamReader. */
-        public static XmlAnySimpleType parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{
-          return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse( xsr, type, options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnySimpleType} fragment from an XMLStreamReader.
+         */
+        public static XmlAnySimpleType parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
+            return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java Thu Sep 17 00:04:39 2020
@@ -15,119 +15,145 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 /**
  * Corresponds to the XML Schema
  * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#anyURI">xs:anyURI</a> type.
  * <p>
- * Convertible to {@link String}. 
- */ 
-public interface XmlAnyURI extends XmlAnySimpleType
-{
-    /** The constant {@link SchemaType} object representing this schema type. */
-    public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_anyURI");
-    
+ * Convertible to {@link String}.
+ */
+public interface XmlAnyURI extends XmlAnySimpleType {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_anyURI");
+
     /**
      * A class with methods for creating instances
      * of {@link XmlAnyURI}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlAnyURI} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlAnyURI}
+         */
         public static XmlAnyURI newInstance() {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().newInstance( type, null ); }
-        
-        /** Creates an empty instance of {@link XmlAnyURI} */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().newInstance(type, null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlAnyURI}
+         */
         public static XmlAnyURI newInstance(org.apache.xmlbeans.XmlOptions options) {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().newInstance( type, options ); }
-        
-        /** Creates an immutable {@link XmlAnyURI} value */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().newInstance(type, options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlAnyURI} value
+         */
         public static XmlAnyURI newValue(Object obj) {
-          return (XmlAnyURI) type.newValue( obj ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a String. For example: "<code>&lt;xml-fragment&gt;http://www.w3.org/&lt;/xml-fragment&gt;</code>". */
+            return (XmlAnyURI) type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a String. For example: "<code>&lt;xml-fragment&gt;http://www.w3.org/&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlAnyURI parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( s, type, null ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a String. For example: "<code>&lt;xml-fragment&gt;http://www.w3.org/&lt;/xml-fragment&gt;</code>". */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(s, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a String. For example: "<code>&lt;xml-fragment&gt;http://www.w3.org/&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlAnyURI parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( s, type, options ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a File. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(s, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a File.
+         */
         public static XmlAnyURI parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( f, type, null ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a File. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(f, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a File.
+         */
         public static XmlAnyURI parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( f, type, options ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a URL. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(f, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a URL.
+         */
         public static XmlAnyURI parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( u, type, null ); }
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(u, type, null);
+        }
 
-        /** Parses a {@link XmlAnyURI} fragment from a URL. */
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a URL.
+         */
         public static XmlAnyURI parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( u, type, options ); }
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(u, type, options);
+        }
 
-        /** Parses a {@link XmlAnyURI} fragment from an InputStream. */
+        /**
+         * Parses a {@link XmlAnyURI} fragment from an InputStream.
+         */
         public static XmlAnyURI parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( is, type, null ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from an InputStream. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(is, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from an InputStream.
+         */
         public static XmlAnyURI parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( is, type, options ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a Reader. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(is, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a Reader.
+         */
         public static XmlAnyURI parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( r, type, null ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a Reader. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(r, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a Reader.
+         */
         public static XmlAnyURI parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( r, type, options ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a DOM Node. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(r, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a DOM Node.
+         */
         public static XmlAnyURI parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( node, type, null ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from a DOM Node. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(node, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from a DOM Node.
+         */
         public static XmlAnyURI parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( node, type, options ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static XmlAnyURI parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( xis, type, null ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static XmlAnyURI parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( xis, type, options ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from an XMLStreamReader. */
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(node, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from an XMLStreamReader.
+         */
         public static XmlAnyURI parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); }
-        
-        /** Parses a {@link XmlAnyURI} fragment from an XMLStreamReader. */
-        public static XmlAnyURI parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{
-          return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse( xsr, type, options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlAnyURI} fragment from an XMLStreamReader.
+         */
+        public static XmlAnyURI parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
+            return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java Thu Sep 17 00:04:39 2020
@@ -15,35 +15,40 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 /**
  * Corresponds to the XML Schema
  * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#base64Binary">xs:base64Binary</a> type.
  * <p>
- * Convertible to a byte array. 
- */ 
-public interface XmlBase64Binary extends XmlAnySimpleType
-{
-    /** The constant {@link SchemaType} object representing this schema type. */
-    public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_base64Binary");
-    
+ * Convertible to a byte array.
+ */
+public interface XmlBase64Binary extends XmlAnySimpleType {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_base64Binary");
+
     /**
      * Returns this value as a byte array.
+     *
      * @deprecated replaced by {@link #getByteArrayValue}
      **/
     byte[] byteArrayValue();
 
     /**
      * Sets this value as a byte array.
+     *
      * @deprecated replaced by {@link #setByteArrayValue}
      **/
     void set(byte[] ba);
 
-    /** Returns this value as a byte array. **/
+    /**
+     * Returns this value as a byte array.
+     **/
     byte[] getByteArrayValue();
-    /** Sets this value as a byte array. */
+
+    /**
+     * Sets this value as a byte array.
+     */
     void setByteArrayValue(byte[] ba);
 
 
@@ -51,101 +56,129 @@ public interface XmlBase64Binary extends
      * A class with methods for creating instances
      * of {@link XmlBase64Binary}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlBase64Binary} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlBase64Binary}
+         */
         public static XmlBase64Binary newInstance() {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().newInstance( type, null ); }
-        
-        /** Creates an empty instance of {@link XmlBase64Binary} */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().newInstance(type, null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlBase64Binary}
+         */
         public static XmlBase64Binary newInstance(org.apache.xmlbeans.XmlOptions options) {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().newInstance( type, options ); }
-        
-        /** Creates an immutable {@link XmlBase64Binary} value */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().newInstance(type, options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlBase64Binary} value
+         */
         public static XmlBase64Binary newValue(Object obj) {
-          return (XmlBase64Binary) type.newValue( obj ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a String. For example: "<code>&lt;xml-fragment&gt;VGhpcyBzdHJp&lt;/xml-fragment&gt;</code>". */
+            return (XmlBase64Binary) type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a String. For example: "<code>&lt;xml-fragment&gt;VGhpcyBzdHJp&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlBase64Binary parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( s, type, null ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a String. For example: "<code>&lt;xml-fragment&gt;VGhpcyBzdHJp&lt;/xml-fragment&gt;</code>". */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(s, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a String. For example: "<code>&lt;xml-fragment&gt;VGhpcyBzdHJp&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlBase64Binary parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( s, type, options ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a File. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(s, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a File.
+         */
         public static XmlBase64Binary parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( f, type, null ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a File. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(f, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a File.
+         */
         public static XmlBase64Binary parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( f, type, options ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a URL. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(f, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a URL.
+         */
         public static XmlBase64Binary parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( u, type, null ); }
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(u, type, null);
+        }
 
-        /** Parses a {@link XmlBase64Binary} fragment from a URL. */
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a URL.
+         */
         public static XmlBase64Binary parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( u, type, options ); }
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(u, type, options);
+        }
 
-        /** Parses a {@link XmlBase64Binary} fragment from an InputStream. */
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from an InputStream.
+         */
         public static XmlBase64Binary parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( is, type, null ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from an InputStream. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(is, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from an InputStream.
+         */
         public static XmlBase64Binary parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( is, type, options ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a Reader. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(is, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a Reader.
+         */
         public static XmlBase64Binary parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( r, type, null ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a Reader. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(r, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a Reader.
+         */
         public static XmlBase64Binary parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( r, type, options ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a DOM Node. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(r, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a DOM Node.
+         */
         public static XmlBase64Binary parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( node, type, null ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from a DOM Node. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(node, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from a DOM Node.
+         */
         public static XmlBase64Binary parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( node, type, options ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static XmlBase64Binary parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( xis, type, null ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static XmlBase64Binary parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( xis, type, options ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from an XMLStreamReader. */
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(node, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from an XMLStreamReader.
+         */
         public static XmlBase64Binary parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); }
-        
-        /** Parses a {@link XmlBase64Binary} fragment from an XMLStreamReader. */
-        public static XmlBase64Binary parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{
-          return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse( xsr, type, options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlBase64Binary} fragment from an XMLStreamReader.
+         */
+        public static XmlBase64Binary parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
+            return (XmlBase64Binary) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message