You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:17 UTC
[12/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
index 5fbfd9e..0281908 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
@@ -66,11 +66,11 @@ import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
public class SoapOutInterceptor extends AbstractSoapInterceptor {
public static final String WROTE_ENVELOPE_START = "wrote.envelope.start";
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SoapOutInterceptor.class);
-
+
private Bus bus;
-
+
public SoapOutInterceptor(Bus b) {
super(Phase.WRITE);
bus = b;
@@ -79,13 +79,13 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
super(phase);
bus = b;
}
-
+
public void handleMessage(SoapMessage message) {
// Yes this is ugly, but it avoids us from having to implement any kind of caching strategy
boolean wroteStart = MessageUtils.isTrue(message.get(WROTE_ENVELOPE_START));
if (!wroteStart) {
writeSoapEnvelopeStart(message);
-
+
OutputStream os = message.getContent(OutputStream.class);
// Unless we're caching the whole message in memory skip the envelope writing
// if there's a fault later.
@@ -97,10 +97,10 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
// Add a final interceptor to write end elements
message.getInterceptorChain().add(new SoapOutEndingInterceptor());
}
-
+
private void writeSoapEnvelopeStart(final SoapMessage message) {
final SoapVersion soapVersion = message.getVersion();
- try {
+ try {
XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
String soapPrefix = xtw.getPrefix(soapVersion.getNamespace());
if (StringUtils.isEmpty(soapPrefix)) {
@@ -114,7 +114,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
}
}
xtw.setPrefix(soapPrefix, soapVersion.getNamespace());
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getEnvelope().getLocalPart(),
soapVersion.getNamespace());
xtw.writeNamespace(soapPrefix, soapVersion.getNamespace());
@@ -122,10 +122,10 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
if (!soapVersion.getNamespace().equals(entry.getValue())) {
xtw.writeNamespace(entry.getKey(), entry.getValue());
}
- }
+ }
} else {
xtw.setPrefix(soapPrefix, soapVersion.getNamespace());
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getEnvelope().getLocalPart(),
soapVersion.getNamespace());
String s2 = xtw.getPrefix(soapVersion.getNamespace());
@@ -138,9 +138,9 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
boolean preexistingHeaders = message.hasHeaders();
if (preexistingHeaders) {
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getHeader().getLocalPart(),
- soapVersion.getNamespace());
+ soapVersion.getNamespace());
List<Header> hdrList = message.getHeaders();
for (Header header : hdrList) {
XMLStreamWriter writer = xtw;
@@ -179,17 +179,17 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
xtw.writeEndElement();
}
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getBody().getLocalPart(),
soapVersion.getNamespace());
-
+
// Interceptors followed such as Wrapped/RPC/Doc Interceptor will write SOAP body
} catch (XMLStreamException e) {
throw new SoapFault(
new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE), e, soapVersion.getSender());
}
}
-
+
private boolean handleHeaderPart(boolean preexistingHeaders, SoapMessage message, String soapPrefix) {
//add MessagePart to soapHeader if necessary
boolean endedHeader = false;
@@ -198,8 +198,8 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
if (bop == null) {
return endedHeader;
}
-
- XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
+
+ XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
boolean startedHeader = false;
BindingOperationInfo unwrappedOp = bop;
if (bop.isUnwrapped()) {
@@ -208,11 +208,11 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
boolean client = isRequestor(message);
BindingMessageInfo bmi = client ? unwrappedOp.getInput() : unwrappedOp.getOutput();
BindingMessageInfo wrappedBmi = client ? bop.getInput() : bop.getOutput();
-
+
if (bmi == null) {
return endedHeader;
}
-
+
if (wrappedBmi.getMessageInfo().getMessagePartsNumber() > 0) {
MessageContentsList objs = MessageContentsList.getContentsList(message);
if (objs == null) {
@@ -222,8 +222,8 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
List<SoapHeaderInfo> headers = bmi.getExtensors(SoapHeaderInfo.class);
if (headers == null) {
return endedHeader;
- }
-
+ }
+
for (SoapHeaderInfo header : headers) {
MessagePartInfo part = header.getPart();
@@ -241,11 +241,11 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
objs.remove(part);
if (!(startedHeader || preexistingHeaders)) {
try {
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getHeader().getLocalPart(),
soapVersion.getNamespace());
} catch (XMLStreamException e) {
- throw new SoapFault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE),
+ throw new SoapFault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE),
e, soapVersion.getSender());
}
startedHeader = true;
@@ -253,20 +253,20 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
DataWriter<XMLStreamWriter> dataWriter = getDataWriter(message);
dataWriter.write(arg, header.getPart(), xtw);
}
-
+
if (startedHeader || preexistingHeaders) {
try {
xtw.writeEndElement();
endedHeader = true;
} catch (XMLStreamException e) {
- throw new SoapFault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE),
+ throw new SoapFault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE),
e, soapVersion.getSender());
}
}
}
return endedHeader;
- }
-
+ }
+
protected DataWriter<XMLStreamWriter> getDataWriter(Message message) {
Service service = ServiceModelUtil.getService(message.getExchange());
DataWriter<XMLStreamWriter> dataWriter = service.getDataBinding().createWriter(XMLStreamWriter.class);
@@ -285,7 +285,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
writer.setSchema(schema);
}
}
-
+
public class SoapOutEndingInterceptor extends AbstractSoapInterceptor {
public SoapOutEndingInterceptor() {
super(SoapOutEndingInterceptor.class.getName(), Phase.WRITE_ENDING);
@@ -296,16 +296,16 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
if (xtw != null) {
// Write body end
- xtw.writeEndElement();
+ xtw.writeEndElement();
// Write Envelope end element
xtw.writeEndElement();
xtw.writeEndDocument();
-
+
xtw.flush();
}
} catch (XMLStreamException e) {
if (e.getCause() instanceof EOFException) {
- //Nothing we can do about this, some clients will close the connection early if
+ //Nothing we can do about this, some clients will close the connection early if
//they fully parse everything they need
} else {
SoapVersion soapVersion = message.getVersion();
@@ -315,14 +315,14 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
}
}
}
-
+
public static class SOAPHeaderWriter extends DelegatingXMLStreamWriter {
final SoapHeader soapHeader;
final SoapVersion soapVersion;
final String soapPrefix;
boolean firstDone;
-
-
+
+
public SOAPHeaderWriter(XMLStreamWriter writer,
SoapHeader header,
SoapVersion version,
@@ -332,7 +332,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
soapVersion = version;
soapPrefix = pfx;
}
-
+
public void writeAttribute(String prefix, String uri, String local, String value)
throws XMLStreamException {
if (soapVersion.getNamespace().equals(uri)
@@ -350,7 +350,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
}
super.writeAttribute(uri, local, value);
}
-
+
private void writeSoapAttributes() throws XMLStreamException {
if (!firstDone) {
firstDone = true;
@@ -362,11 +362,11 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
}
boolean mu = soapHeader.isMustUnderstand();
if (mu) {
- String mul = soapVersion.getAttrValueMustUnderstand(mu);
+ String mul = soapVersion.getAttrValueMustUnderstand(mu);
super.writeAttribute(soapPrefix,
soapVersion.getNamespace(),
soapVersion.getAttrNameMustUnderstand(),
- mul);
+ mul);
}
}
}
@@ -384,7 +384,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
super.writeStartElement(arg0);
writeSoapAttributes();
}
-
-
+
+
};
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
index 62946ca..a5bb91e 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
@@ -52,7 +52,7 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
/**
* Mediate a message dispatch.
- *
+ *
* @param message the current message
* @throws Fault
*/
@@ -64,10 +64,10 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
}
}
-
+
/**
* Ensure the SOAP version is set for this message.
- *
+ *
* @param message the current message
*/
private void ensureVersion(SoapMessage message) {
@@ -77,18 +77,18 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
soapVersion = ((SoapMessage)message.getExchange().getInMessage()).getVersion();
message.setVersion(soapVersion);
}
-
+
if (soapVersion == null) {
soapVersion = Soap11.getInstance();
message.setVersion(soapVersion);
}
-
+
message.put(Message.CONTENT_TYPE, soapVersion.getContentType());
}
-
+
/**
* Ensure the SOAP header is set for this message.
- *
+ *
* @param message the current message
*/
private void ensureMimeHeaders(SoapMessage message) {
@@ -96,32 +96,32 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
message.put(MIME_HEADERS, new HashMap<String, List<String>>());
}
}
-
+
private void setSoapAction(SoapMessage message) {
BindingOperationInfo boi = message.getExchange().getBindingOperationInfo();
-
+
// The soap action is set on the wrapped operation.
if (boi != null && boi.isUnwrapped()) {
boi = boi.getWrappedOperation();
}
-
+
String action = getSoapAction(message, boi);
-
+
if (message.getVersion() instanceof Soap11) {
- Map<String, List<String>> reqHeaders
+ Map<String, List<String>> reqHeaders
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (reqHeaders == null) {
reqHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
}
-
+
if (reqHeaders.size() == 0) {
message.put(Message.PROTOCOL_HEADERS, reqHeaders);
}
-
+
reqHeaders.put(SoapBindingConstants.SOAP_ACTION, Collections.singletonList(action));
} else if (message.getVersion() instanceof Soap12 && !"\"\"".equals(action)) {
String ct = (String) message.get(Message.CONTENT_TYPE);
-
+
if (ct.indexOf("action=\"") == -1) {
ct = new StringBuilder().append(ct)
.append("; action=").append(action).toString();
@@ -133,7 +133,7 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
private String getSoapAction(SoapMessage message, BindingOperationInfo boi) {
// allow an interceptor to override the SOAPAction if need be
String action = (String) message.get(SoapBindingConstants.SOAP_ACTION);
-
+
// Fall back on the SOAPAction in the operation info
if (action == null) {
if (boi == null) {
@@ -143,11 +143,11 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
action = soi == null ? "\"\"" : soi.getAction() == null ? "\"\"" : soi.getAction();
}
}
-
+
if (!action.startsWith("\"")) {
action = new StringBuilder().append("\"").append(action).append("\"").toString();
}
-
+
return action;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
index 60f0b7b..346c5e7 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
@@ -32,15 +32,15 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
public class StartBodyInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(StartBodyInterceptor.class);
-
+
public StartBodyInterceptor() {
super(Phase.READ);
}
-
+
public StartBodyInterceptor(String phase) {
super(phase);
}
@@ -52,8 +52,8 @@ public class StartBodyInterceptor extends AbstractSoapInterceptor {
return;
}
XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
- //advance to just outside the <soap:body> opening tag, but not
- //to the nextTag as that may skip over white space that is
+ //advance to just outside the <soap:body> opening tag, but not
+ //to the nextTag as that may skip over white space that is
//important to keep for ws-security signature digests and stuff
try {
int i = xmlReader.next();
@@ -62,7 +62,7 @@ public class StartBodyInterceptor extends AbstractSoapInterceptor {
i = xmlReader.next();
}
} catch (XMLStreamException e) {
- throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
+ throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
message.getVersion().getSender());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
index 15d1adf..ef4378c 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
@@ -29,7 +29,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
/**
- * Tibco Business Works uses SoapAction instead of the standard spelling SOAPAction.
+ * Tibco Business Works uses SoapAction instead of the standard spelling SOAPAction.
* So this interceptor adds a SoapAction header if SOAPAction is set in protocol header
*/
public class TibcoSoapActionInterceptor extends AbstractPhaseInterceptor<SoapMessage> {
@@ -45,7 +45,7 @@ public class TibcoSoapActionInterceptor extends AbstractPhaseInterceptor<SoapMes
Map<String, Object> headers = (Map<String, Object>)soapMessage.get(Message.PROTOCOL_HEADERS);
if (headers != null && headers.containsKey(SoapBindingConstants.SOAP_ACTION)) {
//need to flip to a case sensitive map. The default
- //is a case insensitive map, but in this case, we need
+ //is a case insensitive map, but in this case, we need
//to use a case sensitive map to make sure both versions go out
headers = new TreeMap<String, Object>(headers);
soapMessage.put(Message.PROTOCOL_HEADERS, headers);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java
index 09743f7..fb16c17 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java
@@ -22,7 +22,7 @@ package org.apache.cxf.binding.soap.jms.interceptor;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
public class JMSFault extends Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
index 7bfe163..e5701f3 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.common.logging.LogUtils;
/**
- *
+ *
*/
public final class JMSFaultFactory {
@@ -50,7 +50,7 @@ public final class JMSFaultFactory {
}).toString();
return createFault(SoapJMSConstants.getContentTypeMismatchQName(), m);
}
-
+
public static JMSFault createMalformedRequestURIFault(String requestURI) {
String m = new org.apache.cxf.common.i18n.Message("MALFORMED_REQUESTURI", LOG,
new Object[] {
@@ -76,7 +76,7 @@ public final class JMSFaultFactory {
String m = new org.apache.cxf.common.i18n.Message("MISSING_SOAPACTION", LOG).toString();
return createFault(SoapJMSConstants.getMissingSoapActionQName(), m);
}
-
+
public static JMSFault createMissingRequestURIFault() {
String m = new org.apache.cxf.common.i18n.Message("MISSING_REQUESTURI", LOG).toString();
return createFault(SoapJMSConstants.getMissingRequestURIQName(), m);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java
index 7b7c7be..0dc92cd 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java
@@ -40,7 +40,7 @@ public class JMSFaultType {
/**
* Gets the value of the faultCode property.
- *
+ *
* @return possible object is {@link QName }
*/
public QName getFaultCode() {
@@ -49,7 +49,7 @@ public class JMSFaultType {
/**
* Sets the value of the faultCode property.
- *
+ *
* @param value allowed object is {@link QName }
*/
public void setFaultCode(QName value) {
@@ -68,7 +68,7 @@ public class JMSFaultType {
* <CODE>set</CODE> method for the any property.
* <p>
* For example, to add a new item, do as follows:
- *
+ *
* <pre>
* getAny().add(newItem);
* </pre>
@@ -96,7 +96,7 @@ public class JMSFaultType {
* the map is keyed by the name of the attribute and the value is the string value of the attribute. the
* map returned by this method is live, and you can add new attribute by updating the map directly.
* Because of this design, there's no setter.
- *
+ *
* @return always non-null
*/
public Map<QName, String> getOtherAttributes() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
index 61046ea..1d8c774 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
@@ -32,34 +32,34 @@ import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.interceptor.Fault;
/**
- *
+ *
*/
public class SoapFaultFactory {
-
+
private SoapVersion version;
-
+
public SoapFaultFactory(Binding binding) {
version = ((SoapBinding)binding).getSoapVersion();
}
-
+
public Fault createFault(JMSFault jmsFault) {
Fault f = null;
if (version == Soap11.getInstance()) {
f = createSoap11Fault(jmsFault);
- // so we can encode the SequenceFault as header
+ // so we can encode the SequenceFault as header
f.initCause(jmsFault);
} else {
f = createSoap12Fault(jmsFault);
}
return f;
}
-
+
Fault createSoap11Fault(JMSFault jmsFault) {
SoapFault fault = new SoapFault(jmsFault.getReason(),
jmsFault.getSubCode());
return fault;
}
-
+
Fault createSoap12Fault(JMSFault jmsFault) {
SoapFault fault = new SoapFault(jmsFault.getReason(),
jmsFault.isSender() ? version.getSender() : version.getReceiver());
@@ -72,7 +72,7 @@ public class SoapFaultFactory {
setDetail(fault, detail);
return fault;
}
-
+
void setDetail(SoapFault fault, Object detail) {
Element el = null;
if (detail instanceof Element) {
@@ -84,10 +84,10 @@ public class SoapFaultFactory {
fault.setDetail(el);
}
}
-
+
public String toString(Fault f) {
return f.toString();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
index aefba15..7d2be87 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
@@ -22,7 +22,7 @@ package org.apache.cxf.binding.soap.jms.interceptor;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
public final class SoapJMSConstants {
@@ -30,7 +30,7 @@ public final class SoapJMSConstants {
public static final String JMS_MESSAGE_TYPE = "JMSMessageType";
public static final String TARGET_SERVICE_IN_REQUESTURI = "target.service.inrequesturi";
public static final String MALFORMED_REQUESTURI = "malformed.requesturi";
-
+
// JMS Message properties' names.
public static final String REQUESTURI_PARAMETER_NAME = "requestURI";
public static final String BINDINGVERSION_PARAMETER_NAME = "bindingVersion";
@@ -39,7 +39,7 @@ public final class SoapJMSConstants {
public static final String CONTENTTYPE_PARAMETER_NAME = "contentType";
public static final String CONTENTENCODING_PARAMETER_NAME = "contentEncoding";
public static final String ISFAULT_PARAMETER_NAME = "isFault";
-
+
// JMS Field name
public static final String REQUESTURI_FIELD = SOAP_JMS_PREFIX + REQUESTURI_PARAMETER_NAME;
public static final String BINDINGVERSION_FIELD = SOAP_JMS_PREFIX
@@ -52,7 +52,7 @@ public final class SoapJMSConstants {
public static final String SOAP_JMS_SPECIFICIATION_TRANSPORTID = "http://www.w3.org/2010/soapjms/";
public static final String SOAP_JMS_NAMESPACE = SOAP_JMS_SPECIFICIATION_TRANSPORTID;
-
+
// fault codes
private static final String JMS_CONTENTTYPEMISMATCH_FAULT_CODE = "contentTypeMismatch";
private static final String JMS_CONTENTENCODINGNOTSUPPORTED_FAULT_CODE = "contentEncodingNotSupported";
@@ -61,18 +61,18 @@ public final class SoapJMSConstants {
private static final String JMS_MISSINGCONTENTTYPE_FAULT_CODE = "missingContentType";
private static final String JMS_MISSINGSOAPACTION_FAULT_CODE = "missingSoapAction";
private static final String JMS_MISSINGREQUESTURI_FAULT_CODE = "missingRequestURI";
- private static final String JMS_TARGETSERVICENOTALLOWEDINREQUESTURI_FAULT_CODE =
+ private static final String JMS_TARGETSERVICENOTALLOWEDINREQUESTURI_FAULT_CODE =
"targetServiceNotAllowedInRequestURI";
private static final String JMS_UNRECOGNIZEDBINDINGVERSION_FAULT_CODE = "unrecognizedBindingVersion";
private static final String JMS_UNSUPPORTEDJMSMESSAGEFORMAT_FAULT_CODE = "unsupportedJMSMessageFormat";
private SoapJMSConstants() {
}
-
+
public static QName getContentTypeMismatchQName() {
return new QName(SOAP_JMS_NAMESPACE, JMS_CONTENTTYPEMISMATCH_FAULT_CODE);
}
-
+
public static QName getContentEncodingNotSupportedQName() {
return new QName(SOAP_JMS_NAMESPACE, JMS_CONTENTENCODINGNOTSUPPORTED_FAULT_CODE);
}
@@ -92,7 +92,7 @@ public final class SoapJMSConstants {
public static QName getMissingSoapActionQName() {
return new QName(SOAP_JMS_NAMESPACE, JMS_MISSINGSOAPACTION_FAULT_CODE);
}
-
+
public static QName getMissingRequestURIQName() {
return new QName(SOAP_JMS_NAMESPACE, JMS_MISSINGREQUESTURI_FAULT_CODE);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
index 33c4d42..840e6ab 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
@@ -33,7 +33,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
@@ -67,7 +67,7 @@ public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
if (!"gzip".equals(contentEncoding)) {
jmsFault = JMSFaultFactory.createContentEncodingNotSupported(contentEncoding);
}
- }
+ }
if (jmsFault != null) {
Fault f = createFault(message, jmsFault);
if (f != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
index d98a5eff..84ce8a7 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
@@ -35,7 +35,7 @@ public class SoapBindingInfo extends BindingInfo {
private String style;
private String transportURI;
-
+
public SoapBindingInfo(ServiceInfo serv, String n) {
this(serv, n, null);
resolveSoapVersion(n);
@@ -96,7 +96,7 @@ public class SoapBindingInfo extends BindingInfo {
/**
* Get the soap action for an operation. Will never return null.
- *
+ *
* @param operation
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
index 8a54c0c..a30a412 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
@@ -28,7 +28,7 @@ public class SoapBodyInfo {
private List <MessagePartInfo> parts = new ArrayList<>();
private List <MessagePartInfo> attachments = new ArrayList<>();
private String use;
-
+
public List<MessagePartInfo> getParts() {
return parts;
}
@@ -52,5 +52,5 @@ public class SoapBodyInfo {
public void setAttachments(List<MessagePartInfo> attachments) {
this.attachments = attachments;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java
index 5a9cadd..55701dc 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java
@@ -22,12 +22,12 @@ package org.apache.cxf.binding.soap.model;
import org.apache.cxf.service.model.MessagePartInfo;
public class SoapHeaderInfo {
-
+
private MessagePartInfo part;
private String use;
-
+
public SoapHeaderInfo() {
-
+
}
public MessagePartInfo getPart() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java
index 229b62c..1e22690 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java
@@ -27,15 +27,15 @@ public class SoapOperationInfo {
public String getAction() {
return action;
}
-
+
public void setAction(String action) {
this.action = action;
}
-
+
public String getStyle() {
return style;
}
-
+
public void setStyle(String style) {
this.style = style;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java
index 21d6f92..0b7d818 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java
@@ -30,13 +30,13 @@ import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.common.util.SystemPropertyAction;
/**
- *
+ *
*/
public final class SAAJFactoryResolver {
- public static final String MESSAGE_FACTORY_KEY
+ public static final String MESSAGE_FACTORY_KEY
= "org.apache.cxf.binding.soap.messageFactoryClassName";
- public static final String SOAP_FACTORY_KEY
+ public static final String SOAP_FACTORY_KEY
= "org.apache.cxf.binding.soap.soapFactoryClassName";
private SAAJFactoryResolver() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
index 516bf89..1747063 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
@@ -81,12 +81,12 @@ import org.apache.cxf.staxutils.W3CDOMStreamWriter;
@NoJSR250Annotations
public class SAAJInInterceptor extends AbstractSoapInterceptor {
public static final SAAJInInterceptor INSTANCE = new SAAJInInterceptor();
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SAAJInInterceptor.class);
private static final String BODY_FILLED_IN = SAAJInInterceptor.class.getName() + ".BODY_DONE";
private SAAJPreInInterceptor preInterceptor = SAAJPreInInterceptor.INSTANCE;
- private List<PhaseInterceptor<? extends Message>> extras
+ private List<PhaseInterceptor<? extends Message>> extras
= new ArrayList<PhaseInterceptor<? extends Message>>(1);
public SAAJInInterceptor() {
super(Phase.PRE_PROTOCOL);
@@ -95,7 +95,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
public SAAJInInterceptor(String phase) {
super(phase);
}
-
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return extras;
}
@@ -107,10 +107,10 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
*/
public static class SAAJPreInInterceptor extends AbstractSoapInterceptor {
public static final SAAJPreInInterceptor INSTANCE = new SAAJPreInInterceptor();
-
+
private MessageFactory factory11;
private MessageFactory factory12;
-
+
public SAAJPreInInterceptor() {
super(Phase.READ);
addBefore(ReadHeadersInterceptor.class.getName());
@@ -134,7 +134,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
MessageFactory factory = getFactory(message);
SOAPMessage soapMessage = factory.createMessage();
message.setContent(SOAPMessage.class, soapMessage);
-
+
SOAPPart part = soapMessage.getSOAPPart();
message.setContent(Node.class, part);
message.put(W3CDOMStreamWriter.class, new SAAJStreamWriter(part));
@@ -148,9 +148,9 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
}
public synchronized MessageFactory getFactory(SoapMessage message) throws SOAPException {
if (message.getVersion() instanceof Soap11) {
- if (factory11 == null) {
+ if (factory11 == null) {
factory11 = SAAJFactoryResolver.createMessageFactory(message.getVersion());
- }
+ }
return factory11;
}
if (message.getVersion() instanceof Soap12) {
@@ -162,9 +162,9 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
return SAAJFactoryResolver.createMessageFactory(null);
}
}
-
-
-
+
+
+
@SuppressWarnings("unchecked")
public void handleMessage(SoapMessage message) throws Fault {
if (isGET(message)) {
@@ -228,7 +228,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
soapMessage.addAttachmentPart(ap);
}
}
-
+
//replace header element if necessary
if (message.hasHeaders()) {
replaceHeaders(soapMessage, message);
@@ -237,21 +237,21 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
if (soapMessage.getSOAPPart().getEnvelope().getHeader() == null) {
soapMessage.getSOAPPart().getEnvelope().addHeader();
}
-
+
//If we have an xmlReader that already is counting the attributes and such
//then we don't want to rely on the system level defaults in StaxUtils.copy
//CXF-6173
boolean secureReader = StaxUtils.isSecureReader(xmlReader, message);
- StaxUtils.copy(xmlReader,
- new SAAJStreamWriter(soapMessage.getSOAPPart(),
+ StaxUtils.copy(xmlReader,
+ new SAAJStreamWriter(soapMessage.getSOAPPart(),
soapMessage.getSOAPPart().getEnvelope().getBody()),
- true,
+ true,
!secureReader);
DOMSource bodySource = new DOMSource(soapMessage.getSOAPPart().getEnvelope().getBody());
xmlReader = StaxUtils.createXMLStreamReader(bodySource);
xmlReader.nextTag();
xmlReader.nextTag(); // move past body tag
- message.setContent(XMLStreamReader.class, xmlReader);
+ message.setContent(XMLStreamReader.class, xmlReader);
} catch (SOAPException soape) {
throw new SoapFault(new org.apache.cxf.common.i18n.Message(
"SOAPHANDLERINTERCEPTOR_EXCEPTION", BUNDLE), soape,
@@ -262,7 +262,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
.getVersion().getSender());
}
}
-
+
private static void adjustPrefixes(SOAPEnvelope env, String envPrefix, String bodyPrefix) throws SOAPException {
SAAJUtils.adjustPrefix(env, envPrefix);
SAAJUtils.adjustPrefix(env.getBody(), bodyPrefix);
@@ -293,7 +293,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
if (b != null && b.getExtension(HeaderManager.class) != null) {
p = b.getExtension(HeaderManager.class).getHeaderProcessor(elem.getNamespaceURI());
}
-
+
Object obj;
DataBinding dataBinding = null;
if (p == null || p.getDataBinding() == null) {
@@ -303,27 +303,27 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
obj = p.getDataBinding().createReader(Node.class).read(elem);
}
//TODO - add the interceptors
-
+
SoapHeader shead = new SoapHeader(new QName(elem.getNamespaceURI(),
elem.getLocalName()),
obj,
dataBinding);
shead.setDirection(SoapHeader.Direction.DIRECTION_IN);
-
+
String mu = elem.getAttributeNS(message.getVersion().getNamespace(),
message.getVersion().getAttrNameMustUnderstand());
String act = elem.getAttributeNS(message.getVersion().getNamespace(),
message.getVersion().getAttrNameRole());
-
+
shead.setActor(act);
shead.setMustUnderstand(Boolean.valueOf(mu) || "1".equals(mu));
Header oldHdr = message.getHeader(
new QName(elem.getNamespaceURI(), elem.getLocalName()));
if (oldHdr != null) {
message.getHeaders().remove(oldHdr);
- }
- message.getHeaders().add(shead);
-
+ }
+ message.getHeaders().add(shead);
+
elem = DOMUtils.getNextElement(elem);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
index a6c47c6..7328832 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
@@ -70,22 +70,22 @@ import org.apache.cxf.staxutils.W3CDOMStreamWriter;
*/
@NoJSR250Annotations
public class SAAJOutInterceptor extends AbstractSoapInterceptor {
- public static final String ORIGINAL_XML_WRITER
+ public static final String ORIGINAL_XML_WRITER
= SAAJOutInterceptor.class.getName() + ".original.xml.writer";
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SAAJOutInterceptor.class);
-
+
private MessageFactory factory11;
private MessageFactory factory12;
-
+
public SAAJOutInterceptor() {
super(Phase.PRE_PROTOCOL);
}
public synchronized MessageFactory getFactory(SoapMessage message) throws SOAPException {
if (message.getVersion() instanceof Soap11) {
- if (factory11 == null) {
+ if (factory11 == null) {
factory11 = SAAJFactoryResolver.createMessageFactory(message.getVersion());
- }
+ }
return factory11;
}
if (message.getVersion() instanceof Soap12) {
@@ -99,23 +99,23 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
public void handleMessage(SoapMessage message) throws Fault {
SOAPMessage saaj = message.getContent(SOAPMessage.class);
- try {
+ try {
if (message.hasHeaders()
- && saaj != null
+ && saaj != null
&& saaj.getSOAPPart().getEnvelope().getHeader() == null) {
// creating an empty SOAPHeader at this point in the
- // pre-existing SOAPMessage avoids the <soap:body> and
+ // pre-existing SOAPMessage avoids the <soap:body> and
// <soap:header> appearing in reverse order when the envolope
// is written to the wire
//
saaj.getSOAPPart().getEnvelope().addHeader();
}
} catch (SOAPException e) {
- throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE, e.getMessage()),
+ throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE, e.getMessage()),
e,
message.getVersion().getSender());
- }
+ }
if (saaj == null) {
SoapVersion version = message.getVersion();
@@ -134,26 +134,26 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
message.setContent(XMLStreamWriter.class, writer);
message.setContent(SOAPMessage.class, soapMessage);
message.setContent(Node.class, soapMessage.getSOAPPart());
-
-
+
+
} catch (SOAPException e) {
throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE, e.getMessage()), e, version.getSender());
}
} else if (!message.containsKey(ORIGINAL_XML_WRITER)) {
//as the SOAPMessage already has everything in place, we do not need XMLStreamWriter to write
- //anything for us, so we just set XMLStreamWriter's output to a dummy output stream.
+ //anything for us, so we just set XMLStreamWriter's output to a dummy output stream.
XMLStreamWriter origWriter = message.getContent(XMLStreamWriter.class);
message.put(ORIGINAL_XML_WRITER, origWriter);
-
+
XMLStreamWriter dummyWriter = StaxUtils.createXMLStreamWriter(new OutputStream() {
public void write(int b) throws IOException {
}
public void write(byte b[], int off, int len) throws IOException {
- }
+ }
});
message.setContent(XMLStreamWriter.class, dummyWriter);
}
-
+
// Add a final interceptor to write the message
message.getInterceptorChain().add(SAAJOutEndingInterceptor.INSTANCE);
}
@@ -170,17 +170,17 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
}
}
-
+
public static class SAAJOutEndingInterceptor extends AbstractSoapInterceptor {
public static final SAAJOutEndingInterceptor INSTANCE = new SAAJOutEndingInterceptor();
-
+
public SAAJOutEndingInterceptor() {
super(SAAJOutEndingInterceptor.class.getName(), Phase.PRE_PROTOCOL_ENDING);
}
public void handleMessage(SoapMessage message) throws Fault {
SOAPMessage soapMessage = message.getContent(SOAPMessage.class);
-
+
if (soapMessage != null) {
if (soapMessage.countAttachments() > 0) {
if (message.getAttachments() == null) {
@@ -205,7 +205,7 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
message.getAttachments().add(att);
}
}
-
+
XMLStreamWriter writer = (XMLStreamWriter)message.get(ORIGINAL_XML_WRITER);
message.remove(ORIGINAL_XML_WRITER);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 8c13b1e..177653b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -45,8 +45,8 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
private final SOAPPart part;
private final SOAPEnvelope envelope;
private String uri;
-
-
+
+
public SAAJStreamWriter(SOAPPart part) {
super(part);
this.part = part;
@@ -73,7 +73,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
this.envelope = env;
isOverlaid = false;
}
-
+
@Override
public String getPrefix(String nsuri) throws XMLStreamException {
if (isOverlaid && part != null && getCurrentNode() == null) {
@@ -105,11 +105,11 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
return envelope;
}
-
+
protected void adjustOverlaidNode(Node nd2, String pfx) {
String namespace = nd2.getNamespaceURI();
try {
- if (namespace != null
+ if (namespace != null
&& namespace.equals(getEnvelopeURI())) {
adjustPrefix((SOAPElement)nd2, pfx);
if ("Envelope".equals(nd2.getLocalName())) {
@@ -121,14 +121,14 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
super.adjustOverlaidNode(nd2, pfx);
}
-
+
protected void createAndAddElement(String prefix, String local, String namespace) {
if (part == null) {
super.createAndAddElement(prefix, local, namespace);
return;
}
try {
- if (namespace != null
+ if (namespace != null
&& namespace.equals(getEnvelopeURI())) {
if ("Envelope".equals(local)) {
setChild(adjustPrefix(getEnvelope(), prefix), false);
@@ -152,7 +152,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
} else if ("Fault".equals(local)) {
SOAPFault f = getEnvelope().getBody().getFault();
if (f == null) {
- Element el = getDocument().createElementNS(namespace,
+ Element el = getDocument().createElementNS(namespace,
StringUtils.isEmpty(prefix) ? local : prefix + ":" + local);
getEnvelope().getBody().appendChild(el);
f = getEnvelope().getBody().getFault();
@@ -187,7 +187,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
super.createAndAddElement(prefix, local, namespace);
}
-
+
@Override
protected Element createElementNS(String ns, String pfx, String local) {
Element cur = getCurrentNode();
@@ -229,5 +229,5 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
return super.createElementNS(ns, pfx, local);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
index f1abe19..c29af06 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
@@ -30,14 +30,14 @@ import javax.xml.soap.SOAPMessage;
import org.apache.cxf.common.util.StringUtils;
/**
- *
+ *
*/
public final class SAAJUtils {
-
+
private SAAJUtils() {
//not constructed
}
-
+
public static SOAPHeader getHeader(SOAPMessage m) throws SOAPException {
try {
return m.getSOAPHeader();
@@ -69,9 +69,9 @@ public final class SAAJUtils {
}
f.setFaultCode(pfx + ":" + code.getLocalPart());
}
-
+
}
-
+
public static SOAPElement adjustPrefix(SOAPElement e, String prefix) {
if (prefix == null) {
prefix = "";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java
index 44a2d64..6c3e18f 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java
@@ -22,6 +22,6 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
public class NamespaceHandler extends NamespaceHandlerSupport {
public void init() {
- registerBeanDefinitionParser("soapBinding", new SoapBindingInfoConfigBeanDefinitionParser());
+ registerBeanDefinitionParser("soapBinding", new SoapBindingInfoConfigBeanDefinitionParser());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
index 93da397..e4fe10b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
@@ -25,7 +25,7 @@ import org.springframework.beans.PropertyEditorRegistrar;
import org.springframework.beans.PropertyEditorRegistry;
/**
- *
+ *
*/
public class SoapVersionRegistrar implements PropertyEditorRegistrar {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java
index 52603d6..73677f5 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java
@@ -23,5 +23,5 @@ import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap12.SOAP12Binding;
public interface SoapBinding extends SOAPBinding, SOAP12Binding {
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java
index cc462ab..2d68977 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java
@@ -23,5 +23,5 @@ import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap12.SOAP12Body;
public interface SoapBody extends SOAPBody, SOAP12Body {
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
index 625c59c..85aeba6 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
@@ -41,7 +41,7 @@ public final class SoapAddressPlugin extends AbstractWSDLPlugin {
SoapAddress soapAddress = null;
soapAddress = SOAPBindingUtil.createSoapAddress(registry, isSOAP12);
-
+
soapAddress.setLocationURI(address);
return soapAddress;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
index 133c019..73d8393 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
@@ -60,15 +60,15 @@ public class MustUnderstandInterceptorTest extends TestBase {
public void setUp() throws Exception {
super.setUp();
-
+
Bus bus = BusFactory.getDefaultBus();
rhi = new ReadHeadersInterceptor(bus, "phase1");
chain.add(rhi);
-
+
sbi = new StartBodyInterceptor("phase1.5");
chain.add(sbi);
-
+
mui = new MustUnderstandInterceptor("phase2");
chain.add(mui);
@@ -112,7 +112,7 @@ public class MustUnderstandInterceptorTest extends TestBase {
public void testHandleMessageWithSoapHeader11Param() throws Exception {
prepareSoapMessage("test-soap-header.xml");
dsi.getUnderstoodHeaders().add(RESERVATION);
-
+
ServiceInfo serviceInfo = getMockedServiceModel(getClass().getResource("test-soap-header.wsdl")
.toString());
@@ -146,7 +146,7 @@ public class MustUnderstandInterceptorTest extends TestBase {
assertEquals("DummaySoapInterceptor getUnderstood has been called!", true, dsi
.isCalledGetUnderstood());
}
-
+
private void prepareSoapMessage(String payloadFileName) throws Exception {
soapMessage = TestUtil.createEmptySoapMessage(Soap12.getInstance(), chain);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java
index af143ac..ea22053 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for myComplexStruct complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* <complexType name="myComplexStruct">
* <complexContent>
@@ -43,8 +43,8 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "myComplexStruct", propOrder = {"elem1", "elem2", "elem3" })
@@ -59,11 +59,11 @@ public class MyComplexStruct {
/**
* Gets the value of the elem1 property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getElem1() {
return elem1;
@@ -71,11 +71,11 @@ public class MyComplexStruct {
/**
* Sets the value of the elem1 property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setElem1(String value) {
this.elem1 = value;
@@ -83,11 +83,11 @@ public class MyComplexStruct {
/**
* Gets the value of the elem2 property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getElem2() {
return elem2;
@@ -95,11 +95,11 @@ public class MyComplexStruct {
/**
* Sets the value of the elem2 property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setElem2(String value) {
this.elem2 = value;
@@ -107,7 +107,7 @@ public class MyComplexStruct {
/**
* Gets the value of the elem3 property.
- *
+ *
*/
public int getElem3() {
return elem3;
@@ -115,7 +115,7 @@ public class MyComplexStruct {
/**
* Sets the value of the elem3 property.
- *
+ *
*/
public void setElem3(int value) {
this.elem3 = value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
index 50add7c..843a300 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
@@ -45,7 +45,7 @@ public class RPCInInterceptorTest extends TestBase {
private static final String OPNAME = "sendReceiveData";
private IMocksControl control = EasyMock.createNiceControl();
-
+
@Before
public void setUp() throws Exception {
super.setUp();
@@ -60,7 +60,7 @@ public class RPCInInterceptorTest extends TestBase {
boi.getOperationInfo().getOutput().getMessagePartByIndex(0).setIndex(0);
soapMessage.getExchange().put(BindingOperationInfo.class, boi);
- control.reset();
+ control.reset();
Service service = control.createMock(Service.class);
JAXBDataBinding dataBinding = new JAXBDataBinding(MyComplexStruct.class);
service.getDataBinding();
@@ -69,7 +69,7 @@ public class RPCInInterceptorTest extends TestBase {
List<ServiceInfo> list = Arrays.asList(si);
EasyMock.expectLastCall().andReturn(list).anyTimes();
EasyMock.expect(service.isEmpty()).andReturn(true).anyTimes();
-
+
soapMessage.getExchange().put(Service.class, service);
soapMessage.getExchange().put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.FALSE);
control.replay();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
index fc356d1..03e6646 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
@@ -79,7 +79,7 @@ public class RPCOutInterceptorTest extends TestBase {
soapMessage.getExchange().put(Service.class, service);
soapMessage.getExchange().put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.FALSE);
control.replay();
-
+
MyComplexStruct mcs = new MyComplexStruct();
mcs.setElem1("elem1");
mcs.setElem2("elem2");
@@ -107,7 +107,7 @@ public class RPCOutInterceptorTest extends TestBase {
assertNull(soapMessage.getContent(Exception.class));
soapMessage.getContent(XMLStreamWriter.class).flush();
baos.flush();
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLStreamReader xr = StaxUtils.createXMLStreamReader(bais);
DepthXMLStreamReader reader = new DepthXMLStreamReader(xr);
@@ -132,7 +132,7 @@ public class RPCOutInterceptorTest extends TestBase {
assertNull(soapMessage.getContent(Exception.class));
soapMessage.getContent(XMLStreamWriter.class).flush();
baos.flush();
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLStreamReader xr = StaxUtils.createXMLStreamReader(bais);
DepthXMLStreamReader reader = new DepthXMLStreamReader(xr);
@@ -142,7 +142,7 @@ public class RPCOutInterceptorTest extends TestBase {
StaxUtils.nextEvent(reader);
StaxUtils.toNextElement(reader);
-
+
assertEquals(new QName(null, "out"), reader.getName());
StaxUtils.nextEvent(reader);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
index b8bf11c..e632b74 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
@@ -118,44 +118,44 @@ public class ReadHeaderInterceptorTest extends TestBase {
public void testNoClosingEnvTage() throws Exception {
assertTrue(testNoClosingEnvTag(Boolean.TRUE));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeBoth() throws Exception {
assertTrue(testNoClosingEnvTag(SchemaValidationType.BOTH));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeIn() throws Exception {
assertTrue(testNoClosingEnvTag(SchemaValidationType.IN));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeOut() throws Exception {
assertFalse(testNoClosingEnvTag(SchemaValidationType.OUT));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeNone() throws Exception {
assertFalse(testNoClosingEnvTag(SchemaValidationType.NONE));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeFalse() throws Exception {
assertFalse(testNoClosingEnvTag(Boolean.FALSE));
}
-
+
private boolean testNoClosingEnvTag(Object validationType) {
soapMessage = TestUtil.createEmptySoapMessage(Soap12.getInstance(), chain);
InputStream in = getClass().getResourceAsStream("test-no-endenv.xml");
assertNotNull(in);
-
+
soapMessage.put(Message.SCHEMA_VALIDATION_ENABLED, validationType);
soapMessage.setContent(XMLStreamReader.class, StaxUtils.createXMLStreamReader(in));
soapMessage.getInterceptorChain().doIntercept(soapMessage);
return soapMessage.getContent(Exception.class) != null;
}
-
+
@Test
public void testHandleHeader() {
try {
@@ -169,9 +169,9 @@ public class ReadHeaderInterceptorTest extends TestBase {
// check the xmlReader should be placed on the first entry of the body element
XMLStreamReader xmlReader = soapMessage.getContent(XMLStreamReader.class);
assertEquals("check the first entry of body", "itinerary", xmlReader.getLocalName());
-
+
List<Header> eleHeaders = soapMessage.getHeaders();
-
+
List<Element> headerChilds = new ArrayList<>();
Iterator<Header> iter = eleHeaders.iterator();
while (iter.hasNext()) {
@@ -205,7 +205,7 @@ public class ReadHeaderInterceptorTest extends TestBase {
Element passenger = ele;
assertNotNull(passenger);
Element child = DOMUtils.getFirstElement(passenger);
- assertNotNull("passenger should have a child element", child);
+ assertNotNull("passenger should have a child element", child);
assertEquals("name", child.getLocalName());
assertEquals("Bob", child.getTextContent());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 7f87165..85ad74f 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -57,7 +57,7 @@ public class ServiceModelUtilTest extends Assert {
private IMocksControl control;
private Bus bus;
private BindingFactoryManager bindingFactoryManager;
-
+
@Before
public void setUp() throws Exception {
String wsdlUrl = getClass().getResource(WSDL_PATH).toString();
@@ -87,12 +87,12 @@ public class ServiceModelUtilTest extends Assert {
control.replay();
serviceInfo = wsdlServiceBuilder.buildServices(def, service).get(0);
}
-
+
@After
public void tearDown() throws Exception {
-
+
}
-
+
@Test
public void testGetSchema() throws Exception {
BindingInfo bindingInfo = null;
@@ -110,18 +110,18 @@ public class ServiceModelUtilTest extends Assert {
input.getMessageInfo().getMessageParts().get(0).getElementQName().getLocalPart(), "inHeader");
assertEquals(input.getMessageInfo().getMessageParts().get(0).getElementQName().getNamespaceURI(),
"http://org.apache.cxf/headers");
-
+
assertTrue(input.getMessageInfo().getMessageParts().get(0).isElement());
assertEquals(
input.getMessageInfo().getMessageParts().get(1).getElementQName().getLocalPart(), "passenger");
assertEquals(input.getMessageInfo().getMessageParts().get(1).getElementQName().getNamespaceURI(),
"http://mycompany.example.com/employees");
assertTrue(input.getMessageInfo().getMessageParts().get(1).isElement());
-
+
MessagePartInfo messagePartInfo = input.getMessageInfo().getMessageParts().get(0);
SchemaInfo schemaInfo = ServiceModelUtil.getSchema(serviceInfo, messagePartInfo);
assertEquals(schemaInfo.getNamespaceURI(), "http://org.apache.cxf/headers");
-
+
messagePartInfo = input.getMessageInfo().getMessageParts().get(1);
schemaInfo = ServiceModelUtil.getSchema(serviceInfo, messagePartInfo);
assertEquals(schemaInfo.getNamespaceURI(), "http://mycompany.example.com/employees");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
index 75f3c21..945bb76 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
@@ -39,11 +39,11 @@ import org.junit.Test;
public class SoapActionInterceptorTest extends Assert {
-
+
@Test
public void testSoapAction() throws Exception {
SoapPreProtocolOutInterceptor i = new SoapPreProtocolOutInterceptor();
-
+
Message message = new MessageImpl();
message.setExchange(new ExchangeImpl());
message.getExchange().setOutMessage(message);
@@ -55,7 +55,7 @@ public class SoapActionInterceptorTest extends Assert {
soapMessage.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
assertEquals(Soap11.getInstance(), soapMessage.getVersion());
(new SoapPreProtocolOutInterceptor()).handleMessage(soapMessage);
- Map<String, List<String>> reqHeaders
+ Map<String, List<String>> reqHeaders
= CastUtils.cast((Map<?, ?>)soapMessage.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
assertEquals("\"\"", reqHeaders.get(SoapBindingConstants.SOAP_ACTION).get(0));
@@ -67,14 +67,14 @@ public class SoapActionInterceptorTest extends Assert {
i.handleMessage(soapMessage);
String ct = (String) soapMessage.get(Message.CONTENT_TYPE);
assertEquals("application/soap+xml", ct);
-
+
BindingOperationInfo bop = createBindingOperation();
-
+
soapMessage.getExchange().put(BindingOperationInfo.class, bop);
SoapOperationInfo soapInfo = new SoapOperationInfo();
soapInfo.setAction("foo");
bop.addExtensor(soapInfo);
-
+
i.handleMessage(soapMessage);
ct = (String) soapMessage.get(Message.CONTENT_TYPE);
assertEquals("application/soap+xml; action=\"foo\"", ct);
@@ -85,7 +85,7 @@ public class SoapActionInterceptorTest extends Assert {
InterfaceInfo ii = s.createInterface(new QName("FooInterface"));
s.setInterface(ii);
ii.addOperation(new QName("fooOp"));
-
+
BindingInfo b = new BindingInfo(s, "foo");
return b.buildOperation(new QName("fooOp"), null, null);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
index 777f06f..bfbe03a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
@@ -57,23 +57,23 @@ import static org.easymock.EasyMock.expectLastCall;
public class SoapBindingFactoryTest extends Assert {
IMocksControl control;
-
+
@Before
public void setUp() {
control = createNiceControl();
}
-
- private Bus getMockBus() {
- return control.createMock(Bus.class);
+
+ private Bus getMockBus() {
+ return control.createMock(Bus.class);
}
-
+
private BindingFactoryManager getBindingFactoryManager(String ns, Bus bus) throws BusException {
SoapBindingFactory bindingFactory = new SoapBindingFactory();
BindingFactoryManager bfm = new BindingFactoryManagerImpl();
bfm.registerBindingFactory(ns, bindingFactory);
return bfm;
}
-
+
@Test
public void testNoBodyParts() throws Exception {
Definition d = createDefinition("/wsdl_soap/no_body_parts.wsdl");
@@ -83,15 +83,15 @@ public class SoapBindingFactoryTest extends Assert {
bus.getExtension(BindingFactoryManager.class);
expectLastCall().andReturn(bfm).anyTimes();
-
+
DestinationFactoryManager dfm = control.createMock(DestinationFactoryManager.class);
expect(bus.getExtension(DestinationFactoryManager.class)).andStubReturn(dfm);
-
+
control.replay();
WSDLServiceBuilder builder = new WSDLServiceBuilder(bus);
ServiceInfo serviceInfo = builder
- .buildServices(d, new QName("urn:org:apache:cxf:no_body_parts/wsdl",
+ .buildServices(d, new QName("urn:org:apache:cxf:no_body_parts/wsdl",
"NoBodyParts"))
.get(0);
@@ -123,7 +123,7 @@ public class SoapBindingFactoryTest extends Assert {
}
@Test
- public void testFactory() throws Exception {
+ public void testFactory() throws Exception {
Definition d = createDefinition("/wsdl_soap/hello_world.wsdl");
Bus bus = getMockBus();
@@ -132,10 +132,10 @@ public class SoapBindingFactoryTest extends Assert {
bus.getExtension(BindingFactoryManager.class);
expectLastCall().andReturn(bfm).anyTimes();
-
+
DestinationFactoryManager dfm = control.createMock(DestinationFactoryManager.class);
expect(bus.getExtension(DestinationFactoryManager.class)).andStubReturn(dfm);
-
+
control.replay();
WSDLServiceBuilder builder = new WSDLServiceBuilder(bus);
@@ -167,10 +167,10 @@ public class SoapBindingFactoryTest extends Assert {
assertNotNull(parts);
assertEquals(1, parts.size());
}
-
-
+
+
@Test
- public void testSoap12Factory() throws Exception {
+ public void testSoap12Factory() throws Exception {
Definition d = createDefinition("/wsdl_soap/hello_world_soap12.wsdl");
Bus bus = getMockBus();
@@ -178,10 +178,10 @@ public class SoapBindingFactoryTest extends Assert {
BindingFactoryManager bfm = getBindingFactoryManager(WSDLConstants.NS_SOAP12, bus);
expect(bus.getExtension(BindingFactoryManager.class)).andReturn(bfm);
-
+
DestinationFactoryManager dfm = control.createMock(DestinationFactoryManager.class);
expect(bus.getExtension(DestinationFactoryManager.class)).andStubReturn(dfm);
-
+
control.replay();
WSDLServiceBuilder builder = new WSDLServiceBuilder(bus);
@@ -212,7 +212,7 @@ public class SoapBindingFactoryTest extends Assert {
List<MessagePartInfo> parts = bodyInfo.getParts();
assertNotNull(parts);
assertEquals(1, parts.size());
-
+
boi = sbi.getOperation(new QName("http://apache.org/hello_world_soap12_http", "pingMe"));
sboi = boi.getExtensor(SoapOperationInfo.class);
assertNotNull(sboi);
@@ -220,11 +220,11 @@ public class SoapBindingFactoryTest extends Assert {
assertEquals("", sboi.getAction());
Collection<BindingFaultInfo> faults = boi.getFaults();
assertEquals(1, faults.size());
- BindingFaultInfo faultInfo = boi.getFault(new QName("http://apache.org/hello_world_soap12_http",
+ BindingFaultInfo faultInfo = boi.getFault(new QName("http://apache.org/hello_world_soap12_http",
"pingMeFault"));
assertNotNull(faultInfo);
}
-
+
public Definition createDefinition(String wsdlURL) throws Exception {
URL resource = getClass().getResource(wsdlURL);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
index cfc3c35..de975bf 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
@@ -26,7 +26,7 @@ import org.junit.Assert;
import org.junit.Test;
public class SoapBindingTest extends Assert {
-
+
@Test
public void testCreateMessage() throws Exception {
Message message = new MessageImpl();
@@ -38,12 +38,12 @@ public class SoapBindingTest extends Assert {
assertEquals(Soap11.getInstance(), soapMessage.getVersion());
assertEquals("text/xml", soapMessage.get(Message.CONTENT_TYPE));
-
+
soapMessage.remove(Message.CONTENT_TYPE);
-
+
sb.setSoapVersion(Soap12.getInstance());
soapMessage = (SoapMessage) sb.createMessage(soapMessage);
- assertEquals(Soap12.getInstance(), soapMessage.getVersion());
+ assertEquals(Soap12.getInstance(), soapMessage.getVersion());
assertEquals("application/soap+xml", soapMessage.get(Message.CONTENT_TYPE));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
index 03973f8..79e43aa 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
@@ -33,7 +33,7 @@ import org.junit.Assert;
import org.junit.Test;
public class SoapDestinationFactoryTest extends Assert {
-
+
@Test
public void testDestination() throws Exception {
String wsdlSoapNs = "http://schemas.xmlsoap.org/wsdl/soap/";
@@ -43,7 +43,7 @@ public class SoapDestinationFactoryTest extends Assert {
ServiceInfo si = new ServiceInfo();
EndpointInfo ei = new EndpointInfo(si, wsdlSoapNs);
// this code used to call "new SOAPAddressImpl()", but the test
- // is currently not testing anything, and needlessly ties the
+ // is currently not testing anything, and needlessly ties the
// code to a specific implementation of wsdl4j. When the SOAPAddress
// is really needed, it should be mocked.
SOAPAddress add = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
index 16250a6..f56dc0d 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
public class SoapOutInterceptorTest extends TestBase {
private ReadHeadersInterceptor rhi;
private SoapOutInterceptor soi;
- private StartBodyInterceptor sbi;
+ private StartBodyInterceptor sbi;
@Before
public void setUp() throws Exception {
@@ -64,9 +64,9 @@ public class SoapOutInterceptorTest extends TestBase {
ByteArrayOutputStream out = new ByteArrayOutputStream();
soapMessage.setContent(OutputStream.class, out);
soapMessage.setContent(XMLStreamWriter.class, StaxUtils.createXMLStreamWriter(out));
-
+
soapMessage.getInterceptorChain().doIntercept(soapMessage);
-
+
assertNotNull(soapMessage.getHeaders());
Exception oe = soapMessage.getContent(Exception.class);
@@ -86,9 +86,9 @@ public class SoapOutInterceptorTest extends TestBase {
ByteArrayOutputStream out = new ByteArrayOutputStream();
soapMessage.setContent(OutputStream.class, out);
soapMessage.setContent(XMLStreamWriter.class, StaxUtils.createXMLStreamWriter(out));
-
+
soapMessage.getInterceptorChain().doIntercept(soapMessage);
-
+
assertNotNull(soapMessage.getHeaders());
Exception oe = soapMessage.getContent(Exception.class);
@@ -110,8 +110,8 @@ public class SoapOutInterceptorTest extends TestBase {
assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.nextTag());
assertEquals("reservation", xmlReader.getLocalName());
- assertEquals(version.getAttrValueMustUnderstand(true),
- xmlReader.getAttributeValue(version.getNamespace(),
+ assertEquals(version.getAttrValueMustUnderstand(true),
+ xmlReader.getAttributeValue(version.getNamespace(),
version.getAttrNameMustUnderstand()));
assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.nextTag());
@@ -122,7 +122,7 @@ public class SoapOutInterceptorTest extends TestBase {
// assertEquals(Soap12.getInstance().getBody(), xmlReader.getName());
}
-
+
private void prepareSoapMessage(String payloadFileName) throws IOException {
soapMessage = TestUtil.createEmptySoapMessage(Soap12.getInstance(), chain);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
index 3d5960c..a53b600 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
@@ -55,8 +55,8 @@ public class TestBase extends Assert {
protected PhaseInterceptorChain chain;
protected SoapMessage soapMessage;
-
-
+
+
@Before
public void setUp() throws Exception {