From c8d1de91c950a80508e23b791c475bca9b377616 Mon Sep 17 00:00:00 2001

From: Mat Booth <mat.booth@redhat.com>

Date: Fri, 10 May 2019 10:40:17 +0100

Subject: [PATCH 1/2] Avoid unnecessary dep on istack-commons

---

 core/pom.xml                                  |   6 +-

 .../sun/xml/bind/marshaller/SAX2DOMEx.java    |   4 +-

 .../v2/model/annotation/AnnotationReader.java |   4 -

 .../xml/bind/v2/model/core/PropertyInfo.java  |   3 +-

 .../java/com/sun/xml/bind/api/Bridge.java     |  54 ++++----

 .../com/sun/xml/bind/api/ClassResolver.java   |   4 +-

 .../com/sun/xml/bind/api/JAXBRIContext.java   |  52 ++++---

 .../com/sun/xml/bind/v2/ContextFactory.java   |   6 +-

 .../v2/model/impl/ByteArrayDataSource.java    |  95 +++++++++++++

 .../xml/bind/v2/model/impl/ClassInfoImpl.java |   8 +-

 .../bind/v2/model/impl/ElementInfoImpl.java   |   6 +-

 .../model/impl/ElementPropertyInfoImpl.java   |   4 +-

 .../impl/RuntimeBuiltinLeafInfoImpl.java      |   1 -

 .../v2/model/impl/RuntimeClassInfoImpl.java   |   3 +-

 .../v2/model/impl/RuntimeModelBuilder.java    |   3 +-

 .../xml/bind/v2/runtime/BridgeAdapter.java    |  11 +-

 .../sun/xml/bind/v2/runtime/BridgeImpl.java   |   9 +-

 .../bind/v2/runtime/ClassBeanInfoImpl.java    |   6 +-

 .../v2/runtime/ContentHandlerAdaptor.java     |  14 +-

 .../xml/bind/v2/runtime/FilterTransducer.java |   3 +-

 .../v2/runtime/InlineBinaryTransducer.java    |   3 +-

 .../xml/bind/v2/runtime/JAXBContextImpl.java  |  16 +--

 .../sun/xml/bind/v2/runtime/JaxBeanInfo.java  |   3 +-

 .../bind/v2/runtime/NamespaceContext2.java    |   3 +-

 .../com/sun/xml/bind/v2/runtime/Pool.java     | 131 ++++++++++++++++++

 .../sun/xml/bind/v2/runtime/Transducer.java   |   7 +-

 .../v2/runtime/ValueListBeanInfoImpl.java     |   4 +-

 .../xml/bind/v2/runtime/XMLSerializer.java    |  12 +-

 .../bind/v2/runtime/output/C14nXmlOutput.java |   4 +-

 .../runtime/output/NamespaceContextImpl.java  |   6 +-

 .../xml/bind/v2/runtime/reflect/Accessor.java |   3 +-

 .../xml/bind/v2/runtime/reflect/Lister.java   |   4 +-

 .../runtime/reflect/TransducedAccessor.java   |  10 +-

 .../v2/runtime/unmarshaller/Base64Data.java   |   7 +-

 .../unmarshaller/UnmarshallingContext.java    |  12 +-

 .../runtime/unmarshaller/XsiTypeLoader.java   |   3 +-

 .../bind/v2/schemagen/XmlSchemaGenerator.java |   6 +-

 37 files changed, 359 insertions(+), 171 deletions(-)

 create mode 100644 runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java

 create mode 100644 runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java

diff --git a/core/pom.xml b/core/pom.xml

index 10be5d6..6330d8a 100644

--- a/core/pom.xml

+++ b/core/pom.xml

@@ -67,10 +67,6 @@ holder.

             <artifactId>txw2</artifactId>

             <version>${project.version}</version>

         </dependency>

-        <dependency>

-            <groupId>com.sun.istack</groupId>

-            <artifactId>istack-commons-runtime</artifactId>

-        </dependency>

     </dependencies>

-</project>

\ No newline at end of file

+</project>

diff --git a/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java b/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java

index fd63b6b..0b97a47 100644

--- a/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java

+++ b/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java

@@ -46,7 +46,7 @@ import javax.xml.parsers.DocumentBuilderFactory;

 import javax.xml.parsers.ParserConfigurationException;

 import com.sun.xml.bind.util.Which;

