Fri, 22 Nov 2013 21:11:19 +0100
8010935: Better XML handling
8027378: Two closed/javax/xml/8005432 fails with jdk7u51b04
8028382: Two javax/xml/8005433 tests still fail after the fix JDK-8028147
Summary: base fix + fixes for test regressions; fix also reviewed by Maxim Soloviev, Alexander Fomin
Reviewed-by: mchung, mgrebac, mullan
ohair@286 | 1 | /* |
alanb@368 | 2 | * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
ohair@286 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ohair@286 | 4 | * |
ohair@286 | 5 | * This code is free software; you can redistribute it and/or modify it |
ohair@286 | 6 | * under the terms of the GNU General Public License version 2 only, as |
ohair@286 | 7 | * published by the Free Software Foundation. Oracle designates this |
ohair@286 | 8 | * particular file as subject to the "Classpath" exception as provided |
ohair@286 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
ohair@286 | 10 | * |
ohair@286 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
ohair@286 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ohair@286 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ohair@286 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
ohair@286 | 15 | * accompanied this code). |
ohair@286 | 16 | * |
ohair@286 | 17 | * You should have received a copy of the GNU General Public License version |
ohair@286 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
ohair@286 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ohair@286 | 20 | * |
ohair@286 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ohair@286 | 22 | * or visit www.oracle.com if you need additional information or have any |
ohair@286 | 23 | * questions. |
ohair@286 | 24 | */ |
ohair@286 | 25 | |
ohair@286 | 26 | package com.sun.xml.internal.ws.spi.db; |
ohair@286 | 27 | |
ohair@286 | 28 | import java.io.InputStream; |
ohair@286 | 29 | import java.io.OutputStream; |
ohair@286 | 30 | |
ohair@286 | 31 | import javax.xml.bind.JAXBException; |
ohair@286 | 32 | import javax.xml.bind.Marshaller; |
ohair@286 | 33 | import javax.xml.bind.Unmarshaller; |
ohair@286 | 34 | import javax.xml.bind.attachment.AttachmentMarshaller; |
ohair@286 | 35 | import javax.xml.bind.attachment.AttachmentUnmarshaller; |
ohair@286 | 36 | import javax.xml.namespace.NamespaceContext; |
ohair@286 | 37 | import javax.xml.stream.XMLStreamReader; |
ohair@286 | 38 | import javax.xml.stream.XMLStreamWriter; |
ohair@286 | 39 | import javax.xml.transform.Result; |
ohair@286 | 40 | import javax.xml.transform.Source; |
ohair@286 | 41 | |
ohair@286 | 42 | import com.sun.istack.internal.NotNull; |
ohair@286 | 43 | import com.sun.istack.internal.Nullable; |
ohair@286 | 44 | import com.sun.xml.internal.bind.api.BridgeContext; |
ohair@286 | 45 | import com.sun.xml.internal.bind.v2.runtime.BridgeContextImpl; |
ohair@286 | 46 | import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl; |
ohair@286 | 47 | |
ohair@286 | 48 | import org.w3c.dom.Node; |
ohair@286 | 49 | import org.xml.sax.ContentHandler; |
ohair@286 | 50 | |
ohair@286 | 51 | /** |
ohair@286 | 52 | * Mini-marshaller/unmarshaller that is specialized for a particular |
ohair@286 | 53 | * element name and a type. |
ohair@286 | 54 | * |
ohair@286 | 55 | * <p> |
ohair@286 | 56 | * Instances of this class is stateless and multi-thread safe. |
ohair@286 | 57 | * They are reentrant. |
ohair@286 | 58 | * |
ohair@286 | 59 | * <p> |
ohair@286 | 60 | * All the marshal operation generates fragments. |
ohair@286 | 61 | * |
ohair@286 | 62 | * <p> |
ohair@286 | 63 | * <b>Subject to change without notice</b>. |
ohair@286 | 64 | * |
ohair@286 | 65 | * @since JAXB 2.0 EA1 |
ohair@286 | 66 | * @author Kohsuke Kawaguchi |
ohair@286 | 67 | */ |
ohair@286 | 68 | public abstract class OldBridge<T> { |
ohair@286 | 69 | protected OldBridge(JAXBContextImpl context) { |
ohair@286 | 70 | this.context = context; |
ohair@286 | 71 | } |
ohair@286 | 72 | |
ohair@286 | 73 | protected final JAXBContextImpl context; |
ohair@286 | 74 | |
ohair@286 | 75 | /** |
ohair@286 | 76 | * Gets the {@link BindingContext} to which this object belongs. |
ohair@286 | 77 | * |
ohair@286 | 78 | * @since 2.1 |
ohair@286 | 79 | */ |
ohair@286 | 80 | public @NotNull BindingContext getContext() { |
ohair@286 | 81 | // return context; |
ohair@286 | 82 | return null; |
ohair@286 | 83 | } |
ohair@286 | 84 | |
ohair@286 | 85 | /** |
ohair@286 | 86 | * |
ohair@286 | 87 | * @throws JAXBException |
ohair@286 | 88 | * if there was an error while marshalling. |
ohair@286 | 89 | * |
ohair@286 | 90 | * @since 2.0 EA1 |
ohair@286 | 91 | */ |
ohair@286 | 92 | public final void marshal(T object,XMLStreamWriter output) throws JAXBException { |
ohair@286 | 93 | marshal(object,output,null); |
ohair@286 | 94 | } |
ohair@286 | 95 | public final void marshal(T object,XMLStreamWriter output, AttachmentMarshaller am) throws JAXBException { |
ohair@286 | 96 | Marshaller m = context.marshallerPool.take(); |
ohair@286 | 97 | m.setAttachmentMarshaller(am); |
ohair@286 | 98 | marshal(m,object,output); |
ohair@286 | 99 | m.setAttachmentMarshaller(null); |
ohair@286 | 100 | context.marshallerPool.recycle(m); |
ohair@286 | 101 | } |
ohair@286 | 102 | |
ohair@286 | 103 | public final void marshal(@NotNull BridgeContext context,T object,XMLStreamWriter output) throws JAXBException { |
ohair@286 | 104 | marshal( ((BridgeContextImpl)context).marshaller, object, output ); |
ohair@286 | 105 | } |
ohair@286 | 106 | |
ohair@286 | 107 | public abstract void marshal(@NotNull Marshaller m,T object,XMLStreamWriter output) throws JAXBException; |
ohair@286 | 108 | |
ohair@286 | 109 | |
ohair@286 | 110 | /** |
ohair@286 | 111 | * Marshals the specified type object with the implicit element name |
ohair@286 | 112 | * associated with this instance of {@link XMLBridge}. |
ohair@286 | 113 | * |
ohair@286 | 114 | * @param nsContext |
ohair@286 | 115 | * if this marshalling is done to marshal a subelement, this {@link NamespaceContext} |
ohair@286 | 116 | * represents in-scope namespace bindings available for that element. Can be null, |
ohair@286 | 117 | * in which case JAXB assumes no in-scope namespaces. |
ohair@286 | 118 | * @throws JAXBException |
ohair@286 | 119 | * if there was an error while marshalling. |
ohair@286 | 120 | * |
ohair@286 | 121 | * @since 2.0 EA1 |
ohair@286 | 122 | */ |
ohair@286 | 123 | public void marshal(T object,OutputStream output, NamespaceContext nsContext) throws JAXBException { |
ohair@286 | 124 | marshal(object,output,nsContext,null); |
ohair@286 | 125 | } |
ohair@286 | 126 | /** |
ohair@286 | 127 | * @since 2.0.2 |
ohair@286 | 128 | */ |
ohair@286 | 129 | public void marshal(T object,OutputStream output, NamespaceContext nsContext, AttachmentMarshaller am) throws JAXBException { |
ohair@286 | 130 | Marshaller m = context.marshallerPool.take(); |
ohair@286 | 131 | m.setAttachmentMarshaller(am); |
ohair@286 | 132 | marshal(m,object,output,nsContext); |
ohair@286 | 133 | m.setAttachmentMarshaller(null); |
ohair@286 | 134 | context.marshallerPool.recycle(m); |
ohair@286 | 135 | } |
ohair@286 | 136 | |
ohair@286 | 137 | public final void marshal(@NotNull BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException { |
ohair@286 | 138 | marshal( ((BridgeContextImpl)context).marshaller, object, output, nsContext ); |
ohair@286 | 139 | } |
ohair@286 | 140 | |
ohair@286 | 141 | public abstract void marshal(@NotNull Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException; |
ohair@286 | 142 | |
ohair@286 | 143 | |
ohair@286 | 144 | public final void marshal(T object,Node output) throws JAXBException { |
ohair@286 | 145 | Marshaller m = context.marshallerPool.take(); |
ohair@286 | 146 | marshal(m,object,output); |
ohair@286 | 147 | context.marshallerPool.recycle(m); |
ohair@286 | 148 | } |
ohair@286 | 149 | |
ohair@286 | 150 | public final void marshal(@NotNull BridgeContext context,T object,Node output) throws JAXBException { |
ohair@286 | 151 | marshal( ((BridgeContextImpl)context).marshaller, object, output ); |
ohair@286 | 152 | } |
ohair@286 | 153 | |
ohair@286 | 154 | public abstract void marshal(@NotNull Marshaller m,T object,Node output) throws JAXBException; |
ohair@286 | 155 | |
ohair@286 | 156 | |
ohair@286 | 157 | /** |
ohair@286 | 158 | * @since 2.0 EA4 |
ohair@286 | 159 | */ |
ohair@286 | 160 | public final void marshal(T object, ContentHandler contentHandler) throws JAXBException { |
ohair@286 | 161 | marshal(object,contentHandler,null); |
ohair@286 | 162 | } |
ohair@286 | 163 | /** |
ohair@286 | 164 | * @since 2.0.2 |
ohair@286 | 165 | */ |
ohair@286 | 166 | public final void marshal(T object, ContentHandler contentHandler, AttachmentMarshaller am) throws JAXBException { |
ohair@286 | 167 | Marshaller m = context.marshallerPool.take(); |
ohair@286 | 168 | m.setAttachmentMarshaller(am); |
ohair@286 | 169 | marshal(m,object,contentHandler); |
ohair@286 | 170 | m.setAttachmentMarshaller(null); |
ohair@286 | 171 | context.marshallerPool.recycle(m); |
ohair@286 | 172 | } |
ohair@286 | 173 | public final void marshal(@NotNull BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException { |
ohair@286 | 174 | marshal( ((BridgeContextImpl)context).marshaller, object, contentHandler ); |
ohair@286 | 175 | } |
ohair@286 | 176 | public abstract void marshal(@NotNull Marshaller m,T object, ContentHandler contentHandler) throws JAXBException; |
ohair@286 | 177 | |
ohair@286 | 178 | /** |
ohair@286 | 179 | * @since 2.0 EA4 |
ohair@286 | 180 | */ |
ohair@286 | 181 | public final void marshal(T object, Result result) throws JAXBException { |
ohair@286 | 182 | Marshaller m = context.marshallerPool.take(); |
ohair@286 | 183 | marshal(m,object,result); |
ohair@286 | 184 | context.marshallerPool.recycle(m); |
ohair@286 | 185 | } |
ohair@286 | 186 | public final void marshal(@NotNull BridgeContext context,T object, Result result) throws JAXBException { |
ohair@286 | 187 | marshal( ((BridgeContextImpl)context).marshaller, object, result ); |
ohair@286 | 188 | } |
ohair@286 | 189 | public abstract void marshal(@NotNull Marshaller m,T object, Result result) throws JAXBException; |
ohair@286 | 190 | |
ohair@286 | 191 | |
ohair@286 | 192 | |
ohair@286 | 193 | private T exit(T r, Unmarshaller u) { |
ohair@286 | 194 | u.setAttachmentUnmarshaller(null); |
ohair@286 | 195 | context.unmarshallerPool.recycle(u); |
ohair@286 | 196 | return r; |
ohair@286 | 197 | } |
ohair@286 | 198 | |
ohair@286 | 199 | /** |
ohair@286 | 200 | * Unmarshals the specified type object. |
ohair@286 | 201 | * |
ohair@286 | 202 | * @param in |
ohair@286 | 203 | * the parser must be pointing at a start tag |
ohair@286 | 204 | * that encloses the XML type that this {@link XMLBridge} is |
ohair@286 | 205 | * instanciated for. |
ohair@286 | 206 | * |
ohair@286 | 207 | * @return |
ohair@286 | 208 | * never null. |
ohair@286 | 209 | * |
ohair@286 | 210 | * @throws JAXBException |
ohair@286 | 211 | * if there was an error while unmarshalling. |
ohair@286 | 212 | * |
ohair@286 | 213 | * @since 2.0 EA1 |
ohair@286 | 214 | */ |
ohair@286 | 215 | public final @NotNull T unmarshal(@NotNull XMLStreamReader in) throws JAXBException { |
ohair@286 | 216 | return unmarshal(in,null); |
ohair@286 | 217 | } |
ohair@286 | 218 | /** |
ohair@286 | 219 | * @since 2.0.3 |
ohair@286 | 220 | */ |
ohair@286 | 221 | public final @NotNull T unmarshal(@NotNull XMLStreamReader in, @Nullable AttachmentUnmarshaller au) throws JAXBException { |
ohair@286 | 222 | Unmarshaller u = context.unmarshallerPool.take(); |
ohair@286 | 223 | u.setAttachmentUnmarshaller(au); |
ohair@286 | 224 | return exit(unmarshal(u,in),u); |
ohair@286 | 225 | } |
ohair@286 | 226 | public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull XMLStreamReader in) throws JAXBException { |
ohair@286 | 227 | return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); |
ohair@286 | 228 | } |
ohair@286 | 229 | public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull XMLStreamReader in) throws JAXBException; |
ohair@286 | 230 | |
ohair@286 | 231 | /** |
ohair@286 | 232 | * Unmarshals the specified type object. |
ohair@286 | 233 | * |
ohair@286 | 234 | * @param in |
ohair@286 | 235 | * the parser must be pointing at a start tag |
ohair@286 | 236 | * that encloses the XML type that this {@link XMLBridge} is |
ohair@286 | 237 | * instanciated for. |
ohair@286 | 238 | * |
ohair@286 | 239 | * @return |
ohair@286 | 240 | * never null. |
ohair@286 | 241 | * |
ohair@286 | 242 | * @throws JAXBException |
ohair@286 | 243 | * if there was an error while unmarshalling. |
ohair@286 | 244 | * |
ohair@286 | 245 | * @since 2.0 EA1 |
ohair@286 | 246 | */ |
ohair@286 | 247 | public final @NotNull T unmarshal(@NotNull Source in) throws JAXBException { |
ohair@286 | 248 | return unmarshal(in,null); |
ohair@286 | 249 | } |
ohair@286 | 250 | /** |
ohair@286 | 251 | * @since 2.0.3 |
ohair@286 | 252 | */ |
ohair@286 | 253 | public final @NotNull T unmarshal(@NotNull Source in, @Nullable AttachmentUnmarshaller au) throws JAXBException { |
ohair@286 | 254 | Unmarshaller u = context.unmarshallerPool.take(); |
ohair@286 | 255 | u.setAttachmentUnmarshaller(au); |
ohair@286 | 256 | return exit(unmarshal(u,in),u); |
ohair@286 | 257 | } |
ohair@286 | 258 | public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Source in) throws JAXBException { |
ohair@286 | 259 | return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); |
ohair@286 | 260 | } |
ohair@286 | 261 | public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull Source in) throws JAXBException; |
ohair@286 | 262 | |
ohair@286 | 263 | /** |
ohair@286 | 264 | * Unmarshals the specified type object. |
ohair@286 | 265 | * |
ohair@286 | 266 | * @param in |
ohair@286 | 267 | * the parser must be pointing at a start tag |
ohair@286 | 268 | * that encloses the XML type that this {@link XMLBridge} is |
ohair@286 | 269 | * instanciated for. |
ohair@286 | 270 | * |
ohair@286 | 271 | * @return |
ohair@286 | 272 | * never null. |
ohair@286 | 273 | * |
ohair@286 | 274 | * @throws JAXBException |
ohair@286 | 275 | * if there was an error while unmarshalling. |
ohair@286 | 276 | * |
ohair@286 | 277 | * @since 2.0 EA1 |
ohair@286 | 278 | */ |
ohair@286 | 279 | public final @NotNull T unmarshal(@NotNull InputStream in) throws JAXBException { |
ohair@286 | 280 | Unmarshaller u = context.unmarshallerPool.take(); |
ohair@286 | 281 | return exit(unmarshal(u,in),u); |
ohair@286 | 282 | } |
ohair@286 | 283 | public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull InputStream in) throws JAXBException { |
ohair@286 | 284 | return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); |
ohair@286 | 285 | } |
ohair@286 | 286 | public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull InputStream in) throws JAXBException; |
ohair@286 | 287 | |
ohair@286 | 288 | /** |
ohair@286 | 289 | * Unmarshals the specified type object. |
ohair@286 | 290 | * |
ohair@286 | 291 | * @param n |
ohair@286 | 292 | * Node to be unmarshalled. |
ohair@286 | 293 | * |
ohair@286 | 294 | * @return |
ohair@286 | 295 | * never null. |
ohair@286 | 296 | * |
ohair@286 | 297 | * @throws JAXBException |
ohair@286 | 298 | * if there was an error while unmarshalling. |
ohair@286 | 299 | * |
ohair@286 | 300 | * @since 2.0 FCS |
ohair@286 | 301 | */ |
ohair@286 | 302 | public final @NotNull T unmarshal(@NotNull Node n) throws JAXBException { |
ohair@286 | 303 | return unmarshal(n,null); |
ohair@286 | 304 | } |
ohair@286 | 305 | /** |
ohair@286 | 306 | * @since 2.0.3 |
ohair@286 | 307 | */ |
ohair@286 | 308 | public final @NotNull T unmarshal(@NotNull Node n, @Nullable AttachmentUnmarshaller au) throws JAXBException { |
ohair@286 | 309 | Unmarshaller u = context.unmarshallerPool.take(); |
ohair@286 | 310 | u.setAttachmentUnmarshaller(au); |
ohair@286 | 311 | return exit(unmarshal(u,n),u); |
ohair@286 | 312 | } |
ohair@286 | 313 | public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Node n) throws JAXBException { |
ohair@286 | 314 | return unmarshal( ((BridgeContextImpl)context).unmarshaller, n ); |
ohair@286 | 315 | } |
ohair@286 | 316 | public abstract @NotNull T unmarshal(@NotNull Unmarshaller context, @NotNull Node n) throws JAXBException; |
ohair@286 | 317 | |
ohair@286 | 318 | /** |
ohair@286 | 319 | * Gets the {@link TypeInfo} from which this bridge was created. |
ohair@286 | 320 | */ |
ohair@286 | 321 | public abstract TypeInfo getTypeReference(); |
ohair@286 | 322 | } |