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:18 UTC
[13/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/SoapBindingFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
index da73ba5..26db8dc 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
@@ -120,10 +120,10 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
"http://schemas.xmlsoap.org/wsdl/soap12/",
"http://schemas.xmlsoap.org/wsdl/soap/http",
"http://www.w3.org/2003/05/soap/bindings/HTTP/",
- "http://www.w3.org/2010/soapjms/"
+ "http://www.w3.org/2010/soapjms/"
);
-
-
+
+
public static final String SOAP_11_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/";
public static final String SOAP_12_BINDING = "http://schemas.xmlsoap.org/wsdl/soap12/";
@@ -132,11 +132,11 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
public SoapBindingFactory() {
}
-
+
public SoapBindingFactory(Bus b) {
super(b, DEFAULT_NAMESPACES);
}
-
+
public BindingInfo createBindingInfo(ServiceInfo si, String bindingid, Object conf) {
SoapBindingConfiguration config;
if (conf instanceof SoapBindingConfiguration) {
@@ -155,9 +155,9 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
info.setName(config.getBindingName(si));
info.setStyle(config.getStyle());
-
+
info.setTransportURI(config.getTransportURI());
-
+
if (config.isMtomEnabled()) {
info.setProperty(Message.MTOM_ENABLED, Boolean.TRUE);
}
@@ -249,7 +249,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
bodyParts.add(part.getName().getLocalPart());
}
- for (SoapHeaderInfo headerInfo : headerInfos) {
+ for (SoapHeaderInfo headerInfo : headerInfos) {
SoapHeader soapHeader = SOAPBindingUtil.createSoapHeader(extensionRegistry,
BindingInput.class,
isSoap12);
@@ -284,7 +284,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
for (MessagePartInfo part : b.getOutput().getMessageParts()) {
bodyParts.add(part.getName().getLocalPart());
}
- for (SoapHeaderInfo headerInfo : headerInfos) {
+ for (SoapHeaderInfo headerInfo : headerInfos) {
SoapHeader soapHeader = SOAPBindingUtil.createSoapHeader(extensionRegistry,
BindingOutput.class,
isSoap12);
@@ -342,7 +342,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
String bindingStyle = SoapBindingConstants.BINDING_STYLE_DOC;
boolean hasWrapped = false;
-
+
org.apache.cxf.binding.soap.SoapBinding sb = null;
SoapVersion version = null;
if (binding instanceof SoapBindingInfo) {
@@ -356,7 +356,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
boolean hasRPC = false;
boolean hasDoc = false;
-
+
// Operation wide style, what to do with the mixed style/use?
for (BindingOperationInfo boi : sbi.getOperations()) {
String st = sbi.getStyle(boi.getOperationInfo());
@@ -374,7 +374,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
hasWrapped = true;
}
}
-
+
if (Boolean.TRUE.equals(binding.getService().getProperty("soap.force.doclit.bare"))) {
hasDoc = true;
hasRPC = false;
@@ -385,7 +385,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
throw new RuntimeException("WSI-BP prohibits RPC and Document style "
+ "operations in same service.");
}
-
+
//jms
if (sbi.getTransportURI().equals(SoapJMSConstants.SOAP_JMS_SPECIFICIATION_TRANSPORTID)) {
sb.getInInterceptors().add(new SoapJMSInInterceptor());
@@ -401,7 +401,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
sb.getInInterceptors().add(new AttachmentInInterceptor());
sb.getInInterceptors().add(new StaxInInterceptor());
sb.getInInterceptors().add(new SoapActionInInterceptor());
-
+
sb.getOutInterceptors().add(new AttachmentOutInterceptor());
sb.getOutInterceptors().add(new StaxOutInterceptor());
sb.getOutInterceptors().add(SoapHeaderOutFilterInterceptor.INSTANCE);
@@ -414,7 +414,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
//sb.getInInterceptors().add(new BareInInterceptor());
sb.getInInterceptors().add(new DocLiteralInInterceptor());
if (hasWrapped) {
- sb.getOutInterceptors().add(new WrappedOutInterceptor());
+ sb.getOutInterceptors().add(new WrappedOutInterceptor());
}
sb.getOutInterceptors().add(new BareOutInterceptor());
} else {
@@ -441,7 +441,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
sb.getInFaultInterceptors().add(new Soap12FaultInInterceptor());
sb.getOutFaultInterceptors().add(new Soap12FaultOutInterceptor());
}
-
+
if (binding.getService() != null) {
for (EndpointInfo ei : binding.getService().getEndpoints()) {
if (ei.getAddress() != null && ei.getAddress().startsWith("soap.udp")) {
@@ -458,10 +458,10 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
WSAddressingFeature add = new WSAddressingFeature();
add.setAddressingRequired(true);
add.initialize(p, bus);
-
+
// UDP has a strict size limit on messages (<64K) so we'll try to shrink the
// message a little by putting the WSA namespace into the
- // the soap:env which allows it to not be written on every header
+ // the soap:env which allows it to not be written on every header
// element as well as disable the output stream optimizations (doesn't really
// matter on such small messages anyway) to make sure we pickup those
// namespaces that are declared there.
@@ -489,7 +489,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
// don't send the optional ReplyTo headers if we don't need to either
ei.setProperty("ws-addressing.write.optional.replyto", Boolean.FALSE);
}
-
+
protected void addMessageFromBinding(ExtensibilityElement ext, BindingOperationInfo bop,
boolean isInput) {
SoapHeader header = SOAPBindingUtil.getSoapHeader(ext);
@@ -497,24 +497,24 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
ServiceInfo serviceInfo = bop.getBinding().getService();
if (header != null && header.getMessage() == null) {
- throw new RuntimeException("Problem with WSDL: soap:header element"
+ throw new RuntimeException("Problem with WSDL: soap:header element"
+ " for operation " + bop.getName() + " under binding " + bop.getBinding().getName()
+ " does not contain a valid message attribute.");
}
-
+
if (header != null && serviceInfo.getMessage(header.getMessage()) == null) {
Definition def = (Definition)serviceInfo.getProperty(WSDLServiceBuilder.WSDL_DEFINITION);
SchemaCollection schemas = serviceInfo.getXmlSchemaCollection();
if (def != null && schemas != null) {
QName qn = header.getMessage();
-
+
javax.wsdl.Message msg = findMessage(qn, def);
if (msg != null) {
addOutOfBandParts(bop, msg, schemas, isInput, header.getPart());
serviceInfo.refresh();
} else {
- throw new RuntimeException("Problem with WSDL: soap:header element"
+ throw new RuntimeException("Problem with WSDL: soap:header element"
+ " for operation " + bop.getName()
+ " is referring to an undefined wsdl:message element: " + qn);
}
@@ -578,7 +578,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
}
}
}
-
+
if (isInput) {
type = MessageInfo.Type.INPUT;
minfo = bop.getOperationInfo().getInput();
@@ -597,7 +597,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
if (unwrapped == null) {
return;
}
-
+
nextId = 0;
if (isInput) {
minfo = unwrapped.getInput();
@@ -633,15 +633,15 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
int nextId,
String partNameFilter) {
for (Part part : cast(msg.getParts().values(), Part.class)) {
-
+
if (StringUtils.isEmpty(partNameFilter)
|| part.getName().equals(partNameFilter)) {
-
+
if (StringUtils.isEmpty(part.getName())) {
throw new RuntimeException("Problem with WSDL: part element in message "
- + msg.getQName().getLocalPart()
+ + msg.getQName().getLocalPart()
+ " does not specify a name.");
- }
+ }
QName pqname = new QName(minfo.getName().getNamespaceURI(), part.getName());
MessagePartInfo pi = minfo.getMessagePart(pqname);
if (pi != null
@@ -649,11 +649,11 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
continue;
}
pi = minfo.addOutOfBandMessagePart(pqname);
-
+
if (!minfo.getName().equals(msg.getQName())) {
pi.setMessageContainer(new MessageInfo(minfo.getOperation(), null, msg.getQName()));
}
-
+
if (part.getTypeName() != null) {
pi.setTypeQName(part.getTypeName());
pi.setElement(false);
@@ -730,10 +730,10 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
headerInfo.setUse(header.getUse());
if (StringUtils.isEmpty(header.getPart())) {
throw new RuntimeException("Problem with WSDL: soap:header element in operation "
- + boi.getName().getLocalPart()
+ + boi.getName().getLocalPart()
+ " does not specify a part.");
}
- MessagePartInfo part = msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
+ MessagePartInfo part = msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
header.getPart()));
if (part != null && header.getMessage() != null
&& !part.getMessageInfo().getName().equals(header.getMessage())) {
@@ -759,7 +759,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
SoapBodyInfo bodyInfo = new SoapBodyInfo();
SoapBody soapBody = SOAPBindingUtil.getSoapBody(bmsg.getExtensors(ExtensibilityElement.class));
-
+
List<?> parts = null;
if (soapBody == null) {
MIMEMultipartRelated mmr = bmsg.getExtensor(MIMEMultipartRelated.class);
@@ -793,8 +793,8 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
bmsg.addExtensor(bodyInfo);
}
-
- private List<MessagePartInfo> handleMimePart(MIMEPart mpart,
+
+ private List<MessagePartInfo> handleMimePart(MIMEPart mpart,
List<MessagePartInfo> attParts,
MessageInfo msg,
BindingMessageInfo bmsg,
@@ -815,7 +815,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
if (StringUtils.isEmpty(partName)) {
throw new RuntimeException("Problem with WSDL: mime content element in operation "
- + bmsg.getBindingOperation().getName().getLocalPart()
+ + bmsg.getBindingOperation().getName().getLocalPart()
+ " does not specify a part.");
}
@@ -841,17 +841,17 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
SoapHeaderInfo headerInfo = new SoapHeaderInfo();
headerInfo.setUse(header.getUse());
-
+
if (StringUtils.isEmpty(header.getPart())) {
throw new RuntimeException("Problem with WSDL: soap:header element in operation "
- + bmsg.getBindingOperation().getName().getLocalPart()
+ + bmsg.getBindingOperation().getName().getLocalPart()
+ " does not specify a part.");
}
-
+
MessagePartInfo mpi =
- msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
+ msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
header.getPart()));
-
+
if (mpi != null && header.getMessage() != null
&& !mpi.getMessageInfo().getName().equals(header.getMessage())) {
mpi = null;
@@ -874,7 +874,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
}
return attParts;
}
-
+
private void addSoapBodyPart(MessageInfo msg, List<MessagePartInfo> bodyParts, String partName) {
MessagePartInfo mpi = msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
partName));
@@ -885,9 +885,9 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
public synchronized void addListener(Destination d, Endpoint e) {
synchronized (d) {
MessageObserver mo = d.getMessageObserver();
- if (d.getAddress() != null
- && d.getAddress().getAddress() != null
- && d.getAddress().getAddress().getValue() != null
+ if (d.getAddress() != null
+ && d.getAddress().getAddress() != null
+ && d.getAddress().getAddress().getValue() != null
&& d.getAddress().getAddress().getValue().startsWith("soap.udp")) {
//soap.udp REQUIRES usage of WS-Addressing... we need to turn this on
setupUDP(e, e.getEndpointInfo());
@@ -899,7 +899,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
if (mo instanceof ChainInitiationObserver) {
ChainInitiationObserver cio = (ChainInitiationObserver) mo;
-
+
Binding b = e.getBinding();
Binding b2 = cio.getEndpoint().getBinding();
if (b == b2) {
@@ -912,50 +912,50 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
} else if (o == null) {
o = Boolean.FALSE;
}
- if (b instanceof org.apache.cxf.binding.soap.SoapBinding
+ if (b instanceof org.apache.cxf.binding.soap.SoapBinding
&& b2 instanceof org.apache.cxf.binding.soap.SoapBinding
&& ((org.apache.cxf.binding.soap.SoapBinding)b).getSoapVersion()
.equals(((org.apache.cxf.binding.soap.SoapBinding)b2).getSoapVersion())
&& Boolean.FALSE.equals(o)) {
-
- throw new RuntimeException("Soap "
+
+ throw new RuntimeException("Soap "
+ ((org.apache.cxf.binding.soap.SoapBinding)b)
.getSoapVersion().getVersion()
+ " endpoint already registered on address "
+ e.getEndpointInfo().getAddress());
}
-
+
MultipleEndpointObserver newMO = new MultipleEndpointObserver(getBus()) {
@Override
protected Message createMessage(Message message) {
return new SoapMessage(message);
}
};
-
+
newMO.getBindingInterceptors().add(new AttachmentInInterceptor());
newMO.getBindingInterceptors().add(new StaxInInterceptor());
-
+
// This will not work if one of the endpoints disables message
// processing. But, if you've disabled message processing, you
// probably aren't going to use this feature.
-
+
newMO.getBindingInterceptors().add(new ReadHeadersInterceptor(getBus(), (SoapVersion)null));
newMO.getBindingInterceptors().add(new StartBodyInterceptor());
newMO.getBindingInterceptors().add(new CheckFaultInterceptor());
-
+
// Add in a default selection interceptor
newMO.getRoutingInterceptors().add(new EndpointSelectionInterceptor());
-
+
newMO.getEndpoints().add(cio.getEndpoint());
-
+
mo = newMO;
}
-
+
if (mo instanceof MultipleEndpointObserver) {
MultipleEndpointObserver meo = (MultipleEndpointObserver) mo;
meo.getEndpoints().add(e);
}
-
+
d.setMessageObserver(mo);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
index bd1fdda..6e74c22 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
@@ -40,7 +40,7 @@ public class SoapFault extends Fault {
/**
* "The message was incorrectly formed or did not contain the appropriate
* information in order to succeed." -- SOAP 1.2 Spec
- */
+ */
/**
* A SOAP 1.2 only fault code. <p/> "The message could not be processed for
@@ -48,7 +48,7 @@ public class SoapFault extends Fault {
* contents of the message itself." -- SOAP 1.2 Spec <p/> If this message is
* used in a SOAP 1.1 Fault it will most likely (depending on the
* FaultHandler) be mapped to "Sender" instead.
- */
+ */
private List<QName> subCodes;
private String role;
@@ -80,15 +80,15 @@ public class SoapFault extends Fault {
super(new Message(message, (ResourceBundle)null), t, faultCode);
}
-
+
public String getCodeString(String prefix, String defaultPrefix) {
return getFaultCodeString(prefix, defaultPrefix, getFaultCode());
}
-
+
public String getSubCodeString(String prefix, String defaultPrefix) {
return getFaultCodeString(prefix, defaultPrefix, getRootSubCode());
}
-
+
private String getFaultCodeString(String prefix, String defaultPrefix, QName fCode) {
String codePrefix = null;
if (StringUtils.isEmpty(prefix)) {
@@ -99,10 +99,10 @@ public class SoapFault extends Fault {
} else {
codePrefix = prefix;
}
-
- return codePrefix + ":" + fCode.getLocalPart();
+
+ return codePrefix + ":" + fCode.getLocalPart();
}
-
+
private QName getRootSubCode() {
return subCodes != null && subCodes.size() > 0 ? subCodes.get(0) : null;
}
@@ -122,7 +122,7 @@ public class SoapFault extends Fault {
/**
* Returns the fault actor.
- *
+ *
* @return the fault actor.
*/
public String getRole() {
@@ -131,25 +131,25 @@ public class SoapFault extends Fault {
/**
* Sets the fault actor.
- *
+ *
* @param actor the actor.
*/
public void setRole(String actor) {
this.role = actor;
}
-
+
public String getNode() {
return node;
}
public void setNode(String n) {
this.node = n;
- }
+ }
/**
- * Returns the SubCode for the Fault Code. If there are more than one Subcode entries
+ * Returns the SubCode for the Fault Code. If there are more than one Subcode entries
* in this fault, the first Subcode is returned.
- *
+ *
* @return The SubCode element as detailed by the SOAP 1.2 spec.
*/
public QName getSubCode() {
@@ -158,7 +158,7 @@ public class SoapFault extends Fault {
/**
* Returns the SubCode list for the Fault Code.
- *
+ *
* @return The SubCode element list as detailed by the SOAP 1.2 spec.
*/
public List<QName> getSubCodes() {
@@ -166,9 +166,9 @@ public class SoapFault extends Fault {
}
/**
- * Sets the SubCode for the Fault Code. If there are more than one Subcode entries
+ * Sets the SubCode for the Fault Code. If there are more than one Subcode entries
* in this fault, the first Subcode is set while the other entries are removed.
- *
+ *
* @param subCode The SubCode element as detailed by the SOAP 1.2 spec.
*/
public void setSubCode(QName subCode) {
@@ -177,7 +177,7 @@ public class SoapFault extends Fault {
/**
* Sets the SubCode list for the Fault Code.
- *
+ *
* @param subCode The SubCode element list as detailed by the SOAP 1.2 spec.
*/
public void setSubCodes(List<QName> subCodes) {
@@ -186,8 +186,8 @@ public class SoapFault extends Fault {
/**
* Appends the SubCode to the SubCode list.
- *
- * @param subCode The SubCode element as detailed by the SOAP 1.2 spec.
+ *
+ * @param subCode The SubCode element as detailed by the SOAP 1.2 spec.
*/
public void addSubCode(QName subCode) {
if (subCodes == null) {
@@ -222,7 +222,7 @@ public class SoapFault extends Fault {
return;
}
f.setFaultCode(Soap12.getInstance().getReceiver());
-
+
if (f.getSubCodes() == null) {
f.setRootSubCode(fc);
} else if (!f.getSubCodes().contains(fc)) {
@@ -237,7 +237,7 @@ public class SoapFault extends Fault {
QName fc = f.getFaultCode();
if (Fault.FAULT_CODE_CLIENT.equals(fc)) {
fc = v.getSender();
- } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
+ } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
fc = v.getReceiver();
}
f.setFaultCode(fc);
@@ -251,7 +251,7 @@ public class SoapFault extends Fault {
QName fc = f.getFaultCode();
if (Fault.FAULT_CODE_CLIENT.equals(fc)) {
fc = v.getSender();
- } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
+ } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
fc = v.getReceiver();
}
SoapFault soapFault = new SoapFault(new Message(f.getMessage(), (ResourceBundle)null),
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java
index 39ff6bc..ecf88fb 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java
@@ -33,20 +33,20 @@ public class SoapHeader extends Header {
public SoapHeader(QName q, Object o, DataBinding b) {
super(q, o, b);
}
-
+
public String getActor() {
return actor;
}
public void setActor(String actor) {
this.actor = actor;
}
-
+
public boolean isMustUnderstand() {
return mustUnderstand;
}
public void setMustUnderstand(boolean mustUnderstand) {
this.mustUnderstand = mustUnderstand;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
index 00f1c29..d6dbf0f 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
@@ -51,7 +51,7 @@ public class SoapMessage extends MessageImpl {
super.put(SoapVersion.class, v);
this.version = v;
}
-
+
public List<Header> getHeaders() {
List<Header> heads = CastUtils.cast((List<?>)get(Header.HEADER_LIST));
if (heads == null) {
@@ -60,7 +60,7 @@ public class SoapMessage extends MessageImpl {
}
return heads;
}
-
+
public boolean hasHeader(QName qn) {
for (Header head : getHeaders()) {
if (head.getName().equals(qn)) {
@@ -77,18 +77,18 @@ public class SoapMessage extends MessageImpl {
}
return null;
}
-
+
public boolean hasHeaders() {
return containsKey(Header.HEADER_LIST) && getHeaders().size() > 0;
}
-
+
public Map<String, String> getEnvelopeNs() {
return CastUtils.cast((Map<?, ?>)getContextualProperty("soap.env.ns.map"));
}
-
+
public boolean hasAdditionalEnvNs() {
Map<String, String> ns = getEnvelopeNs();
return ns != null && !ns.isEmpty();
- }
-
+ }
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
index 4c0a82a..e4d2d3e 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
@@ -57,14 +57,14 @@ import org.apache.cxf.wsdl11.WSDLEndpointFactory;
@NoJSR250Annotations
public class SoapTransportFactory extends AbstractTransportFactory implements DestinationFactory,
WSDLEndpointFactory, ConduitInitiator {
-
- public static final String CANNOT_GET_CONDUIT_ERROR
+
+ public static final String CANNOT_GET_CONDUIT_ERROR
= "Could not find conduit initiator for address: %s and transport: %s";
public static final String SOAP_11_HTTP_BINDING = "http://schemas.xmlsoap.org/soap/http";
public static final String SOAP_12_HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
-
+
public static final String TRANSPORT_ID = "http://schemas.xmlsoap.org/soap/";
-
+
public static final List<String> DEFAULT_NAMESPACES = Arrays.asList(
"http://schemas.xmlsoap.org/soap/",
"http://schemas.xmlsoap.org/wsdl/soap/",
@@ -73,15 +73,15 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
"http://schemas.xmlsoap.org/wsdl/soap/http",
"http://www.w3.org/2010/soapjms/",
"http://www.w3.org/2003/05/soap/bindings/HTTP/");
- public static final Set<String> DEFAULT_PREFIXES
+ public static final Set<String> DEFAULT_PREFIXES
= Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"soap.udp"
)));
-
+
public SoapTransportFactory() {
super(DEFAULT_NAMESPACES);
}
-
+
public Set<String> getUriPrefixes() {
return DEFAULT_PREFIXES;
}
@@ -119,8 +119,8 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
DestinationFactory destinationFactory;
try {
DestinationFactoryManager mgr = bus.getExtension(DestinationFactoryManager.class);
- if (StringUtils.isEmpty(address)
- || address.startsWith("http")
+ if (StringUtils.isEmpty(address)
+ || address.startsWith("http")
|| address.startsWith("jms")
|| address.startsWith("soap.udp")
|| address.startsWith("/")) {
@@ -149,7 +149,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
private void createSoapExtensors(Bus bus, EndpointInfo ei, SoapBindingInfo bi, boolean isSoap12) {
try {
-
+
String address = ei.getAddress();
if (address == null) {
address = "http://localhost:9090";
@@ -158,9 +158,9 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
ExtensionRegistry registry = bus.getExtension(WSDLManager.class).getExtensionRegistry();
SoapAddress soapAddress = SOAPBindingUtil.createSoapAddress(registry, isSoap12);
soapAddress.setLocationURI(address);
-
+
ei.addExtensor(soapAddress);
-
+
} catch (WSDLException e) {
e.printStackTrace();
}
@@ -168,7 +168,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
public EndpointInfo createEndpointInfo(Bus bus,
ServiceInfo serviceInfo,
- BindingInfo b,
+ BindingInfo b,
List<?> ees) {
String transportURI = "http://schemas.xmlsoap.org/wsdl/soap/";
if (b instanceof SoapBindingInfo) {
@@ -176,14 +176,14 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
transportURI = sbi.getTransportURI();
}
EndpointInfo info = new SoapEndpointInfo(serviceInfo, transportURI);
-
+
if (ees != null) {
for (Iterator<?> itr = ees.iterator(); itr.hasNext();) {
Object extensor = itr.next();
-
+
if (SOAPBindingUtil.isSOAPAddress(extensor)) {
final SoapAddress sa = SOAPBindingUtil.getSoapAddress(extensor);
-
+
info.addExtensor(sa);
info.setAddress(sa.getLocationURI());
if (isJMSSpecAddress(sa.getLocationURI())) {
@@ -194,7 +194,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
}
}
}
-
+
return info;
}
@@ -212,7 +212,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
ConduitInitiator conduitInit;
try {
ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class);
- if (StringUtils.isEmpty(address)
+ if (StringUtils.isEmpty(address)
|| address.startsWith("http")
|| address.startsWith("jms")
|| address.startsWith("soap.udp")) {
@@ -232,7 +232,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
public Conduit getConduit(EndpointInfo ei, Bus b) throws IOException {
return getConduit(ei, ei.getTarget(), b);
}
-
+
public void setActivationNamespaces(Collection<String> ans) {
super.setTransportIds(new ArrayList<>(ans));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
index 944b87d..c796241 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
@@ -23,7 +23,7 @@ import javax.xml.namespace.QName;
public interface SoapVersion {
String getBindingId();
-
+
double getVersion();
String getNamespace();
@@ -33,34 +33,34 @@ public interface SoapVersion {
QName getHeader();
QName getBody();
-
+
QName getFault();
-
+
QName getReceiver();
-
+
QName getSender();
-
+
QName getMustUnderstand();
-
+
QName getVersionMismatch();
-
+
QName getDateEncodingUnknown();
String getSoapEncodingStyle();
String getAttrNameMustUnderstand();
-
+
String getAttrValueMustUnderstand(boolean value);
-
+
// Role related properties
//-------------------------------------------------------------------------
String getAttrNameRole();
-
+
String getNoneRole();
String getUltimateReceiverRole();
String getNextRole();
-
+
String getContentType();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java
index 31e1a6a..9113204 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java
@@ -30,17 +30,17 @@ public class SoapVersionFactory {
getInstance().register(Soap11.getInstance());
getInstance().register(Soap12.getInstance());
}
-
+
private Map<String, SoapVersion> versions = new HashMap<String, SoapVersion>();
-
+
public static SoapVersionFactory getInstance() {
return factory;
}
-
+
public SoapVersion getSoapVersion(String namespace) {
return versions.get(namespace);
}
-
+
public void register(SoapVersion version) {
versions.put(version.getNamespace(), version);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java
index b7fd6ac..f7307bc 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java
@@ -49,9 +49,9 @@ public class SoapBindingBPInfoConfigDefinitionParser extends AbstractBPBeanDefin
@Override
protected void mapElement(ParserContext ctx, MutableBeanMetadata bean, Element el, String name) {
- if ("version".equals(name)
- || "mtomEnabled".equals(name)
- || "style".equals(name)
+ if ("version".equals(name)
+ || "mtomEnabled".equals(name)
+ || "style".equals(name)
|| "use".equals(name)) {
bean.addProperty(name, parseMapData(ctx, bean, el));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
index 096ca02..ac96d72 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
@@ -39,9 +39,9 @@ import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.staxutils.StaxUtils;
-public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<SoapMessage>
+public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<SoapMessage>
implements SoapInterceptor {
-
+
public AbstractSoapInterceptor(String p) {
super(p);
}
@@ -49,7 +49,7 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
super(i, p);
}
-
+
public Set<URI> getRoles() {
return Collections.emptySet();
}
@@ -57,16 +57,16 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
public Set<QName> getUnderstoodHeaders() {
return Collections.emptySet();
}
-
+
protected String getFaultCodePrefix(XMLStreamWriter writer, QName faultCode) throws XMLStreamException {
String codeNs = faultCode.getNamespaceURI();
String prefix = null;
if (codeNs.length() > 0) {
prefix = StaxUtils.getUniquePrefix(writer, codeNs, true);
- }
+ }
return prefix;
}
-
+
protected void prepareStackTrace(SoapMessage message, SoapFault fault) throws Exception {
boolean config = MessageUtils.getContextualBoolean(message, Message.FAULT_STACKTRACE_ENABLED, false);
if (config && fault.getCause() != null) {
@@ -81,7 +81,7 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
}
throwable = throwable.getCause();
if (throwable != null) {
- sb.append("Caused by: " + throwable.getClass().getCanonicalName()
+ sb.append("Caused by: " + throwable.getClass().getCanonicalName()
+ " : " + throwable.getMessage() + Message.EXCEPTION_CAUSE_SUFFIX);
}
}
@@ -97,7 +97,7 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
fault.setDetail(detail);
detail.appendChild(stackTrace);
} else {
- Element stackTrace =
+ Element stackTrace =
detail.getOwnerDocument().createElementNS(Fault.STACKTRACE_NAMESPACE,
Fault.STACKTRACE);
stackTrace.setTextContent(sb.toString());
@@ -112,7 +112,7 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
}
boolean config = MessageUtils.getContextualBoolean(message, Message.EXCEPTION_MESSAGE_CAUSE_ENABLED, false);
if (fault.getMessage() != null) {
- if (config && fault.getCause() != null
+ if (config && fault.getCause() != null
&& fault.getCause().getMessage() != null && !fault.getMessage().equals(fault.getCause().getMessage())) {
return fault.getMessage() + " Caused by: " + fault.getCause().getMessage();
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
index 47c6df6..75f57c2 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
@@ -33,7 +33,7 @@ import org.apache.cxf.phase.Phase;
public class CheckFaultInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(CheckFaultInterceptor.class);
-
+
public CheckFaultInterceptor() {
this(Phase.POST_PROTOCOL);
}
@@ -59,7 +59,7 @@ public class CheckFaultInterceptor extends AbstractSoapInterceptor {
return;
}
} 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());
}
if (message.getVersion().getFault().equals(xmlReader.getName()) && isRequestor(message)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
index 529b7d3..cdb9dc9 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
@@ -32,13 +32,13 @@ import org.apache.cxf.wsdl.interceptors.AbstractEndpointSelectionInterceptor;
/**
* Selects the most appropriate endpoint based on the SOAP version used.
- *
+ *
* @param message
* @param eps
* @return
*/
public class EndpointSelectionInterceptor extends AbstractEndpointSelectionInterceptor {
-
+
public EndpointSelectionInterceptor() {
super(Phase.READ);
getAfter().add(ReadHeadersInterceptor.class.getName());
@@ -51,7 +51,7 @@ public class EndpointSelectionInterceptor extends AbstractEndpointSelectionInter
EndpointInfo ei = e.getEndpointInfo();
BindingInfo binding = ei.getBinding();
- if (binding instanceof SoapBindingInfo
+ if (binding instanceof SoapBindingInfo
&& ((SoapBindingInfo)binding).getSoapVersion().equals(sv)) {
return e;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
index 20d54b3..75de8ac 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
@@ -52,9 +52,9 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(MustUnderstandInterceptor.class);
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
-
+
private MustUnderstandEndingInterceptor ending = new MustUnderstandEndingInterceptor();
-
+
public MustUnderstandInterceptor() {
super(Phase.PRE_PROTOCOL);
}
@@ -68,8 +68,8 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
if (soapMessage.getHeaders().isEmpty() && paramHeaders.isEmpty()) {
return;
}
-
- SoapVersion soapVersion = soapMessage.getVersion();
+
+ SoapVersion soapVersion = soapMessage.getVersion();
Set<Header> mustUnderstandHeaders = new HashSet<>();
Set<URI> serviceRoles = new HashSet<>();
Set<QName> notUnderstandHeaders = new HashSet<>();
@@ -79,9 +79,9 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
initServiceSideInfo(mustUnderstandQNames, soapMessage, serviceRoles, paramHeaders);
buildMustUnderstandHeaders(mustUnderstandHeaders, soapMessage,
serviceRoles, ultimateReceiverHeaders);
-
+
checkUnderstand(mustUnderstandHeaders, mustUnderstandQNames, notUnderstandHeaders);
-
+
if (!notUnderstandHeaders.isEmpty()) {
if (!isRequestor(soapMessage)) {
soapMessage.put(MustUnderstandInterceptor.UNKNOWNS, notUnderstandHeaders);
@@ -98,7 +98,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
@Override
public void handleFault(SoapMessage msg) {
Set<QName> unknowns = CastUtils.cast((Set<?>)msg.get(MustUnderstandInterceptor.UNKNOWNS));
- if (msg.getExchange().getBindingOperationInfo() == null
+ if (msg.getExchange().getBindingOperationInfo() == null
&& unknowns != null && !unknowns.isEmpty()) {
//per jaxws spec, if there are must understands that we didn't understand, but couldn't map
//to an operation either, we need to throw the mustunderstand fault, not the one related to
@@ -109,7 +109,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
}
private void checkUltimateReceiverHeaders(Set<Header> ultimateReceiverHeaders,
- Set<QName> mustUnderstandQNames,
+ Set<QName> mustUnderstandQNames,
SoapMessage soapMessage) {
soapMessage.getInterceptorChain()
.add(new UltimateReceiverMustUnderstandInterceptor(mustUnderstandQNames));
@@ -160,7 +160,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
if (paramHeaders != null) {
mustUnderstandQNames.addAll(paramHeaders);
}
- for (Interceptor<? extends org.apache.cxf.message.Message> interceptorInstance
+ for (Interceptor<? extends org.apache.cxf.message.Message> interceptorInstance
: soapMessage.getInterceptorChain()) {
if (interceptorInstance instanceof SoapInterceptor) {
SoapInterceptor si = (SoapInterceptor) interceptorInstance;
@@ -188,7 +188,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
if (role.equals(soapMessage.getVersion().getNextRole())) {
mustUnderstandHeaders.add(header);
} else if (role.equals(soapMessage.getVersion().getUltimateReceiverRole())) {
- ultimateReceiverHeaders.add(header);
+ ultimateReceiverHeaders.add(header);
} else {
for (URI roleFromBinding : serviceRoles) {
if (role.equals(roleFromBinding.toString())) {
@@ -216,11 +216,11 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
}
}
}
-
-
-
+
+
+
/**
- *
+ *
*/
private static class UltimateReceiverMustUnderstandInterceptor extends AbstractSoapInterceptor {
Set<QName> knownHeaders;
@@ -232,7 +232,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
SoapVersion soapVersion = soapMessage.getVersion();
Set<QName> notFound = new HashSet<>();
List<Header> heads = soapMessage.getHeaders();
-
+
for (Header header : heads) {
if (header instanceof SoapHeader
&& ((SoapHeader)header).isMustUnderstand()
@@ -241,21 +241,21 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
&& (StringUtils.isEmpty(((SoapHeader)header).getActor())
|| soapVersion.getUltimateReceiverRole()
.equals(((SoapHeader)header).getActor()))) {
-
+
notFound.add(header.getName());
}
}
-
-
+
+
if (!notFound.isEmpty()) {
soapMessage.remove(UNKNOWNS);
throw new SoapFault(new Message("MUST_UNDERSTAND", BUNDLE, notFound),
soapVersion.getMustUnderstand());
- }
+ }
}
}
-
+
public static class MustUnderstandEndingInterceptor extends AbstractSoapInterceptor {
public MustUnderstandEndingInterceptor() {
super(Phase.PRE_LOGICAL);
@@ -265,17 +265,17 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
public MustUnderstandEndingInterceptor(String phase) {
super(phase);
}
-
+
public void handleMessage(SoapMessage message) throws Fault {
// throws soapFault after the response code 202 is set in OneWayProcessorInterceptor
if (message.get(MustUnderstandInterceptor.UNKNOWNS) != null) {
- //we may not have known the Operation in the main interceptor and thus may not
+ //we may not have known the Operation in the main interceptor and thus may not
//have been able to get the parameter based headers. We now know the
//operation and thus can remove those.
Set<QName> unknowns = CastUtils.cast((Set<?>)message.get(MustUnderstandInterceptor.UNKNOWNS));
Set<QName> paramHeaders = HeaderUtil.getHeaderQNameInOperationParam(message);
unknowns.removeAll(paramHeaders);
-
+
message.remove(MustUnderstandInterceptor.UNKNOWNS);
if (!unknowns.isEmpty()) {
throw new SoapFault(new Message("MUST_UNDERSTAND", BUNDLE, unknowns),
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
index 6607e1b..d36f196 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
@@ -54,7 +54,7 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
private static final QName SOAP12_RESULT = new QName("http://www.w3.org/2003/05/soap-rpc",
"result");
private static final Logger LOG = LogUtils.getL7dLogger(RPCInInterceptor.class);
-
+
public RPCInInterceptor() {
super(Phase.UNMARSHAL);
}
@@ -75,8 +75,8 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
body = info.getOutput().getExtensor(SoapBody.class);
} else {
body = info.getInput().getExtensor(SoapBody.class);
- }
- if (body != null
+ }
+ if (body != null
&& opName.getNamespaceURI().equals(body.getNamespaceURI())) {
return info;
}
@@ -122,11 +122,11 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
msg = operation.getOperationInfo().getOutput();
}
message.put(MessageInfo.class, msg);
-
+
MessageContentsList parameters = new MessageContentsList();
StaxUtils.nextEvent(xmlReader);
-
+
boolean hasNext = true;
Iterator<MessagePartInfo> itr = msg.getMessageParts().iterator();
while (itr.hasNext()) {
@@ -150,8 +150,8 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
StaxUtils.toNextElement(xmlReader);
qn = xmlReader.getName();
}
-
-
+
+
// WSI-BP states that RPC/Lit part accessors should be completely unqualified
// However, older toolkits (Axis 1.x) are qualifying them. We'll go
// ahead and just match on the localpart. The RPCOutInterceptor
@@ -186,9 +186,9 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
message.setContent(List.class, parameters);
}
-
-
- private void setMessage(Message message,
+
+
+ private void setMessage(Message message,
BindingOperationInfo operation) {
Exchange ex = message.getExchange();
ex.put(BindingOperationInfo.class, operation);
@@ -208,7 +208,7 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
QName portQName = endpointInfo.getName();
message.put(Message.WSDL_PORT, portQName);
-
+
URI wsdlDescription = endpointInfo.getProperty("URI", URI.class);
if (wsdlDescription == null) {
String address = endpointInfo.getAddress();
@@ -220,8 +220,8 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
endpointInfo.setProperty("URI", wsdlDescription);
}
message.put(Message.WSDL_DESCRIPTION, wsdlDescription);
-
+
// configure endpoint and operation level schema validation
- setOperationSchemaValidation(message);
- }
+ setOperationSchemaValidation(message);
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
index 4c6912d..703d1ed 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
@@ -112,8 +112,8 @@ public class RPCOutInterceptor extends AbstractOutDatabindingInterceptor {
// Finishing the writing.
xmlWriter.writeEndElement();
-
-
+
+
if (cache != null) {
try {
for (XMLEvent event : cache.getEvents()) {
@@ -132,10 +132,10 @@ public class RPCOutInterceptor extends AbstractOutDatabindingInterceptor {
}
}
- protected String addOperationNode(NSStack nsStack, Message message,
- XMLStreamWriter xmlWriter,
+ protected String addOperationNode(NSStack nsStack, Message message,
+ XMLStreamWriter xmlWriter,
boolean output,
- BindingOperationInfo boi)
+ BindingOperationInfo boi)
throws XMLStreamException {
String ns = boi.getName().getNamespaceURI();
SoapBody body = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index c0b72c9..d016ee9 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -67,19 +67,19 @@ import org.apache.cxf.staxutils.W3CDOMStreamWriter;
public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
-
+
public static final String ENVELOPE_EVENTS = "envelope.events";
public static final String BODY_EVENTS = "body.events";
public static final String ENVELOPE_PREFIX = "envelope.prefix";
public static final String BODY_PREFIX = "body.prefix";
/**
- *
+ *
*/
public static class CheckClosingTagsInterceptor extends AbstractSoapInterceptor {
public CheckClosingTagsInterceptor() {
super(Phase.POST_LOGICAL);
}
-
+
/** {@inheritDoc}*/
public void handleMessage(SoapMessage message) throws Fault {
XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
@@ -91,7 +91,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
}
}
} catch (XMLStreamException e) {
- throw new SoapFault(e.getMessage(), e,
+ throw new SoapFault(e.getMessage(), e,
message.getVersion().getSender());
}
}
@@ -168,15 +168,15 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
}
try {
- if (xmlReader.getEventType() == XMLStreamConstants.START_ELEMENT
+ if (xmlReader.getEventType() == XMLStreamConstants.START_ELEMENT
|| xmlReader.nextTag() == XMLStreamConstants.START_ELEMENT) {
-
+
SoapVersion soapVersion = readVersion(xmlReader, message);
if (soapVersion == Soap12.getInstance()
&& version == Soap11.getInstance()) {
message.setVersion(version);
throw new SoapFault(new Message("INVALID_11_VERSION", LOG),
- version.getVersionMismatch());
+ version.getVersionMismatch());
}
XMLStreamReader filteredReader = new PartialXMLStreamReader(xmlReader, message.getVersion()
@@ -192,7 +192,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
doc = (Document)nd;
StaxUtils.readDocElements(doc, doc, filteredReader, false, false);
} else {
- final boolean addNC =
+ final boolean addNC =
MessageUtils.getContextualBoolean(
message, "org.apache.cxf.binding.soap.addNamespaceContext", false);
Map<String, String> bodyNC = addNC ? new HashMap<String, String>() : null;
@@ -284,14 +284,14 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
}
}
} 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());
} finally {
if (closeNeeded) {
try {
StaxUtils.close(xmlReader);
} 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());
}
}
@@ -332,7 +332,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
private QName lastStartElementQName;
private String envelopePrefix;
private String bodyPrefix;
-
+
static {
try {
eventFactory = XMLEventFactory.newInstance();
@@ -451,7 +451,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
events.add(event);
}
}
-
+
public List<XMLEvent> getBodyAttributeAndNamespaceEvents() {
if (bodyEvents == null) {
return Collections.emptyList();
@@ -459,7 +459,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
return Collections.unmodifiableList(bodyEvents);
}
}
-
+
public List<XMLEvent> getEnvAttributeAndNamespaceEvents() {
if (envEvents == null) {
return Collections.emptyList();
@@ -467,11 +467,11 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
return Collections.unmodifiableList(envEvents);
}
}
-
+
public String getEnvelopePrefix() {
return envelopePrefix;
}
-
+
public String getBodyPrefix() {
return bodyPrefix;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
index 2943f77..164e065 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
@@ -40,7 +40,7 @@ import org.apache.cxf.staxutils.StaxUtils;
public class Soap11FaultInInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(Soap11FaultInInterceptor.class);
-
+
public Soap11FaultInInterceptor() {
super(Phase.UNMARSHAL);
addBefore(ClientFaultConverter.class.getName());
@@ -52,7 +52,7 @@ public class Soap11FaultInInterceptor extends AbstractSoapInterceptor {
message.setContent(Exception.class, unmarshalFault(message, reader));
}
- public static SoapFault unmarshalFault(SoapMessage message,
+ public static SoapFault unmarshalFault(SoapMessage message,
XMLStreamReader reader) {
String exMessage = "";
QName faultCode = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
index 8d6d24b..690e1a1 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
@@ -50,29 +50,29 @@ public class Soap11FaultOutInterceptor extends AbstractSoapInterceptor {
if (message.getVersion() == Soap11.getInstance()) {
message.getInterceptorChain().add(Soap11FaultOutInterceptorInternal.INSTANCE);
} else {
- message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
+ message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
}
}
-
+
static class Soap11FaultOutInterceptorInternal extends AbstractSoapInterceptor {
static final Soap11FaultOutInterceptorInternal INSTANCE = new Soap11FaultOutInterceptorInternal();
-
+
Soap11FaultOutInterceptorInternal() {
super(Phase.MARSHAL);
}
- public void handleMessage(SoapMessage message) throws Fault {
+ public void handleMessage(SoapMessage message) throws Fault {
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
Fault f = (Fault) message.getContent(Exception.class);
-
+
SoapFault fault = SoapFault.createFault(f, message.getVersion());
-
+
try {
Map<String, String> namespaces = fault.getNamespaces();
for (Map.Entry<String, String> e : namespaces.entrySet()) {
writer.writeNamespace(e.getKey(), e.getValue());
}
-
- String ns = message.getVersion().getNamespace();
+
+ String ns = message.getVersion().getNamespace();
String defaultPrefix = writer.getPrefix(ns);
if (defaultPrefix == null) {
defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, false);
@@ -81,12 +81,12 @@ public class Soap11FaultOutInterceptor extends AbstractSoapInterceptor {
} else {
writer.writeStartElement(defaultPrefix, "Fault", ns);
}
-
+
writer.writeStartElement("faultcode");
-
+
String codeString = fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
defaultPrefix);
-
+
writer.writeCharacters(codeString);
writer.writeEndElement();
@@ -98,27 +98,27 @@ public class Soap11FaultOutInterceptor extends AbstractSoapInterceptor {
writer.writeCharacters(getFaultMessage(message, fault));
writer.writeEndElement();
prepareStackTrace(message, fault);
-
+
if (fault.getRole() != null) {
writer.writeStartElement("faultactor");
writer.writeCharacters(fault.getRole());
writer.writeEndElement();
}
-
+
if (fault.hasDetails()) {
Element detail = fault.getDetail();
writer.writeStartElement("detail");
-
+
Node node = detail.getFirstChild();
while (node != null) {
StaxUtils.writeNode(node, writer, true);
node = node.getNextSibling();
}
-
+
// Details
writer.writeEndElement();
}
-
+
// Fault
writer.writeEndElement();
} catch (Exception xe) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
index 5a3ada6..fdecf8b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
@@ -51,7 +51,7 @@ import org.apache.cxf.staxutils.W3CDOMStreamReader;
public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(Soap12FaultInInterceptor.class);
-
+
public Soap12FaultInInterceptor() {
super(Phase.UNMARSHAL);
addBefore(ClientFaultConverter.class.getName());
@@ -66,7 +66,7 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
message.setContent(Exception.class, unmarshalFault(message, reader));
}
- public static SoapFault unmarshalFault(SoapMessage message,
+ public static SoapFault unmarshalFault(SoapMessage message,
XMLStreamReader reader) {
String exMessage = null;
QName faultCode = null;
@@ -78,11 +78,11 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
Map<String, String> ns = new HashMap<String, String>();
ns.put("s", Soap12.SOAP_NAMESPACE);
- XPathUtils xu = new XPathUtils(ns);
+ XPathUtils xu = new XPathUtils(ns);
try {
Node mainNode = message.getContent(Node.class);
Node fault = null;
-
+
if (reader instanceof W3CDOMStreamReader) {
W3CDOMStreamReader dr = (W3CDOMStreamReader)reader;
fault = dr.getCurrentElement();
@@ -100,15 +100,15 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
} else {
fault = StaxUtils.read(new FragmentStreamReader(reader));
}
- Element el = (Element)xu.getValue("//s:Fault/s:Code/s:Value",
- fault,
+ Element el = (Element)xu.getValue("//s:Fault/s:Code/s:Value",
+ fault,
XPathConstants.NODE);
if (el != null) {
faultCode = DOMUtils.createQName(el.getTextContent(), el);
}
-
- el = (Element)xu.getValue("//s:Fault/s:Code/s:Subcode",
- fault,
+
+ el = (Element)xu.getValue("//s:Fault/s:Code/s:Subcode",
+ fault,
XPathConstants.NODE);
if (el != null) {
subCodes = new LinkedList<QName>();
@@ -118,29 +118,29 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
subCodes.add(DOMUtils.createQName(v.getTextContent(), v));
}
}
-
- exMessage = (String) xu.getValue("//s:Fault/s:Reason/s:Text/text()",
+
+ exMessage = (String) xu.getValue("//s:Fault/s:Reason/s:Text/text()",
fault,
XPathConstants.STRING);
-
- lang = (String) xu.getValue("//s:Fault/s:Reason/s:Text/@xml:lang",
+
+ lang = (String) xu.getValue("//s:Fault/s:Reason/s:Text/@xml:lang",
fault,
XPathConstants.STRING);
-
+
Node detailNode = (Node) xu.getValue("//s:Fault/s:Detail",
fault,
XPathConstants.NODE);
if (detailNode != null) {
detail = (Element) detailNode;
}
-
- role = (String) xu.getValue("//s:Fault/s:Role/text()",
+
+ role = (String) xu.getValue("//s:Fault/s:Role/text()",
fault,
XPathConstants.STRING);
- node = (String) xu.getValue("//s:Fault/s:Node/text()",
+ node = (String) xu.getValue("//s:Fault/s:Node/text()",
fault,
- XPathConstants.STRING);
+ XPathConstants.STRING);
} catch (XMLStreamException e) {
throw new SoapFault("Could not parse message.",
e,
@@ -151,7 +151,7 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
faultCode = Soap12.getInstance().getReceiver();
exMessage = new Message("INVALID_FAULT", LOG).toString();
}
-
+
SoapFault fault = new SoapFault(exMessage, faultCode);
fault.setSubCodes(subCodes);
fault.setDetail(detail);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
index 9b54970..b68a27c 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
@@ -54,21 +54,21 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
}
}
-
+
static class Soap12FaultOutInterceptorInternal extends AbstractSoapInterceptor {
static final Soap12FaultOutInterceptorInternal INSTANCE = new Soap12FaultOutInterceptorInternal();
-
+
Soap12FaultOutInterceptorInternal() {
super(Phase.MARSHAL);
}
public void handleMessage(SoapMessage message) throws Fault {
LOG.info(getClass() + (String) message.get(SoapMessage.CONTENT_TYPE));
-
+
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
Fault f = (Fault)message.getContent(Exception.class);
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, f.getStatusCode());
-
- SoapFault fault = SoapFault.createFault(f, message.getVersion());
+
+ SoapFault fault = SoapFault.createFault(f, message.getVersion());
try {
Map<String, String> namespaces = fault.getNamespaces();
@@ -88,8 +88,8 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
writer.writeStartElement(defaultPrefix, "Code", ns);
writer.writeStartElement(defaultPrefix, "Value", ns);
-
- writer.writeCharacters(fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
+
+ writer.writeCharacters(fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
defaultPrefix));
writer.writeEndElement();
@@ -98,7 +98,7 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
for (QName fsc : fault.getSubCodes()) {
writer.writeStartElement(defaultPrefix, "Subcode", ns);
writer.writeStartElement(defaultPrefix, "Value", ns);
- writer.writeCharacters(getCodeString(getFaultCodePrefix(writer, fsc),
+ writer.writeCharacters(getCodeString(getFaultCodePrefix(writer, fsc),
defaultPrefix, fsc));
writer.writeEndElement();
fscCount++;
@@ -127,7 +127,7 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
}
prepareStackTrace(message, fault);
-
+
if (fault.hasDetails()) {
Element detail = fault.getDetail();
writer.writeStartElement(defaultPrefix, "Detail", ns);
@@ -150,7 +150,7 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
}
}
- private String getLangCode() {
+ private String getLangCode() {
String code = LOG.getResourceBundle().getLocale().getLanguage();
if (StringUtils.isEmpty(code)) {
return "en";
@@ -169,8 +169,8 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
} else {
codePrefix = prefix;
}
-
- return codePrefix + ":" + code.getLocalPart();
+
+ return codePrefix + ":" + code.getLocalPart();
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
index ca4af42..94e899b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
@@ -44,24 +44,24 @@ import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
public class SoapActionInInterceptor extends AbstractSoapInterceptor {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(SoapActionInInterceptor.class);
private static final String ALLOW_NON_MATCHING_TO_DEFAULT = "allowNonMatchingToDefaultSoapAction";
private static final String CALCULATED_WSA_ACTION = SoapActionInInterceptor.class.getName() + ".ACTION";
-
+
public SoapActionInInterceptor() {
super(Phase.READ);
addAfter(ReadHeadersInterceptor.class.getName());
addAfter(EndpointSelectionInterceptor.class.getName());
}
-
+
public static String getSoapAction(Message m) {
if (!(m instanceof SoapMessage)) {
return null;
}
SoapMessage message = (SoapMessage)m;
if (message.getVersion() instanceof Soap11) {
- Map<String, List<String>> headers
+ Map<String, List<String>> headers
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers != null) {
List<String> sa = headers.get(SoapBindingConstants.SOAP_ACTION);
@@ -75,11 +75,11 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
} else if (message.getVersion() instanceof Soap12) {
String ct = (String) message.get(Message.CONTENT_TYPE);
-
+
if (ct == null) {
return null;
}
-
+
int start = ct.indexOf("action=");
if (start == -1 && ct.indexOf("multipart/related") == 0 && ct.indexOf("start-info") == -1) {
// the action property may not be found at the package's content-type for non-mtom multipart message
@@ -113,19 +113,19 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
return null;
}
-
+
public void handleMessage(SoapMessage message) throws Fault {
if (isRequestor(message)) {
return;
}
-
+
String action = getSoapAction(message);
if (!StringUtils.isEmpty(action)) {
getAndSetOperation(message, action);
message.put(SoapBindingConstants.SOAP_ACTION, action);
}
}
-
+
public static void getAndSetOperation(SoapMessage message, String action) {
getAndSetOperation(message, action, true);
}
@@ -133,15 +133,15 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
if (StringUtils.isEmpty(action)) {
return;
}
-
+
Exchange ex = message.getExchange();
Endpoint ep = ex.getEndpoint();
if (ep == null) {
return;
}
-
+
BindingOperationInfo bindingOp = null;
-
+
Collection<BindingOperationInfo> bops = ep.getEndpointInfo()
.getBinding().getOperations();
if (bops != null) {
@@ -162,7 +162,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
}
}
-
+
if (bindingOp == null) {
if (strict) {
//we didn't match the an operation, we'll try again later to make
@@ -173,7 +173,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
return;
}
-
+
ex.put(BindingOperationInfo.class, bindingOp);
}
private static boolean matchWSAAction(BindingOperationInfo boi, String action) {
@@ -188,7 +188,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
return false;
}
-
+
private static String getWSAAction(BindingOperationInfo boi) {
Object o = boi.getOperationInfo().getInput().getProperty(CALCULATED_WSA_ACTION);
if (o == null) {
@@ -232,7 +232,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
return buffer.toString();
}
-
+
public static class SoapActionInAttemptTwoInterceptor extends AbstractSoapInterceptor {
final String action;
public SoapActionInAttemptTwoInterceptor(String action) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
index 1a70d16..6cba304 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
@@ -65,7 +65,7 @@ import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(SoapHeaderInterceptor.class);
-
+
public SoapHeaderInterceptor() {
super(Phase.UNMARSHAL);
addAfter(BareInInterceptor.class.getName());
@@ -92,19 +92,19 @@ public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
if (bop.isUnwrapped()) {
bop = bop.getWrappedOperation();
}
-
+
boolean client = isRequestor(message);
BindingMessageInfo bmi = client ? bop.getOutput() : bop.getInput();
if (bmi == null) {
// one way operation.
return;
}
-
+
List<SoapHeaderInfo> headers = bmi.getExtensors(SoapHeaderInfo.class);
if (headers == null || headers.size() == 0) {
return;
}
-
+
boolean supportsNode = this.supportsDataReader(message, Node.class);
Service service = ServiceModelUtil.getService(message.getExchange());
for (SoapHeaderInfo header : headers) {
@@ -124,18 +124,18 @@ public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
if (mpi.getTypeClass() != null) {
Header param = findHeader(message, mpi);
-
+
Object object = null;
if (param != null) {
message.getHeaders().remove(param);
-
+
if (param.getDataBinding() == null) {
Node source = (Node)param.getObject();
if (source instanceof Element) {
//need to remove these attributes as they
//would cause validation failures
Element el = (Element)source;
-
+
el.removeAttributeNS(soapVersion.getNamespace(),
soapVersion.getAttrNameMustUnderstand());
el.removeAttributeNS(soapVersion.getNamespace(),
@@ -149,13 +149,13 @@ public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
reader.nextTag(); //advance into the first tag
} catch (XMLStreamException e) {
//ignore
- }
+ }
object = getDataReader(message, XMLStreamReader.class).read(mpi, reader);
}
} else {
object = param.getObject();
}
-
+
}
parameters.put(mpi, object);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
index 48e47a6..130a88e 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
@@ -28,19 +28,19 @@ import org.apache.cxf.phase.Phase;
public class SoapHeaderOutFilterInterceptor extends AbstractSoapInterceptor {
public static final SoapHeaderOutFilterInterceptor INSTANCE = new SoapHeaderOutFilterInterceptor();
-
+
public SoapHeaderOutFilterInterceptor() {
super(Phase.PRE_LOGICAL);
}
public void handleMessage(SoapMessage message) throws Fault {
Iterator<Header> iter = message.getHeaders().iterator();
-
+
while (iter.hasNext()) {
Header hdr = iter.next();
//Only remove inbound marked headers..
if (hdr == null || hdr.getDirection() == Header.Direction.DIRECTION_IN) {
- iter.remove();
+ iter.remove();
}
}
}