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:16 UTC
[11/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
index 5fbff73..1f0768c 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
@@ -44,22 +44,22 @@ public final class TestUtil {
public static XopType createXopObject(Class<?> clazz)
throws IOException, URISyntaxException {
-
+
XopType xopObj = new XopType();
- xopObj.setName("hello world");
-
+ xopObj.setName("hello world");
+
URL url1 = clazz.getResource("my.wav");
-
+
xopObj.setAttachinfo(new DataHandler(url1));
-
- return xopObj;
+
+ return xopObj;
}
-
+
public static SoapMessage createSoapMessage(SoapVersion soapVersion,
InterceptorChain chain, Class<?> clazz)
- throws IOException {
-
- SoapMessage soapMessage = createEmptySoapMessage(soapVersion, chain);
+ throws IOException {
+
+ SoapMessage soapMessage = createEmptySoapMessage(soapVersion, chain);
// setup the message result with attachment.class
ByteArrayDataSource bads = new ByteArrayDataSource(clazz.getResourceAsStream("primarySoapPart.xml"),
"Application/xop+xml");
@@ -83,7 +83,7 @@ public final class TestUtil {
return soapMessage;
}
-
+
public static SoapMessage createEmptySoapMessage(SoapVersion soapVersion, InterceptorChain chain) {
Exchange exchange = new ExchangeImpl();
MessageImpl messageImpl = new MessageImpl();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java
index 81be8a1..34fd9bc 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java
@@ -28,9 +28,9 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for XopType complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* <complexType name="XopType">
* <complexContent>
@@ -43,8 +43,8 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "XopType", propOrder = {"name", "attachinfo" })
@@ -58,11 +58,11 @@ public class XopType {
/**
* Gets the value of the name property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getName() {
return name;
@@ -70,11 +70,11 @@ public class XopType {
/**
* Sets the value of the name property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setName(String value) {
this.name = value;
@@ -82,11 +82,11 @@ public class XopType {
/**
* Gets the value of the attachinfo property.
- *
+ *
* @return
* possible object is
* {@link DataHandler }
- *
+ *
*/
public DataHandler getAttachinfo() {
return attachinfo;
@@ -94,11 +94,11 @@ public class XopType {
/**
* Sets the value of the attachinfo property.
- *
+ *
* @param value
* allowed object is
* {@link DataHandler }
- *
+ *
*/
public void setAttachinfo(DataHandler value) {
this.attachinfo = value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
index 80f6f41..d5c6d94 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
@@ -23,13 +23,13 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
*/
public class SoapBindingBPHandlerTest extends Assert {
@Test
public void testGetSchemaLocation() {
SoapBindingBPHandler handler = new SoapBindingBPHandler();
-
+
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/bindings/soap"));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
index e2fd16c..4544a79 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
@@ -34,10 +34,10 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class ReadHeadersInterceptorTest extends Assert {
- private static final byte[] TEST_SOAP =
+ private static final byte[] TEST_SOAP =
("<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'"
+ " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
+ " xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:bar='tmp:bar'>"
@@ -45,9 +45,9 @@ public class ReadHeadersInterceptorTest extends Assert {
+ "<ns2:payload xmlns:ns2='urn:tmp:foo'/>"
+ "</soap:Body>"
+ "</soap:Envelope>").getBytes();
-
+
private ReadHeadersInterceptor interceptor;
-
+
@Before
public void setUp() {
interceptor = new ReadHeadersInterceptor(null);
@@ -57,7 +57,7 @@ public class ReadHeadersInterceptorTest extends Assert {
public void testNotAddNSContext() throws Exception {
SoapMessage message = setUpMessage();
interceptor.handleMessage(message);
- Map<String, String> nsc = CastUtils.cast((Map<?, ?>)message.get("soap.body.ns.context"));
+ Map<String, String> nsc = CastUtils.cast((Map<?, ?>)message.get("soap.body.ns.context"));
assertNull(nsc);
}
@@ -71,7 +71,7 @@ public class ReadHeadersInterceptorTest extends Assert {
assertEquals("http://www.w3.org/2001/XMLSchema-instance", nsc.get("xsi"));
assertEquals("http://www.w3.org/2001/XMLSchema", nsc.get("xs"));
assertEquals("tmp:bar", nsc.get("bar"));
-
+
}
private SoapMessage setUpMessage() throws Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index 206b752..62068cc 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -38,7 +38,7 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class SoapActionInInterceptorTest extends Assert {
private IMocksControl control;
@@ -50,7 +50,7 @@ public class SoapActionInInterceptorTest extends Assert {
@Test
public void testGetSoapActionForSOAP11() throws Exception {
- SoapMessage message = setUpMessage("text/xml", Soap11.getInstance(), "urn:cxf");
+ SoapMessage message = setUpMessage("text/xml", Soap11.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -59,7 +59,7 @@ public class SoapActionInInterceptorTest extends Assert {
@Test
public void testGetSoapActionForSOAP11None() throws Exception {
- SoapMessage message = setUpMessage("text/xml", Soap11.getInstance(), null);
+ SoapMessage message = setUpMessage("text/xml", Soap11.getInstance(), null);
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertNull(action);
@@ -86,7 +86,7 @@ public class SoapActionInInterceptorTest extends Assert {
@Test
public void testGetSoapActionForSOAP11SwA() throws Exception {
- SoapMessage message = setUpMessage("multipart/related", Soap11.getInstance(), "urn:cxf");
+ SoapMessage message = setUpMessage("multipart/related", Soap11.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -99,7 +99,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP12SwAWithStartInfo() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related; start-info=\"application/soap+xml; action=\\\"urn:cxf\\\"",
- Soap12.getInstance(), null);
+ Soap12.getInstance(), null);
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -113,7 +113,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP12SwAWithAction() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related; start-info=\"application/soap+xml\"; action=\"urn:cxf\"",
- Soap12.getInstance(), null);
+ Soap12.getInstance(), null);
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -126,7 +126,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP12SwAWithActionInPartHeaders() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related",
- Soap12.getInstance(), "urn:cxf");
+ Soap12.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -138,7 +138,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP12SwANone() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related",
- Soap12.getInstance(), null);
+ Soap12.getInstance(), null);
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertNull(action);
@@ -149,7 +149,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP11MTOM() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related; type=\"application/xop+xml\"; start-info=\"text/xml\"",
- Soap11.getInstance(), "urn:cxf");
+ Soap11.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -157,14 +157,14 @@ public class SoapActionInInterceptorTest extends Assert {
}
@Test
- // some systems use this form, although this is not spec-conformant as
+ // some systems use this form, although this is not spec-conformant as
// the action property is not part of the multipart/related media type.
// here the action propety is set as in start-info="application/soap+xml"; action="urn:cxf"
public void testGetSoapActionForSOAP12MTOMWithAction() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related; type=\"application/xop+xml\""
+ "; start-info=\"application/soap+xml\"; action=\"urn:cxf\"",
- Soap11.getInstance(), "urn:cxf");
+ Soap11.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -178,7 +178,7 @@ public class SoapActionInInterceptorTest extends Assert {
if (version instanceof Soap11 && prop != null) {
headers.put("SOAPAction", Collections.singletonList(prop));
} else if (version instanceof Soap12 && prop != null) {
- partHeaders.put(Message.CONTENT_TYPE,
+ partHeaders.put(Message.CONTENT_TYPE,
Collections.singletonList("application/soap+xml; action=\"" + prop + "\""));
}
EasyMock.expect(message.getVersion()).andReturn(version).anyTimes();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index 4304c1c..98cbc2b 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -72,7 +72,7 @@ public class SoapFaultSerializerTest extends Assert {
+ " from document:\n" + StaxUtils.toString(doc));
}
}
-
+
@Test
public void testSoap11Out() throws Exception {
String faultString = "Hadrian caused this Fault!";
@@ -112,18 +112,18 @@ public class SoapFaultSerializerTest extends Assert {
assertEquals(fault.getMessage(), fault2.getMessage());
assertEquals(Soap11.getInstance().getSender(), fault2.getFaultCode());
}
-
+
@Test
public void testSoap12Out() throws Exception {
String faultString = "Hadrian caused this Fault!";
SoapFault fault = new SoapFault(faultString, Soap12.getInstance().getSender());
-
+
QName qname = new QName("http://cxf.apache.org/soap/fault", "invalidsoap", "cxffaultcode");
fault.setSubCode(qname);
SoapMessage m = new SoapMessage(new MessageImpl());
m.setVersion(Soap12.getInstance());
-
+
m.setContent(Exception.class, fault);
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -140,15 +140,15 @@ public class SoapFaultSerializerTest extends Assert {
writer.close();
Document faultDoc = StaxUtils.read(new ByteArrayInputStream(out.toByteArray()));
-
- assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
+
+ assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Subcode/"
- + "soap12env:Value[text()='ns2:invalidsoap']",
+ + "soap12env:Value[text()='ns2:invalidsoap']",
faultDoc);
- assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
+ assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
faultDoc);
- assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[text()='" + faultString + "']",
+ assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[text()='" + faultString + "']",
faultDoc);
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(out.toByteArray()));
@@ -162,21 +162,21 @@ public class SoapFaultSerializerTest extends Assert {
SoapFault fault2 = (SoapFault)m.getContent(Exception.class);
assertNotNull(fault2);
assertEquals(Soap12.getInstance().getSender(), fault2.getFaultCode());
- assertEquals(fault.getMessage(), fault2.getMessage());
+ assertEquals(fault.getMessage(), fault2.getMessage());
assertEquals(fault.getSubCode(), fault2.getSubCode());
}
-
+
@Test
public void testSoap12WithMultipleSubCodesOut() throws Exception {
String faultString = "Hadrian caused this Fault!";
SoapFault fault = new SoapFault(faultString, Soap12.getInstance().getSender());
-
+
fault.addSubCode(new QName("http://cxf.apache.org/soap/fault", "invalidsoap", "cxffaultcode"));
fault.addSubCode(new QName("http://cxf.apache.org/soap/fault2", "invalidsoap2", "cxffaultcode2"));
SoapMessage m = new SoapMessage(new MessageImpl());
m.setVersion(Soap12.getInstance());
-
+
m.setContent(Exception.class, fault);
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -193,18 +193,18 @@ public class SoapFaultSerializerTest extends Assert {
writer.close();
Document faultDoc = StaxUtils.read(new ByteArrayInputStream(out.toByteArray()));
-
- assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
+
+ assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Subcode/"
- + "soap12env:Value[text()='ns2:invalidsoap']",
+ + "soap12env:Value[text()='ns2:invalidsoap']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Subcode/soap12env:Subcode/"
- + "soap12env:Value[text()='ns2:invalidsoap2']",
+ + "soap12env:Value[text()='ns2:invalidsoap2']",
faultDoc);
- assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
+ assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
faultDoc);
- assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[text()='" + faultString + "']",
+ assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[text()='" + faultString + "']",
faultDoc);
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(out.toByteArray()));
@@ -218,7 +218,7 @@ public class SoapFaultSerializerTest extends Assert {
SoapFault fault2 = (SoapFault)m.getContent(Exception.class);
assertNotNull(fault2);
assertEquals(Soap12.getInstance().getSender(), fault2.getFaultCode());
- assertEquals(fault.getMessage(), fault2.getMessage());
+ assertEquals(fault.getMessage(), fault2.getMessage());
assertEquals(fault.getSubCodes(), fault2.getSubCodes());
}
@Test
@@ -227,24 +227,24 @@ public class SoapFaultSerializerTest extends Assert {
Fault fault = new Fault(ex, Fault.FAULT_CODE_CLIENT);
verifyFaultToSoapFault(fault, null, true, Soap11.getInstance());
verifyFaultToSoapFault(fault, null, true, Soap12.getInstance());
-
+
fault = new Fault(ex, Fault.FAULT_CODE_SERVER);
verifyFaultToSoapFault(fault, null, false, Soap11.getInstance());
verifyFaultToSoapFault(fault, null, false, Soap12.getInstance());
-
+
fault.setMessage("fault-one");
verifyFaultToSoapFault(fault, "fault-one", false, Soap11.getInstance());
ex = new Exception("fault-two");
fault = new Fault(ex, Fault.FAULT_CODE_CLIENT);
verifyFaultToSoapFault(fault, "fault-two", true, Soap11.getInstance());
-
+
fault = new Fault(ex, new QName("http://cxf.apache.org", "myFaultCode"));
SoapFault f = verifyFaultToSoapFault(fault, "fault-two", false, Soap12.getInstance());
assertEquals("myFaultCode", f.getSubCodes().get(0).getLocalPart());
}
-
+
private SoapFault verifyFaultToSoapFault(Fault fault, String msg, boolean sender, SoapVersion v) {
SoapFault sf = SoapFault.createFault(fault, v);
assertEquals(sender ? v.getSender() : v.getReceiver(), sf.getFaultCode());
@@ -256,7 +256,7 @@ public class SoapFaultSerializerTest extends Assert {
public void testCXF1864() throws Exception {
SoapMessage m = new SoapMessage(new MessageImpl());
- m.setVersion(Soap12.getInstance());
+ m.setVersion(Soap12.getInstance());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(this.getClass()
@@ -278,7 +278,7 @@ public class SoapFaultSerializerTest extends Assert {
//Try WITH SAAJ
SoapMessage m = new SoapMessage(new MessageImpl());
m.put(Message.HTTP_REQUEST_METHOD, "POST");
- m.setVersion(Soap12.getInstance());
+ m.setVersion(Soap12.getInstance());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(this.getClass()
.getResourceAsStream("cxf4181.xml"));
@@ -291,23 +291,23 @@ public class SoapFaultSerializerTest extends Assert {
new Soap12FaultInInterceptor().handleMessage(m);
Node nd = m.getContent(Node.class);
-
+
SOAPPart part = (SOAPPart)nd;
assertEquals("S", part.getEnvelope().getPrefix());
assertEquals("S2", part.getEnvelope().getHeader().getPrefix());
assertEquals("S3", part.getEnvelope().getBody().getPrefix());
SOAPFault fault = part.getEnvelope().getBody().getFault();
assertEquals("S", fault.getPrefix());
-
+
assertEquals("Authentication Failure", fault.getFaultString());
-
+
SoapFault fault2 = (SoapFault)m.getContent(Exception.class);
assertNotNull(fault2);
-
+
assertEquals(Soap12.getInstance().getSender(), fault2.getFaultCode());
- assertEquals(new QName("http://schemas.xmlsoap.org/ws/2005/02/trust", "FailedAuthentication"),
+ assertEquals(new QName("http://schemas.xmlsoap.org/ws/2005/02/trust", "FailedAuthentication"),
fault2.getSubCode());
-
+
Element el = part.getEnvelope().getBody();
nd = el.getFirstChild();
int count = 0;
@@ -318,11 +318,11 @@ public class SoapFaultSerializerTest extends Assert {
nd = nd.getNextSibling();
}
assertEquals(1, count);
-
-
+
+
//Try WITHOUT SAAJ
m = new SoapMessage(new MessageImpl());
- m.setVersion(Soap12.getInstance());
+ m.setVersion(Soap12.getInstance());
reader = StaxUtils.createXMLStreamReader(this.getClass()
.getResourceAsStream("cxf4181.xml"));
@@ -339,16 +339,16 @@ public class SoapFaultSerializerTest extends Assert {
assertNotNull(fault2);
assertEquals(Soap12.getInstance().getSender(), fault2.getFaultCode());
- assertEquals(new QName("http://schemas.xmlsoap.org/ws/2005/02/trust", "FailedAuthentication"),
+ assertEquals(new QName("http://schemas.xmlsoap.org/ws/2005/02/trust", "FailedAuthentication"),
fault2.getSubCode());
}
-
-
+
+
@Test
public void testCXF5493() throws Exception {
SoapMessage m = new SoapMessage(new MessageImpl());
- m.setVersion(Soap11.getInstance());
+ m.setVersion(Soap11.getInstance());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(this.getClass()
@@ -365,12 +365,12 @@ public class SoapFaultSerializerTest extends Assert {
assertNotNull(fault2);
assertEquals(Soap11.getInstance().getReceiver(), fault2.getFaultCode());
assertEquals("some text containing a xml tag <xml-tag>", fault2.getMessage());
-
-
-
+
+
+
m = new SoapMessage(new MessageImpl());
m.put(Message.HTTP_REQUEST_METHOD, "POST");
- m.setVersion(Soap11.getInstance());
+ m.setVersion(Soap11.getInstance());
reader = StaxUtils.createXMLStreamReader(this.getClass().getResourceAsStream("cxf5493.xml"));
m.setContent(XMLStreamReader.class, reader);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
index ce1ff61..77e9762 100755
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
@@ -45,12 +45,12 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class SoapPreProtocolOutInterceptorTest extends Assert {
private IMocksControl control;
private SoapPreProtocolOutInterceptor interceptor;
-
+
@Before
public void setUp() {
control = EasyMock.createNiceControl();
@@ -63,7 +63,7 @@ public class SoapPreProtocolOutInterceptorTest extends Assert {
interceptor.handleMessage(message);
control.verify();
- Map<String, List<String>> reqHeaders
+ Map<String, List<String>> reqHeaders
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
List<String> soapaction = reqHeaders.get("soapaction");
@@ -72,7 +72,7 @@ public class SoapPreProtocolOutInterceptorTest extends Assert {
}
private SoapMessage setUpMessage() throws Exception {
-
+
SoapMessage message = new SoapMessage(new MessageImpl());
Exchange exchange = new ExchangeImpl();
BindingOperationInfo bop = setUpBindingOperationInfo("http://foo/bar",
@@ -85,25 +85,25 @@ public class SoapPreProtocolOutInterceptorTest extends Assert {
exchange.put(BindingOperationInfo.class, bop);
message.setExchange(exchange);
message.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
-
+
control.replay();
return message;
}
-
- private BindingOperationInfo setUpBindingOperationInfo(String nsuri,
+
+ private BindingOperationInfo setUpBindingOperationInfo(String nsuri,
String opreq,
String opresp,
Method method) {
ServiceInfo si = new ServiceInfo();
- InterfaceInfo iinf = new InterfaceInfo(si,
+ InterfaceInfo iinf = new InterfaceInfo(si,
new QName(nsuri, method.getDeclaringClass().getSimpleName()));
OperationInfo opInfo = iinf.addOperation(new QName(nsuri, method.getName()));
opInfo.setProperty(Method.class.getName(), method);
opInfo.setInput(opreq, opInfo.createMessage(new QName(nsuri, opreq), Type.INPUT));
opInfo.setOutput(opresp, opInfo.createMessage(new QName(nsuri, opresp), Type.INPUT));
-
+
BindingOperationInfo bindingOpInfo = new BindingOperationInfo(null, opInfo);
-
+
return bindingOpInfo;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
index 4751f4e..811402c 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
@@ -33,18 +33,18 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class SoapFaultFactoryTest extends Assert {
private IMocksControl control;
private JMSFault jmsFault;
-
+
@Before
public void setUp() {
- control = EasyMock.createNiceControl();
+ control = EasyMock.createNiceControl();
}
-
+
JMSFault setupJMSFault(boolean isSender, QName code, Object detail, boolean isSoap12) {
jmsFault = control.createMock(JMSFault.class);
EasyMock.expect(jmsFault.getReason()).andReturn("reason");
@@ -59,28 +59,28 @@ public class SoapFaultFactoryTest extends Assert {
}
return jmsFault;
}
-
- @Test
+
+ @Test
public void createSoap11Fault() {
SoapBinding sb = control.createMock(SoapBinding.class);
- EasyMock.expect(sb.getSoapVersion()).andReturn(Soap11.getInstance());
+ EasyMock.expect(sb.getSoapVersion()).andReturn(Soap11.getInstance());
setupJMSFault(true, SoapJMSConstants.getContentTypeMismatchQName(), null, false);
control.replay();
-
+
SoapFaultFactory factory = new SoapFaultFactory(sb);
SoapFault fault = (SoapFault)factory.createFault(jmsFault);
assertEquals("reason", fault.getReason());
assertEquals(SoapJMSConstants.getContentTypeMismatchQName(), fault.getFaultCode());
assertNull(fault.getDetail());
assertSame(jmsFault, fault.getCause());
- control.verify();
+ control.verify();
}
-
- @Test
+
+ @Test
public void createSoap12Fault() {
SoapBinding sb = control.createMock(SoapBinding.class);
- EasyMock.expect(sb.getSoapVersion()).andReturn(Soap12.getInstance());
- setupJMSFault(true, SoapJMSConstants.getMismatchedSoapActionQName(), null, true);
+ EasyMock.expect(sb.getSoapVersion()).andReturn(Soap12.getInstance());
+ setupJMSFault(true, SoapJMSConstants.getMismatchedSoapActionQName(), null, true);
control.replay();
SoapFaultFactory factory = new SoapFaultFactory(sb);
SoapFault fault = (SoapFault)factory.createFault(jmsFault);
@@ -89,6 +89,6 @@ public class SoapFaultFactoryTest extends Assert {
assertEquals(SoapJMSConstants.getMismatchedSoapActionQName(), fault.getSubCode());
assertNull(fault.getDetail());
assertNull(fault.getCause());
- control.verify();
+ control.verify();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index afff3b9..a41239e 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -61,11 +61,11 @@ public class ParseBodyTest extends Assert {
//System.out.println("Original[" + n + "]: " + data);
xmlReader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(data.getBytes("utf-8")));
-
- //reader should be on the start element for the
+
+ //reader should be on the start element for the
assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.next());
assertEquals("Body", xmlReader.getLocalName());
-
+
factory = MessageFactory.newInstance();
soapMessage = factory.createMessage();
}
@@ -84,16 +84,16 @@ public class ParseBodyTest extends Assert {
public void testUsingStaxUtilsCopyWithSAAJWriterData2() throws Exception {
testUsingStaxUtilsCopyWithSAAJWriter(2);
}
-
+
@Test
public void testReadSOAPFault() throws Exception {
InputStream inStream = getClass().getResourceAsStream("soap12-fault.xml");
Document doc = StaxUtils.read(inStream);
-
+
SoapMessage msg = new SoapMessage(new MessageImpl());
Exchange ex = new ExchangeImpl();
ex.setInMessage(msg);
-
+
SOAPMessage saajMsg = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL).createMessage();
SOAPPart part = saajMsg.getSOAPPart();
SAAJStreamWriter writer = new SAAJStreamWriter(part);
@@ -101,14 +101,14 @@ public class ParseBodyTest extends Assert {
//Source s = new StaxSource(StaxUtils.createXMLStreamReader(doc));
//part.setContent(s);
saajMsg.saveChanges();
-
+
msg.setContent(SOAPMessage.class, saajMsg);
doc = part;
-
+
// System.out.println("OUTPUT: " + StaxUtils.toString(doc));
-
+
byte[] docbytes = getMessageBytes(doc);
-
+
// System.out.println("OUTPUT: " + new String(docbytes));
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(docbytes));
@@ -139,7 +139,7 @@ public class ParseBodyTest extends Assert {
//System.out.println("UsingStaxUtilsCopyWithSAAJWriter: " + result);
assertEquals(DATA[n], result);
}
-
+
private byte[] getMessageBytes(Document doc) throws Exception {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
index f6d5150..d3d3d72 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
@@ -66,7 +66,7 @@ public class SAAJInInterceptorTest extends TestBase {
saajIntc = new SAAJInInterceptor("phase2");
chain.add(saajIntc);
-
+
chain.add(new CheckFaultInterceptor("phase3"));
}
@@ -91,7 +91,7 @@ public class SAAJInInterceptorTest extends TestBase {
List<Header> eleHeaders = soapMessage.getHeaders();
List<Element> headerChilds = new ArrayList<>();
Iterator<Header> iter = eleHeaders.iterator();
-
+
while (iter.hasNext()) {
Header hdr = iter.next();
@@ -99,10 +99,10 @@ public class SAAJInInterceptorTest extends TestBase {
headerChilds.add((Element) hdr.getObject());
}
}
-
+
assertEquals(2, headerChilds.size());
}
-
+
@Test
public void testFaultDetail() throws Exception {
try {
@@ -120,7 +120,7 @@ public class SAAJInInterceptorTest extends TestBase {
XMLStreamReader xmlReader = soapMessage.getContent(XMLStreamReader.class);
xmlReader.nextTag();
saajIntc.handleMessage(soapMessage);
-
+
SOAPMessage parsedMessage = soapMessage.getContent(SOAPMessage.class);
SOAPFault fault = parsedMessage.getSOAPBody().getFault();
assertEquals("soap:Server", fault.getFaultCode());
@@ -135,7 +135,7 @@ public class SAAJInInterceptorTest extends TestBase {
nd = nd.getNextSibling();
}
assertEquals(2, count);
-
+
Iterator<?> detailEntries = faultDetail.getDetailEntries();
DetailEntry detailEntry = (DetailEntry)detailEntries.next();
assertEquals("errorcode", detailEntry.getLocalName());
@@ -143,9 +143,9 @@ public class SAAJInInterceptorTest extends TestBase {
detailEntry = (DetailEntry)detailEntries.next();
assertEquals("errorstring", detailEntry.getLocalName());
assertEquals("This is a fault detail error string", detailEntry.getTextContent());
-
+
}
-
+
@Test
public void testFaultDetailSOAP12() throws Exception {
try {
@@ -163,14 +163,14 @@ public class SAAJInInterceptorTest extends TestBase {
XMLStreamReader xmlReader = soapMessage.getContent(XMLStreamReader.class);
xmlReader.nextTag();
saajIntc.handleMessage(soapMessage);
-
+
SOAPMessage parsedMessage = soapMessage.getContent(SOAPMessage.class);
SOAPFault fault = parsedMessage.getSOAPBody().getFault();
assertEquals("Simulated failure", fault.getFaultReasonTexts().next());
assertEquals("soap:Receiver", fault.getFaultCode());
-
+
}
-
+
private void prepareSoapMessage(String message) throws IOException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java
index 938c245..3cceb15 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java
@@ -59,12 +59,12 @@ public class SAAJOutInterceptorTest extends TestBase {
public void testHandleHeader() throws Exception {
soapMessage = TestUtil.createEmptySoapMessage(Soap11.getInstance(), chain);
soapMessage.setContent(OutputStream.class, new ByteArrayOutputStream());
-
+
SOAPMessage m = SAAJFactoryResolver.createMessageFactory(soapMessage.getVersion()).createMessage();
InputStream ins = getClass().getResourceAsStream("../test-soap-header.xml");
m.getSOAPPart().setContent(new StreamSource(ins));
-
+
Element el = DOMUtils.getFirstElement(m.getSOAPPart().getEnvelope().getHeader());
List<Header> h = soapMessage.getHeaders();
while (el != null) {
@@ -75,6 +75,6 @@ public class SAAJOutInterceptorTest extends TestBase {
W3CDOMStreamWriter writer = new SAAJStreamWriter(m.getSOAPPart());
soapMessage.setContent(XMLStreamWriter.class, writer);
soi.handleMessage(soapMessage);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java
index d72df3c..10f44ec 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java
@@ -27,9 +27,9 @@ import org.apache.cxf.message.XMLMessage;
import org.apache.cxf.service.model.BindingInfo;
public class XMLBinding extends AbstractBasicInterceptorProvider implements Binding {
-
+
private BindingInfo bindingInfo;
-
+
public XMLBinding(BindingInfo bindingInfo) {
super();
this.bindingInfo = bindingInfo;
@@ -45,10 +45,10 @@ public class XMLBinding extends AbstractBasicInterceptorProvider implements Bind
public Message createMessage(Message m) {
if (!m.containsKey(Message.CONTENT_TYPE)) {
-
+
String ct = null;
-
- // Should this be done in ServiceInvokerInterceptor to support a case where the
+
+ // Should this be done in ServiceInvokerInterceptor to support a case where the
// response content type is detected early on the inbound chain for all the bindings ?
Exchange exchange = m.getExchange();
if (exchange != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
index 99db9c2..4b1f554 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
@@ -46,51 +46,51 @@ import org.apache.cxf.wsdl.interceptors.WrappedOutInterceptor;
@NoJSR250Annotations(unlessNull = { "bus" })
public class XMLBindingFactory extends AbstractBindingFactory {
- public static final Collection<String> DEFAULT_NAMESPACES
+ public static final Collection<String> DEFAULT_NAMESPACES
= Arrays.asList(
"http://cxf.apache.org/bindings/xformat",
"http://www.w3.org/2004/08/wsdl/http",
"http://schemas.xmlsoap.org/wsdl/http/");
-
+
public XMLBindingFactory() {
}
public XMLBindingFactory(Bus b) {
super(b, DEFAULT_NAMESPACES);
}
-
+
public Binding createBinding(BindingInfo binding) {
XMLBinding xb = new XMLBinding(binding);
-
- xb.getInInterceptors().add(new AttachmentInInterceptor());
+
+ xb.getInInterceptors().add(new AttachmentInInterceptor());
xb.getInInterceptors().add(new StaxInInterceptor());
xb.getInInterceptors().add(new DocLiteralInInterceptor());
xb.getInInterceptors().add(new XMLMessageInInterceptor());
-
+
xb.getOutInterceptors().add(new AttachmentOutInterceptor());
xb.getOutInterceptors().add(new StaxOutInterceptor());
xb.getOutInterceptors().add(new WrappedOutInterceptor());
- xb.getOutInterceptors().add(new XMLMessageOutInterceptor());
+ xb.getOutInterceptors().add(new XMLMessageOutInterceptor());
xb.getInFaultInterceptors().add(new XMLFaultInInterceptor());
xb.getOutFaultInterceptors().add(new StaxOutInterceptor());
xb.getOutFaultInterceptors().add(new XMLFaultOutInterceptor());
-
+
return xb;
- }
-
+ }
+
public BindingInfo createBindingInfo(ServiceInfo service, String namespace, Object config) {
- BindingInfo info = new BindingInfo(service, "http://cxf.apache.org/bindings/xformat");
- info.setName(new QName(service.getName().getNamespaceURI(),
+ BindingInfo info = new BindingInfo(service, "http://cxf.apache.org/bindings/xformat");
+ info.setName(new QName(service.getName().getNamespaceURI(),
service.getName().getLocalPart() + "XMLBinding"));
for (OperationInfo op : service.getInterface().getOperations()) {
adjustConcreteNames(op.getInput());
adjustConcreteNames(op.getOutput());
- BindingOperationInfo bop =
+ BindingOperationInfo bop =
info.buildOperation(op.getName(), op.getInputName(), op.getOutputName());
info.addOperation(bop);
}
-
+
return info;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java
index bc87255..76c3dd8 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java
@@ -36,19 +36,19 @@ public class XMLFault extends Fault {
public static final String XML_FAULT_CODE_CLIENT = "CLIENT";
-
+
static final long serialVersionUID = 100000;
public XMLFault(Message message, Throwable throwable) {
- super(message, throwable);
+ super(message, throwable);
}
public XMLFault(Message message) {
- super(message);
+ super(message);
}
public XMLFault(String message) {
- super(new Message(message, (ResourceBundle) null));
+ super(new Message(message, (ResourceBundle) null));
}
public static XMLFault createFault(Fault f) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
index 38ad110..d940787 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
@@ -109,7 +109,7 @@ public class XMLFormatValidator extends ServiceValidator {
return true;
}
- private boolean findXMLFormatRootNode(Iterator<XMLBindingMessageFormat> it,
+ private boolean findXMLFormatRootNode(Iterator<XMLBindingMessageFormat> it,
BindingOperationInfo bo,
String errorPath) {
while (it != null && it.hasNext()) {
@@ -119,7 +119,7 @@ public class XMLFormatValidator extends ServiceValidator {
addErrorMessage(errorPath
+ ": empty value of rootNode attribute, the value should be "
+ rootNodeName);
- return false;
+ return false;
}
}
return true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
index 8fce4c9..f991fb3 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
@@ -48,13 +48,13 @@ public class XMLFaultInInterceptor extends AbstractInDatabindingInterceptor {
super(phase);
addBefore(ClientFaultConverter.class.getName());
}
-
+
public void handleMessage(Message message) throws Fault {
XMLStreamReader xsr = message.getContent(XMLStreamReader.class);
DepthXMLStreamReader reader = new DepthXMLStreamReader(xsr);
- try {
+ try {
reader.nextTag();
if (!StaxUtils.toNextElement(reader)) {
throw new Fault(new org.apache.cxf.common.i18n.Message("ILLEGAL_XMLFAULT_FORMAT", BUNDLE));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
index 4b65569..400ee5b 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
@@ -48,11 +48,11 @@ public class XMLFaultOutInterceptor extends AbstractOutDatabindingInterceptor {
}
public void handleMessage(Message message) throws Fault {
-
+
if (mustPropogateException(message)) {
throw (Fault) message.getContent(Exception.class);
}
-
+
Fault f = (Fault) message.getContent(Exception.class);
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, f.getStatusCode());
NSStack nsStack = new NSStack();
@@ -63,21 +63,21 @@ public class XMLFaultOutInterceptor extends AbstractOutDatabindingInterceptor {
try {
nsStack.add(XMLConstants.NS_XML_FORMAT);
String prefix = nsStack.getPrefix(XMLConstants.NS_XML_FORMAT);
- StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_ROOT,
+ StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_ROOT,
XMLConstants.NS_XML_FORMAT);
- StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_STRING,
+ StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_STRING,
XMLConstants.NS_XML_FORMAT);
Throwable t = xmlFault.getCause();
writer.writeCharacters(t == null ? xmlFault.getMessage() : t.toString());
// fault string
writer.writeEndElement();
// call StaxUtils to write Fault detail.
-
+
if (xmlFault.getDetail() != null) {
Element detail = xmlFault.getDetail();
StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_DETAIL,
XMLConstants.NS_XML_FORMAT);
-
+
Node node = detail.getFirstChild();
while (node != null) {
StaxUtils.writeNode(node, writer, false);
@@ -92,14 +92,14 @@ public class XMLFaultOutInterceptor extends AbstractOutDatabindingInterceptor {
throw new Fault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE), xe);
}
}
-
+
@Override
public void handleFault(Message message) throws Fault {
if (mustPropogateException(message)) {
throw (Fault) message.getContent(Exception.class);
}
}
-
+
protected boolean mustPropogateException(Message m) {
return Boolean.TRUE.equals(m.getExchange().get(Message.PROPOGATE_EXCEPTION));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
index 540640c..85b967f 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
@@ -45,7 +45,7 @@ import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(XMLMessageInInterceptor.class);
-
+
public XMLMessageInInterceptor() {
this(Phase.UNMARSHAL);
}
@@ -104,9 +104,9 @@ public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
}
}
- private BindingOperationInfo getBindingOperationInfo(boolean isRequestor,
- QName startQName,
- BindingInfo bi,
+ private BindingOperationInfo getBindingOperationInfo(boolean isRequestor,
+ QName startQName,
+ BindingInfo bi,
XMLStreamReader xsr) {
for (BindingOperationInfo boi : bi.getOperations()) {
@@ -116,7 +116,7 @@ public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
} else {
bmi = boi.getOutput();
}
-
+
if (hasRootNode(bmi, startQName)) {
//Consume The rootNode tag
try {
@@ -145,7 +145,7 @@ public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
}
return boi;
}
- }
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
index 8ad08c7..5352684 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
@@ -68,7 +68,7 @@ public class XMLMessageOutInterceptor extends AbstractOutDatabindingInterceptor
rootInModel = xmf.getRootNode();
}
final int mpn = mi.getMessagePartsNumber();
- if (boi.isUnwrapped()
+ if (boi.isUnwrapped()
|| mpn == 1) {
// wrapper out interceptor created the wrapper
// or if bare-one-param
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
index 2e4e451..8d30118 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
@@ -28,11 +28,11 @@ import org.apache.cxf.wsdl.WSDLExtensionLoader;
import org.apache.cxf.wsdl.WSDLManager;
/**
- *
+ *
*/
@NoJSR250Annotations
-public final class XMLWSDLExtensionLoader implements WSDLExtensionLoader {
-
+public final class XMLWSDLExtensionLoader implements WSDLExtensionLoader {
+
public XMLWSDLExtensionLoader(Bus b) {
setupBus(b);
}
@@ -40,22 +40,22 @@ public final class XMLWSDLExtensionLoader implements WSDLExtensionLoader {
WSDLManager manager = b.getExtension(WSDLManager.class);
registerExtensors(manager);
}
-
+
public static void registerExtensors(WSDLManager manager) {
createExtensor(manager, javax.wsdl.BindingInput.class,
org.apache.cxf.bindings.xformat.XMLBindingMessageFormat.class);
- createExtensor(manager, javax.wsdl.BindingOutput.class,
+ createExtensor(manager, javax.wsdl.BindingOutput.class,
org.apache.cxf.bindings.xformat.XMLBindingMessageFormat.class);
createExtensor(manager, javax.wsdl.Binding.class,
org.apache.cxf.bindings.xformat.XMLFormatBinding.class);
}
-
+
public static void createExtensor(WSDLManager manager,
Class<?> parentType,
Class<?> elementType) {
try {
JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
- parentType,
+ parentType,
elementType,
null,
XMLWSDLExtensionLoader.class.getClassLoader());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
index 12000cd..b530e87 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
@@ -28,19 +28,19 @@ import org.junit.Assert;
import org.junit.Test;
public class XMLBindingFactoryTest extends Assert {
-
+
@Test
public void testContainsInAttachmentInterceptor() {
XMLBindingFactory xbf = new XMLBindingFactory();
Binding b = xbf.createBinding(new BindingInfo(null, null));
-
+
boolean found = false;
for (Interceptor<? extends Message> interseptor : b.getInInterceptors()) {
if (interseptor instanceof AttachmentInInterceptor) {
found = true;
}
}
-
+
assertTrue("No in attachment interceptor found", found);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
index 9ef4243..fac8011 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
@@ -62,13 +62,13 @@ public class TestBase extends Assert {
protected PhaseInterceptorChain chain;
protected Message xmlMessage;
-
+
protected Bus bus;
protected IMocksControl control;
-
+
protected ServiceInfo serviceInfo;
-
+
@Before
public void setUp() throws Exception {
SortedSet<Phase> phases = new TreeSet<Phase>();
@@ -112,26 +112,26 @@ public class TestBase extends Assert {
}
return null;
}
-
+
protected void common(String wsdl, QName portName, Class<?>... jaxbClasses) throws Exception {
control = EasyMock.createNiceControl();
-
+
bus = control.createMock(Bus.class);
-
+
WSDLManagerImpl manager = new WSDLManagerImpl();
XMLWSDLExtensionLoader.registerExtensors(manager);
EasyMock.expect(bus.getExtension(WSDLManager.class)).andStubReturn(manager);
-
+
BindingFactoryManager bindingFactoryManager = control.createMock(BindingFactoryManager.class);
EasyMock.expect(bus.getExtension(BindingFactoryManager.class)).andStubReturn(bindingFactoryManager);
DestinationFactoryManager dfm = control.createMock(DestinationFactoryManager.class);
EasyMock.expect(bus.getExtension(DestinationFactoryManager.class)).andStubReturn(dfm);
-
- control.replay();
-
+
+ control.replay();
+
assertNotNull(bus.getExtension(WSDLManager.class));
-
- WSDLServiceFactory factory =
+
+ WSDLServiceFactory factory =
new WSDLServiceFactory(bus, getClass().getResource(wsdl).toString(),
new QName(portName.getNamespaceURI(), "XMLService"));
@@ -153,13 +153,13 @@ public class TestBase extends Assert {
EasyMock.expect(endpoint.getBinding()).andStubReturn(xmlBinding);
EasyMock.expect(endpoint.getService()).andStubReturn(service);
EasyMock.expect(endpoint.isEmpty()).andReturn(true).anyTimes();
-
+
control.replay();
xmlMessage.getExchange().put(Endpoint.class, endpoint);
xmlMessage.getExchange().put(org.apache.cxf.service.Service.class, service);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
index c1c1808..b54e65f 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
@@ -62,33 +62,33 @@ public class XMLFaultOutInterceptorTest extends TestBase {
JAXBContext ctx = JAXBContext.newInstance(FaultDetail.class);
Marshaller m = ctx.createMarshaller();
m.marshal(detail, el);
-
+
OutputStream outputStream = new ByteArrayOutputStream();
xmlMessage.setContent(OutputStream.class, outputStream);
XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(outputStream);
xmlMessage.setContent(XMLStreamWriter.class, writer);
xmlMessage.setContent(Exception.class, xmlFault);
-
+
out.handleMessage(xmlMessage);
outputStream.flush();
XMLStreamReader reader = getXMLReader();
DepthXMLStreamReader dxr = new DepthXMLStreamReader(reader);
-
+
dxr.nextTag();
StaxUtils.toNextElement(dxr);
assertEquals(XMLConstants.NS_XML_FORMAT, dxr.getNamespaceURI());
assertEquals(XMLFault.XML_FAULT_ROOT, dxr.getLocalName());
-
+
dxr.nextTag();
StaxUtils.toNextElement(dxr);
assertEquals(XMLFault.XML_FAULT_STRING, dxr.getLocalName());
assertEquals(fault.toString(), dxr.getElementText());
-
+
dxr.nextTag();
StaxUtils.toNextElement(dxr);
assertEquals(XMLFault.XML_FAULT_DETAIL, dxr.getLocalName());
-
+
dxr.nextTag();
StaxUtils.toNextElement(dxr);
assertEquals("faultDetail", dxr.getLocalName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
index c7927a7..11e0941 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
@@ -51,11 +51,11 @@ public class XMLMessageInInterceptorTest extends TestBase {
prepareMessage("/message-bare-multi-param.xml");
common("/wsdl/hello_world_xml_bare.wsdl", new QName(ns, "XMLPort"),
MyComplexStructType.class);
-
+
OperationInfo op = serviceInfo.getInterface().getOperation(new QName(ns, "testMultiParamPart"));
op.getInput().getMessagePartByIndex(0).setTypeClass(String.class);
op.getInput().getMessagePartByIndex(1).setTypeClass(MyComplexStructType.class);
-
+
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
List<?> list = xmlMessage.getContent(List.class);
@@ -71,10 +71,10 @@ public class XMLMessageInInterceptorTest extends TestBase {
String ns = "http://apache.org/hello_world_xml_http/bare";
prepareMessage("/message-bare-single-param-element.xml");
common("/wsdl/hello_world_xml_bare.wsdl", new QName(ns, "XMLPort"));
-
+
OperationInfo op = serviceInfo.getInterface().getOperation(new QName(ns, "greetMe"));
op.getInput().getMessagePartByIndex(0).setTypeClass(String.class);
-
+
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
List<?> list = xmlMessage.getContent(List.class);
@@ -89,10 +89,10 @@ public class XMLMessageInInterceptorTest extends TestBase {
prepareMessage("/message-wrap.xml");
common("/wsdl/hello_world_xml_wrapped.wsdl", new QName(ns, "XMLPort"),
GreetMe.class);
-
+
OperationInfo op = serviceInfo.getInterface().getOperation(new QName(ns, "greetMe"));
op.getInput().getMessagePartByIndex(0).setTypeClass(GreetMe.class);
-
+
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
List<?> list = xmlMessage.getContent(List.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
index 3db2888..90d7e9d 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
@@ -74,7 +74,7 @@ public class XMLMessageOutInterceptorTest extends TestBase {
chain.add(out);
prepareMessage(params);
}
-
+
@Test
public void testBareOutSingle() throws Exception {
@@ -97,7 +97,7 @@ public class XMLMessageOutInterceptorTest extends TestBase {
DepthXMLStreamReader dxr = new DepthXMLStreamReader(reader);
StaxUtils.nextEvent(dxr);
StaxUtils.toNextElement(dxr);
-
+
assertEquals(bareMyComplexStructTypeQName.getLocalPart(), dxr.getLocalName());
StaxUtils.toNextElement(dxr);
StaxUtils.toNextText(dxr);
@@ -113,7 +113,7 @@ public class XMLMessageOutInterceptorTest extends TestBase {
myComplexStruct.setElem3(45);
params.add("tli");
params.add(myComplexStruct);
-
+
common("/wsdl/hello_world_xml_bare.wsdl", new QName(bareNs, "XMLPort"),
MyComplexStructType.class);
@@ -132,13 +132,13 @@ public class XMLMessageOutInterceptorTest extends TestBase {
assertEquals("multiParamRootReq", dxr.getLocalName());
StaxUtils.nextEvent(dxr);
StaxUtils.toNextElement(dxr);
-
+
assertEquals(bareRequestTypeQName, dxr.getName());
StaxUtils.nextEvent(dxr);
if (StaxUtils.toNextText(dxr)) {
assertEquals("tli", dxr.getText());
}
-
+
boolean foundRequest = false;
while (true) {
StaxUtils.nextEvent(dxr);
@@ -189,7 +189,7 @@ public class XMLMessageOutInterceptorTest extends TestBase {
private XMLStreamReader getXMLReader() throws Exception {
ByteArrayOutputStream o = (ByteArrayOutputStream) xmlMessage.getContent(OutputStream.class);
- writer.flush();
+ writer.flush();
InputStream in = new ByteArrayInputStream(o.toByteArray());
return StaxUtils.createXMLStreamReader(in);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java b/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
index 8e10a5e..b883175 100644
--- a/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
+++ b/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
@@ -76,7 +76,7 @@ import org.jdom.UncheckedJDOMFactory;
/**
* Builds a JDOM {@link org.jdom.Document org.jdom.Document} using a
* {@link javax.xml.stream.XMLStreamReader}.
- *
+ *
* @author Tatu Saloranta
* @author Bradley S. Huffman
* @author Benson I. Margulies, mods for CXF to allow reading a portion of a stream.
@@ -162,7 +162,7 @@ public class StaxBuilder {
/**
* Returns the current {@link org.jdom.JDOMFactory} in use, if one has been
* previously set with {@link #setFactory}, otherwise null.
- *
+ *
* @return the factory builder will use
*/
public JDOMFactory getFactory() {
@@ -171,7 +171,7 @@ public class StaxBuilder {
/**
* This will build a JDOM tree given a StAX stream reader.
* This API explicitly supports building mid-stream.
- *
+ *
* @param r Stream reader from which input is read.
* @return <code>Document</code> - JDOM document object.
* @throws XMLStreamException If the reader threw such exception (to
@@ -190,7 +190,7 @@ public class StaxBuilder {
return buildInternal(reader);
} finally {
StaxUtils.close(reader);
- }
+ }
}
public Document build(Reader reader) throws XMLStreamException {
@@ -201,13 +201,13 @@ public class StaxBuilder {
return buildInternal(streamReader);
} finally {
StaxUtils.close(streamReader);
- }
+ }
}
-
+
private Document buildInternal(XMLStreamReader r) throws XMLStreamException {
/*
* Should we do sanity checking to see that r is positioned at
- * beginning in the non-mid-stream case?
+ * beginning in the non-mid-stream case?
*/
JDOMFactory f = factory;
if (f == null) {
@@ -223,7 +223,7 @@ public class StaxBuilder {
* Recursion has been eliminated by using local stack of open elements; this
* improves performance somewhat (classic
* recursion-by-iteration-and-explicit stack transformation)
- *
+ *
* @param node <code>Code</node> to examine.
* @param doc JDOM <code>Document</code> being built.
*/
@@ -284,7 +284,7 @@ public class StaxBuilder {
current = current.getParentElement();
}
noadd = true;
- if(isReadingMidStream && current == null)
+ if(isReadingMidStream && current == null)
return;
break;
@@ -306,7 +306,7 @@ public class StaxBuilder {
child = f.processingInstruction(r.getPITarget(), r.getPIData());
break;
- case XMLStreamConstants.START_ELEMENT:
+ case XMLStreamConstants.START_ELEMENT:
{
// Ok, need to add a new element and simulate recursion
Element newElem = null;
@@ -380,7 +380,7 @@ public class StaxBuilder {
}
// And then 'push' new element...
current = newElem;
-
+
// Already added the element, can continue
noadd = true;
break;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java
index d127731..be01567 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java
@@ -35,13 +35,13 @@ public abstract class AbstractAegisIoImpl {
protected Schema schema;
protected AegisContext aegisContext;
protected Context context;
-
+
protected AbstractAegisIoImpl(AegisContext globalContext) {
aegisContext = globalContext;
context = new Context(globalContext);
properties = new HashMap<String, Object>();
- }
-
+ }
+
/**
* Due to the fact that the element data reader borrows this class, we need
* a constructor that takes an existing context.
@@ -52,11 +52,11 @@ public abstract class AbstractAegisIoImpl {
aegisContext = globalContext;
this.context = context;
properties = new HashMap<String, Object>();
- }
-
+ }
+
/** {@inheritDoc}*/
public void setProperty(String prop, Object value) {
- if (DataReader.FAULT.equals(prop)) {
+ if (DataReader.FAULT.equals(prop)) {
context.setFault((Fault)value);
}
}
@@ -64,7 +64,7 @@ public abstract class AbstractAegisIoImpl {
/** {@inheritDoc}*/
public void setSchema(Schema s) {
}
-
+
public Context getContext() {
return context;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
index 8d640a7..fb4406b 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
@@ -130,7 +130,7 @@ public class AegisContext {
/**
* Initialize the context. The encodingStyleURI allows .aegis.xml files to have multiple mappings for,
* say, SOAP 1.1 versus SOAP 1.2. Passing null uses a default URI.
- *
+ *
* @param mappingNamespaceURI URI to select mappings based on the encoding.
*/
public void initialize() {
@@ -140,8 +140,8 @@ public class AegisContext {
}
if (typeMapping == null) {
boolean defaultNillable = configuration.isDefaultNillable();
- TypeMapping baseTM = DefaultTypeMapping.createDefaultTypeMapping(defaultNillable,
- mtomUseXmime,
+ TypeMapping baseTM = DefaultTypeMapping.createDefaultTypeMapping(defaultNillable,
+ mtomUseXmime,
enableJDOMMappings);
if (mappingNamespaceURI == null) {
mappingNamespaceURI = DefaultTypeMapping.DEFAULT_MAPPING_URI;
@@ -172,7 +172,7 @@ public class AegisContext {
/**
* If a class was provided as part of the 'root' list, retrieve it's AegisType by Class.
- *
+ *
* @param clazz
* @return
*/
@@ -186,7 +186,7 @@ public class AegisContext {
/**
* If a class was provided as part of the root list, retrieve it's AegisType by schema type QName.
- *
+ *
* @param schemaTypeName
* @return
*/
@@ -197,7 +197,7 @@ public class AegisContext {
return null;
}
}
-
+
private Set<Class<?>> rootMappableClasses() {
Set<Class<?>> mappableClasses = new HashSet<Class<?>>();
for (java.lang.reflect.Type jtype : rootClasses) {
@@ -228,7 +228,7 @@ public class AegisContext {
/**
* Examine a list of override classes, and register all of them.
- *
+ *
* @param tm type manager for this binding
* @param classes list of class names
*/
@@ -255,7 +255,7 @@ public class AegisContext {
// This is a list of AegisType rather than Class so that it can set up for generic collections.
// When we see a generic, we process both the generic outer class and each parameter class.
// This is not the same thing as allowing mappings of arbitrary x<q> types.
-
+
Set<Class<?>> rootMappableClassSet = rootMappableClasses();
/*
* First loop: process non-Class roots, creating full types for them
@@ -264,16 +264,16 @@ public class AegisContext {
for (java.lang.reflect.Type reflectType : rootClasses) {
if (!(reflectType instanceof Class)) {
// if it's not a Class, it can't be mapped from Class to type in the mapping.
- // so we create
+ // so we create
AegisType aegisType = typeMapping.getTypeCreator().createType(reflectType);
typeMapping.register(aegisType);
- // note: we don't handle arbitrary generics, so no BeanType
+ // note: we don't handle arbitrary generics, so no BeanType
// check here.
rootTypeQNames.add(aegisType.getSchemaType());
- }
+ }
}
/*
- * Second loop: process Class roots, including those derived from
+ * Second loop: process Class roots, including those derived from
* generic types, creating when not in the default mappings.
*/
for (Class<?> c : rootMappableClassSet) {
@@ -294,23 +294,23 @@ public class AegisContext {
public static boolean schemaImportsUtilityTypes(XmlSchema schema) {
return XmlSchemaUtils.schemaImportsNamespace(schema, UTILITY_TYPES_SCHEMA_NS);
}
-
- private Document getSchemaDocument(String resourcePath) {
+
+ private Document getSchemaDocument(String resourcePath) {
try {
return StaxUtils.read(getClass().getResourceAsStream(resourcePath));
} catch (XMLStreamException e) {
throw new RuntimeException(e);
}
}
-
+
// could we make these documents static? What would we synchronize on?
- private Document getAegisTypesSchemaDocument() {
+ private Document getAegisTypesSchemaDocument() {
if (aegisTypesSchemaDocument == null) {
aegisTypesSchemaDocument = getSchemaDocument("/META-INF/cxf/aegisTypes.xsd");
- }
+ }
return aegisTypesSchemaDocument;
}
-
+
private Document getXmimeSchemaDocument() {
if (xmimeSchemaDocument == null) {
xmimeSchemaDocument = getSchemaDocument("/schemas/wsdl/xmime.xsd");
@@ -321,7 +321,7 @@ public class AegisContext {
public XmlSchema addTypesSchemaDocument(XmlSchemaCollection collection) {
return collection.read(getAegisTypesSchemaDocument(), null);
}
-
+
public XmlSchema addXmimeSchemaDocument(XmlSchemaCollection collection) {
return collection.read(getXmimeSchemaDocument(), null);
}
@@ -333,7 +333,7 @@ public class AegisContext {
/**
* Retrieve the set of root class names. Note that if the application specifies the root classes by Class
* instead of by name, this will return null.
- *
+ *
* @return
*/
public Set<String> getRootClassNames() {
@@ -343,7 +343,7 @@ public class AegisContext {
/**
* Set the root class names. This function is a convenience for Spring configuration. It sets the same
* underlying collection as {@link #setRootClasses(Set)}.
- *
+ *
* @param classNames
*/
public void setRootClassNames(Set<String> classNames) {
@@ -352,7 +352,7 @@ public class AegisContext {
/**
* Return the type mapping configuration associated with this context.
- *
+ *
* @return Returns the configuration.
*/
public TypeCreationOptions getTypeCreationOptions() {
@@ -361,7 +361,7 @@ public class AegisContext {
/**
* Set the configuration object. The configuration specifies default type mapping behaviors.
- *
+ *
* @param configuration The configuration to set.
*/
public void setTypeCreationOptions(TypeCreationOptions newConfiguration) {
@@ -378,7 +378,7 @@ public class AegisContext {
/**
* Controls whether Aegis writes xsi:type attributes on all elements. False by default.
- *
+ *
* @param flag
*/
public void setWriteXsiTypes(boolean flag) {
@@ -388,7 +388,7 @@ public class AegisContext {
/**
* Controls the use of xsi:type attributes when reading objects. By default, xsi:type reading is enabled.
* When disabled, Aegis will only map for objects that the application manually maps in the type mapping.
- *
+ *
* @param flag
*/
public void setReadXsiTypes(boolean flag) {
@@ -397,7 +397,7 @@ public class AegisContext {
/**
* Return the type mapping object used by this context.
- *
+ *
* @return
*/
public TypeMapping getTypeMapping() {
@@ -406,7 +406,7 @@ public class AegisContext {
/**
* Set the type mapping object used by this context.
- *
+ *
* @param typeMapping
*/
public void setTypeMapping(TypeMapping typeMapping) {
@@ -415,7 +415,7 @@ public class AegisContext {
/**
* Retrieve the Aegis type objects for the root classes.
- *
+ *
* @return the set of type objects.
*/
public Set<AegisType> getRootTypes() {
@@ -425,7 +425,7 @@ public class AegisContext {
/**
* This property provides support for interfaces. If there is a mapping from an interface's Class<T> to a
* string containing a class name, Aegis will create proxy objects of that class name.
- *
+ *
* @see org.apache.cxf.aegis.type.basic.BeanType
* @return
*/
@@ -443,7 +443,7 @@ public class AegisContext {
/**
* The list of initial classes.
- *
+ *
* @param rootClasses
*/
public void setRootClasses(Set<java.lang.reflect.Type> rootClasses) {
@@ -452,7 +452,7 @@ public class AegisContext {
/**
* Is MTOM enabled in this context?
- *
+ *
* @return
*/
public boolean isMtomEnabled() {
@@ -465,7 +465,7 @@ public class AegisContext {
/**
* Should this service use schema for MTOM types xmime:base64Binary instead of xsd:base64Binary?
- *
+ *
* @return
*/
public boolean isMtomUseXmime() {
@@ -480,7 +480,7 @@ public class AegisContext {
* What URI identifies the type mapping for this context? When the XMLTypeCreator reads .aegis.xml file,
* it will only read mappings for this URI (or no URI). When the abstract type creator is otherwise at a
* loss for a namespace URI, it will use this URI.
- *
+ *
* @return
*/
public String getMappingNamespaceURI() {
@@ -497,9 +497,9 @@ public class AegisContext {
public boolean isEnableJDOMMappings() {
return enableJDOMMappings;
}
-
+
/**
- * Whether to enable JDOM as a mapping for xsd:anyType if JDOM is in the classpath.
+ * Whether to enable JDOM as a mapping for xsd:anyType if JDOM is in the classpath.
* @param enableJDOMMappings
*/
public void setEnableJDOMMappings(boolean enableJDOMMappings) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java
index a3d991f..84ef4a7 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.staxutils.W3CDOMStreamReader;
-public class AegisElementDataReader extends AbstractAegisIoImpl
+public class AegisElementDataReader extends AbstractAegisIoImpl
implements AegisReader<Element> {
protected AegisXMLStreamDataReader reader;
@@ -43,7 +43,7 @@ public class AegisElementDataReader extends AbstractAegisIoImpl
sreader.nextTag(); //advance into the first tag
return reader.read(sreader);
}
-
+
public Object read(Element input, AegisType desiredType) throws Exception {
W3CDOMStreamReader sreader = new W3CDOMStreamReader(input);
sreader.nextTag(); //advance into the first tag
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
index cb4c8bd..7f58f00 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
@@ -26,11 +26,11 @@ import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
/**
- *
+ *
*/
-public class AegisElementDataWriter extends AbstractAegisIoImpl
+public class AegisElementDataWriter extends AbstractAegisIoImpl
implements AegisWriter<Element> {
-
+
protected AegisXMLStreamDataWriter writer;
public AegisElementDataWriter(AegisContext globalContext) {
@@ -48,6 +48,6 @@ public class AegisElementDataWriter extends AbstractAegisIoImpl
java.lang.reflect.Type objectType) throws Exception {
W3CDOMStreamWriter swriter = new W3CDOMStreamWriter(output);
writer.write(obj, elementName, optional, swriter, objectType);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java
index e8ca99e..978b44a 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java
@@ -24,10 +24,10 @@ import javax.xml.validation.Schema;
/**
* Aegis abstraction for reading.
- *
+ *
* Note that this interface does not include the 'read' method. Since the caller of a reader has to know
* the type of the source object, the read method is not specified here in the interface, but is provided
- * in the specific type.
+ * in the specific type.
*/
public interface AegisIo {
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java
index a0f7576..47fe5cd 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java
@@ -27,7 +27,7 @@ import org.apache.cxf.aegis.type.AegisType;
public interface AegisReader<ReaderT> extends AegisIo {
/**
- * Read an object.
+ * Read an object.
* @param reader the source.
* @return
* @throws Exception