Sun, 31 Aug 2014 16:14:36 +0400
8036981: JAXB not preserving formatting for xsd:any Mixed content
Reviewed-by: lancea, mkos
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. Oracle designates this |
aoqi@0 | 8 | * particular file as subject to the "Classpath" exception as provided |
aoqi@0 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
aoqi@0 | 10 | * |
aoqi@0 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 15 | * accompanied this code). |
aoqi@0 | 16 | * |
aoqi@0 | 17 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 20 | * |
aoqi@0 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 22 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 23 | * questions. |
aoqi@0 | 24 | */ |
aoqi@0 | 25 | |
aoqi@0 | 26 | package com.sun.xml.internal.bind.v2.runtime.unmarshaller; |
aoqi@0 | 27 | |
aoqi@0 | 28 | import javax.xml.stream.XMLStreamException; |
aoqi@0 | 29 | import javax.xml.stream.XMLStreamReader; |
aoqi@0 | 30 | |
aoqi@0 | 31 | import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx; |
aoqi@0 | 32 | import org.xml.sax.SAXException; |
aoqi@0 | 33 | |
aoqi@0 | 34 | /** |
aoqi@0 | 35 | * Reads XML from StAX {@link XMLStreamReader} and |
aoqi@0 | 36 | * feeds events to {@link XmlVisitor}. |
aoqi@0 | 37 | * |
aoqi@0 | 38 | * @author Ryan.Shoemaker@Sun.COM |
aoqi@0 | 39 | * @author Kohsuke Kawaguchi |
aoqi@0 | 40 | * @version JAXB 2.0 |
aoqi@0 | 41 | */ |
aoqi@0 | 42 | final class StAXExConnector extends StAXStreamConnector { |
aoqi@0 | 43 | |
aoqi@0 | 44 | // StAX event source |
aoqi@0 | 45 | private final XMLStreamReaderEx in; |
aoqi@0 | 46 | |
aoqi@0 | 47 | public StAXExConnector(XMLStreamReaderEx in, XmlVisitor visitor) { |
aoqi@0 | 48 | super(in,visitor); |
aoqi@0 | 49 | this.in = in; |
aoqi@0 | 50 | } |
aoqi@0 | 51 | |
aoqi@0 | 52 | @Override |
aoqi@0 | 53 | protected void handleCharacters() throws XMLStreamException, SAXException { |
aoqi@0 | 54 | if( predictor.expectText() ) { |
aoqi@0 | 55 | CharSequence pcdata = in.getPCDATA(); |
aoqi@0 | 56 | if(pcdata instanceof com.sun.xml.internal.org.jvnet.staxex.Base64Data) { |
aoqi@0 | 57 | com.sun.xml.internal.org.jvnet.staxex.Base64Data bd = (com.sun.xml.internal.org.jvnet.staxex.Base64Data) pcdata; |
aoqi@0 | 58 | Base64Data binary = new Base64Data(); |
aoqi@0 | 59 | if(!bd.hasData()) |
aoqi@0 | 60 | binary.set(bd.getDataHandler()); |
aoqi@0 | 61 | else |
aoqi@0 | 62 | binary.set( bd.get(), bd.getDataLen(), bd.getMimeType() ); |
aoqi@0 | 63 | // we make an assumption here that the binary data shows up on its own |
aoqi@0 | 64 | // not adjacent to other text. So it's OK to fire it off right now. |
aoqi@0 | 65 | visitor.text(binary); |
aoqi@0 | 66 | textReported = true; |
aoqi@0 | 67 | } else { |
aoqi@0 | 68 | buffer.append(pcdata); |
aoqi@0 | 69 | } |
aoqi@0 | 70 | } |
aoqi@0 | 71 | } |
aoqi@0 | 72 | } |