jdk-sandbox: comparison jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointFactory.java

equal deleted inserted replaced

-:85dbdc227c5e
+:953bfc3fbe31
 /*
-* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2014, 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 javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.soap.SOAPBinding;
 import java.io.IOException;
 import java.net.URL;
+import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 /**
 * Entry point to the JAX-WS RI server-side runtime.
 *
 if (invoker == null) {
 invoker = InstanceResolver.createDefault(implType).createInvoker();
 }
-List<SDDocumentSource> md = new ArrayList<SDDocumentSource>();
+// Performance analysis indicates that reading and parsing imported schemas is
-if(metadata!=null)
+// a major component of Endpoint creation time.  Therefore, modify SDDocumentSource
+// handling to delay iterating collection as long as possible.
+Collection<SDDocumentSource> md = new CollectionCollection<SDDocumentSource>();
+if(primaryWsdl!=null) {
+if(metadata!=null) {
+Iterator<? extends SDDocumentSource> it = metadata.iterator();
+if (it.hasNext() && primaryWsdl.equals(it.next()))
+md.addAll(metadata);
+else {
+md.add(primaryWsdl);
+md.addAll(metadata);
+}
+} else
+md.add(primaryWsdl);
+} else if(metadata!=null)
 md.addAll(metadata);
-if(primaryWsdl!=null && !md.contains(primaryWsdl))
-md.add(primaryWsdl);
 if(container==null)
 container = ContainerResolver.getInstance().getContainer();
 if(serviceName==null)
 if (isStandard && implType.getAnnotation(WebServiceProvider.class)==null) {
 portTypeName = RuntimeModeler.getPortTypeName(implType, metadataReader);
 }
 // Categorises the documents as WSDL, Schema etc
-List<SDDocumentImpl> docList = categoriseMetadata(md, serviceName, portTypeName);
+Collection<SDDocumentImpl> docList = categoriseMetadata(md.iterator(), serviceName, portTypeName);
 // Finds the primary WSDL and makes sure that metadata doesn't have
 // two concrete or abstract WSDLs
 SDDocumentImpl primaryDoc = primaryWsdl != null ? SDDocumentImpl.create(primaryWsdl,serviceName,portTypeName) : findPrimary(docList);
 EndpointAwareTube terminal;
 * This done traversing from primary WSDL and its imports until it builds a
 * complete set of documents(transitive closure) for the endpoint.
 *
 * @param primaryDoc primary WSDL doc
 * @param docList complete metadata
-* @return new metadata that doesn't contain extraneous documnets.
+* @return new metadata that doesn't contain extraneous documents.
 */
