[axis-axis2-java-core] branch master updated: Adapt to changes in Axiom

[veithen]

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 04d3412df0 Adapt to changes in Axiom
04d3412df0 is described below

commit 04d3412df0a909e5d3b5a3648bf5bd1957a9f51e
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Fri Nov 4 21:00:01 2022 +0000

    Adapt to changes in Axiom
---
 .../src/test/java/org/apache/axis2/schema/AbstractTestCase.java       | 4 +++-
 .../src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java  | 4 +++-
 .../kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java | 4 +++-
 .../org/apache/axis2/kernel/http/MultipartFormDataFormatterTest.java  | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java 
b/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java
index 14324ef618..5a7b17a9f5 100644
--- 
a/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java
+++ 
b/modules/adb-tests/src/test/java/org/apache/axis2/schema/AbstractTestCase.java
@@ -47,6 +47,8 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.mime.ContentTransferEncoding;
+import org.apache.axiom.mime.ContentType;
 import org.apache.axiom.mime.MultipartBodyWriter;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
@@ -374,7 +376,7 @@ public abstract class AbstractTestCase extends TestCase {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         OMOutputFormat format = new OMOutputFormat();
         MultipartBodyWriter mpWriter = new MultipartBodyWriter(buffer, 
format.getMimeBoundary());
-        OutputStream rootPartWriter = mpWriter.writePart("application/xop+xml; 
charset=UTF-8; type=\"text/xml\"", "binary", format.getRootContentId(), null);
+        OutputStream rootPartWriter = mpWriter.writePart(new 
ContentType("application/xop+xml; charset=UTF-8; type=\"text/xml\""), 
ContentTransferEncoding.BINARY, format.getRootContentId(), null);
         envelope.serialize(rootPartWriter, format);
         rootPartWriter.close();
         mpWriter.complete();
diff --git 
a/modules/kernel/src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java
 
b/modules/kernel/src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java
index 4c8cab3359..7d2949f21a 100644
--- 
a/modules/kernel/src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java
+++ 
b/modules/kernel/src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java
@@ -19,7 +19,9 @@
 
 package org.apache.axis2.kernel.http;
 
+import org.apache.axiom.mime.ContentType;
 import org.apache.axiom.mime.Header;
+import org.apache.axiom.mime.MediaType;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -180,7 +182,7 @@ public class MultipartFormDataFormatter implements 
MessageFormatter {
         return omElement;
     }
     
-    public static final String DEFAULT_CONTENT_TYPE = "text/plain; 
charset=US-ASCII";
+    public static final ContentType DEFAULT_CONTENT_TYPE = new 
ContentType(MediaType.TEXT_PLAIN, "charset", "US-ASCII");
     public static final String DISPOSITION_TYPE = "form-data";
     
 }
diff --git 
a/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java 
b/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
index 82a675683b..49fe3cb9ad 100644
--- a/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
@@ -20,6 +20,8 @@
 package org.apache.axis2.kernel.http;
 
 import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.mime.ContentType;
+import org.apache.axiom.mime.MediaType;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMOutputFormat;
@@ -206,7 +208,7 @@ public class SOAPMessageFormatter implements 
MessageFormatter {
                 }
                 OMOutputFormat innerFormat = new OMOutputFormat(format);
                 innerFormat.setMimeBoundary(innerBoundary);
-                innerOutputStream = mpw.writePart("multipart/related; 
boundary=\"" + innerBoundary + "\"", partCID);
+                innerOutputStream = mpw.writePart(new 
ContentType(MediaType.MULTIPART_RELATED, "boundary", innerBoundary), partCID);
                 attachmentsWriter = new OMMultipartWriter(innerOutputStream, 
innerFormat);
             }
             
diff --git 
a/modules/kernel/test/org/apache/axis2/kernel/http/MultipartFormDataFormatterTest.java
 
b/modules/kernel/test/org/apache/axis2/kernel/http/MultipartFormDataFormatterTest.java
index 43cb5f86a1..487ff982fe 100644
--- 
a/modules/kernel/test/org/apache/axis2/kernel/http/MultipartFormDataFormatterTest.java
+++ 
b/modules/kernel/test/org/apache/axis2/kernel/http/MultipartFormDataFormatterTest.java
@@ -88,7 +88,7 @@ public class MultipartFormDataFormatterTest extends TestCase {
         assertTrue("Can not find the content",
                 message.contains("Content-Disposition: form-data; 
name=\"part2\""));
         assertTrue("Can not find the content",
-                message.contains("Content-Type: text/plain; 
charset=US-ASCII"));
+                message.contains("Content-Type: text/plain; 
charset=\"US-ASCII\""));
         //assertTrue("Can not find the content", 
message.contains("Content-Transfer-Encoding: 8bit"));
         assertTrue("Can not find the content", message.contains("sample data 
part 1"));
         assertTrue("Can not find the content", message.contains("sample data 
part 2"));