[ws-axiom] branch master updated: Switch SOAP_11_CONTENT_TYPE and SOAP_12_CONTENT_TYPE back to String

[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/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new fed88b1e7 Switch SOAP_11_CONTENT_TYPE and SOAP_12_CONTENT_TYPE back to 
String
fed88b1e7 is described below

commit fed88b1e7adc2aae07a09eade1c4a63e55c65fed
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Fri Nov 4 20:35:13 2022 +0000

    Switch SOAP_11_CONTENT_TYPE and SOAP_12_CONTENT_TYPE back to String
    
    Instead of changing the type to MediaType, deprecate those constants.
---
 axiom-api/pom.xml                                                  | 2 --
 .../src/main/java/org/apache/axiom/om/impl/OMMultipartWriter.java  | 7 +++----
 axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java | 7 ++++---
 axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java | 7 ++++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/axiom-api/pom.xml b/axiom-api/pom.xml
index ddae29a5a..b457ff6dd 100644
--- a/axiom-api/pom.xml
+++ b/axiom-api/pom.xml
@@ -264,8 +264,6 @@
                                 org.apache.axiom.om.OMXMLBuilderFactory -&gt; 
org.apache.axiom.soap.SOAPModelBuilder,
                                 org.apache.axiom.om.OMXMLBuilderFactory -&gt; 
org.apache.axiom.soap.SOAPProcessingException,
                                 org.apache.axiom.om.OMXMLBuilderFactory -&gt; 
org.apache.axiom.soap.SOAPVersion,
-                                org.apache.axiom.om.OMOutputFormat -&gt; 
org.apache.axiom.soap.SOAP11Constants,
-                                org.apache.axiom.om.OMOutputFormat -&gt; 
org.apache.axiom.soap.SOAP12Constants,
                                 <!-- The public API shouldn't depend on 
classes in o.a.a.om.util -->
                                 org.apache.axiom.om.OMMetaFactorySPI -&gt; 
org.apache.axiom.om.util.StAXParserConfiguration,
                                 org.apache.axiom.om.OMXMLBuilderFactory -&gt; 
org.apache.axiom.om.util.StAXParserConfiguration,
diff --git 
a/axiom-api/src/main/java/org/apache/axiom/om/impl/OMMultipartWriter.java 
b/axiom-api/src/main/java/org/apache/axiom/om/impl/OMMultipartWriter.java
index d06817892..9e2f25173 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/impl/OMMultipartWriter.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/impl/OMMultipartWriter.java
@@ -33,8 +33,7 @@ import org.apache.axiom.mime.Header;
 import org.apache.axiom.mime.MediaType;
 import org.apache.axiom.mime.MultipartBodyWriter;
 import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPVersion;
 
 /**
  * Writes a MIME multipart package as used by XOP/MTOM and SOAP with 
Attachments. This class wraps a
@@ -57,9 +56,9 @@ public class OMMultipartWriter {
         
         MediaType soapContentType;
         if (format.isSOAP11()) {
-            soapContentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
+            soapContentType = SOAPVersion.SOAP11.getMediaType();
         } else {
-            soapContentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
+            soapContentType = SOAPVersion.SOAP12.getMediaType();
         }
         if (format.isOptimized()) {
             rootPartContentType = ContentType.builder()
diff --git a/axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java 
b/axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java
index 1b421d793..3ffd4b487 100644
--- a/axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java
+++ b/axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java
@@ -21,8 +21,6 @@ package org.apache.axiom.soap;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.mime.MediaType;
-
 
 public interface SOAP11Constants extends SOAPConstants {
     static final String SOAP_ENVELOPE_NAMESPACE_URI =
@@ -43,7 +41,10 @@ public interface SOAP11Constants extends SOAPConstants {
     static final String SOAP_FAULT_DETAIL_LOCAL_NAME = "detail";
 
     //SOAP 1.2 Content Type
-    static final MediaType SOAP_11_CONTENT_TYPE = MediaType.TEXT_XML;
+    /**
+     * @deprecated Use {@link SOAPVersion#getMediaType()} instead.
+     */
+    static final String SOAP_11_CONTENT_TYPE = "text/xml";
 
     // -------- SOAP Fault Codes ------------------------------
     static final String FAULT_CODE_SENDER = "Client";
diff --git a/axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java 
b/axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java
index 8ac541ea6..d1a6674b9 100644
--- a/axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java
+++ b/axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java
@@ -21,8 +21,6 @@ package org.apache.axiom.soap;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.mime.MediaType;
-
 
 public interface SOAP12Constants extends SOAPConstants {
     public String SOAP_ENVELOPE_NAMESPACE_URI =
@@ -63,7 +61,10 @@ public interface SOAP12Constants extends SOAPConstants {
     public static final String SOAP_FAULT_ROLE_LOCAL_NAME = "Role";
 
     //SOAP 1.2 Content Type
-    public static final MediaType SOAP_12_CONTENT_TYPE = 
MediaType.APPLICATION_SOAP_XML;
+    /**
+     * @deprecated Use {@link SOAPVersion#getMediaType()} instead.
+     */
+    public static final String SOAP_12_CONTENT_TYPE = "application/soap+xml";
 
     // -------- SOAP Fault Codes ------------------------------
     public static final String FAULT_CODE_SENDER = "Sender";