jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
 import com.sun.tools.internal.xjc.util.DOMUtils;
 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 com.sun.xml.internal.ws.util.xml.XmlUtil;
-import org.w3c.dom.Document;
+import org.w3c.dom.*;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.xml.sax.SAXParseException;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 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;
 /**
 * Internalizes external binding declarations.
 *
 * @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;
 }
 public void transform() {
 for (Element jaxwsBinding : forest.outerMostBindings) {
 internalize(jaxwsBinding, jaxwsBinding);
 }
-/*
-Map<Element, Node> targetNodes = new HashMap<Element, Node>();
-for (Element jaxwsBinding : forest.outerMostBindings) {
-buildTargetNodeMap(jaxwsBinding, jaxwsBinding, targetNodes);
-}
-for (Element jaxwsBinding : forest.outerMostBindings) {
-move(jaxwsBinding, targetNodes);
-}
-*/
 }
 /**
 * Validates attributes of a &lt;JAXWS:bindings> element.
 */
 private void validate(Element bindings) {
 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
 }
 }
 targetNodes = getWSDLDefintionNode(bindings, target);
 }
 //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) {
 for (int i = 0; i < targetNodes.getLength(); i++) {
 insertBinding(bindings, targetNodes.item(i));
 // look for child <JAXWS:bindings> and process them recursively
 Element[] children = getChildElements(bindings);
-for (Element child : children)
+for (Element child : children) {
-if("bindings".equals(child.getLocalName())) {
+if ("bindings".equals(child.getLocalName())) {
 internalize(child, targetNodes.item(i));
 }
+}
 }
 }
 }
 if (targetNodes == null) {
 // look for child <JAXWS:bindings> and process them recursively
 Element[] children = getChildElements(bindings);
-for (Element child : children)
+for (Element child : children) {
 internalize(child, target);
+}
 }
 }
 /**
 * Moves JAXWS customizations under their respective target nodes.
 } else {
 moveUnder(bindings, (Element) target);
 }
 }
-/**
-* 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<Element, Node> 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 <JAXWS:bindings>
-}
-}
-//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 <JAXWS:bindings> 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();
 }
 });
 }
 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/");
 }
 private static Element[] getChildElements(Element parent) {
 ArrayList<Element> a = new ArrayList<Element>();
 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 <jaxb:bindings>
-}
-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 {
 reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(expression));
 return null; // abort
 }
 return nlst;
-}
-/**
-* Moves JAXWS customizations under their respective target nodes.
-*/
-private void move(Element bindings, Map<Element, Node> 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 <jaxws:bindings> 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);
 }
 NamedNodeMap atts = p.getAttributes();
 for (int i = 0; i < atts.getLength(); i++) {
 Attr a = (Attr) atts.item(i);
 if (Constants.NS_XMLNS.equals(a.getNamespaceURI())) {
 String prefix;
-if (a.getName().indexOf(':') == -1) prefix = "";
+if (a.getName().indexOf(':') == -1) {
-else prefix = a.getLocalName();
+prefix = "";
+} else {
+prefix = a.getLocalName();
+}
 if (inscopes.add(prefix) && p != e) {
 // if this is the first time we see this namespace bindings,
 // copy the declaration.
 // if p==decl, there's no need to. Note that
 e.setAttributeNodeNS((Attr) a.cloneNode(true));
 }
 }
 }
-if (p.getParentNode() instanceof Document)
+if (p.getParentNode() instanceof Document) {
 break;
+}
 p = (Element) p.getParentNode();
 }
 if (!inscopes.contains("")) {
 }
 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;
 }
 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;
 }
 /**
 * Creates a new XML Schema element of the given local name
 private Element insertXMLSchemaElement(Element parent, String localName) {
 // use the same prefix as the parent node to avoid modifying
 // the namespace binding.
 String qname = parent.getTagName();
 int idx = qname.indexOf(':');
-if (idx == -1) qname = localName;
+if (idx == -1) {
-else qname = qname.substring(0, idx + 1) + localName;
+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;
 }
 private Element insertJAXWSBindingsElement(Element parent, String localName) {
 Element child = parent.getOwnerDocument().createElementNS(JAXWSBindingsConstants.NS_JAXWS_BINDINGS, 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;
 }
-private static
 @NotNull
-String fixNull(@Nullable String s) {
+static String fixNull(@Nullable String s) {
-if (s == null) return "";
+if (s == null) {
-else return s;
+return "";
-}
+} else {
+return s;
+}
+}
 private void reportError(Element errorSource, String formattedMsg) {
 reportError(errorSource, formattedMsg, null);
 }

Mercurial > jdk8-mips64-public > jaxws / file comparison

comparison: src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java

src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java