-import com.sun.istack.FinalArrayList;

+import java.util.ArrayList;

 import com.sun.xml.bind.v2.util.XmlFactory;

 import org.w3c.dom.Document;

@@ -68,7 +68,7 @@ public class SAX2DOMEx implements ContentHandler {

     private Node node = null;

     private boolean isConsolidate;

     protected final Stack<Node> nodeStack = new Stack<Node>();

-    private final FinalArrayList<String> unprocessedNamespaces = new FinalArrayList<String>();

+    private final ArrayList<String> unprocessedNamespaces = new ArrayList<String>();

     /**

      * Document object that owns the specified node.

      */

diff --git a/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java b/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java

index 744d806..a5e5623 100644

--- a/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java

+++ b/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java

@@ -44,7 +44,6 @@ import java.lang.annotation.Annotation;

 import java.lang.reflect.Field;

 import java.lang.reflect.Method;

-import com.sun.istack.Nullable;

 import com.sun.xml.bind.v2.model.core.ErrorHandler;

 /**

@@ -140,20 +139,17 @@ public interface AnnotationReader<T,C,F,M> {

      * @return null

      *      if the annotation was not found.

      */

-    @Nullable

      A getMethodParameterAnnotation(

             Class annotation, M method, int paramIndex, Locatable srcPos );

     /**

      * Reads an annotation on a class.

      */

-    @Nullable

      A getClassAnnotation(Class annotation, C clazz, Locatable srcpos) ;

     /**

      * Reads an annotation on the package that the given class belongs to.

      */

-    @Nullable

      A getPackageAnnotation(Class annotation, C clazz, Locatable srcpos);

     /**

diff --git a/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java b/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java

index badcdd6..f483fea 100644

--- a/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java

+++ b/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java

@@ -49,7 +49,6 @@ import javax.xml.bind.annotation.XmlType;

 import javax.xml.bind.annotation.XmlSchemaType;

 import javax.xml.namespace.QName;

-import com.sun.istack.Nullable;

 import com.sun.xml.bind.v2.model.annotation.AnnotationSource;

 /**

@@ -163,5 +162,5 @@ public interface PropertyInfo<T,C> extends AnnotationSource {

      * when this returns non-null, it overrides the type names of all types

      * that are in this property.)

      */

-    @Nullable QName getSchemaType();

+    QName getSchemaType();

 }

diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java

index 23a688b..e7aba9e 100644

--- a/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java

+++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java

@@ -54,8 +54,6 @@ import javax.xml.stream.XMLStreamWriter;

 import javax.xml.transform.Result;

 import javax.xml.transform.Source;

-import com.sun.istack.NotNull;

-import com.sun.istack.Nullable;

 import com.sun.xml.bind.v2.runtime.BridgeContextImpl;

 import com.sun.xml.bind.v2.runtime.JAXBContextImpl;

