jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 1997, 2011, 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.xml.internal.ws.resources.StreamingMessages;
 import com.sun.xml.internal.ws.util.ByteArrayBuffer;
 import javax.activation.DataSource;
 import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
 /**
 * The Accept header for Fast Infoset and XML encodings
 */
 private static final String fiXmlAccept = APPLICATION_FAST_INFOSET_MIME_TYPE + ", " + BASE_ACCEPT_VALUE;
-private class AcceptContentType implements ContentType {
+private ContentTypeImpl setAcceptHeader(Packet p, ContentType c) {
-private ContentType _c;
+ContentTypeImpl ctImpl = (ContentTypeImpl)c;
-private String _accept;
+if (p.contentNegotiation == ContentNegotiation.optimistic
+|| p.contentNegotiation == ContentNegotiation.pessimistic) {
-public AcceptContentType set(Packet p, ContentType c) {
+ctImpl.setAcceptHeader(fiXmlAccept);
-// TODO: need to compose based on underlying codecs
+} else {
-if (p.contentNegotiation == ContentNegotiation.optimistic
+ctImpl.setAcceptHeader(xmlAccept);
-|| p.contentNegotiation == ContentNegotiation.pessimistic) {
+}
-_accept = fiXmlAccept;
+p.setContentType(ctImpl);
-} else {
+return ctImpl;
-_accept = xmlAccept;
+}
-}
-_c = c;
-return this;
-}
-public String getContentType() {
-return _c.getContentType();
-}
-public String getSOAPActionHeader() {
-return _c.getSOAPActionHeader();
-}
-public String getAcceptHeader() {
-return _accept;
-}
-}
-private AcceptContentType _adaptingContentType = new AcceptContentType();
 public XMLHTTPBindingCodec(WSFeatureList f) {
 super(SOAPVersion.SOAP_11, f);
 xmlCodec = new XMLCodec(f);
 fiCodec = getFICodec();
 }
+@Override
 public String getMimeType() {
 return null;
 }
 @Override
 public ContentType getStaticContentType(Packet packet) {
-setRootCodec(packet);
+ContentType ct;
+if (packet.getInternalMessage() instanceof MessageDataSource) {
-ContentType ct = null;
+final MessageDataSource mds = (MessageDataSource)packet.getInternalMessage();
-if (packet.getMessage() instanceof MessageDataSource) {
-final MessageDataSource mds = (MessageDataSource)packet.getMessage();
 if (mds.hasUnconsumedDataSource()) {
 ct = getStaticContentType(mds);
 return (ct != null)
-? _adaptingContentType.set(packet, ct)
+? setAcceptHeader(packet, ct) //_adaptingContentType.set(packet, ct)
 : null;
 }
 }
 ct = super.getStaticContentType(packet);
 return (ct != null)
-? _adaptingContentType.set(packet, ct)
+? setAcceptHeader(packet, ct) //_adaptingContentType.set(packet, ct)
 : null;
 }
 @Override
 public ContentType encode(Packet packet, OutputStream out) throws IOException {
-setRootCodec(packet);
+if (packet.getInternalMessage() instanceof MessageDataSource) {
+final MessageDataSource mds = (MessageDataSource)packet.getInternalMessage();
-if (packet.getMessage() instanceof MessageDataSource) {
-final MessageDataSource mds = (MessageDataSource)packet.getMessage();
 if (mds.hasUnconsumedDataSource())
-return _adaptingContentType.set(packet, encode(mds, out));
+return setAcceptHeader(packet, encode(mds, out));
 }
-return _adaptingContentType.set(packet, super.encode(packet, out));
+return setAcceptHeader(packet, super.encode(packet, out));
 }
+@Override
 public ContentType encode(Packet packet, WritableByteChannel buffer) {
 throw new UnsupportedOperationException();
 }
 @Override
 if (!useFastInfosetForEncoding) {
 useFastInfosetForEncoding = isFastInfosetAcceptable(packet.acceptableMimeTypes);
 }
 }
+@Override
 protected void decode(MimeMultipartParser mpp, Packet packet) throws IOException {
 // This method will never be invoked
 }
+@Override
 public MimeCodec copy() {
 return new XMLHTTPBindingCodec(features);
 }
 private boolean isMultipartRelated(String contentType) {
 return compareStrings(contentType, MimeCodec.MULTIPART_RELATED_MIME_TYPE);
-}
-private boolean isApplicationXopXml(String contentType) {
-return compareStrings(contentType, MtomCodec.XOP_XML_MIME_TYPE);
 }
 private boolean isXml(String contentType) {
 return compareStrings(contentType, XMLCodec.XML_APPLICATION_MIME_TYPE)
 || compareStrings(contentType, XMLCodec.XML_TEXT_MIME_TYPE)
 } catch(IOException ioe) {
 throw new WebServiceException(ioe);
 }
 }
-private void setRootCodec(Packet p) {
+@Override
+protected Codec getMimeRootCodec(Packet p) {
 /**
 * The following logic is only for outbound packets
 * to be encoded by client.
 * On the server the p.contentNegotiation == null.
 */
 } else if (p.contentNegotiation == ContentNegotiation.optimistic) {
 // Always encode using Fast Infoset if in optimisitic mode
 useFastInfosetForEncoding = true;
 }
-rootCodec = (useFastInfosetForEncoding && fiCodec != null)
+return (useFastInfosetForEncoding && fiCodec != null)? fiCodec : xmlCodec;
-? fiCodec : xmlCodec;
 }
 public static boolean requiresTransformationOfDataSource(
 boolean isFastInfoset, boolean useFastInfoset) {
 return (isFastInfoset && !useFastInfoset) || (!isFastInfoset && useFastInfoset);

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

comparison: src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java

src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java