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

SWS-464

Browse Source
This commit is contained in:
Arjen Poutsma
2008-12-16 21:37:19 +00:00
parent 66bdbafc39
commit 5431450bcd
9 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/springframework/ws/soap/SoapElement.java
View File

@@ -74,4 +74,13 @@ public interface SoapElement {
*/
Iterator getAllAttributes();
/**
* Adds a namespace declaration with the specified prefix and URI to this element.
*
* @param prefix the namespace prefix. Can be empty or null to declare the default namespace
* @param namespaceUri the namespace uri
* @throws SoapElementException in case of errors
*/
void addNamespaceDeclaration(String prefix, String namespaceUri);
}

11
core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java
View File

@@ -178,15 +178,18 @@ public abstract class AbstractAddressingVersion extends TransformerObjectSupport
if (address == null) {
return null;
}
List referenceProperties = referencePropertiesExpression != null ?
referencePropertiesExpression.evaluateAsNodeList(node) : Collections.EMPTY_LIST;
List referenceParameters = referenceParametersExpression != null ?
referenceParametersExpression.evaluateAsNodeList(node) : Collections.EMPTY_LIST;
List referenceProperties =
referencePropertiesExpression != null ? referencePropertiesExpression.evaluateAsNodeList(node) :
Collections.EMPTY_LIST;
List referenceParameters =
referenceParametersExpression != null ? referenceParametersExpression.evaluateAsNodeList(node) :
Collections.EMPTY_LIST;
return new EndpointReference(address, referenceProperties, referenceParameters);
}
public void addAddressingHeaders(SoapMessage message, MessageAddressingProperties map) {
SoapHeader header = message.getSoapHeader();
header.addNamespaceDeclaration(getNamespacePrefix(), getNamespaceUri());
// To
if (map.getTo() != null) {
SoapHeaderElement to = header.addHeaderElement(getToName());

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

@@ -29,6 +29,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPFactory;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.ws.soap.SoapElement;
import org.springframework.xml.transform.StaxSource;
@@ -116,6 +117,20 @@ class AxiomSoapElement implements SoapElement {
}
}
public void addNamespaceDeclaration(String prefix, String namespaceUri) {
try {
if (StringUtils.hasLength(prefix)) {
getAxiomElement().declareNamespace(namespaceUri, prefix);
}
else {
getAxiomElement().declareDefaultNamespace(namespaceUri);
}
}
catch (OMException ex) {
throw new AxiomSoapElementException(ex);
}
}
protected final OMElement getAxiomElement() {
return axiomElement;
}

4
core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java
View File

@@ -283,6 +283,10 @@ class Saaj11Implementation extends SaajImplementation {
return element.getChildElements(elementName);
}
void addNamespaceDeclaration(SOAPElement element, String prefix, String namespaceUri) throws SOAPException {
element.addNamespaceDeclaration(prefix, namespaceUri);
}
public void writeTo(SOAPMessage message, OutputStream outputStream) throws SOAPException, IOException {
if (message.saveRequired()) {
message.saveChanges();

4
core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java
View File

@@ -233,6 +233,10 @@ class Saaj12Implementation extends SaajImplementation {
return element.getChildElements(elementName);
}
void addNamespaceDeclaration(SOAPElement element, String prefix, String namespaceUri) throws SOAPException {
element.addNamespaceDeclaration(prefix, namespaceUri);
}
public void writeTo(SOAPMessage message, OutputStream outputStream) throws SOAPException, IOException {
if (message.saveRequired()) {
message.saveChanges();

4
core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java
View File

@@ -259,6 +259,10 @@ class Saaj13Implementation extends SaajImplementation {
return element.getChildElements(name);
}
void addNamespaceDeclaration(SOAPElement element, String prefix, String namespaceUri) throws SOAPException {
element.addNamespaceDeclaration(prefix, namespaceUri);
}
public void writeTo(SOAPMessage message, OutputStream outputStream) throws SOAPException, IOException {
if (message.saveRequired()) {
message.saveChanges();

4
core/src/main/java/org/springframework/ws/soap/saaj/SaajImplementation.java
View File

@@ -82,6 +82,9 @@ abstract class SaajImplementation {
/** Returns an iterator over all the child elements with the specified name. */
abstract Iterator getChildElements(SOAPElement element, QName name) throws SOAPException;
/** Declares a namespace. */
abstract void addNamespaceDeclaration(SOAPElement element, String prefix, String namespaceUri) throws SOAPException;
/*
* SOAPMessage
*/
@@ -231,5 +234,4 @@ abstract class SaajImplementation {
/** Adds a text node to the given detail entry. */
abstract void addTextNode(DetailEntry detailEntry, String text) throws SOAPException;
}

11
core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java
View File

@@ -36,7 +36,7 @@ class SaajSoapElement implements SoapElement {
private final SOAPElement element;
public SaajSoapElement(SOAPElement element) {
SaajSoapElement(SOAPElement element) {
Assert.notNull(element, "element must not be null");
this.element = element;
}
@@ -80,6 +80,15 @@ class SaajSoapElement implements SoapElement {
return getImplementation().getAllAttibutes(element);
}
public void addNamespaceDeclaration(String prefix, String namespaceUri) {
try {
getImplementation().addNamespaceDeclaration(element, prefix, namespaceUri);
}
catch (SOAPException ex) {
throw new SaajSoapElementException(ex);
}
}
protected final SOAPElement getSaajElement() {
return element;
}

11
core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java
View File

@@ -44,7 +44,18 @@ public abstract class AbstractSoapElementTestCase extends XMLTestCase {
assertEquals("Invalid attribute value", value, soapElement.getAttributeValue(name));
Iterator allAttributes = soapElement.getAllAttributes();
assertTrue("Iterator is empty", allAttributes.hasNext());
}
public void testAddNamespaceDeclaration() throws Exception {
String prefix = "p";
String namespace = "http://springframework.org/spring-ws";
soapElement.addNamespaceDeclaration(prefix, namespace);
}
public void testAddDefaultNamespaceDeclaration() throws Exception {
String prefix = "";
String namespace = "http://springframework.org/spring-ws";
soapElement.addNamespaceDeclaration(prefix, namespace);
}