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
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.property; |
aoqi@0 | 27 | |
aoqi@0 | 28 | import java.io.IOException; |
aoqi@0 | 29 | import java.lang.reflect.Type; |
aoqi@0 | 30 | import java.util.HashMap; |
aoqi@0 | 31 | import java.util.List; |
aoqi@0 | 32 | import java.util.Map; |
aoqi@0 | 33 | |
aoqi@0 | 34 | import javax.xml.bind.JAXBException; |
aoqi@0 | 35 | import javax.xml.stream.XMLStreamException; |
aoqi@0 | 36 | |
aoqi@0 | 37 | import com.sun.xml.internal.bind.api.AccessorException; |
aoqi@0 | 38 | import com.sun.xml.internal.bind.v2.model.core.PropertyKind; |
aoqi@0 | 39 | import com.sun.xml.internal.bind.v2.model.core.TypeRef; |
aoqi@0 | 40 | import com.sun.xml.internal.bind.v2.model.runtime.RuntimeElementPropertyInfo; |
aoqi@0 | 41 | import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeRef; |
aoqi@0 | 42 | import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl; |
aoqi@0 | 43 | import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo; |
aoqi@0 | 44 | import com.sun.xml.internal.bind.v2.runtime.Name; |
aoqi@0 | 45 | import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil; |
aoqi@0 | 46 | import com.sun.xml.internal.bind.v2.runtime.Transducer; |
aoqi@0 | 47 | import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; |
aoqi@0 | 48 | import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor; |
aoqi@0 | 49 | import com.sun.xml.internal.bind.v2.runtime.reflect.ListIterator; |
aoqi@0 | 50 | import com.sun.xml.internal.bind.v2.runtime.reflect.Lister; |
aoqi@0 | 51 | import com.sun.xml.internal.bind.v2.runtime.reflect.NullSafeAccessor; |
aoqi@0 | 52 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.ChildLoader; |
aoqi@0 | 53 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator; |
aoqi@0 | 54 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader; |
aoqi@0 | 55 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Receiver; |
aoqi@0 | 56 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.TextLoader; |
aoqi@0 | 57 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader; |
aoqi@0 | 58 | import com.sun.xml.internal.bind.v2.util.QNameMap; |
aoqi@0 | 59 | |
aoqi@0 | 60 | import org.xml.sax.SAXException; |
aoqi@0 | 61 | |
aoqi@0 | 62 | /** |
aoqi@0 | 63 | * {@link Property} implementation for multi-value property that maps to an element. |
aoqi@0 | 64 | * |
aoqi@0 | 65 | * @author Kohsuke Kawaguchi |
aoqi@0 | 66 | */ |
aoqi@0 | 67 | abstract class ArrayElementProperty<BeanT,ListT,ItemT> extends ArrayERProperty<BeanT,ListT,ItemT> { |
aoqi@0 | 68 | |
aoqi@0 | 69 | private final Map<Class,TagAndType> typeMap = new HashMap<Class,TagAndType>(); |
aoqi@0 | 70 | /** |
aoqi@0 | 71 | * Set by the constructor and reset in the {@link #wrapUp()} method. |
aoqi@0 | 72 | */ |
aoqi@0 | 73 | private Map<TypeRef<Type,Class>,JaxBeanInfo> refs = new HashMap<TypeRef<Type, Class>, JaxBeanInfo>(); |
aoqi@0 | 74 | /** |
aoqi@0 | 75 | * Set by the constructor and reset in the {@link #wrapUp()} method. |
aoqi@0 | 76 | */ |
aoqi@0 | 77 | protected RuntimeElementPropertyInfo prop; |
aoqi@0 | 78 | |
aoqi@0 | 79 | /** |
aoqi@0 | 80 | * Tag name used when we see null in the collection. Can be null. |
aoqi@0 | 81 | */ |
aoqi@0 | 82 | private final Name nillableTagName; |
aoqi@0 | 83 | |
aoqi@0 | 84 | protected ArrayElementProperty(JAXBContextImpl grammar, RuntimeElementPropertyInfo prop) { |
aoqi@0 | 85 | super(grammar, prop, prop.getXmlName(), prop.isCollectionNillable()); |
aoqi@0 | 86 | this.prop = prop; |
aoqi@0 | 87 | |
aoqi@0 | 88 | List<? extends RuntimeTypeRef> types = prop.getTypes(); |
aoqi@0 | 89 | |
aoqi@0 | 90 | Name n = null; |
aoqi@0 | 91 | |
aoqi@0 | 92 | for (RuntimeTypeRef typeRef : types) { |
aoqi@0 | 93 | Class type = (Class)typeRef.getTarget().getType(); |
aoqi@0 | 94 | if(type.isPrimitive()) |
aoqi@0 | 95 | type = RuntimeUtil.primitiveToBox.get(type); |
aoqi@0 | 96 | |
aoqi@0 | 97 | JaxBeanInfo beanInfo = grammar.getOrCreate(typeRef.getTarget()); |
aoqi@0 | 98 | TagAndType tt = new TagAndType( |
aoqi@0 | 99 | grammar.nameBuilder.createElementName(typeRef.getTagName()), |
aoqi@0 | 100 | beanInfo); |
aoqi@0 | 101 | typeMap.put(type,tt); |
aoqi@0 | 102 | refs.put(typeRef,beanInfo); |
aoqi@0 | 103 | if(typeRef.isNillable() && n==null) |
aoqi@0 | 104 | n = tt.tagName; |
aoqi@0 | 105 | } |
aoqi@0 | 106 | |
aoqi@0 | 107 | nillableTagName = n; |
aoqi@0 | 108 | } |
aoqi@0 | 109 | |
aoqi@0 | 110 | @Override |
aoqi@0 | 111 | public void wrapUp() { |
aoqi@0 | 112 | super.wrapUp(); |
aoqi@0 | 113 | refs = null; |
aoqi@0 | 114 | prop = null; // avoid keeping model objects live |
aoqi@0 | 115 | } |
aoqi@0 | 116 | |
aoqi@0 | 117 | protected void serializeListBody(BeanT beanT, XMLSerializer w, ListT list) throws IOException, XMLStreamException, SAXException, AccessorException { |
aoqi@0 | 118 | ListIterator<ItemT> itr = lister.iterator(list, w); |
aoqi@0 | 119 | |
aoqi@0 | 120 | boolean isIdref = itr instanceof Lister.IDREFSIterator; // UGLY |
aoqi@0 | 121 | |
aoqi@0 | 122 | while(itr.hasNext()) { |
aoqi@0 | 123 | try { |
aoqi@0 | 124 | ItemT item = itr.next(); |
aoqi@0 | 125 | if (item != null) { |
aoqi@0 | 126 | Class itemType = item.getClass(); |
aoqi@0 | 127 | if(isIdref) |
aoqi@0 | 128 | // This should be the only place where we need to be aware |
aoqi@0 | 129 | // that the iterator is iterating IDREFS. |
aoqi@0 | 130 | itemType = ((Lister.IDREFSIterator)itr).last().getClass(); |
aoqi@0 | 131 | |
aoqi@0 | 132 | // normally, this returns non-null |
aoqi@0 | 133 | TagAndType tt = typeMap.get(itemType); |
aoqi@0 | 134 | while(tt==null && itemType!=null) { |
aoqi@0 | 135 | // otherwise we'll just have to try the slow way |
aoqi@0 | 136 | itemType = itemType.getSuperclass(); |
aoqi@0 | 137 | tt = typeMap.get(itemType); |
aoqi@0 | 138 | } |
aoqi@0 | 139 | |
aoqi@0 | 140 | if(tt==null) { |
aoqi@0 | 141 | // item is not of the expected type. |
aoqi@0 | 142 | // w.reportError(new ValidationEventImpl(ValidationEvent.ERROR, |
aoqi@0 | 143 | // Messages.UNEXPECTED_JAVA_TYPE.format( |
aoqi@0 | 144 | // item.getClass().getName(), |
aoqi@0 | 145 | // getExpectedClassNameList() |
aoqi@0 | 146 | // ), |
aoqi@0 | 147 | // w.getCurrentLocation(fieldName))); |
aoqi@0 | 148 | // continue; |
aoqi@0 | 149 | |
aoqi@0 | 150 | // see the similar code in SingleElementNodeProperty. |
aoqi@0 | 151 | // for the purpose of simple type substitution, make it a non-error |
aoqi@0 | 152 | |
aoqi@0 | 153 | w.startElement(typeMap.values().iterator().next().tagName,null); |
aoqi@0 | 154 | w.childAsXsiType(item,fieldName,w.grammar.getBeanInfo(Object.class), false); |
aoqi@0 | 155 | } else { |
aoqi@0 | 156 | w.startElement(tt.tagName,null); |
aoqi@0 | 157 | serializeItem(tt.beanInfo,item,w); |
aoqi@0 | 158 | } |
aoqi@0 | 159 | |
aoqi@0 | 160 | w.endElement(); |
aoqi@0 | 161 | } else { |
aoqi@0 | 162 | if(nillableTagName!=null) { |
aoqi@0 | 163 | w.startElement(nillableTagName,null); |
aoqi@0 | 164 | w.writeXsiNilTrue(); |
aoqi@0 | 165 | w.endElement(); |
aoqi@0 | 166 | } |
aoqi@0 | 167 | } |
aoqi@0 | 168 | } catch (JAXBException e) { |
aoqi@0 | 169 | w.reportError(fieldName,e); |
aoqi@0 | 170 | // recover by ignoring this item |
aoqi@0 | 171 | } |
aoqi@0 | 172 | } |
aoqi@0 | 173 | } |
aoqi@0 | 174 | |
aoqi@0 | 175 | /** |
aoqi@0 | 176 | * Serializes one item of the property. |
aoqi@0 | 177 | */ |
aoqi@0 | 178 | protected abstract void serializeItem(JaxBeanInfo expected, ItemT item, XMLSerializer w) throws SAXException, AccessorException, IOException, XMLStreamException; |
aoqi@0 | 179 | |
aoqi@0 | 180 | |
aoqi@0 | 181 | public void createBodyUnmarshaller(UnmarshallerChain chain, QNameMap<ChildLoader> loaders) { |
aoqi@0 | 182 | |
aoqi@0 | 183 | // all items go to the same lister, |
aoqi@0 | 184 | // so they should share the same offset. |
aoqi@0 | 185 | int offset = chain.allocateOffset(); |
aoqi@0 | 186 | Receiver recv = new ReceiverImpl(offset); |
aoqi@0 | 187 | |
aoqi@0 | 188 | for (RuntimeTypeRef typeRef : prop.getTypes()) { |
aoqi@0 | 189 | |
aoqi@0 | 190 | Name tagName = chain.context.nameBuilder.createElementName(typeRef.getTagName()); |
aoqi@0 | 191 | Loader item = createItemUnmarshaller(chain,typeRef); |
aoqi@0 | 192 | |
aoqi@0 | 193 | if(typeRef.isNillable() || chain.context.allNillable) |
aoqi@0 | 194 | item = new XsiNilLoader.Array(item); |
aoqi@0 | 195 | if(typeRef.getDefaultValue()!=null) |
aoqi@0 | 196 | item = new DefaultValueLoaderDecorator(item,typeRef.getDefaultValue()); |
aoqi@0 | 197 | |
aoqi@0 | 198 | loaders.put(tagName,new ChildLoader(item,recv)); |
aoqi@0 | 199 | } |
aoqi@0 | 200 | } |
aoqi@0 | 201 | |
aoqi@0 | 202 | public final PropertyKind getKind() { |
aoqi@0 | 203 | return PropertyKind.ELEMENT; |
aoqi@0 | 204 | } |
aoqi@0 | 205 | |
aoqi@0 | 206 | /** |
aoqi@0 | 207 | * Creates a loader handler that unmarshals the body of the item. |
aoqi@0 | 208 | * |
aoqi@0 | 209 | * <p> |
aoqi@0 | 210 | * This will be sandwiched into <item> ... </item>. |
aoqi@0 | 211 | * |
aoqi@0 | 212 | * <p> |
aoqi@0 | 213 | * When unmarshalling the body of item, the Pack of {@link Lister} is available |
aoqi@0 | 214 | * as the handler state. |
aoqi@0 | 215 | * |
aoqi@0 | 216 | * @param chain |
aoqi@0 | 217 | * @param typeRef |
aoqi@0 | 218 | */ |
aoqi@0 | 219 | private Loader createItemUnmarshaller(UnmarshallerChain chain, RuntimeTypeRef typeRef) { |
aoqi@0 | 220 | if(PropertyFactory.isLeaf(typeRef.getSource())) { |
aoqi@0 | 221 | final Transducer xducer = typeRef.getTransducer(); |
aoqi@0 | 222 | return new TextLoader(xducer); |
aoqi@0 | 223 | } else { |
aoqi@0 | 224 | return refs.get(typeRef).getLoader(chain.context,true); |
aoqi@0 | 225 | } |
aoqi@0 | 226 | } |
aoqi@0 | 227 | |
aoqi@0 | 228 | public Accessor getElementPropertyAccessor(String nsUri, String localName) { |
aoqi@0 | 229 | if(wrapperTagName!=null) { |
aoqi@0 | 230 | if(wrapperTagName.equals(nsUri,localName)) |
aoqi@0 | 231 | return acc; |
aoqi@0 | 232 | } else { |
aoqi@0 | 233 | for (TagAndType tt : typeMap.values()) { |
aoqi@0 | 234 | if(tt.tagName.equals(nsUri,localName)) |
aoqi@0 | 235 | // when we can't distinguish null and empty list, JAX-WS doesn't want to see |
aoqi@0 | 236 | // null (just like any user apps), but since we are providing a raw accessor, |
aoqi@0 | 237 | // which just grabs the value from the field, we wrap it so that it won't return |
aoqi@0 | 238 | // null. |
aoqi@0 | 239 | return new NullSafeAccessor<BeanT,ListT,Object>(acc,lister); |
aoqi@0 | 240 | } |
aoqi@0 | 241 | } |
aoqi@0 | 242 | return null; |
aoqi@0 | 243 | } |
aoqi@0 | 244 | } |