-private static List<SDDocumentImpl> findMetadataClosure(SDDocumentImpl primaryDoc, List<SDDocumentImpl> docList, EntityResolver resolver) {
+private static Collection<SDDocumentImpl> findMetadataClosure(
-// create a map for old metadata
+final SDDocumentImpl primaryDoc, final Collection<SDDocumentImpl> docList, final EntityResolver resolver) {
-Map<String, SDDocumentImpl> oldMap = new HashMap<String, SDDocumentImpl>();
+return new AbstractCollection<SDDocumentImpl>() {
-for(SDDocumentImpl doc : docList) {
+@Override
-oldMap.put(doc.getSystemId().toString(), doc);
+public Iterator<SDDocumentImpl> iterator() {
-}
+// create a map for old metadata
-// create a map for new metadata
+Map<String, SDDocumentImpl> oldMap = new HashMap<String, SDDocumentImpl>();
-Map<String, SDDocumentImpl> newMap = new HashMap<String, SDDocumentImpl>();
+Iterator<SDDocumentImpl> oldDocs = docList.iterator();
-newMap.put(primaryDoc.getSystemId().toString(), primaryDoc);
+// create a map for new metadata
-List<String> remaining = new ArrayList<String>();
+Map<String, SDDocumentImpl> newMap = new HashMap<String, SDDocumentImpl>();
-remaining.addAll(primaryDoc.getImports());
+newMap.put(primaryDoc.getSystemId().toString(), primaryDoc);
-while(!remaining.isEmpty()) {
-String url = remaining.remove(0);
+List<String> remaining = new ArrayList<String>();
-SDDocumentImpl doc = oldMap.get(url);
+remaining.addAll(primaryDoc.getImports());
-if (doc == null) {
+while(!remaining.isEmpty()) {
-// old metadata doesn't have this imported doc, may be external
+String url = remaining.remove(0);
-if (resolver != null) {
+SDDocumentImpl doc = oldMap.get(url);
-try {
+if (doc == null) {
-InputSource source = resolver.resolveEntity(null, url);
+while (oldDocs.hasNext()) {
-if (source != null) {
+SDDocumentImpl old = oldDocs.next();
-MutableXMLStreamBuffer xsb = new MutableXMLStreamBuffer();
+String id = old.getSystemId().toString();
-XMLStreamReader reader = XmlUtil.newXMLInputFactory(true).createXMLStreamReader(source.getByteStream());
+oldMap.put(id, old);
-xsb.createFromXMLStreamReader(reader);
+if (id.equals(url)) {
+doc = old;
-SDDocumentSource sdocSource = SDDocumentImpl.create(new URL(url), xsb);
+break;
-doc = SDDocumentImpl.create(sdocSource, null, null);
+}
+}
+if (doc == null) {
+// old metadata doesn't have this imported doc, may be external
+if (resolver != null) {
+try {
+InputSource source = resolver.resolveEntity(null, url);
+if (source != null) {
+MutableXMLStreamBuffer xsb = new MutableXMLStreamBuffer();
+XMLStreamReader reader = XmlUtil.newXMLInputFactory(true).createXMLStreamReader(source.getByteStream());
+xsb.createFromXMLStreamReader(reader);
+SDDocumentSource sdocSource = SDDocumentImpl.create(new URL(url), xsb);
+doc = SDDocumentImpl.create(sdocSource, null, null);
+}
+} catch (Exception ex) {
+ex.printStackTrace();
+}
 }
-} catch (Exception ex) {
-ex.printStackTrace();
 }
+}
+// Check if new metadata already contains this doc
+if (doc != null && !newMap.containsKey(url)) {
+newMap.put(url, doc);
+remaining.addAll(doc.getImports());
+}
 }
-}
-// Check if new metadata already contains this doc
+return newMap.values().iterator();
-if (doc != null && !newMap.containsKey(url)) {
+}
-newMap.put(url, doc);
-remaining.addAll(doc.getImports());
+@Override
-}
+public int size() {
-}
+int size = 0;
-List<SDDocumentImpl> newMetadata = new ArrayList<SDDocumentImpl>();
+Iterator<SDDocumentImpl> it = iterator();
-newMetadata.addAll(newMap.values());
+while (it.hasNext()) {
-return newMetadata;
+it.next();
+size++;
+}
+return size;
+}
+@Override
+public void clear() {
+throw new UnsupportedOperationException();
+}
+@Override
+public boolean isEmpty() {
+return docList.isEmpty();
+}
+};
 }
 private static <T> void processHandlerAnnotation(WSBinding binding, Class<T> implType, QName serviceName, QName portName) {
 HandlerAnnotationInfo chainInfo =
 HandlerAnnotationProcessor.buildHandlerInfo(
 /**
 * Generates the WSDL and XML Schema for the endpoint if necessary
 * It generates WSDL only for SOAP1.1, and for XSOAP1.2 bindings
 */
-private static SDDocumentImpl generateWSDL(WSBinding binding, AbstractSEIModelImpl seiModel, List<SDDocumentImpl> docs,
+private static SDDocumentImpl generateWSDL(WSBinding binding, AbstractSEIModelImpl seiModel, Collection<SDDocumentImpl> docs,
 Container container, Class implType) {
 BindingID bindingId = binding.getBindingId();
 if (!bindingId.canGenerateWSDL()) {
 throw new ServerRtException("can.not.generate.wsdl", bindingId);
 }
 }
 /**
 * Builds {@link SDDocumentImpl} from {@link SDDocumentSource}.
 */
-private static List<SDDocumentImpl> categoriseMetadata(
+private static Collection<SDDocumentImpl> categoriseMetadata(
-List<SDDocumentSource> src, QName serviceName, QName portTypeName) {
+final Iterator<SDDocumentSource> src, final QName serviceName, final QName portTypeName) {
-List<SDDocumentImpl> r = new ArrayList<SDDocumentImpl>(src.size());
+return new AbstractCollection<SDDocumentImpl>() {
-for (SDDocumentSource doc : src) {
+private final Collection<SDDocumentImpl> theConverted = new ArrayList<SDDocumentImpl>();
-r.add(SDDocumentImpl.create(doc,serviceName,portTypeName));
-}
+@Override
-return r;
+public boolean add(SDDocumentImpl arg0) {
+return theConverted.add(arg0);
+}
+@Override
+public Iterator<SDDocumentImpl> iterator() {
+return new Iterator<SDDocumentImpl>() {
+private Iterator<SDDocumentImpl> convIt = theConverted.iterator();
+@Override
+public boolean hasNext() {
+if (convIt != null && convIt.hasNext())
+return true;
+return src.hasNext();
+}
+@Override
+public SDDocumentImpl next() {
+if (convIt != null && convIt.hasNext())
+return convIt.next();
+convIt = null;
+if (!src.hasNext())
+throw new NoSuchElementException();
+SDDocumentImpl next = SDDocumentImpl.create(src.next(),serviceName,portTypeName);
+theConverted.add(next);
+return next;
+}
+@Override
+public void remove() {
+throw new UnsupportedOperationException();
+}
+};
+}
+@Override
+public int size() {
+throw new UnsupportedOperationException();
+}
+@Override
+public boolean isEmpty() {
+if (!theConverted.isEmpty())
+return false;
+return !src.hasNext();
+}
+};
 }
 /**
 * Verifies whether the given primaryWsdl contains the given serviceName.
 * If the WSDL doesn't have the service, it throws an WebServiceException.
 * it throws an exception.
 *
 * @return primay wsdl document, null if is not there in the docList
 *
 */
-private static @Nullable SDDocumentImpl findPrimary(@NotNull List<SDDocumentImpl> docList) {
+private static @Nullable SDDocumentImpl findPrimary(@NotNull Collection<SDDocumentImpl> docList) {
 SDDocumentImpl primaryDoc = null;
 boolean foundConcrete = false;
 boolean foundAbstract = false;
 for(SDDocumentImpl doc : docList) {
 if (doc instanceof SDDocument.WSDL) {
 * @param serviceName service name in wsdl
 * @param portName port name in WSDL
 * @param container container in which this service is running
 * @return non-null wsdl port object
 */
-private static @NotNull WSDLPort getWSDLPort(SDDocumentSource primaryWsdl, List<? extends SDDocumentSource> metadata,
+private static @NotNull WSDLPort getWSDLPort(SDDocumentSource primaryWsdl, Collection<? extends SDDocumentSource> metadata,
 @NotNull QName serviceName, @NotNull QName portName, Container container,
 EntityResolver resolver) {
 URL wsdlUrl = primaryWsdl.getSystemId();
 try {
 // TODO: delegate to another entity resolver
 /**
 * {@link XMLEntityResolver} that can resolve to {@link SDDocumentSource}s.
 */
 private static final class EntityResolverImpl implements XMLEntityResolver {
-private Map<String,SDDocumentSource> metadata = new HashMap<String,SDDocumentSource>();
+private Iterator<? extends SDDocumentSource> origMetadata;
+private Map<String,SDDocumentSource> metadata = new ConcurrentHashMap<String,SDDocumentSource>();
 private EntityResolver resolver;
-public EntityResolverImpl(List<? extends SDDocumentSource> metadata, EntityResolver resolver) {
+public EntityResolverImpl(Collection<? extends SDDocumentSource> metadata, EntityResolver resolver) {
-for (SDDocumentSource doc : metadata) {
+this.origMetadata = metadata.iterator();
-this.metadata.put(doc.getSystemId().toExternalForm(),doc);
-}
 this.resolver = resolver;
 }
 public Parser resolveEntity (String publicId, String systemId) throws IOException, XMLStreamException {
 if (systemId != null) {
 SDDocumentSource doc = metadata.get(systemId);
 if (doc != null)
 return new Parser(doc);
+synchronized(this) {
+while(origMetadata.hasNext()) {
+doc = origMetadata.next();
+String extForm = doc.getSystemId().toExternalForm();
+this.metadata.put(extForm,doc);
+if (systemId.equals(extForm))
+return new Parser(doc);
+}
+}
 }
 if (resolver != null) {
 try {
 InputSource source = resolver.resolveEntity(publicId, systemId);
 if (source != null) {
 }
 private static final Logger logger = Logger.getLogger(
 com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".server.endpoint");
+private static class CollectionCollection<T> extends AbstractCollection<T> {
+private final Collection<Collection<? extends T>> cols = new ArrayList<Collection<? extends T>>();
+@Override
+public Iterator<T> iterator() {
+final Iterator<Collection<? extends T>> colIt = cols.iterator();
+return new Iterator<T>() {
+private Iterator<? extends T> current = null;
+@Override
+public boolean hasNext() {
+if (current == null || !current.hasNext()) {
+do {
+if (!colIt.hasNext())
+return false;
+current = colIt.next().iterator();
+} while (!current.hasNext());
+return true;
+}
+return true;
+}
+@Override
+public T next() {
+if (!hasNext())
+throw new NoSuchElementException();
+return current.next();
+}
+@Override
+public void remove() {
+if (current == null)
+throw new IllegalStateException();
+current.remove();
+}
+};
+}
+@Override
+public int size() {
+int size = 0;
+for (Collection<? extends T> c : cols)
+size += c.size();
+return size;
+}
+@Override
+public boolean add(T arg0) {
+return cols.add(Collections.singleton(arg0));
+}
+@Override
+public boolean addAll(Collection<? extends T> arg0) {
+return cols.add(arg0);
+}
+@Override
+public void clear() {
+cols.clear();
+}
+@Override
+public boolean isEmpty() {
+return !iterator().hasNext();
+}
+}
 }

changeset 23782	953bfc3fbe31
parent 20590	b3b34e4344ce