Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced usage of the deprecated OMNamespace.getName() to OMNamespace.getNamespaceURI

Browse Source
This commit is contained in:
Arjen Poutsma
2006-10-15 11:28:12 +00:00
parent 047235a8bf
commit 657f23ca2e
3 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelope.java
View File

@@ -1,21 +1,16 @@
package org.springframework.ws.soap.axiom;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import org.apache.axiom.om.OMException;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.*;
import org.springframework.util.Assert;
import org.springframework.ws.soap.SoapBody;
import org.springframework.ws.soap.SoapEnvelope;
import org.springframework.ws.soap.SoapHeader;
import org.springframework.xml.transform.StaxSource;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
/**
* Axiom-Specific version of <code>org.springframework.ws.soap.SoapEnvelope</code>.
*
@@ -59,7 +54,7 @@ class AxiomSoapEnvelope implements SoapEnvelope {
}
else {
SOAPHeader axiomHeader = axiomEnvelope.getHeader();
String namespaceURI = axiomEnvelope.getNamespace().getName();
String namespaceURI = axiomEnvelope.getNamespace().getNamespaceURI();
if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(namespaceURI)) {
return new AxiomSoapHeader(axiomHeader, axiomFactory);
}
@@ -80,7 +75,7 @@ class AxiomSoapEnvelope implements SoapEnvelope {
if (body == null) {
try {
SOAPBody axiomBody = axiomEnvelope.getBody();
String namespaceURI = axiomEnvelope.getNamespace().getName();
String namespaceURI = axiomEnvelope.getNamespace().getNamespaceURI();
if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(namespaceURI)) {
body = new AxiomSoap11Body(axiomBody, axiomFactory, payloadCaching);
}

15
core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFault.java
View File

@@ -16,22 +16,17 @@
package org.springframework.ws.soap.axiom;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import org.apache.axiom.om.OMException;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
import org.apache.axiom.soap.SOAPFaultRole;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.*;
import org.springframework.util.Assert;
import org.springframework.ws.soap.SoapFault;
import org.springframework.ws.soap.SoapFaultDetail;
import org.springframework.xml.namespace.QNameUtils;
import org.springframework.xml.transform.StaxSource;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
/**
* @author Arjen Poutsma
*/
@@ -68,7 +63,7 @@ abstract class AxiomSoapFault implements SoapFault {
int idx = text.indexOf(':');
String prefix = text.substring(0, idx);
String localPart = text.substring(idx + 1);
String namespaceUri = axiomFault.getCode().getValue().findNamespaceURI(prefix).getName();
String namespaceUri = axiomFault.getCode().getValue().findNamespaceURI(prefix).getNamespaceURI();
return QNameUtils.createQName(namespaceUri, localPart, prefix);
}

18
core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java
View File

@@ -16,15 +16,15 @@
package org.springframework.ws.soap.axiom.support;
import java.util.Locale;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import javax.xml.namespace.QName;
import java.util.Locale;
public class AxiomUtilsTest extends TestCase {
private OMElement element;
@@ -36,25 +36,25 @@ public class AxiomUtilsTest extends TestCase {
}
public void testToNamespaceDeclared() throws Exception {
QName qName = new QName(element.getNamespace().getName(), "localPart");
QName qName = new QName(element.getNamespace().getNamespaceURI(), "localPart");
OMNamespace namespace = AxiomUtils.toNamespace(qName, element);
assertNotNull("Invalid namespace", namespace);
assertEquals("Invalid namespace", qName.getNamespaceURI(), namespace.getName());
assertEquals("Invalid namespace", qName.getNamespaceURI(), namespace.getNamespaceURI());
}
public void testToNamespaceUndeclared() throws Exception {
QName qName = new QName("http://www.example.com", "localPart");
OMNamespace namespace = AxiomUtils.toNamespace(qName, element);
assertNotNull("Invalid namespace", namespace);
assertEquals("Invalid namespace", qName.getNamespaceURI(), namespace.getName());
assertEquals("Invalid namespace", qName.getNamespaceURI(), namespace.getNamespaceURI());
assertFalse("Invalid prefix", "prefix".equals(namespace.getPrefix()));
}
public void testToNamespacePrefixDeclared() throws Exception {
QName qName = new QName(element.getNamespace().getName(), "localPart", "prefix");
QName qName = new QName(element.getNamespace().getNamespaceURI(), "localPart", "prefix");
OMNamespace namespace = AxiomUtils.toNamespace(qName, element);
assertNotNull("Invalid namespace", namespace);
assertEquals("Invalid namespace", qName.getNamespaceURI(), namespace.getName());
assertEquals("Invalid namespace", qName.getNamespaceURI(), namespace.getNamespaceURI());
assertEquals("Invalid prefix", "prefix", namespace.getPrefix());
}
@@ -62,7 +62,7 @@ public class AxiomUtilsTest extends TestCase {
QName qName = new QName("http://www.example.com", "localPart", "otherPrefix");
OMNamespace namespace = AxiomUtils.toNamespace(qName, element);
assertNotNull("Invalid namespace", namespace);
assertEquals("Invalid namespace", qName.getNamespaceURI(), namespace.getName());
assertEquals("Invalid namespace", qName.getNamespaceURI(), namespace.getNamespaceURI());
assertEquals("Invalid prefix", qName.getPrefix(), namespace.getPrefix());
}