You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/05/13 12:06:54 UTC
svn commit: r1795055 - in /axis/axis2/java/core/trunk/modules:
saaj/src/org/apache/axis2/saaj/
transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/
transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/
...
Author: veithen
Date: Sat May 13 12:06:54 2017
New Revision: 1795055
URL: http://svn.apache.org/viewvc?rev=1795055&view=rev
Log:
Adapt to changes in the Axiom API.
Removed:
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/ContentTypeUtil.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java?rev=1795055&r1=1795054&r2=1795055&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java Sat May 13 12:06:54 2017
@@ -20,7 +20,7 @@
package org.apache.axis2.saaj;
import org.apache.axiom.attachments.Attachments;
-import org.apache.axiom.mime.ContentTypeBuilder;
+import org.apache.axiom.mime.ContentType;
import org.apache.axiom.mime.MediaType;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMOutputFormat;
@@ -270,11 +270,11 @@ public class SOAPMessageImpl extends SOA
public void saveChanges() throws SOAPException {
try {
String contentTypeValue = getSingleHeaderValue(HTTPConstants.HEADER_CONTENT_TYPE);
- ContentTypeBuilder contentType;
+ ContentType.Builder contentType;
if (isEmptyString(contentTypeValue)) {
- contentType = new ContentTypeBuilder(attachmentParts.size() > 0 ? MediaType.MULTIPART_RELATED : getMediaType());
+ contentType = ContentType.builder().setMediaType(attachmentParts.size() > 0 ? MediaType.MULTIPART_RELATED : getMediaType());
} else {
- contentType = new ContentTypeBuilder(contentTypeValue);
+ contentType = new ContentType(contentTypeValue).toBuilder();
//Use configures the baseType with multipart/related while no attachment exists or all the attachments are removed
if (contentType.getMediaType().equals(MediaType.MULTIPART_RELATED) && attachmentParts.size() == 0) {
contentType.setMediaType(getMediaType());
@@ -311,11 +311,11 @@ public class SOAPMessageImpl extends SOA
//Configure charset
String soapPartContentTypeValue = getSingleHeaderValue(soapPart.getMimeHeader(HTTPConstants.HEADER_CONTENT_TYPE));
- ContentTypeBuilder soapPartContentType = null;
+ ContentType.Builder soapPartContentType;
if (isEmptyString(soapPartContentTypeValue)) {
- soapPartContentType = new ContentTypeBuilder(soapPartContentTypeValue);
+ soapPartContentType = new ContentType(soapPartContentTypeValue).toBuilder();
} else {
- soapPartContentType = new ContentTypeBuilder(getMediaType());
+ soapPartContentType = ContentType.builder().setMediaType(getMediaType());
}
setCharsetParameter(soapPartContentType);
} else {
@@ -323,7 +323,7 @@ public class SOAPMessageImpl extends SOA
setCharsetParameter(contentType);
}
- mimeHeaders.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, contentType.toString());
+ mimeHeaders.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, contentType.build().toString());
} catch (ParseException e) {
throw new SOAPException("Invalid Content Type Field in the Mime Message", e);
}
@@ -374,7 +374,7 @@ public class SOAPMessageImpl extends SOA
if (attachmentParts.isEmpty()) {
envelope.serialize(out, format);
} else {
- ContentTypeBuilder contentType = new ContentTypeBuilder(getSingleHeaderValue(HTTPConstants.HEADER_CONTENT_TYPE));
+ ContentType.Builder contentType = new ContentType(getSingleHeaderValue(HTTPConstants.HEADER_CONTENT_TYPE)).toBuilder();
String boundary = contentType.getParameter("boundary");
if(isEmptyString(boundary)) {
boundary = UIDGenerator.generateMimeBoundary();
@@ -396,7 +396,7 @@ public class SOAPMessageImpl extends SOA
format.setSOAP11(((SOAPFactory)((SOAPEnvelopeImpl) soapPart.getEnvelope()).omTarget.getOMFactory()).getSOAPVersion() == SOAP11Version.getSingleton());
//Double save the content-type in case anything is updated
- mimeHeaders.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, contentType.toString());
+ mimeHeaders.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, contentType.build().toString());
OMMultipartWriter mpw = new OMMultipartWriter(out, format);
OutputStream rootPartOutputStream = mpw.writeRootPart();
@@ -615,7 +615,7 @@ public class SOAPMessageImpl extends SOA
* @param contentType
* @throws SOAPException
*/
- private void setCharsetParameter(ContentTypeBuilder contentType) throws SOAPException{
+ private void setCharsetParameter(ContentType.Builder contentType) throws SOAPException{
String charset = (String)getProperty(CHARACTER_SET_ENCODING);
if (!isEmptyString(charset)) {
contentType.setParameter("charset", charset);
Modified: axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=1795055&r1=1795054&r2=1795055&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java Sat May 13 12:06:54 2017
@@ -26,7 +26,6 @@ import junit.framework.AssertionFailedEr
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.mime.ContentType;
-import org.apache.axiom.mime.ContentTypeBuilder;
import org.apache.axis2.Constants;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
@@ -77,7 +76,7 @@ public class AxisTestClient implements T
public ContentType getContentType(ClientOptions options, ContentType contentType) {
// TODO: this may be incorrect in some cases
- ContentTypeBuilder builder = new ContentTypeBuilder(contentType);
+ ContentType.Builder builder = contentType.toBuilder();
String charset = options.getCharset();
if (charset == null) {
builder.setParameter("charset", charset);
Modified: axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java?rev=1795055&r1=1795054&r2=1795055&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java Sat May 13 12:06:54 2017
@@ -37,7 +37,6 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.transport.base.BaseConstants;
import org.apache.axis2.transport.testkit.client.ClientOptions;
-import org.apache.axis2.transport.testkit.util.ContentTypeUtil;
public interface MessageEncoder<T,U> {
MessageEncoder<XMLMessage,AxisMessage> XML_TO_AXIS =
@@ -77,7 +76,7 @@ public interface MessageEncoder<T,U> {
outputFormat.setRootContentId(options.getRootContentId());
return new ContentType(outputFormat.getContentTypeForSwA(SOAP12Constants.SOAP_12_CONTENT_TYPE));
} else {
- return ContentTypeUtil.addCharset(contentType, options.getCharset());
+ return contentType.toBuilder().setParameter("charset", options.getCharset()).build();
}
}
@@ -169,7 +168,7 @@ public interface MessageEncoder<T,U> {
new MessageEncoder<String,byte[]>() {
public ContentType getContentType(ClientOptions options, ContentType contentType) {
- return ContentTypeUtil.addCharset(contentType, options.getCharset());
+ return contentType.toBuilder().setParameter("charset", options.getCharset()).build();
}
public byte[] encode(ClientOptions options, String message) throws Exception {