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 | /* |
ohair@286 | 2 | * Copyright (c) 1997, 2010, 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.bind.v2.runtime.property; |
ohair@286 | 27 | |
ohair@286 | 28 | import java.io.IOException; |
alanb@368 | 29 | import java.lang.reflect.Modifier; |
ohair@286 | 30 | |
alanb@368 | 31 | import javax.xml.bind.JAXBElement; |
ohair@286 | 32 | import javax.xml.stream.XMLStreamException; |
ohair@286 | 33 | |
ohair@286 | 34 | import com.sun.xml.internal.bind.api.AccessorException; |
alanb@368 | 35 | import com.sun.xml.internal.bind.v2.model.core.ID; |
ohair@286 | 36 | import com.sun.xml.internal.bind.v2.model.core.PropertyKind; |
ohair@286 | 37 | import com.sun.xml.internal.bind.v2.model.runtime.RuntimeElementPropertyInfo; |
ohair@286 | 38 | import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeRef; |
alanb@368 | 39 | import com.sun.xml.internal.bind.v2.runtime.ClassBeanInfoImpl; |
ohair@286 | 40 | import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl; |
ohair@286 | 41 | import com.sun.xml.internal.bind.v2.runtime.Name; |
ohair@286 | 42 | import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; |
ohair@286 | 43 | import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; |
ohair@286 | 44 | import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor; |
ohair@286 | 45 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.ChildLoader; |
ohair@286 | 46 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator; |
ohair@286 | 47 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.LeafPropertyLoader; |
ohair@286 | 48 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.LeafPropertyXsiLoader; |
ohair@286 | 49 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader; |
ohair@286 | 50 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader; |
ohair@286 | 51 | import com.sun.xml.internal.bind.v2.util.QNameMap; |
ohair@286 | 52 | |
ohair@286 | 53 | import org.xml.sax.SAXException; |
ohair@286 | 54 | |
ohair@286 | 55 | /** |
ohair@286 | 56 | * {@link Property} that contains a leaf value. |
ohair@286 | 57 | * |
ohair@286 | 58 | * @author Kohsuke Kawaguchi (kk@kohsuke.org) |
ohair@286 | 59 | */ |
ohair@286 | 60 | final class SingleElementLeafProperty<BeanT> extends PropertyImpl<BeanT> { |
ohair@286 | 61 | |
ohair@286 | 62 | private final Name tagName; |
ohair@286 | 63 | private final boolean nillable; |
ohair@286 | 64 | private final Accessor acc; |
ohair@286 | 65 | private final String defaultValue; |
ohair@286 | 66 | private final TransducedAccessor<BeanT> xacc; |
ohair@286 | 67 | private final boolean improvedXsiTypeHandling; |
alanb@368 | 68 | private final boolean idRef; |
ohair@286 | 69 | |
ohair@286 | 70 | public SingleElementLeafProperty(JAXBContextImpl context, RuntimeElementPropertyInfo prop) { |
ohair@286 | 71 | super(context, prop); |
ohair@286 | 72 | RuntimeTypeRef ref = prop.getTypes().get(0); |
ohair@286 | 73 | tagName = context.nameBuilder.createElementName(ref.getTagName()); |
ohair@286 | 74 | assert tagName != null; |
ohair@286 | 75 | nillable = ref.isNillable(); |
ohair@286 | 76 | defaultValue = ref.getDefaultValue(); |
ohair@286 | 77 | this.acc = prop.getAccessor().optimize(context); |
ohair@286 | 78 | |
ohair@286 | 79 | xacc = TransducedAccessor.get(context, ref); |
ohair@286 | 80 | assert xacc != null; |
ohair@286 | 81 | |
ohair@286 | 82 | improvedXsiTypeHandling = context.improvedXsiTypeHandling; |
alanb@368 | 83 | idRef = ref.getSource().id() == ID.IDREF; |
ohair@286 | 84 | } |
ohair@286 | 85 | |
ohair@286 | 86 | public void reset(BeanT o) throws AccessorException { |
ohair@286 | 87 | acc.set(o, null); |
ohair@286 | 88 | } |
ohair@286 | 89 | |
ohair@286 | 90 | public String getIdValue(BeanT bean) throws AccessorException, SAXException { |
ohair@286 | 91 | return xacc.print(bean).toString(); |
ohair@286 | 92 | } |
ohair@286 | 93 | |
ohair@286 | 94 | @Override |
ohair@286 | 95 | public void serializeBody(BeanT o, XMLSerializer w, Object outerPeer) throws SAXException, AccessorException, IOException, XMLStreamException { |
ohair@286 | 96 | boolean hasValue = xacc.hasValue(o); |
ohair@286 | 97 | |
ohair@286 | 98 | Object obj = null; |
ohair@286 | 99 | |
ohair@286 | 100 | try { |
ohair@286 | 101 | obj = acc.getUnadapted(o); |
ohair@286 | 102 | } catch (AccessorException ae) { |
ohair@286 | 103 | ; // noop |
ohair@286 | 104 | } |
ohair@286 | 105 | |
ohair@286 | 106 | Class valueType = acc.getValueType(); |
ohair@286 | 107 | |
ohair@286 | 108 | // check for different type than expected. If found, add xsi:type declaration |
alanb@368 | 109 | if (xsiTypeNeeded(o, w, obj, valueType)) { |
ohair@286 | 110 | w.startElement(tagName, outerPeer); |
alanb@368 | 111 | w.childAsXsiType(obj, fieldName, w.grammar.getBeanInfo(valueType), false); |
ohair@286 | 112 | w.endElement(); |
ohair@286 | 113 | } else { // current type is expected |
ohair@286 | 114 | if (hasValue) { |
ohair@286 | 115 | xacc.writeLeafElement(w, tagName, o, fieldName); |
ohair@286 | 116 | } else if (nillable) { |
ohair@286 | 117 | w.startElement(tagName, null); |
ohair@286 | 118 | w.writeXsiNilTrue(); |
ohair@286 | 119 | w.endElement(); |
ohair@286 | 120 | } |
ohair@286 | 121 | } |
ohair@286 | 122 | } |
ohair@286 | 123 | |
alanb@368 | 124 | /** |
alanb@368 | 125 | * Checks if xsi type needed to be specified |
alanb@368 | 126 | */ |
alanb@368 | 127 | private boolean xsiTypeNeeded(BeanT bean, XMLSerializer w, Object value, Class valueTypeClass) { |
alanb@368 | 128 | if (!improvedXsiTypeHandling) // improved xsi type set |
alanb@368 | 129 | return false; |
alanb@368 | 130 | if (acc.isAdapted()) // accessor is not adapted |
alanb@368 | 131 | return false; |
alanb@368 | 132 | if (value == null) // value is not null |
alanb@368 | 133 | return false; |
alanb@368 | 134 | if (value.getClass().equals(valueTypeClass)) // value represented by different class |
alanb@368 | 135 | return false; |
alanb@368 | 136 | if (idRef) // IDREF |
alanb@368 | 137 | return false; |
alanb@368 | 138 | if (valueTypeClass.isPrimitive()) // is not primitive |
alanb@368 | 139 | return false; |
alanb@368 | 140 | return acc.isValueTypeAbstractable() || isNillableAbstract(bean, w.grammar, value, valueTypeClass); |
alanb@368 | 141 | } |
alanb@368 | 142 | |
alanb@368 | 143 | /** |
alanb@368 | 144 | * Checks if element is nillable and represented by abstract class. |
alanb@368 | 145 | */ |
alanb@368 | 146 | private boolean isNillableAbstract(BeanT bean, JAXBContextImpl context, Object value, Class valueTypeClass) { |
alanb@368 | 147 | if (!nillable) // check if element is nillable |
alanb@368 | 148 | return false; |
alanb@368 | 149 | if (valueTypeClass != Object.class) // required type wasn't recognized |
alanb@368 | 150 | return false; |
alanb@368 | 151 | if (bean.getClass() != JAXBElement.class) // is JAXBElement |
alanb@368 | 152 | return false; |
alanb@368 | 153 | JAXBElement jaxbElement = (JAXBElement) bean; |
alanb@368 | 154 | Class valueClass = value.getClass(); |
alanb@368 | 155 | Class declaredTypeClass = jaxbElement.getDeclaredType(); |
alanb@368 | 156 | if (declaredTypeClass.equals(valueClass)) // JAXBElement<class> is different from unadapted class) |
alanb@368 | 157 | return false; |
alanb@368 | 158 | if (!declaredTypeClass.isAssignableFrom(valueClass)) // and is subclass from it |
alanb@368 | 159 | return false; |
alanb@368 | 160 | if (!Modifier.isAbstract(declaredTypeClass.getModifiers())) // declared class is abstract |
alanb@368 | 161 | return false; |
alanb@368 | 162 | return acc.isAbstractable(declaredTypeClass); // and is not builtin type |
alanb@368 | 163 | } |
alanb@368 | 164 | |
ohair@286 | 165 | public void buildChildElementUnmarshallers(UnmarshallerChain chain, QNameMap<ChildLoader> handlers) { |
ohair@286 | 166 | Loader l = new LeafPropertyLoader(xacc); |
ohair@286 | 167 | if (defaultValue != null) |
ohair@286 | 168 | l = new DefaultValueLoaderDecorator(l, defaultValue); |
ohair@286 | 169 | if (nillable || chain.context.allNillable) |
ohair@286 | 170 | l = new XsiNilLoader.Single(l, acc); |
ohair@286 | 171 | |
ohair@286 | 172 | // LeafPropertyXsiLoader doesn't work well with nillable elements |
alanb@368 | 173 | if (improvedXsiTypeHandling) |
ohair@286 | 174 | l = new LeafPropertyXsiLoader(l, xacc, acc); |
ohair@286 | 175 | |
ohair@286 | 176 | handlers.put(tagName, new ChildLoader(l, null)); |
ohair@286 | 177 | } |
ohair@286 | 178 | |
ohair@286 | 179 | |
ohair@286 | 180 | public PropertyKind getKind() { |
ohair@286 | 181 | return PropertyKind.ELEMENT; |
ohair@286 | 182 | } |
ohair@286 | 183 | |
ohair@286 | 184 | @Override |
ohair@286 | 185 | public Accessor getElementPropertyAccessor(String nsUri, String localName) { |
ohair@286 | 186 | if (tagName.equals(nsUri, localName)) |
ohair@286 | 187 | return acc; |
ohair@286 | 188 | else |
ohair@286 | 189 | return null; |
ohair@286 | 190 | } |
ohair@286 | 191 | } |