@@ -91,7 +89,7 @@ public abstract class Bridge<T> {

      *

      * @since 2.1

      */

-    public @NotNull JAXBRIContext getContext() {

+    public  JAXBRIContext getContext() {

         return context;

     }

@@ -113,11 +111,11 @@ public abstract class Bridge<T> {

         context.marshallerPool.recycle(m);

     }

-    public final void marshal(@NotNull BridgeContext context,T object,XMLStreamWriter output) throws JAXBException {

+    public final void marshal( BridgeContext context,T object,XMLStreamWriter output) throws JAXBException {

         marshal( ((BridgeContextImpl)context).marshaller, object, output );

     }

-    public abstract void marshal(@NotNull Marshaller m,T object,XMLStreamWriter output) throws JAXBException;

+    public abstract void marshal( Marshaller m,T object,XMLStreamWriter output) throws JAXBException;

     /**

@@ -147,11 +145,11 @@ public abstract class Bridge<T> {

         context.marshallerPool.recycle(m);

     }

-    public final void marshal(@NotNull BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException {

+    public final void marshal( BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException {

         marshal( ((BridgeContextImpl)context).marshaller, object, output, nsContext );

     }

-    public abstract void marshal(@NotNull Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException;

+    public abstract void marshal( Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException;

     public final void marshal(T object,Node output) throws JAXBException {

@@ -160,11 +158,11 @@ public abstract class Bridge<T> {

         context.marshallerPool.recycle(m);

     }

-    public final void marshal(@NotNull BridgeContext context,T object,Node output) throws JAXBException {

+    public final void marshal( BridgeContext context,T object,Node output) throws JAXBException {

         marshal( ((BridgeContextImpl)context).marshaller, object, output );

     }

-    public abstract void marshal(@NotNull Marshaller m,T object,Node output) throws JAXBException;

+    public abstract void marshal( Marshaller m,T object,Node output) throws JAXBException;

     /**

@@ -183,10 +181,10 @@ public abstract class Bridge<T> {

         m.setAttachmentMarshaller(null);

         context.marshallerPool.recycle(m);

     }

-    public final void marshal(@NotNull BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException {

+    public final void marshal( BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException {

         marshal( ((BridgeContextImpl)context).marshaller, object, contentHandler );

     }

-    public abstract void marshal(@NotNull Marshaller m,T object, ContentHandler contentHandler) throws JAXBException;

+    public abstract void marshal( Marshaller m,T object, ContentHandler contentHandler) throws JAXBException;

     /**

      * @since 2.0 EA4

@@ -196,10 +194,10 @@ public abstract class Bridge<T> {

         marshal(m,object,result);

         context.marshallerPool.recycle(m);

     }

-    public final void marshal(@NotNull BridgeContext context,T object, Result result) throws JAXBException {

+    public final void marshal( BridgeContext context,T object, Result result) throws JAXBException {

         marshal( ((BridgeContextImpl)context).marshaller, object, result );

     }

-    public abstract void marshal(@NotNull Marshaller m,T object, Result result) throws JAXBException;

+    public abstract void marshal( Marshaller m,T object, Result result) throws JAXBException;

@@ -225,21 +223,21 @@ public abstract class Bridge<T> {

      *

      * @since 2.0 EA1

      */

-    public final @NotNull T unmarshal(@NotNull XMLStreamReader in) throws JAXBException {

+    public final  T unmarshal( XMLStreamReader in) throws JAXBException {

         return unmarshal(in,null);

     }

     /**

      * @since 2.0.3

      */

-    public final @NotNull T unmarshal(@NotNull XMLStreamReader in, @Nullable AttachmentUnmarshaller au) throws JAXBException {

+    public final  T unmarshal( XMLStreamReader in,  AttachmentUnmarshaller au) throws JAXBException {

         Unmarshaller u = context.unmarshallerPool.take();

         u.setAttachmentUnmarshaller(au);

         return exit(unmarshal(u,in),u);

     }

-    public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull XMLStreamReader in) throws JAXBException {

+    public final  T unmarshal( BridgeContext context,  XMLStreamReader in) throws JAXBException {

         return unmarshal( ((BridgeContextImpl)context).unmarshaller, in );

     }

-    public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull XMLStreamReader in) throws JAXBException;

+    public abstract  T unmarshal( Unmarshaller u,  XMLStreamReader in) throws JAXBException;

     /**

      * Unmarshals the specified type object.

@@ -257,21 +255,21 @@ public abstract class Bridge<T> {

      *

      * @since 2.0 EA1

      */

-    public final @NotNull T unmarshal(@NotNull Source in) throws JAXBException {

+    public final  T unmarshal( Source in) throws JAXBException {

         return unmarshal(in,null);

     }

     /**

      * @since 2.0.3

      */

-    public final @NotNull T unmarshal(@NotNull Source in, @Nullable AttachmentUnmarshaller au) throws JAXBException {

+    public final  T unmarshal( Source in,  AttachmentUnmarshaller au) throws JAXBException {

         Unmarshaller u = context.unmarshallerPool.take();

         u.setAttachmentUnmarshaller(au);

         return exit(unmarshal(u,in),u);

     }

-    public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Source in) throws JAXBException {

+    public final  T unmarshal( BridgeContext context,  Source in) throws JAXBException {

         return unmarshal( ((BridgeContextImpl)context).unmarshaller, in );

     }

-    public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull Source in) throws JAXBException;

+    public abstract  T unmarshal( Unmarshaller u,  Source in) throws JAXBException;

     /**

      * Unmarshals the specified type object.

@@ -289,14 +287,14 @@ public abstract class Bridge<T> {

      *

      * @since 2.0 EA1

      */

-    public final @NotNull T unmarshal(@NotNull InputStream in) throws JAXBException {

+    public final  T unmarshal( InputStream in) throws JAXBException {

         Unmarshaller u = context.unmarshallerPool.take();

         return exit(unmarshal(u,in),u);

     }

-    public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull InputStream in) throws JAXBException {

+    public final  T unmarshal( BridgeContext context,  InputStream in) throws JAXBException {

         return unmarshal( ((BridgeContextImpl)context).unmarshaller, in );

     }

-    public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull InputStream in) throws JAXBException;

+    public abstract  T unmarshal( Unmarshaller u,  InputStream in) throws JAXBException;

     /**

      * Unmarshals the specified type object.

@@ -312,21 +310,21 @@ public abstract class Bridge<T> {

      *

      * @since 2.0 FCS

      */

-    public final @NotNull T unmarshal(@NotNull Node n) throws JAXBException {

+    public final  T unmarshal( Node n) throws JAXBException {

         return unmarshal(n,null);

     }

     /**

      * @since 2.0.3

      */

-    public final @NotNull T unmarshal(@NotNull Node n, @Nullable AttachmentUnmarshaller au) throws JAXBException {

+    public final  T unmarshal( Node n,  AttachmentUnmarshaller au) throws JAXBException {

         Unmarshaller u = context.unmarshallerPool.take();

         u.setAttachmentUnmarshaller(au);

         return exit(unmarshal(u,n),u);

     }

-    public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Node n) throws JAXBException {

+    public final  T unmarshal( BridgeContext context,  Node n) throws JAXBException {

         return unmarshal( ((BridgeContextImpl)context).unmarshaller, n );

     }

-    public abstract @NotNull T unmarshal(@NotNull Unmarshaller context, @NotNull Node n) throws JAXBException;

+    public abstract  T unmarshal( Unmarshaller context,  Node n) throws JAXBException;

     /**

      * Gets the {@link TypeReference} from which this bridge was created.

diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java

index 37bbf61..659f5a3 100644

--- a/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java

+++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java

@@ -45,8 +45,6 @@ import javax.xml.bind.Unmarshaller;

 import javax.xml.bind.ValidationEventHandler;

 import javax.xml.bind.annotation.XmlAnyElement;

-import com.sun.istack.NotNull;

-import com.sun.istack.Nullable;

 /**

  * Dynamically locates classes to represent elements discovered during the unmarshalling.

@@ -115,5 +113,5 @@ public abstract class ClassResolver {

      *      reproted to {@link ValidationEventHandler} (just like any other error

      *      during the unmarshalling.)

      */

-    public abstract @Nullable Class resolveElementName(@NotNull String nsUri, @NotNull String localName) throws Exception;

+    public abstract  Class resolveElementName( String nsUri,  String localName) throws Exception;

 }

diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java

index 05a2b4d..814b291 100644

--- a/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java

+++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java

@@ -55,8 +55,6 @@ import javax.xml.bind.annotation.XmlAttachmentRef;

 import javax.xml.namespace.QName;

 import javax.xml.transform.Result;

-import com.sun.istack.NotNull;

-import com.sun.istack.Nullable;

 import com.sun.xml.bind.api.impl.NameConverter;

 import com.sun.xml.bind.v2.ContextFactory;

 import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader;

@@ -103,11 +101,11 @@ public abstract class JAXBRIContext extends JAXBContext {

      *      Can be null.

      * @since JAXB 2.1 EA2

      */

-    public static JAXBRIContext newInstance(@NotNull Class[] classes,

-       @Nullable Collection<TypeReference> typeRefs,

-       @Nullable Map<Class,Class> subclassReplacements,

-       @Nullable String defaultNamespaceRemap, boolean c14nSupport,

-       @Nullable RuntimeAnnotationReader ar) throws JAXBException {

+    public static JAXBRIContext newInstance( Class[] classes,

+        Collection<TypeReference> typeRefs,

+        Map<Class,Class> subclassReplacements,

+        String defaultNamespaceRemap, boolean c14nSupport,

+        RuntimeAnnotationReader ar) throws JAXBException {

         return newInstance(classes, typeRefs, subclassReplacements,

                 defaultNamespaceRemap, c14nSupport, ar, false, false, false, false);

     }

@@ -145,11 +143,11 @@ public abstract class JAXBRIContext extends JAXBContext {

      * @param supressAccessorWarnings

      *      See {@link #SUPRESS_ACCESSOR_WARNINGS} for the meaning of this parameter.

      */

-    public static JAXBRIContext newInstance(@NotNull Class[] classes,

-       @Nullable Collection<TypeReference> typeRefs,

-       @Nullable Map<Class,Class> subclassReplacements,

-       @Nullable String defaultNamespaceRemap, boolean c14nSupport,

-       @Nullable RuntimeAnnotationReader ar,

+    public static JAXBRIContext newInstance( Class[] classes,

+        Collection<TypeReference> typeRefs,

+        Map<Class,Class> subclassReplacements,

+        String defaultNamespaceRemap, boolean c14nSupport,

+        RuntimeAnnotationReader ar,

        boolean xmlAccessorFactorySupport, 

        boolean allNillable, 

        boolean retainPropertyInfo, 

@@ -171,9 +169,9 @@ public abstract class JAXBRIContext extends JAXBContext {

      * @deprecated

      *      Compatibility with older versions.

      */

-    public static JAXBRIContext newInstance(@NotNull Class[] classes,

-        @Nullable Collection<TypeReference> typeRefs,

-        @Nullable String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException {

+    public static JAXBRIContext newInstance( Class[] classes,

+         Collection<TypeReference> typeRefs,

+         String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException {

         return newInstance(classes,typeRefs, Collections.<Class,Class>emptyMap(),

                 defaultNamespaceRemap,c14nSupport,null);

     }

@@ -197,7 +195,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      *

      * @since 2.0 EA1

      */

-    public abstract @Nullable QName getElementName(@NotNull Object o) throws JAXBException;

+    public abstract  QName getElementName( Object o) throws JAXBException;

     /**

      * Allows to retrieve the element name based on Class.

@@ -206,7 +204,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      * @throws javax.xml.bind.JAXBException

      * @since 2.1.10

      */

-    public abstract @Nullable QName getElementName(@NotNull Class o) throws JAXBException;

+    public abstract  QName getElementName( Class o) throws JAXBException;

     /**

      * Creates a mini-marshaller/unmarshaller that can process a {@link TypeReference}.

@@ -216,7 +214,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      *

      * @since 2.0 EA1

      */

-    public abstract Bridge createBridge(@NotNull TypeReference ref);

+    public abstract Bridge createBridge( TypeReference ref);

     /**

      * Creates a new {@link BridgeContext} instance.

@@ -226,7 +224,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      *

      * @since 2.0 EA1

      */

-    public abstract @NotNull BridgeContext createBridgeContext();

+    public abstract  BridgeContext createBridgeContext();

     /**

      * Gets a {@link RawAccessor} for the specified element property of the specified wrapper bean class.

@@ -274,7 +272,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      *

      * @since 2.0 EA2

      */

-    public abstract @NotNull List<String> getKnownNamespaceURIs();

+    public abstract  List<String> getKnownNamespaceURIs();

     /**

@@ -302,7 +300,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      *      if {@link SchemaOutputResolver} throws an {@link IOException}.

      */

     @Override

-    public abstract void generateSchema(@NotNull SchemaOutputResolver outputResolver) throws IOException;

+    public abstract void generateSchema( SchemaOutputResolver outputResolver) throws IOException;

     /**

      * Returns the name of the XML Type bound to the

@@ -319,7 +317,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      * @return null

      *      if the referenced type is an anonymous and therefore doesn't have a name.

      */

-    public abstract QName getTypeName(@NotNull TypeReference tr);

+    public abstract QName getTypeName( TypeReference tr);

     /**

      * Gets the build information of the JAXB runtime.

@@ -328,7 +326,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      *      may be null, if the runtime is loaded by a class loader that doesn't support

      *      the access to the manifest informatino.

      */

-    public abstract @NotNull String getBuildId();

+    public abstract  String getBuildId();

     /**

      * Generates the episode file that represents the binding known to this {@link JAXBContext},

@@ -372,7 +370,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      * @return

      *      Typically, this method returns "nameLikeThis".

      */

-    public static @NotNull String mangleNameToVariableName(@NotNull String localName) {

+    public static  String mangleNameToVariableName( String localName) {

         return NameConverter.standard.toVariableName(localName);

     }

@@ -385,7 +383,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      * @return

      *      Typically, this method returns "NameLikeThis".

      */

-    public static @NotNull String mangleNameToClassName(@NotNull String localName) {

+    public static  String mangleNameToClassName( String localName) {

         return NameConverter.standard.toClassName(localName);

     }

@@ -400,7 +398,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      * @return

      *      Typically, this method returns "NameLikeThis".

      */

-    public static @NotNull String mangleNameToPropertyName(@NotNull String localName) {

+    public static  String mangleNameToPropertyName( String localName) {

         return NameConverter.standard.toPropertyName(localName);

     }

@@ -430,7 +428,7 @@ public abstract class JAXBRIContext extends JAXBContext {

      *      or null if the type is not assignable to the base type.

      * @since 2.0 FCS

      */

-    public static @Nullable Type getBaseType(@NotNull Type type, @NotNull Class baseType) {

+    public static  Type getBaseType( Type type,  Class baseType) {

         return Utils.REFLECTION_NAVIGATOR.getBaseClass(type, baseType);

     }

diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java

index 94dce69..879dedb 100644

--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java

+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java

@@ -55,7 +55,7 @@ import java.util.logging.Level;

 import javax.xml.bind.JAXBContext;

 import javax.xml.bind.JAXBException;

-import com.sun.istack.FinalArrayList;

+import java.util.ArrayList;

 import com.sun.xml.bind.Util;

 import com.sun.xml.bind.api.JAXBRIContext;

 import com.sun.xml.bind.api.TypeReference;

@@ -243,7 +243,7 @@ public class ContextFactory {

      */

     public static JAXBContext createContext( String contextPath,

                                              ClassLoader classLoader, Map<String,Object> properties ) throws JAXBException {

-        FinalArrayList<Class> classes = new FinalArrayList<Class>();

+        ArrayList<Class> classes = new ArrayList<Class>();

         StringTokenizer tokens = new StringTokenizer(contextPath,":");

         List<Class> indexedClasses;

@@ -306,7 +306,7 @@ public class ContextFactory {

         BufferedReader in =

                 new BufferedReader(new InputStreamReader(resourceAsStream, "UTF-8"));

         try {

-            FinalArrayList<Class> classes = new FinalArrayList<Class>();

+            ArrayList<Class> classes = new ArrayList<Class>();

             String className = in.readLine();

             while (className != null) {

                 className = className.trim();

diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java

new file mode 100644

index 0000000..9c46637

--- /dev/null

+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java

@@ -0,0 +1,95 @@

+/*

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

+ *

+ * Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved.

+ *

+ * The contents of this file are subject to the terms of either the GNU

+ * General Public License Version 2 only ("GPL") or the Common Development

+ * and Distribution License("CDDL") (collectively, the "License").  You

+ * may not use this file except in compliance with the License.  You can

+ * obtain a copy of the License at

+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html

+ * or packager/legal/LICENSE.txt.  See the License for the specific

+ * language governing permissions and limitations under the License.

+ *

+ * When distributing the software, include this License Header Notice in each

+ * file and include the License file at packager/legal/LICENSE.txt.

+ *

+ * GPL Classpath Exception:

+ * Oracle designates this particular file as subject to the "Classpath"

+ * exception as provided by Oracle in the GPL Version 2 section of the License

+ * file that accompanied this code.

+ *

+ * Modifications:

+ * If applicable, add the following below the License Header, with the fields

+ * enclosed by brackets [] replaced by your own identifying information:

+ * "Portions Copyright [year] [name of copyright owner]"

+ *

+ * Contributor(s):

+ * If you wish your version of this file to be governed by only the CDDL or

+ * only the GPL Version 2, indicate your decision by adding "[Contributor]

+ * elects to include this software in this distribution under the [CDDL or GPL

+ * Version 2] license."  If you don't indicate a single choice of license, a

+ * recipient has the option to distribute your version of this file under

+ * either the CDDL, the GPL Version 2 or to extend the choice of license to

+ * its licensees as provided above.  However, if you add GPL Version 2 code

+ * and therefore, elected the GPL Version 2 license, then the option applies

+ * only if the new code is made subject to such option by the copyright

+ * holder.

+ */

+

+package com.sun.xml.bind.v2.model.impl;

+

+import javax.activation.DataSource;

+import java.io.InputStream;

+import java.io.ByteArrayInputStream;

+import java.io.OutputStream;

+

+/**

+ * {@link DataSource} backed by a byte buffer.

+ *

+ * @author Kohsuke Kawaguchi

+ */

+public final class ByteArrayDataSource implements DataSource {

+

+    private final String contentType;

+    private final byte[] buf;

+    private final int len;

+

+    /**

+     * @param buf input buffer - the byte array isn't being copied; used directly

+     * @param contentType

+     */

+    public ByteArrayDataSource(byte[] buf, String contentType) {

+        this(buf,buf.length,contentType);

+    }

+

+    /**

+     * @param buf input buffer - the byte array isn't being copied; used directly

+     * @param length

+     * @param contentType

+     */

+    public ByteArrayDataSource(byte[] buf, int length, String contentType) {

+        this.buf = buf;

+        this.len = length;

+        this.contentType = contentType;

+    }

+

+    public String getContentType() {

+        if(contentType==null)

+            return "application/octet-stream";

+        return contentType;

+    }

+

+    public InputStream getInputStream() {

+        return new ByteArrayInputStream(buf,0,len);

+    }

+

+    public String getName() {

+        return null;

+    }

+

+    public OutputStream getOutputStream() {

+        throw new UnsupportedOperationException();

+    }

+}

diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java

index 7b092a5..d6dd439 100644

--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java

+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java

@@ -82,7 +82,7 @@ import javax.xml.bind.annotation.XmlValue;

 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;

 import javax.xml.namespace.QName;

-import com.sun.istack.FinalArrayList;

+import java.util.ArrayList;

 import com.sun.xml.bind.annotation.OverrideAnnotationOf;

 import com.sun.xml.bind.v2.model.annotation.Locatable;

 import com.sun.xml.bind.v2.model.annotation.MethodLocatable;

@@ -124,7 +124,7 @@ public class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>

      *

      * @see #getProperties()

      */

-    private FinalArrayList<PropertyInfoImpl<T,C,F,M>> properties;

+    private ArrayList<PropertyInfoImpl<T,C,F,M>> properties;

     /**

      * The property order.

@@ -306,7 +306,7 @@ public class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>

         // check the access type first

         XmlAccessType at = getAccessType();

-        properties = new FinalArrayList<PropertyInfoImpl<T,C,F,M>>();

+        properties = new ArrayList<PropertyInfoImpl<T,C,F,M>>();

         findFieldProperties(clazz,at);

@@ -579,7 +579,7 @@ public class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>

     }

     private static <T> List<T> makeSet( T... args ) {

-        List<T> l = new FinalArrayList<T>();

+        List<T> l = new ArrayList<T>();

         for( T arg : args )

             if(arg!=null)   l.add(arg);

         return l;

diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java

index f20bf49..28994b5 100644

--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java

+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java

@@ -56,7 +56,7 @@ import javax.xml.bind.annotation.XmlSchema;

 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;

 import javax.xml.namespace.QName;

-import com.sun.istack.FinalArrayList;

+import java.util.ArrayList;

 import com.sun.xml.bind.v2.TODO;

 import com.sun.xml.bind.v2.model.annotation.AnnotationSource;

 import com.sun.xml.bind.v2.model.annotation.Locatable;

@@ -107,7 +107,7 @@ class ElementInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M> implements ElementI

      * This could be null.

      * @see #link()

      */

-    private FinalArrayList<ElementInfoImpl<T,C,F,M>> substitutionMembers;

+    private ArrayList<ElementInfoImpl<T,C,F,M>> substitutionMembers;

     /**

      * The factory method from which this mapping was created.

@@ -435,7 +435,7 @@ class ElementInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M> implements ElementI

     private void addSubstitutionMember(ElementInfoImpl<T,C,F,M> child) {

         if(substitutionMembers==null)

-            substitutionMembers = new FinalArrayList<ElementInfoImpl<T,C,F,M>>();

+            substitutionMembers = new ArrayList<ElementInfoImpl<T,C,F,M>>();

         substitutionMembers.add(child);

     }

diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java

index 4a0169e..3693240 100644

--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java