diff -r 8c0b6bccfe47 -r 0989ad8c0860 src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java Thu Apr 04 19:05:24 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java Tue Apr 09 14:51:13 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,12 +36,8 @@ import com.sun.xml.internal.bind.v2.util.EditDistance; import com.sun.xml.internal.ws.util.DOMUtil; import com.sun.xml.internal.ws.util.JAXWSUtils; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; +import com.sun.xml.internal.ws.util.xml.XmlUtil; +import org.w3c.dom.*; import org.xml.sax.SAXParseException; import javax.xml.namespace.NamespaceContext; @@ -52,10 +48,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.Map; import java.util.Set; @@ -65,16 +59,15 @@ * @author Vivek Pandey */ public class Internalizer { - private static final XPathFactory xpf = XPathFactory.newInstance(); + + private static final XPathFactory xpf = XmlUtil.newXPathFactory(true); private final XPath xpath = xpf.newXPath(); - private final WsimportOptions options; private final DOMForest forest; private final ErrorReceiver errorReceiver; public Internalizer(DOMForest forest, WsimportOptions options, ErrorReceiver errorReceiver) { this.forest = forest; - this.options = options; this.errorReceiver = errorReceiver; } @@ -82,15 +75,6 @@ for (Element jaxwsBinding : forest.outerMostBindings) { internalize(jaxwsBinding, jaxwsBinding); } - /* - Map targetNodes = new HashMap(); - for (Element jaxwsBinding : forest.outerMostBindings) { - buildTargetNodeMap(jaxwsBinding, jaxwsBinding, targetNodes); - } - for (Element jaxwsBinding : forest.outerMostBindings) { - move(jaxwsBinding, targetNodes); - } - */ } /** @@ -100,12 +84,15 @@ NamedNodeMap atts = bindings.getAttributes(); for (int i = 0; i < atts.getLength(); i++) { Attr a = (Attr) atts.item(i); - if (a.getNamespaceURI() != null) + if (a.getNamespaceURI() != null) { continue; // all foreign namespace OK. - if (a.getLocalName().equals("node")) + } + if (a.getLocalName().equals("node")) { continue; - if (a.getLocalName().equals("wsdlLocation")) + } + if (a.getLocalName().equals("wsdlLocation")) { continue; + } // TODO: flag error for this undefined attribute } @@ -181,9 +168,9 @@ //if target is null or empty it means the xpath evaluation has some problem, // just return - if (targetNodes == null && hasNode && !isToplevelBinding) + if (targetNodes == null && hasNode && !isToplevelBinding) { return; - + } if (hasNode) { if (targetNodes != null) { @@ -191,10 +178,11 @@ insertBinding(bindings, targetNodes.item(i)); // look for child and process them recursively Element[] children = getChildElements(bindings); - for (Element child : children) - if("bindings".equals(child.getLocalName())) { + for (Element child : children) { + if ("bindings".equals(child.getLocalName())) { internalize(child, targetNodes.item(i)); } + } } } } @@ -202,8 +190,9 @@ // look for child and process them recursively Element[] children = getChildElements(bindings); - for (Element child : children) + for (Element child : children) { internalize(child, target); + } } } @@ -226,105 +215,20 @@ } } - - /** - * Determines the target node of the "bindings" element - * by using the inherited target node, then put - * the result into the "result" map. - */ - /* TODO Remove this logic if there are no regressions with new internalization logic - private void buildTargetNodeMap(Element bindings, Node inheritedTarget, Map result) { - // start by the inherited target - Node target = inheritedTarget; - - validate(bindings); // validate this node - - // look for @wsdlLocation - if (isTopLevelBinding(bindings)) { - String wsdlLocation; - if (bindings.getAttributeNode("wsdlLocation") != null) { - wsdlLocation = bindings.getAttribute("wsdlLocation"); - - try { - // absolutize this URI. - // TODO: use the URI class - // TODO: honor xml:base - wsdlLocation = new URL(new URL(forest.getSystemId(bindings.getOwnerDocument())), - wsdlLocation).toExternalForm(); - } catch (MalformedURLException e) { - wsdlLocation = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation)); - } - } else { - //the node does not have - wsdlLocation = forest.getFirstRootDocument(); - } - target = forest.get(wsdlLocation); - - if (target == null) { - reportError(bindings, WsdlMessages.INTERNALIZER_INCORRECT_SCHEMA_REFERENCE(wsdlLocation, EditDistance.findNearest(wsdlLocation, forest.listSystemIDs()))); - return; // abort processing this - } - } - - //if the target node is xs:schema, declare the jaxb version on it as latter on it will be - //required by the inlined schema bindings - - Element element = DOMUtil.getFirstElementChild(target); - if (element != null && element.getNamespaceURI().equals(Constants.NS_WSDL) && element.getLocalName().equals("definitions")) { - //get all schema elements - Element type = DOMUtils.getFirstChildElement(element, Constants.NS_WSDL, "types"); - if (type != null) { - for (Element schemaElement : DOMUtils.getChildElements(type, Constants.NS_XSD, "schema")) { - if (!schemaElement.hasAttributeNS(Constants.NS_XMLNS, "jaxb")) { - schemaElement.setAttributeNS(Constants.NS_XMLNS, "xmlns:jaxb", JAXWSBindingsConstants.NS_JAXB_BINDINGS); - } - - //add jaxb:bindings version info. Lets put it to 1.0, may need to change latter - if (!schemaElement.hasAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "version")) { - schemaElement.setAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "jaxb:version", JAXWSBindingsConstants.JAXB_BINDING_VERSION); - } - } - } - } - - - boolean hasNode = true; - if ((isJAXWSBindings(bindings) || isJAXBBindings(bindings)) && bindings.getAttributeNode("node") != null) { - target = evaluateXPathNode(bindings, target, bindings.getAttribute("node"), new NamespaceContextImpl(bindings)); - } else - if (isJAXWSBindings(bindings) && (bindings.getAttributeNode("node") == null) && !isTopLevelBinding(bindings)) { - hasNode = false; - } else - if (isGlobalBinding(bindings) && !isWSDLDefinition(target) && isTopLevelBinding(bindings.getParentNode())) { - target = getWSDLDefintionNode(bindings, target); - } - - //if target is null it means the xpath evaluation has some problem, - // just return - if (target == null) - return; - - // update the result map - if (hasNode) - result.put(bindings, target); - - // look for child and process them recursively - Element[] children = getChildElements(bindings); - for (Element child : children) - buildTargetNodeMap(child, target, result); - } - */ private NodeList getWSDLDefintionNode(Node bindings, Node target) { return evaluateXPathMultiNode(bindings, target, "wsdl:definitions", new NamespaceContext() { + @Override public String getNamespaceURI(String prefix) { return "http://schemas.xmlsoap.org/wsdl/"; } + @Override public String getPrefix(String nsURI) { throw new UnsupportedOperationException(); } + @Override public Iterator getPrefixes(String namespaceURI) { throw new UnsupportedOperationException(); } @@ -332,8 +236,9 @@ } private boolean isWSDLDefinition(Node target) { - if (target == null) + if (target == null) { return false; + } String localName = target.getLocalName(); String nsURI = target.getNamespaceURI(); return fixNull(localName).equals("definitions") && fixNull(nsURI).equals("http://schemas.xmlsoap.org/wsdl/"); @@ -369,43 +274,17 @@ NodeList children = parent.getChildNodes(); for (int i = 0; i < children.getLength(); i++) { Node item = children.item(i); - if (!(item instanceof Element)) continue; - + if (!(item instanceof Element)) { + continue; + } if (JAXWSBindingsConstants.NS_JAXWS_BINDINGS.equals(item.getNamespaceURI()) || - JAXWSBindingsConstants.NS_JAXB_BINDINGS.equals(item.getNamespaceURI())) + JAXWSBindingsConstants.NS_JAXB_BINDINGS.equals(item.getNamespaceURI())) { a.add((Element) item); + } } return a.toArray(new Element[a.size()]); } - private Node evaluateXPathNode(Node bindings, Node target, String expression, NamespaceContext namespaceContext) { - NodeList nlst; - try { - xpath.setNamespaceContext(namespaceContext); - nlst = (NodeList) xpath.evaluate(expression, target, XPathConstants.NODESET); - } catch (XPathExpressionException e) { - reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATION_ERROR(e.getMessage()), e); - return null; // abort processing this - } - - if (nlst.getLength() == 0) { - reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(expression)); - return null; // abort - } - - if (nlst.getLength() != 1) { - reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(expression, nlst.getLength())); - return null; // abort - } - - Node rnode = nlst.item(0); - if (!(rnode instanceof Element)) { - reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(expression)); - return null; // abort - } - return rnode; - } - private NodeList evaluateXPathMultiNode(Node bindings, Node target, String expression, NamespaceContext namespaceContext) { NodeList nlst; try { @@ -424,35 +303,6 @@ return nlst; } - /** - * Moves JAXWS customizations under their respective target nodes. - */ - private void move(Element bindings, Map targetNodes) { - Node target = targetNodes.get(bindings); - if (target == null) - // this must be the result of an error on the external binding. - // recover from the error by ignoring this node - return; - - Element[] children = DOMUtils.getChildElements(bindings); - - for (Element item : children) { - if ("bindings".equals(item.getLocalName())) { - // process child recursively - move(item, targetNodes); - } else if (isGlobalBinding(item)) { - target = targetNodes.get(item); - moveUnder(item, (Element) target); - } else { - if (!(target instanceof Element)) { - return; // abort - } - // move this node under the target - moveUnder(item, (Element) target); - } - } - } - private boolean isJAXBBindingElement(Element e) { return fixNull(e.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXB_BINDINGS); } @@ -536,8 +386,11 @@ Attr a = (Attr) atts.item(i); if (Constants.NS_XMLNS.equals(a.getNamespaceURI())) { String prefix; - if (a.getName().indexOf(':') == -1) prefix = ""; - else prefix = a.getLocalName(); + if (a.getName().indexOf(':') == -1) { + prefix = ""; + } else { + prefix = a.getLocalName(); + } if (inscopes.add(prefix) && p != e) { // if this is the first time we see this namespace bindings, @@ -550,8 +403,9 @@ } } - if (p.getParentNode() instanceof Document) + if (p.getParentNode() instanceof Document) { break; + } p = (Element) p.getParentNode(); } @@ -567,15 +421,17 @@ public Element refineSchemaTarget(Element target) { // look for existing xs:annotation Element annotation = DOMUtils.getFirstChildElement(target, Constants.NS_XSD, "annotation"); - if (annotation == null) + if (annotation == null) { // none exists. need to make one annotation = insertXMLSchemaElement(target, "annotation"); + } // then look for appinfo Element appinfo = DOMUtils.getFirstChildElement(annotation, Constants.NS_XSD, "appinfo"); - if (appinfo == null) + if (appinfo == null) { // none exists. need to make one appinfo = insertXMLSchemaElement(annotation, "appinfo"); + } return appinfo; } @@ -583,9 +439,10 @@ public Element refineWSDLTarget(Element target) { // look for existing xs:annotation Element JAXWSBindings = DOMUtils.getFirstChildElement(target, JAXWSBindingsConstants.NS_JAXWS_BINDINGS, "bindings"); - if (JAXWSBindings == null) + if (JAXWSBindings == null) { // none exists. need to make one JAXWSBindings = insertJAXWSBindingsElement(target, "bindings"); + } return JAXWSBindings; } @@ -600,17 +457,21 @@ // the namespace binding. String qname = parent.getTagName(); int idx = qname.indexOf(':'); - if (idx == -1) qname = localName; - else qname = qname.substring(0, idx + 1) + localName; + if (idx == -1) { + qname = localName; + } else { + qname = qname.substring(0, idx + 1) + localName; + } Element child = parent.getOwnerDocument().createElementNS(Constants.NS_XSD, qname); NodeList children = parent.getChildNodes(); - if (children.getLength() == 0) + if (children.getLength() == 0) { parent.appendChild(child); - else + } else { parent.insertBefore(child, children.item(0)); + } return child; } @@ -622,22 +483,24 @@ NodeList children = parent.getChildNodes(); - if (children.getLength() == 0) + if (children.getLength() == 0) { parent.appendChild(child); - else + } else { parent.insertBefore(child, children.item(0)); + } return child; } - private static @NotNull - String fixNull(@Nullable String s) { - if (s == null) return ""; - else return s; + static String fixNull(@Nullable String s) { + if (s == null) { + return ""; + } else { + return s; + } } - private void reportError(Element errorSource, String formattedMsg) { reportError(errorSource, formattedMsg, null); }