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 fdabffb8b Replace usages of deprecated APIs
fdabffb8b is described below
commit fdabffb8b1522eddb2a6a10235397b6a665f677d
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Fri Nov 4 23:41:16 2022 +0000
Replace usages of deprecated APIs
---
axiom-api/pom.xml | 1 +
.../main/java/org/apache/axiom/om/OMOutputFormat.java | 7 +++----
.../java/org/apache/axiom/om/OMOutputFormatTest.java | 17 ++++++++---------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/axiom-api/pom.xml b/axiom-api/pom.xml
index b457ff6dd..044057196 100644
--- a/axiom-api/pom.xml
+++ b/axiom-api/pom.xml
@@ -264,6 +264,7 @@
org.apache.axiom.om.OMXMLBuilderFactory ->
org.apache.axiom.soap.SOAPModelBuilder,
org.apache.axiom.om.OMXMLBuilderFactory ->
org.apache.axiom.soap.SOAPProcessingException,
org.apache.axiom.om.OMXMLBuilderFactory ->
org.apache.axiom.soap.SOAPVersion,
+ org.apache.axiom.om.OMOutputFormat ->
org.apache.axiom.soap.SOAPVersion,
<!-- The public API shouldn't depend on
classes in o.a.a.om.util -->
org.apache.axiom.om.OMMetaFactorySPI ->
org.apache.axiom.om.util.StAXParserConfiguration,
org.apache.axiom.om.OMXMLBuilderFactory ->
org.apache.axiom.om.util.StAXParserConfiguration,
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
b/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
index b300ebe1f..5d216b303 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
@@ -24,8 +24,7 @@ import java.util.Map;
import org.apache.axiom.om.impl.MTOMConstants;
import org.apache.axiom.om.util.StAXWriterConfiguration;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPVersion;
import org.apache.axiom.util.UIDGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -189,9 +188,9 @@ public class OMOutputFormat {
}
if (contentType == null) {
if (isSoap11) {
- contentType = SOAP11Constants.SOAP_11_CONTENT_TYPE.toString();
+ contentType = SOAPVersion.SOAP11.getMediaType().toString();
} else {
- contentType = SOAP12Constants.SOAP_12_CONTENT_TYPE.toString();
+ contentType = SOAPVersion.SOAP12.getMediaType().toString();
}
}
// If MTOM or SWA, the returned content-type is an
diff --git
a/axiom-api/src/test/java/org/apache/axiom/om/OMOutputFormatTest.java
b/axiom-api/src/test/java/org/apache/axiom/om/OMOutputFormatTest.java
index 395a07d91..eeb25a2af 100644
--- a/axiom-api/src/test/java/org/apache/axiom/om/OMOutputFormatTest.java
+++ b/axiom-api/src/test/java/org/apache/axiom/om/OMOutputFormatTest.java
@@ -20,8 +20,7 @@
package org.apache.axiom.om;
import org.apache.axiom.om.impl.MTOMConstants;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPVersion;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -54,14 +53,14 @@ public class OMOutputFormatTest extends TestCase {
public void testGetContentTypeDefault() {
OMOutputFormat format = new OMOutputFormat();
String contentType = format.getContentType();
-
assertTrue(contentType.equals(SOAP11Constants.SOAP_11_CONTENT_TYPE.toString()));
+
assertTrue(contentType.equals(SOAPVersion.SOAP11.getMediaType().toString()));
}
public void testGetContentTypeSOAP12() {
OMOutputFormat format = new OMOutputFormat();
format.setSOAP11(false);
String contentType = format.getContentType();
-
assertTrue(contentType.equals(SOAP12Constants.SOAP_12_CONTENT_TYPE.toString()));
+
assertTrue(contentType.equals(SOAPVersion.SOAP12.getMediaType().toString()));
}
public void testGetContentTypeSOAP11MTOM() {
@@ -71,7 +70,7 @@ public class OMOutputFormatTest extends TestCase {
// This is rudimentary. We can add a more complete test that checks
// sub items in the future.
-
assertTrue(contentType.indexOf(SOAP11Constants.SOAP_11_CONTENT_TYPE.toString())!=-1);
+
assertTrue(contentType.indexOf(SOAPVersion.SOAP11.getMediaType().toString())!=-1);
assertTrue(contentType.indexOf(MTOMConstants.MTOM_TYPE)!=-1);
// Test for a double quoted boundary value.
@@ -89,7 +88,7 @@ public class OMOutputFormatTest extends TestCase {
// This is rudimentary. We can add a more complete test that checks
// sub items in the future.
-
assertTrue(contentType.indexOf(SOAP11Constants.SOAP_11_CONTENT_TYPE.toString())>=0);
+
assertTrue(contentType.indexOf(SOAPVersion.SOAP11.getMediaType().toString())>=0);
assertTrue(contentType.indexOf("multipart/related")>=0);
assertTrue(contentType.indexOf(MTOMConstants.MTOM_TYPE) < 0);
@@ -104,7 +103,7 @@ public class OMOutputFormatTest extends TestCase {
// This is rudimentary. We can add a more complete test that checks
// sub items in the future.
-
assertTrue(contentType.indexOf(SOAP11Constants.SOAP_11_CONTENT_TYPE.toString())>=0);
+
assertTrue(contentType.indexOf(SOAPVersion.SOAP11.getMediaType().toString())>=0);
assertTrue(contentType.indexOf("multipart/related")>=0);
assertTrue(contentType.indexOf(MTOMConstants.MTOM_TYPE) < 0);
@@ -123,7 +122,7 @@ public class OMOutputFormatTest extends TestCase {
// This is rudimentary. We can add a more complete test that checks
// sub items in the future.
-
assertTrue(contentType.indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE.toString())!=-1);
+
assertTrue(contentType.indexOf(SOAPVersion.SOAP12.getMediaType().toString())!=-1);
assertTrue(contentType.indexOf(MTOMConstants.MTOM_TYPE)!=-1);
}
@@ -136,7 +135,7 @@ public class OMOutputFormatTest extends TestCase {
// This is rudimentary. We can add a more complete test that checks
// sub items in the future.
-
assertTrue(contentType.indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE.toString())!=-1);
+
assertTrue(contentType.indexOf(SOAPVersion.SOAP12.getMediaType().toString())!=-1);
assertTrue(contentType.indexOf(MTOMConstants.MTOM_TYPE)!=-1);
assertTrue(contentType.indexOf("action=\\\"testSoapAction\\\"")!=-1);
}
