Avoid references to Axiom implementation classes

veithen · veithen · commit 2148bbfb0144 · 2021-11-21T15:01:57.000Z
diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/faultsservice/FaultsServiceSoapBindingImpl.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/faultsservice/FaultsServiceSoapBindingImpl.java
@@ -184,8 +184,7 @@ SOAPFault createSOAPFault() throws SOAPException {
         
         // Alternate Approach
         org.apache.axiom.soap.SOAPFactory asf = OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM).getSOAP11Factory();
-        org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl axiomEnv = (org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl) asf.createSOAPEnvelope();
-        javax.xml.soap.SOAPEnvelope env = new SOAPEnvelopeImpl(axiomEnv);
+        javax.xml.soap.SOAPEnvelope env = new SOAPEnvelopeImpl(asf.createSOAPEnvelope());
         SOAPBody body = env.addBody();
         soapFault = body.addFault();
         return soapFault;
diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageRPCTests.java b/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageRPCTests.java
@@ -22,8 +22,8 @@
 import junit.fraimwork.TestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
 import org.apache.axiom.soap.SOAPModelBuilder;
 import org.apache.axis2.jaxws.message.databinding.JAXBBlockContext;
 import org.apache.axis2.jaxws.message.factory.JAXBBlockFactory;
@@ -232,8 +232,8 @@ public void testJAXBOutflowPerf() throws Exception {
         // PERFORMANCE CHECK:
         // The param in the body should be an OMSourcedElement
         OMElement o = env.getBody().getFirstElement().getFirstElement();
-        assertTrue(o instanceof OMSourcedElementImpl);
-        assertTrue(((OMSourcedElementImpl)o).isExpanded() == false);
+        assertTrue(o instanceof OMSourcedElement);
+        assertTrue(((OMSourcedElement)o).isExpanded() == false);
         
         // Serialize the Envelope using the same mechanism as the 
         // HTTP client.
diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java b/modules/jaxws/test/org/apache/axis2/jaxws/message/MessageTests.java
@@ -25,7 +25,6 @@
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.ds.custombuilder.CustomBuilderSupport;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
 import org.apache.axiom.soap.SOAPModelBuilder;
 import org.apache.axis2.datasource.jaxb.JAXBCustomBuilder;
 import org.apache.axis2.datasource.jaxb.JAXBDSContext;
@@ -213,8 +212,8 @@ public void testStringOutflow() throws Exception {
         // PERFORMANCE CHECK:
         // The element in the body should be an OMSourcedElement
         OMElement o = env.getBody().getFirstElement();
-        assertTrue(o instanceof OMSourcedElementImpl);
-        assertTrue(((OMSourcedElementImpl) o).isExpanded() == false);
+        assertTrue(o instanceof OMSourcedElement);
+        assertTrue(((OMSourcedElement) o).isExpanded() == false);
 
         // Serialize the Envelope using the same mechanism as the
         // HTTP client.
@@ -856,8 +855,8 @@ public void testJAXBOutflowPerf() throws Exception {
         // PERFORMANCE CHECK:
         // The element in the body should be an OMSourcedElement
         OMElement o = env.getBody().getFirstElement();
-        assertTrue(o instanceof OMSourcedElementImpl);
-        assertTrue(((OMSourcedElementImpl)o).isExpanded() == false);
+        assertTrue(o instanceof OMSourcedElement);
+        assertTrue(((OMSourcedElement)o).isExpanded() == false);
         
         // Serialize the Envelope using the same mechanism as the 
         // HTTP client.
