cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [06/51] [partial] cxf git commit: Remove all trailing whitespaces
Date Tue, 14 Feb 2017 09:49:11 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 700a837..2f8ea71 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -104,7 +104,7 @@ public class JAXBDataBindingTest extends Assert {
         bus = control.createMock(Bus.class);
         bindingFactoryManager = control.createMock(BindingFactoryManager.class);
         destinationFactoryManager = control.createMock(DestinationFactoryManager.class);
-        
+
         EasyMock.expect(bus.getExtension(BindingFactoryManager.class)).andStubReturn(bindingFactoryManager);
         EasyMock.expect(bus.getExtension(DestinationFactoryManager.class))
             .andStubReturn(destinationFactoryManager);
@@ -118,7 +118,7 @@ public class JAXBDataBindingTest extends Assert {
                 break;
             }
         }
-        
+
         wsdlServiceBuilder.buildServices(def, service);
     }
 
@@ -131,7 +131,7 @@ public class JAXBDataBindingTest extends Assert {
     public void testCreateReader() {
         DataReader<?> reader = jaxbDataBinding.createReader(XMLStreamReader.class);
         assertTrue(reader instanceof DataReaderImpl);
-        
+
         reader = jaxbDataBinding.createReader(XMLEventReader.class);
         assertTrue(reader instanceof DataReaderImpl);
 
@@ -164,17 +164,17 @@ public class JAXBDataBindingTest extends Assert {
     public void testCreateWriter() {
         DataWriter<?> writer = jaxbDataBinding.createWriter(XMLStreamWriter.class);
         assertTrue(writer instanceof DataWriterImpl);
-        
+
         writer = jaxbDataBinding.createWriter(XMLEventWriter.class);
         assertTrue(writer instanceof DataWriterImpl);
-        
+
         writer = jaxbDataBinding.createWriter(Node.class);
         assertTrue(writer instanceof DataWriterImpl);
-        
+
         writer = jaxbDataBinding.createWriter(null);
         assertNull(writer);
     }
-    
+
     @Test
     public void testExtraClass() {
         Class<?>[] extraClass = new Class[] {GreetMe.class, GreetMeOneWay.class};
@@ -183,8 +183,8 @@ public class JAXBDataBindingTest extends Assert {
         assertEquals(jaxbDataBinding.getExtraClass()[0], GreetMe.class);
         assertEquals(jaxbDataBinding.getExtraClass()[1], GreetMeOneWay.class);
     }
-    
-    @Test 
+
+    @Test
     public void testContextProperties() throws Exception {
         JAXBDataBinding db = new JAXBDataBinding();
         Map<String, String> nsMap = new HashMap<String, String>();
@@ -207,7 +207,7 @@ public class JAXBDataBindingTest extends Assert {
         String xml = stringWriter.toString();
         assertTrue(xml, xml.contains("uri:ultima:thule"));
     }
-    
+
     JAXBDataBinding createJaxbContext(boolean internal) throws Exception {
         JAXBDataBinding db = new JAXBDataBinding();
         Map<String, String> nsMap = new HashMap<String, String>();
@@ -220,7 +220,7 @@ public class JAXBDataBindingTest extends Assert {
 
         //have to fastboot to avoid conflicts of generated accessors
         System.setProperty("com.sun.xml.bind.v2.runtime.JAXBContextImpl.fastBoot", "true");
-        System.setProperty("com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.fastBoot", "true");        
+        System.setProperty("com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.fastBoot", "true");
         if (internal) {
             System.setProperty(JAXBContext.JAXB_CONTEXT_FACTORY, "com.sun.xml.internal.bind.v2.ContextFactory");
             db.setContext(db.createJAXBContext(classes));
@@ -232,10 +232,10 @@ public class JAXBDataBindingTest extends Assert {
         System.clearProperty("com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.fastBoot");
         return db;
     }
-    
+
     void doNamespaceMappingTest(boolean internal, boolean asm) throws Exception {
         if (internal) {
-            try { 
+            try {
                 Class.forName("com.sun.xml.internal.bind.v2.ContextFactory");
             } catch (Throwable t) {
                 //on a JVM (likely IBM's) that doesn't rename the ContextFactory package to include "internal"
@@ -247,9 +247,9 @@ public class JAXBDataBindingTest extends Assert {
                 ReflectionUtil.setAccessible(ReflectionUtil.getDeclaredField(ASMHelper.class, "badASM"))
                     .set(null, Boolean.TRUE);
             }
-            
+
             JAXBDataBinding db = createJaxbContext(internal);
-            
+
             DataWriter<XMLStreamWriter> writer = db.createWriter(XMLStreamWriter.class);
             XMLOutputFactory writerFactory = XMLOutputFactory.newInstance();
             StringWriter stringWriter = new StringWriter();
@@ -267,17 +267,17 @@ public class JAXBDataBindingTest extends Assert {
             }
         }
     }
-    
+
     @Test
     public void testDeclaredNamespaceMappingRI() throws Exception {
         doNamespaceMappingTest(false, true);
     }
-    
+
     @Test
     public void testDeclaredNamespaceMappingInternal() throws Exception {
         doNamespaceMappingTest(true, true);
     }
-    
+
     @Test
     public void testDeclaredNamespaceMappingInternalNoAsm() throws Exception {
         try {
@@ -287,7 +287,7 @@ public class JAXBDataBindingTest extends Assert {
             er.getMessage().contains("Failed to map namespace");
         }
     }
-    
+
 
     @Test
     public void testResursiveType() throws Exception {
@@ -298,17 +298,17 @@ public class JAXBDataBindingTest extends Assert {
         init.addClass(Type2.class);
         assertEquals(2, classes.size());
     }
-    
+
     public abstract static class Type2 extends AddressEntity<Type2> {
     }
-    
+
     public abstract static class AddressEntity<T extends AddressEntity<T>> {
         public abstract Addressable<T> getEntity();
     }
-    
+
     public interface Addressable<T extends AddressEntity<T>> {
     }
-    
+
     @Test
     public void testConfiguredXmlAdapter() throws Exception {
         Language dutch = new Language("nl_NL", "Dutch");

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index d4cabb9..d28aad0 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -74,9 +74,9 @@ import org.junit.Test;
  * JAXBEncoderDecoderTest
  */
 public class JAXBEncoderDecoderTest extends Assert {
-    public static final QName  SOAP_ENV = 
+    public static final QName  SOAP_ENV =
             new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
-    public static final QName  SOAP_BODY = 
+    public static final QName  SOAP_BODY =
             new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body");
 
     RequestWrapper wrapperAnnotation;
@@ -85,7 +85,7 @@ public class JAXBEncoderDecoderTest extends Assert {
     Map<String, String> mapField;
     String arrayField[];
     List<String> listField;
-    
+
     @Before
     public void setUp() throws Exception {
         context = JAXBContext.newInstance(new Class[] {
@@ -96,7 +96,7 @@ public class JAXBEncoderDecoderTest extends Assert {
         });
         Method method = getMethod("greetMe");
         wrapperAnnotation = method.getAnnotation(RequestWrapper.class);
-        
+
         InputStream is =  getClass().getResourceAsStream("resources/StringStruct.xsd");
         StreamSource schemaSource = new StreamSource(is);
         assertNotNull(schemaSource);
@@ -113,12 +113,12 @@ public class JAXBEncoderDecoderTest extends Assert {
         }
         return null;
     }
-    
-    @RequestWrapper(localName = "greetMe", 
-        targetNamespace = "http://apache.org/hello_world_soap_http/types", 
+
+    @RequestWrapper(localName = "greetMe",
+        targetNamespace = "http://apache.org/hello_world_soap_http/types",
         className = "org.apache.hello_world_soap_http.types.GreetMe")
-    @ResponseWrapper(localName = "greetMeResponse", 
-        targetNamespace = "http://apache.org/hello_world_soap_http/types", 
+    @ResponseWrapper(localName = "greetMeResponse",
+        targetNamespace = "http://apache.org/hello_world_soap_http/types",
         className = "org.apache.hello_world_soap_http.types.GreetMeResponse")
     public java.lang.String greetMe(
         java.lang.String requestType
@@ -126,24 +126,24 @@ public class JAXBEncoderDecoderTest extends Assert {
         return "Hello " + requestType;
     }
 
-    
+
     private Type getFieldType(String name) throws Exception {
         return this.getClass()
             .getDeclaredField(name)
             .getGenericType();
     }
-    
+
     @Test
     public void testCXF3611() throws Exception {
         Map<String, String> foo = new HashMap<String, String>();
-        
+
         assertTrue(JAXBSchemaInitializer.isArray(getFieldType("arrayField")));
         assertTrue(JAXBSchemaInitializer.isArray(getFieldType("listField")));
 
         assertFalse(JAXBSchemaInitializer.isArray(foo.getClass()));
         assertFalse(JAXBSchemaInitializer.isArray(getFieldType("mapField")));
     }
-    
+
     @Test
     public void testMarshallIntoDOM() throws Exception {
         String str = new String("Hello");
@@ -151,9 +151,9 @@ public class JAXBEncoderDecoderTest extends Assert {
         MessagePartInfo part = new MessagePartInfo(inCorrectElName, null);
         part.setElement(true);
         part.setElementQName(inCorrectElName);
-        
+
         Document doc = DOMUtils.createDocument();
-        Element elNode = doc.createElementNS(inCorrectElName.getNamespaceURI(), 
+        Element elNode = doc.createElementNS(inCorrectElName.getNamespaceURI(),
                                              inCorrectElName.getLocalPart());
         assertNotNull(elNode);
 
@@ -198,19 +198,19 @@ public class JAXBEncoderDecoderTest extends Assert {
             //expected - not a valid object
         }
     }
-    
+
     @Test
     public void testMarshallWithFormQualifiedElement() throws Exception {
         ObjectWithQualifiedElementElement testObject = new ObjectWithQualifiedElementElement();
         testObject.setString1("twine");
         testObject.setString2("cord");
-        
+
         QName elName = new QName(wrapperAnnotation.targetNamespace(),
                                  wrapperAnnotation.localName());
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
         part.setElementQName(elName);
-        
+
         StringWriter stringWriter = new StringWriter();
         XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
         opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
@@ -223,7 +223,7 @@ public class JAXBEncoderDecoderTest extends Assert {
         // so that it could be examined inside the debugger to see how JAXB works.
         assertTrue(xmlResult.contains(":string2>cord</ns"));
     }
-    
+
     @Test
     public void testCustomNamespaces() throws Exception {
         Map<String, String> mapper = new HashMap<String, String>();
@@ -232,13 +232,13 @@ public class JAXBEncoderDecoderTest extends Assert {
         ObjectWithQualifiedElementElement testObject = new ObjectWithQualifiedElementElement();
         testObject.setString1("twine");
         testObject.setString2("cord");
-        
+
         QName elName = new QName(wrapperAnnotation.targetNamespace(),
                                  wrapperAnnotation.localName());
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
         part.setElementQName(elName);
-        
+
         StringWriter stringWriter = new StringWriter();
         XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
         opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
@@ -253,7 +253,7 @@ public class JAXBEncoderDecoderTest extends Assert {
         // so that it could be examined inside the debugger to see how JAXB works.
         assertTrue(xmlResult.contains("Gallia:string2"));
     }
-    
+
     @Test
     public void testMarshallIntoStaxStreamWriter() throws Exception {
         GreetMe obj = new GreetMe();
@@ -263,33 +263,33 @@ public class JAXBEncoderDecoderTest extends Assert {
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
         part.setElementQName(elName);
-                
+
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
         opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
         FixNamespacesXMLStreamWriter writer = new FixNamespacesXMLStreamWriter(opFactory.createXMLStreamWriter(baos));
-        
+
         assertNull(writer.getMarshaller());
-        
+
         Marshaller m = context.createMarshaller();
         JAXBEncoderDecoder.marshall(m, obj, part, writer);
         assertEquals(m, writer.getMarshaller());
         writer.flush();
         writer.close();
-        
+
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
         XMLInputFactory ipFactory = XMLInputFactory.newInstance();
         XMLEventReader reader = ipFactory.createXMLEventReader(bais);
-        
-        Unmarshaller um = context.createUnmarshaller();        
+
+        Unmarshaller um = context.createUnmarshaller();
         Object val = um.unmarshal(reader, GreetMe.class);
         assertTrue(val instanceof JAXBElement);
         val = ((JAXBElement<?>)val).getValue();
         assertTrue(val instanceof GreetMe);
-        assertEquals(obj.getRequestType(), 
+        assertEquals(obj.getRequestType(),
                      ((GreetMe)val).getRequestType());
     }
-    
+
     @Test
     public void testMarshallIntoStaxEventWriter() throws Exception {
         GreetMe obj = new GreetMe();
@@ -299,13 +299,13 @@ public class JAXBEncoderDecoderTest extends Assert {
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
         part.setElementQName(elName);
-                
+
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
         opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
         FixNamespacesXMLEventWriter writer = new FixNamespacesXMLEventWriter(opFactory.createXMLEventWriter(baos));
         assertNull(writer.getMarshaller());
-        
+
         //STARTDOCUMENT/ENDDOCUMENT is not required
         //writer.add(eFactory.createStartDocument("utf-8", "1.0"));
         Marshaller m = context.createMarshaller();
@@ -314,19 +314,19 @@ public class JAXBEncoderDecoderTest extends Assert {
         //writer.add(eFactory.createEndDocument());
         writer.flush();
         writer.close();
-        
+
         //System.out.println(baos.toString());
-        
+
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
         XMLInputFactory ipFactory = XMLInputFactory.newInstance();
         XMLEventReader reader = ipFactory.createXMLEventReader(bais);
-        
-        Unmarshaller um = context.createUnmarshaller();        
+
+        Unmarshaller um = context.createUnmarshaller();
         Object val = um.unmarshal(reader, GreetMe.class);
         assertTrue(val instanceof JAXBElement);
         val = ((JAXBElement<?>)val).getValue();
         assertTrue(val instanceof GreetMe);
-        assertEquals(obj.getRequestType(), 
+        assertEquals(obj.getRequestType(),
                      ((GreetMe)val).getRequestType());
     }
 
@@ -339,14 +339,14 @@ public class JAXBEncoderDecoderTest extends Assert {
         InputStream is =  getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
         XMLInputFactory factory = XMLInputFactory.newInstance();
         XMLStreamReader reader = factory.createXMLStreamReader(is);
-        
+
         QName[] tags = {SOAP_ENV, SOAP_BODY};
         StaxStreamFilter filter = new StaxStreamFilter(tags);
         FixNamespacesXMLStreamReader filteredReader = new FixNamespacesXMLStreamReader(
                 factory.createFilteredReader(reader, filter));
 
         assertNull(filteredReader.getUnmarshaller());
-        
+
         //Remove START_DOCUMENT & START_ELEMENT pertaining to Envelope and Body Tags.
 
         part.setTypeClass(GreetMe.class);
@@ -355,12 +355,12 @@ public class JAXBEncoderDecoderTest extends Assert {
         assertEquals(um, filteredReader.getUnmarshaller());
         assertNotNull(val);
         assertTrue(val instanceof GreetMe);
-        assertEquals("TestSOAPInputPMessage", 
+        assertEquals("TestSOAPInputPMessage",
                      ((GreetMe)val).getRequestType());
 
         is.close();
     }
-    
+
     @Test
     public void testUnmarshallFromStaxEventReader() throws Exception {
         QName elName = new QName(wrapperAnnotation.targetNamespace(),
@@ -370,7 +370,7 @@ public class JAXBEncoderDecoderTest extends Assert {
         InputStream is =  getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
         XMLInputFactory factory = XMLInputFactory.newInstance();
         FixNamespacesXMLEventReader reader = new FixNamespacesXMLEventReader(factory.createXMLEventReader(is));
-        
+
         assertNull(reader.getUnmarshaller());
 
         part.setTypeClass(GreetMe.class);
@@ -379,30 +379,30 @@ public class JAXBEncoderDecoderTest extends Assert {
         assertEquals(um, reader.getUnmarshaller());
         assertNotNull(val);
         assertTrue(val instanceof GreetMe);
-        assertEquals("TestSOAPInputPMessage", 
+        assertEquals("TestSOAPInputPMessage",
                      ((GreetMe)val).getRequestType());
 
         is.close();
     }
-    
+
     @Test
     public void testMarshalRPCLit() throws Exception {
         QName elName = new QName("http://test_jaxb_marshall", "in");
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
         part.setElementQName(elName);
-        
+
 
         Document doc = DOMUtils.createDocument();
-        Element elNode = doc.createElementNS(elName.getNamespaceURI(), 
+        Element elNode = doc.createElementNS(elName.getNamespaceURI(),
                                              elName.getLocalPart());
-        JAXBEncoderDecoder.marshall(context.createMarshaller(), 
+        JAXBEncoderDecoder.marshall(context.createMarshaller(),
                                     new String("TestSOAPMessage"), part,  elNode);
-        
+
         assertEquals("TestSOAPMessage", elNode.getFirstChild().getFirstChild().getNodeValue());
     }
 
-    
+
     @Test
     public void testUnMarshall() throws Exception {
         //Hello World Wsdl generated namespace
@@ -413,10 +413,10 @@ public class JAXBEncoderDecoderTest extends Assert {
         part.setElement(true);
         part.setElementQName(elName);
         part.setTypeClass(Class.forName(wrapperAnnotation.className()));
-        
+
 
         Document doc = DOMUtils.createDocument();
-        Element elNode = doc.createElementNS(elName.getNamespaceURI(), 
+        Element elNode = doc.createElementNS(elName.getNamespaceURI(),
                                              elName.getLocalPart());
         Element rtEl = doc.createElementNS(elName.getNamespaceURI(), "requestType");
         elNode.appendChild(rtEl);
@@ -429,7 +429,7 @@ public class JAXBEncoderDecoderTest extends Assert {
         //Add a Node and then test
         assertEquals(GreetMe.class,  obj.getClass());
         assertEquals("Hello Test", ((GreetMe)obj).getRequestType());
-        
+
         part.setTypeClass(String.class);
         Node n = null;
         try {
@@ -440,7 +440,7 @@ public class JAXBEncoderDecoderTest extends Assert {
         } catch (Exception ex) {
             fail("Should have received a Fault, not: " + ex);
         }
-        
+
         // Now test schema validation during unmarshaling
         elName = new QName(wrapperAnnotation.targetNamespace(),
                            "stringStruct");
@@ -453,20 +453,20 @@ public class JAXBEncoderDecoderTest extends Assert {
         part.setElement(true);
         part.setElementQName(elName);
         part.setTypeClass(Class.forName("org.apache.hello_world_soap_http.types.StringStruct"));
-        
+
         doc = DOMUtils.createDocument();
-        elNode = doc.createElementNS(elName.getNamespaceURI(), 
+        elNode = doc.createElementNS(elName.getNamespaceURI(),
                                              elName.getLocalPart());
         rtEl = doc.createElementNS(elName.getNamespaceURI(), "arg1");
         elNode.appendChild(rtEl);
         rtEl.appendChild(doc.createTextNode("World"));
-        
+
         // Should unmarshal without problems when no schema used.
         obj = JAXBEncoderDecoder.unmarshall(context.createUnmarshaller(), elNode, part, true);
         assertNotNull(obj);
         assertEquals(StringStruct.class,  obj.getClass());
         assertEquals("World", ((StringStruct)obj).getArg1());
-        
+
         try {
             // unmarshal with schema should raise exception.
             Unmarshaller m = context.createUnmarshaller();
@@ -484,13 +484,13 @@ public class JAXBEncoderDecoderTest extends Assert {
                                  wrapperAnnotation.localName());
 
         Document doc = DOMUtils.createDocument();
-        Element elNode = doc.createElementNS(elName.getNamespaceURI(), 
+        Element elNode = doc.createElementNS(elName.getNamespaceURI(),
                                              elName.getLocalPart());
         Element rtEl = doc.createElementNS(elName.getNamespaceURI(), "requestType");
         elNode.appendChild(rtEl);
         rtEl.appendChild(doc.createTextNode("Hello Test"));
-       
-        Object obj = JAXBEncoderDecoder.unmarshall(context.createUnmarshaller(), 
+
+        Object obj = JAXBEncoderDecoder.unmarshall(context.createUnmarshaller(),
                                                    elNode,
                                                    null,
                                                    true);
@@ -503,30 +503,30 @@ public class JAXBEncoderDecoderTest extends Assert {
     public void testMarshallExceptionWithOrder() throws Exception {
         Document doc = DOMUtils.createDocument();
         Element elNode = doc.createElementNS("http://cxf.apache.org",  "ExceptionRoot");
-        
+
         OrderException exception = new OrderException("Mymessage");
         exception.setAValue("avalue");
         exception.setDetail("detail");
         exception.setInfo1("info1");
         exception.setInfo2("info2");
         exception.setIntVal(10000);
-       
-        QName elName = new QName("http://cxf.apache.org", "OrderException");       
+
+        QName elName = new QName("http://cxf.apache.org", "OrderException");
         ServiceInfo serviceInfo = new ServiceInfo();
         InterfaceInfo interfaceInfo = new InterfaceInfo(serviceInfo, null);
-        OperationInfo op = interfaceInfo.addOperation(new QName("http://cxf.apache.org", "operation"));     
+        OperationInfo op = interfaceInfo.addOperation(new QName("http://cxf.apache.org", "operation"));
         MessageInfo message = new MessageInfo(op, null, null);
         MessagePartInfo part = new MessagePartInfo(elName, message);
         part.setElement(true);
         part.setElementQName(elName);
         part.setTypeClass(OrderException.class);
-            
+
         //just need a simple generic context to handle the exceptions internal primitives
         JAXBContext exceptionContext = JAXBContext.newInstance(new Class[] {
             String.class,
         });
         JAXBEncoderDecoder.marshallException(exceptionContext.createMarshaller(), exception, part, elNode);
-        
+
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         StaxUtils.writeTo(elNode, bout);
         int a = bout.toString().lastIndexOf("aValue");
@@ -541,56 +541,56 @@ public class JAXBEncoderDecoderTest extends Assert {
         assertTrue(bout.toString().indexOf("transientValue") < 0);
         assertTrue(bout.toString(), bout.toString().indexOf("mappedField=\"MappedField\"") > 0);
     }
-    
+
     @Test
     public void testMarshallWithoutQNameInfo() throws Exception {
         GreetMe obj = new GreetMe();
         obj.setRequestType("Hello");
-        
+
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
         opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
         XMLEventWriter writer = opFactory.createXMLEventWriter(baos);
 
         //STARTDOCUMENT/ENDDOCUMENT is not required
-        //writer.add(eFactory.createStartDocument("utf-8", "1.0"));        
+        //writer.add(eFactory.createStartDocument("utf-8", "1.0"));
         JAXBEncoderDecoder.marshall(context.createMarshaller(), obj, null, writer);
         //writer.add(eFactory.createEndDocument());
         writer.flush();
         writer.close();
-        
+
         //System.out.println(baos.toString());
-        
+
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
         XMLInputFactory ipFactory = XMLInputFactory.newInstance();
         XMLEventReader reader = ipFactory.createXMLEventReader(bais);
-        
-        Unmarshaller um = context.createUnmarshaller();        
+
+        Unmarshaller um = context.createUnmarshaller();
         Object val = um.unmarshal(reader, GreetMe.class);
         assertTrue(val instanceof JAXBElement);
         val = ((JAXBElement<?>)val).getValue();
         assertTrue(val instanceof GreetMe);
-        assertEquals(obj.getRequestType(), 
+        assertEquals(obj.getRequestType(),
                      ((GreetMe)val).getRequestType());
     }
-    
+
     @Test
     public void testGetClassFromType() throws Exception {
         Method testByte = getMethod("testByte");
         Type[] genericParameterTypes = testByte.getGenericParameterTypes();
         Class<?>[] paramTypes = testByte.getParameterTypes();
- 
+
         int idx = 0;
         for (Type t : genericParameterTypes) {
             Class<?> cls = JAXBEncoderDecoder.getClassFromType(t);
             assertTrue(cls.equals(paramTypes[idx]));
             idx++;
         }
-        
+
         Method testBase64Binary = getMethod("testBase64Binary");
         genericParameterTypes = testBase64Binary.getGenericParameterTypes();
         paramTypes = testBase64Binary.getParameterTypes();
- 
+
         idx = 0;
         for (Type t : genericParameterTypes) {
             Class<?> cls = JAXBEncoderDecoder.getClassFromType(t);
@@ -598,20 +598,20 @@ public class JAXBEncoderDecoderTest extends Assert {
             idx++;
         }
     }
- 
+
     @Test
     public void testDefaultValueConverter() throws Exception {
         Base64WithDefaultValueType testData = (new ObjectFactory()).createBase64WithDefaultValueType();
         byte[] checkValue = testData.getAttributeWithDefaultValue();
         assertNotNull(checkValue);
     }
-    
-    
+
+
     @RequestWrapper(localName = "testByte",
-        targetNamespace = "http://apache.org/type_test/doc", 
+        targetNamespace = "http://apache.org/type_test/doc",
         className = "org.apache.type_test.doc.TestByte")
-    @ResponseWrapper(localName = "testByteResponse", 
-        targetNamespace = "http://apache.org/type_test/doc", 
+    @ResponseWrapper(localName = "testByteResponse",
+        targetNamespace = "http://apache.org/type_test/doc",
         className = "org.apache.type_test.doc.TestByteResponse")
     public byte testByte(
         byte x,
@@ -619,12 +619,12 @@ public class JAXBEncoderDecoderTest extends Assert {
         javax.xml.ws.Holder<java.lang.Byte> z) {
         return 24;
     }
-    
-    @RequestWrapper(localName = "testBase64Binary", 
-        targetNamespace = "http://apache.org/type_test/doc", 
+
+    @RequestWrapper(localName = "testBase64Binary",
+        targetNamespace = "http://apache.org/type_test/doc",
         className = "org.apache.type_test.doc.TestBase64Binary")
-    @ResponseWrapper(localName = "testBase64BinaryResponse", 
-        targetNamespace = "http://apache.org/type_test/doc", 
+    @ResponseWrapper(localName = "testBase64BinaryResponse",
+        targetNamespace = "http://apache.org/type_test/doc",
         className = "org.apache.type_test.doc.TestBase64BinaryResponse")
     public byte[] testBase64Binary(
         byte[] x,

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
index 62f9070..4759237 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 
 
 public class JAXBUtilsTest extends Assert {
-    
+
     @Test
     public void testBuiltInTypeToJavaType() {
         assertEquals("boolean", JAXBUtils.builtInTypeToJavaType("boolean"));
@@ -70,7 +70,7 @@ public class JAXBUtilsTest extends Assert {
                 JAXBUtils.namespaceURIToPackage("http://cxf.apache.org/configuration/types.auto"));
         assertEquals("org.apache.cxf.configuration.types_mouse",
                 JAXBUtils.namespaceURIToPackage("http://cxf.apache.org/configuration/types.mouse"));
-        
+
         // other tests
         assertEquals("https.com.mytech.rosette_analysis",
                 JAXBUtils.namespaceURIToPackage("https://mytech.com/rosette.analysis"));
@@ -85,80 +85,80 @@ public class JAXBUtilsTest extends Assert {
         assertEquals("org.apache.cxf.config.types",
                 JAXBUtils.namespaceURIToPackage("urn:cxf-apache-org:config:types"));
         assertEquals("types", JAXBUtils.namespaceURIToPackage("types"));
-    } 
-    
+    }
+
     @Test
     public void testNameToIdentifier() {
-        assertEquals("_return", 
+        assertEquals("_return",
                      JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.VARIABLE));
-        assertEquals("getReturn", 
+        assertEquals("getReturn",
                      JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.GETTER));
-        assertEquals("setReturn", 
+        assertEquals("setReturn",
                      JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.SETTER));
-        
 
-        assertEquals("_public", 
+
+        assertEquals("_public",
                      JAXBUtils.nameToIdentifier("public", JAXBUtils.IdentifierType.VARIABLE));
-        assertEquals("getPublic", 
+        assertEquals("getPublic",
                      JAXBUtils.nameToIdentifier("public", JAXBUtils.IdentifierType.GETTER));
-        assertEquals("setPublic", 
+        assertEquals("setPublic",
                      JAXBUtils.nameToIdentifier("public", JAXBUtils.IdentifierType.SETTER));
 
-        assertEquals("arg0", 
+        assertEquals("arg0",
                      JAXBUtils.nameToIdentifier("arg0", JAXBUtils.IdentifierType.VARIABLE));
-        assertEquals("getArg0", 
+        assertEquals("getArg0",
                      JAXBUtils.nameToIdentifier("arg0", JAXBUtils.IdentifierType.GETTER));
-        assertEquals("setArg0", 
+        assertEquals("setArg0",
                      JAXBUtils.nameToIdentifier("arg0", JAXBUtils.IdentifierType.SETTER));
-        
-        assertEquals("mixedCaseName", 
+
+        assertEquals("mixedCaseName",
                      JAXBUtils.nameToIdentifier("mixedCaseName", JAXBUtils.IdentifierType.VARIABLE));
-        assertEquals("MixedCaseName", 
+        assertEquals("MixedCaseName",
                      JAXBUtils.nameToIdentifier("mixedCaseName", JAXBUtils.IdentifierType.CLASS));
-        assertEquals("setMixedCaseName", 
+        assertEquals("setMixedCaseName",
                      JAXBUtils.nameToIdentifier("mixedCaseName", JAXBUtils.IdentifierType.SETTER));
-        assertEquals("MIXED_CASE_NAME", 
+        assertEquals("MIXED_CASE_NAME",
                      JAXBUtils.nameToIdentifier("mixedCaseName", JAXBUtils.IdentifierType.CONSTANT));
-        
-        assertEquals("answer42", 
+
+        assertEquals("answer42",
                      JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.VARIABLE));
-        assertEquals("Answer42", 
-                     JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.CLASS)); 
-        assertEquals("getAnswer42", 
+        assertEquals("Answer42",
+                     JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.CLASS));
+        assertEquals("getAnswer42",
                      JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.GETTER));
-        assertEquals("ANSWER_42", 
+        assertEquals("ANSWER_42",
                      JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.CONSTANT));
-        
-        assertEquals("nameWithDashes", 
+
+        assertEquals("nameWithDashes",
                      JAXBUtils.nameToIdentifier("name-with-dashes", JAXBUtils.IdentifierType.VARIABLE));
-        assertEquals("NameWithDashes", 
+        assertEquals("NameWithDashes",
                      JAXBUtils.nameToIdentifier("name-with-dashes", JAXBUtils.IdentifierType.CLASS));
-        assertEquals("setNameWithDashes", 
+        assertEquals("setNameWithDashes",
                      JAXBUtils.nameToIdentifier("name-with-dashes", JAXBUtils.IdentifierType.SETTER));
-        assertEquals("NAME_WITH_DASHES", 
+        assertEquals("NAME_WITH_DASHES",
                      JAXBUtils.nameToIdentifier("name-with-dashes", JAXBUtils.IdentifierType.CONSTANT));
-        
-        assertEquals("otherPunctChars", 
+
+        assertEquals("otherPunctChars",
                      JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.VARIABLE));
-        assertEquals("OtherPunctChars", 
+        assertEquals("OtherPunctChars",
                      JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.CLASS));
-        assertEquals("getOtherPunctChars", 
+        assertEquals("getOtherPunctChars",
                      JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.GETTER));
-        assertEquals("OTHER_PUNCT_CHARS", 
+        assertEquals("OTHER_PUNCT_CHARS",
                      JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.CONSTANT));
     }
-    
+
     @Test
     public void testNsToPkg() {
-        String urn = "urn:cxf.apache.org";     
+        String urn = "urn:cxf.apache.org";
         String pkg = JAXBUtils.namespaceURIToPackage(urn);
         assertEquals("org.apache.cxf", pkg);
-        
+
         urn = "urn:cxf.apache.org:test.v4.6.4";
         pkg = JAXBUtils.namespaceURIToPackage(urn);
-        assertEquals("org.apache.cxf.test_v4_6_4", pkg);       
+        assertEquals("org.apache.cxf.test_v4_6_4", pkg);
     }
-    
+
     @Test
     public void testSetNamespaceMapper() throws Exception {
         JAXBContext ctx = JAXBContext.newInstance(GreetMe.class);
@@ -177,12 +177,12 @@ public class JAXBUtilsTest extends Assert {
         if (mapperkey != null) {
             Object mapper = marshaller.getProperty(mapperkey);
             assertNotNull(mapper);
-            
+
             // also verify this mapper has setContextualNamespaceDecls
-            Method m = ReflectionUtil.getDeclaredMethod(mapper.getClass(), 
+            Method m = ReflectionUtil.getDeclaredMethod(mapper.getClass(),
                                                         "setContextualNamespaceDecls", new Class<?>[]{String[].class});
             assertNotNull(m);
         }
-        
+
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index 822a217..6a16e09 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -40,7 +40,7 @@ public class JAXBWrapperHelperTest extends Assert {
         SetIsOK ok = new SetIsOK();
         ok.setParameter3(new boolean[] {true, false});
         ok.setParameter4("hello");
-        
+
         List<String> partNames = Arrays.asList(new String[] {
             "Parameter1",
             "Parameter2",
@@ -62,13 +62,13 @@ public class JAXBWrapperHelperTest extends Assert {
             String.class,
             List.class,
         });
-        
+
         WrapperHelper wh = new JAXBDataBinding().createWrapperHelper(SetIsOK.class,
                                                                      null,
                                           partNames,
                                           elTypeNames,
                                           partClasses);
-        
+
         List<Object> lst = wh.getWrapperParts(ok);
         assertEquals(5, lst.size());
         assertTrue(lst.get(0) instanceof Boolean);
@@ -104,11 +104,11 @@ public class JAXBWrapperHelperTest extends Assert {
         protected String parameter4;
         @XmlElement(name = "Parameter5")
         protected List<String> parameter5 = new ArrayList<>();
-        
-        
+
+
         /**
          * Gets the value of the parameter1 property.
-         * 
+         *
          */
         public boolean isParameter1() {
             return parameter1;
@@ -116,7 +116,7 @@ public class JAXBWrapperHelperTest extends Assert {
 
         /**
          * Sets the value of the parameter1 property.
-         * 
+         *
          */
         public void setParameter1(boolean value) {
             this.parameter1 = value;
@@ -124,7 +124,7 @@ public class JAXBWrapperHelperTest extends Assert {
 
         /**
          * Gets the value of the parameter2 property.
-         * 
+         *
          */
         public int getParameter2() {
             return parameter2;
@@ -132,16 +132,16 @@ public class JAXBWrapperHelperTest extends Assert {
 
         /**
          * Sets the value of the parameter2 property.
-         * 
+         *
          */
         public void setParameter2(int value) {
             this.parameter2 = value;
         }
-        
-        
+
+
         /**
          * Gets the value of the parameter2 property.
-         * 
+         *
          */
         public boolean[] getParameter3() {
             return parameter3;
@@ -149,12 +149,12 @@ public class JAXBWrapperHelperTest extends Assert {
 
         /**
          * Sets the value of the parameter2 property.
-         * 
+         *
          */
         public void setParameter3(boolean value[]) {
             this.parameter3 = value;
         }
-        
+
         public String getParameter4() {
             return parameter4;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java
index 1aa52f1..f9670cb 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java
@@ -24,12 +24,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 
 @XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
 public class OrderException extends Exception {
-      
+
     private static final long serialVersionUID = 1L;
-    
+
     @XmlAttribute(name = "mappedField")
     private static final String MAPPED_FIELD = "MappedField";
-    
+
     private transient int transientValue;
 
     private String info1;
@@ -41,9 +41,9 @@ public class OrderException extends Exception {
     private int intVal;
 
     private String detail;
-    
-    
-    
+
+
+
     public OrderException(String message) {
         super(message);
     }
@@ -99,7 +99,7 @@ public class OrderException extends Exception {
     void setTransientValue(int transientValue) {
         this.transientValue = transientValue;
     }
-    
+
     public String mappedField() {
         return MAPPED_FIELD;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java
index 9e62a6e..3a8f360 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java
@@ -33,7 +33,7 @@ public class StaxEventFilter implements EventFilter {
     }
 
     public boolean accept(XMLEvent event) {
-        if (event.isStartDocument() 
+        if (event.isStartDocument()
             || event.isEndDocument()) {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
index 35a1b3b..e70e4db 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
@@ -86,7 +86,7 @@ public class TestBase extends Assert {
             .andStubReturn(new ArrayList<Interceptor<? extends Message>>());
         expect(binding.getOutFaultInterceptors())
             .andStubReturn(new ArrayList<Interceptor<? extends Message>>());
-        
+
         bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", bf);
 
         String ns = "http://apache.org/hello_world_soap_http";

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
index 4d417a8..7396cbc 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
@@ -33,22 +33,22 @@ public class QualifiedBean {
     public void setAriadne(String ariadne) {
         this.ariadne = ariadne;
     }
-    
+
     @XmlAttribute
     public String getDefaultAttribute() {
         return "default";
     }
-    
+
     public void setDefaultAttribute(String val) {
         //
     }
-    
-    
+
+
     @XmlAttribute(namespace = "")
     public String getEmptyNamespaceAttribute() {
         return "empty";
     }
-    
+
     public void setEmptyNamespaceAttribute() {
     }
 
@@ -56,7 +56,7 @@ public class QualifiedBean {
     public String getExplicitNamespaceAttribute() {
         return "explicit";
     }
-    
+
     public void setExplicitNamespaceAttribute() {
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java
index 7bfbaa0..79536dd 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java
@@ -28,7 +28,7 @@ public class MyCustomHandler implements ValidationEventHandler {
     public boolean getUsed() {
         return used;
     }
-    
+
     public boolean handleEvent(ValidationEvent event) {
         used = true;
         return true;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java
index c494dfa..369f3c9 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java
@@ -27,16 +27,16 @@ import javax.xml.bind.util.ValidationEventCollector;
 import org.apache.cxf.jaxb.MarshallerEventHandler;
 import org.apache.cxf.jaxb.UnmarshallerEventHandler;
 
-public class MyCustomMarshallerHandler extends ValidationEventCollector implements 
+public class MyCustomMarshallerHandler extends ValidationEventCollector implements
         UnmarshallerEventHandler, MarshallerEventHandler {
     private boolean used;
     private boolean onMarshalComplete;
     private boolean onUnmarshalComplete;
-    
+
     public boolean getUsed() {
         return used;
     }
-    
+
     public boolean isOnMarshalComplete() {
         return onMarshalComplete;
     }
@@ -47,7 +47,7 @@ public class MyCustomMarshallerHandler extends ValidationEventCollector implemen
 
     public boolean handleEvent(ValidationEvent event) {
         super.handleEvent(event);
-        
+
         used = true;
         return true;
     }
@@ -55,7 +55,7 @@ public class MyCustomMarshallerHandler extends ValidationEventCollector implemen
     @Override
     public void onUnmarshalComplete() throws UnmarshalException {
         this.onUnmarshalComplete = true;
-        
+
         if (hasEvents()) {
             throw new UnmarshalException("My unmarshalling exception");
         }
@@ -64,7 +64,7 @@ public class MyCustomMarshallerHandler extends ValidationEventCollector implemen
     @Override
     public void onMarshalComplete() throws MarshalException {
         this.onMarshalComplete = true;
-        
+
         if (hasEvents()) {
             throw new MarshalException("My marshalling exception");
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
index f4d3405..8b2d7a9 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
@@ -41,13 +41,13 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
- 
+
 public class XMLStreamDataReaderTest extends Assert {
 
     private XMLInputFactory factory;
     private XMLStreamReader reader;
     private InputStream is;
-    
+
     @Before
     public void setUp() throws Exception {
         factory = XMLInputFactory.newInstance();
@@ -61,9 +61,9 @@ public class XMLStreamDataReaderTest extends Assert {
     @Test
     public void testSetProperty() throws Exception {
         MyCustomHandler handler = new MyCustomHandler();
-        
+
         DataReaderImpl<XMLStreamReader> dr = newDataReader(handler);
-        
+
         // Should fail if custom handler doesn't skip formatting error
         Object val = dr.read(reader);
         assertTrue(val instanceof GreetMe);
@@ -71,11 +71,11 @@ public class XMLStreamDataReaderTest extends Assert {
 
         assertTrue(handler.getUsed());
     }
-    
+
     @Test
     public void testSetPropertyWithCustomExceptionHandling() throws Exception {
         MyCustomMarshallerHandler handler = new MyCustomMarshallerHandler();
-        
+
         DataReaderImpl<XMLStreamReader> dr = newDataReader(handler);
 
         // Should fail if custom handler doesn't skip formatting error
@@ -85,39 +85,39 @@ public class XMLStreamDataReaderTest extends Assert {
         } catch (Fault f) {
             assertTrue(f.getMessage().contains("My unmarshalling exception"));
         }
-        
+
         // Check handler used
         assertTrue(handler.getUsed());
         assertFalse(handler.isOnMarshalComplete());
         assertTrue(handler.isOnUnmarshalComplete());
     }
-    
+
     private DataReaderImpl<XMLStreamReader> newDataReader(ValidationEventHandler handler) throws Exception {
         JAXBDataBinding db = getDataBinding(GreetMe.class);
-    
+
         reader = getTestReader("../resources/SetPropertyValidationFailureReq.xml");
         assertNotNull(reader);
-        
+
         DataReaderImpl<XMLStreamReader> dr = (DataReaderImpl<XMLStreamReader>)db.createReader(XMLStreamReader.class);
         assertNotNull(dr);
-        
+
         // Build message to set custom event handler
         org.apache.cxf.message.Message message = new org.apache.cxf.message.MessageImpl();
         message.put(JAXBDataBinding.READER_VALIDATION_EVENT_HANDLER, handler);
         message.put("unwrap.jaxb.element", true);
-    
-        dr.setProperty("org.apache.cxf.message.Message", message);        
-        
+
+        dr.setProperty("org.apache.cxf.message.Message", message);
+
         return dr;
     }
-    
+
     @Test
     public void testReadWrapper() throws Exception {
         JAXBDataBinding db = getDataBinding(GreetMe.class);
-        
+
         reader = getTestReader("../resources/GreetMeDocLiteralReq.xml");
         assertNotNull(reader);
-        
+
         DataReader<XMLStreamReader> dr = db.createReader(XMLStreamReader.class);
         assertNotNull(dr);
         Object val = dr.read(reader);
@@ -135,9 +135,9 @@ public class XMLStreamDataReaderTest extends Assert {
 
         DataReader<XMLStreamReader> dr = db.createReader(XMLStreamReader.class);
         assertNotNull(dr);
-        
+
         Object retValue = dr.read(reader);
-        
+
         assertNotNull(retValue);
         assertTrue(retValue instanceof GreetMeResponse);
         assertEquals("TestSOAPOutputPMessage", ((GreetMeResponse)retValue).getResponseType());
@@ -151,7 +151,7 @@ public class XMLStreamDataReaderTest extends Assert {
 
         reader = getTestReader("../resources/greetMeRpcLitReq.xml");
         assertNotNull(reader);
-        
+
         XMLStreamReader localReader = getTestFilteredReader(reader, tags);
 
         DataReader<XMLStreamReader> dr = db.createReader(XMLStreamReader.class);
@@ -174,7 +174,7 @@ public class XMLStreamDataReaderTest extends Assert {
 
         reader = getTestReader("../resources/sayHiDocLitBareReq.xml");
         assertNotNull(reader);
-        
+
         DataReader<XMLStreamReader> dr = db.createReader(XMLStreamReader.class);
         assertNotNull(dr);
         QName elName = new QName("http://apache.org/hello_world_doc_lit_bare/types", "inout");

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
index 420c843..afa9af6 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
@@ -67,43 +67,43 @@ public class XMLStreamDataWriterTest extends Assert {
     public void tearDown() throws Exception {
         baos.close();
     }
-    
+
     @Test
     public void testSetProperty() throws Exception {
         MyCustomHandler handler = new MyCustomHandler();
-        
+
         DataWriterImpl<XMLStreamWriter> dw = newDataWriter(handler);
         // Write Stuff
         TradePriceData val = new TradePriceData();
         val.setTickerSymbol("This is a symbol");
         val.setTickerPrice(1.0f);
-        
+
         QName elName = new QName("http://apache.org/hello_world_doc_lit_bare/types", "inout");
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
         part.setElementQName(elName);
         dw.write(val, part, streamWriter);
         streamWriter.flush();
-        
+
         // Test MyCustomHandler
         assertTrue(handler.getUsed());
     }
-    
+
     @Test
     public void testSetPropertyWithCustomExceptionHandling() throws Exception {
         MyCustomMarshallerHandler handler = new MyCustomMarshallerHandler();
-        
+
         DataWriterImpl<XMLStreamWriter> dw = newDataWriter(handler);
         // Write Stuff
         TradePriceData val = new TradePriceData();
         val.setTickerSymbol("This is a symbol");
         val.setTickerPrice(1.0f);
-        
+
         QName elName = new QName("http://apache.org/hello_world_doc_lit_bare/types", "inout");
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
         part.setElementQName(elName);
-        
+
         try {
             dw.write(val, part, streamWriter);
             streamWriter.flush();
@@ -111,7 +111,7 @@ public class XMLStreamDataWriterTest extends Assert {
         } catch (Fault f) {
             assertTrue(f.getMessage().contains("My marshalling exception"));
         }
-        
+
         // Test MyCustomHandler
         assertTrue(handler.getUsed());
         assertTrue(handler.isOnMarshalComplete());
@@ -121,28 +121,28 @@ public class XMLStreamDataWriterTest extends Assert {
 
     private DataWriterImpl<XMLStreamWriter> newDataWriter(ValidationEventHandler handler) throws Exception {
         JAXBDataBinding db = getTestWriterFactory();
-        
+
         DataWriterImpl<XMLStreamWriter> dw = (DataWriterImpl<XMLStreamWriter>)db.createWriter(XMLStreamWriter.class);
         assertNotNull(dw);
-        
+
         // Build message to set custom event handler
         org.apache.cxf.message.Message message = new org.apache.cxf.message.MessageImpl();
         message.put(JAXBDataBinding.WRITER_VALIDATION_EVENT_HANDLER, handler);
-    
-        dw.setProperty("org.apache.cxf.message.Message", message);     
-        
+
+        dw.setProperty("org.apache.cxf.message.Message", message);
+
         return dw;
     }
-    
+
     @Test
     public void testWriteRPCLit1() throws Exception {
         JAXBDataBinding db = getTestWriterFactory();
-        
+
         DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
         assertNotNull(dw);
-        
+
         String val = new String("TESTOUTPUTMESSAGE");
-        QName elName = new QName("http://apache.org/hello_world_rpclit/types", 
+        QName elName = new QName("http://apache.org/hello_world_rpclit/types",
                                  "in");
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
@@ -165,21 +165,21 @@ public class XMLStreamDataWriterTest extends Assert {
     @Test
     public void testWriteRPCLit2() throws Exception {
         JAXBDataBinding db = getTestWriterFactory(MyComplexStruct.class);
-        
+
         DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
         assertNotNull(dw);
-        
+
         MyComplexStruct val = new MyComplexStruct();
         val.setElem1("This is element 1");
         val.setElem2("This is element 2");
         val.setElem3(1);
-        
-        QName elName = new QName("http://apache.org/hello_world_rpclit/types", 
+
+        QName elName = new QName("http://apache.org/hello_world_rpclit/types",
                                  "in");
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
         part.setElementQName(elName);
-        
+
         dw.write(val, part, streamWriter);
         streamWriter.flush();
 
@@ -203,14 +203,14 @@ public class XMLStreamDataWriterTest extends Assert {
     @Test
     public void testWriteBare() throws Exception {
         JAXBDataBinding db = getTestWriterFactory(TradePriceData.class);
-        
+
         DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
         assertNotNull(dw);
-        
+
         TradePriceData val = new TradePriceData();
         val.setTickerSymbol("This is a symbol");
         val.setTickerPrice(1.0f);
-        
+
         QName elName = new QName("http://apache.org/hello_world_doc_lit_bare/types", "inout");
         MessagePartInfo part = new MessagePartInfo(elName, null);
         part.setElement(true);
@@ -234,17 +234,17 @@ public class XMLStreamDataWriterTest extends Assert {
         StaxUtils.toNextText(reader);
         assertEquals("This is a symbol", reader.getText());
     }
-    
+
     @Test
     public void testWriteWrapper() throws Exception {
         JAXBDataBinding db = getTestWriterFactory(GreetMe.class);
-        
+
         DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
         assertNotNull(dw);
 
         GreetMe val = new GreetMe();
         val.setRequestType("Hello");
-        
+
         dw.write(val, streamWriter);
         streamWriter.flush();
 
@@ -259,7 +259,7 @@ public class XMLStreamDataWriterTest extends Assert {
         StaxUtils.toNextElement(reader);
         assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "requestType"),
                      reader.getName());
-        
+
         StaxUtils.nextEvent(reader);
         StaxUtils.toNextText(reader);
         assertEquals("Hello", reader.getText());
@@ -268,16 +268,16 @@ public class XMLStreamDataWriterTest extends Assert {
     @Test
     public void testWriteWrapperReturn() throws Exception {
         JAXBDataBinding db = getTestWriterFactory(GreetMeResponse.class);
-        
+
         DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
         assertNotNull(dw);
 
         GreetMeResponse retVal = new GreetMeResponse();
         retVal.setResponseType("TESTOUTPUTMESSAGE");
-        
+
         dw.write(retVal, streamWriter);
         streamWriter.flush();
-        
+
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
         XMLStreamReader xr = inFactory.createXMLStreamReader(bais);
         DepthXMLStreamReader reader = new DepthXMLStreamReader(xr);
@@ -289,7 +289,7 @@ public class XMLStreamDataWriterTest extends Assert {
         StaxUtils.toNextElement(reader);
         assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "responseType"),
                      reader.getName());
-        
+
         StaxUtils.nextEvent(reader);
         StaxUtils.toNextText(reader);
         assertEquals("TESTOUTPUTMESSAGE", reader.getText());
@@ -301,7 +301,7 @@ public class XMLStreamDataWriterTest extends Assert {
         Map<String, String> nspref = new HashMap<String, String>();
         nspref.put("http://apache.org/hello_world_soap_http/types", "x");
         db.setNamespaceMap(nspref);
-        
+
         // use the output stream instead of XMLStreamWriter to test
         DataWriter<OutputStream> dw = db.createWriter(OutputStream.class);
         assertNotNull(dw);
@@ -309,25 +309,25 @@ public class XMLStreamDataWriterTest extends Assert {
         GreetMe val = new GreetMe();
         val.setRequestType("Hello");
         dw.write(val, baos);
-        
+
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
         XMLStreamReader xr = inFactory.createXMLStreamReader(bais);
         DepthXMLStreamReader reader = new DepthXMLStreamReader(xr);
         StaxUtils.toNextElement(reader);
-        QName qname = reader.getName(); 
+        QName qname = reader.getName();
         assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "greetMe"), qname);
         assertEquals("x", qname.getPrefix());
-        
+
         assertEquals(1, reader.getNamespaceCount());
         assertEquals("http://apache.org/hello_world_soap_http/types", reader.getNamespaceURI(0));
         assertEquals("x", reader.getNamespacePrefix(0));
-        
+
         StaxUtils.nextEvent(reader);
         StaxUtils.toNextElement(reader);
         qname = reader.getName();
         assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "requestType"), qname);
         assertEquals("x", qname.getPrefix());
-        
+
         StaxUtils.nextEvent(reader);
         StaxUtils.toNextText(reader);
         assertEquals("Hello", reader.getText());
@@ -340,7 +340,7 @@ public class XMLStreamDataWriterTest extends Assert {
         nspref.put("http://apache.org/hello_world_soap_http/types", "x");
         db.setNamespaceMap(nspref);
         db.setContextualNamespaceMap(nspref);
-        
+
         // use the output stream instead of XMLStreamWriter to test
         DataWriter<OutputStream> dw = db.createWriter(OutputStream.class);
         assertNotNull(dw);
@@ -348,14 +348,14 @@ public class XMLStreamDataWriterTest extends Assert {
         GreetMe val = new GreetMe();
         val.setRequestType("Hello");
         dw.write(val, baos);
-        
+
         String xstr = new String(baos.toByteArray());
-        
+
         // there should be no namespace decls
         if (!db.getContext().getClass().getName().contains("eclipse")) {
             //bug in eclipse moxy
             //https://bugs.eclipse.org/bugs/show_bug.cgi?id=421463
-            
+
             assertEquals("<x:greetMe><x:requestType>Hello</x:requestType></x:greetMe>", xstr);
         }
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java
index 1c1d7d4..00da309e 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java
@@ -29,8 +29,8 @@ import javax.xml.bind.annotation.XmlType;
 public class TestJAXBClass {
     @XmlElement(name = "EndPart", required = true)
     protected String endPart;
-    
-    
+
+
     public String getEndPart() {
         return endPart;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
index 49a332c..ebef316 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
@@ -47,18 +47,18 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
     public void setDelayBetweenRetries(long delay) {
         this.delayBetweenRetries = delay;
     }
-    
+
     public long getDelayBetweenRetries() {
         return this.delayBetweenRetries;
     }
-    
+
     public void setAlternateAddresses(List<String> alternateAddresses) {
         this.alternateAddresses = alternateAddresses;
     }
-   
+
     /**
      * Get the alternate addresses for this invocation.
-     * 
+     *
      * @param exchange the current Exchange
      * @return a List of alternate addresses if available
      */
@@ -70,7 +70,7 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
 
     /**
      * Select one of the alternate addresses for a retried invocation.
-     * 
+     *
      * @param a List of alternate addresses if available
      * @return the selected address
      */
@@ -92,17 +92,17 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
 
     /**
      * Get the alternate endpoints for this invocation.
-     * 
+     *
      * @param exchange the current Exchange
      * @return a List of alternate endpoints if available
      */
     public List<Endpoint> getAlternateEndpoints(Exchange exchange) {
         return getEndpoints(exchange, false);
     }
-    
+
     /**
      * Select one of the alternate endpoints for a retried invocation.
-     * 
+     *
      * @param a List of alternate endpoints if available
      * @return the selected endpoint
      */
@@ -122,10 +122,10 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
         }
         return selected;
     }
-    
+
     /**
      * Get the endpoints for this invocation.
-     * 
+     *
      * @param exchange the current Exchange
      * @param acceptCandidatesWithSameAddress true to accept candidates with the same address
      * @return a List of alternate endpoints if available
@@ -165,17 +165,17 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
 
     /**
      * Get next alternate endpoint.
-     * 
-     * @param alternates non-empty List of alternate endpoints 
+     *
+     * @param alternates non-empty List of alternate endpoints
      * @return
      */
     protected abstract <T> T getNextAlternate(List<T> alternates);
-    
+
     /**
-     * Get the log level for reporting the selection of the new alternative address or endpoint 
+     * Get the log level for reporting the selection of the new alternative address or endpoint
      * @return the log level
      */
     protected Level getLogLevel() {
-        return Level.WARNING;    
+        return Level.WARNING;
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
index 9bcc6fc..3010351 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
@@ -47,7 +47,7 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
 
     /**
      * Static instance of empty (or noop) circuit breaker to handle use cases
-     * when alternative addresses or alternative endpoint addresses are nullable 
+     * when alternative addresses or alternative endpoint addresses are nullable
      * (or non-valid).
      */
     private static final  CircuitBreaker NOOP_CIRCUIT_BREAKER = new CircuitBreaker() {
@@ -55,41 +55,41 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
         public boolean allowRequest() {
             return true;
         }
-        
+
         @Override
         public void markFailure(Throwable cause) {
         }
-        
+
         @Override
         public void markSuccess() {
         }
     };
-    
+
     private final int threshold;
-    private final long timeout; 
+    private final long timeout;
     private final Map<String, CircuitBreaker> circuits = new LinkedHashMap<>();
-    
+
     public CircuitBreakerTargetSelector(final int threshold, final long timeout) {
         super();
         this.threshold = threshold;
         this.timeout = timeout;
     }
-    
+
     public CircuitBreakerTargetSelector(final int threshold, final long timeout,
                                         final String clientBootstrapAddress) {
         super(clientBootstrapAddress);
         this.threshold = threshold;
         this.timeout = timeout;
     }
-    
+
     public CircuitBreakerTargetSelector() {
         this(DEFAULT_THESHOLD, DEFAULT_TIMEOUT);
     }
-    
+
     @Override
     public synchronized void setStrategy(FailoverStrategy strategy) {
         super.setStrategy(strategy);
-        
+
         // Registering the original endpoint in the list of circuit breakers
         if (getEndpoint() != null) {
             final String address = getEndpoint().getEndpointInfo().getAddress();
@@ -97,7 +97,7 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
                 circuits.putIfAbsent(address, new ZestCircuitBreaker(threshold, timeout));
             }
         }
-        
+
         if (strategy != null) {
             final List<String> alternatives = strategy.getAlternateAddresses(null /* no Exchange at this point */);
             if (alternatives != null) {
@@ -120,10 +120,10 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
         InvocationContext invocation = inProgress.get(key);
         if (invocation != null && !invocation.getContext().containsKey(IS_SELECTED)) {
             final String address = (String) message.get(Message.ENDPOINT_ADDRESS);
-            
+
             if (isFailoverRequired(address)) {
                 Endpoint target = getFailoverTarget(exchange, invocation);
-                
+
                 if (target == null) {
                     throw new Fault(new FailoverFailedException(
                         "None of alternative addresses are available at the moment"));
@@ -140,22 +140,22 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
 
         return getSelectedConduit(message);
     }
-    
+
     @Override
     protected Endpoint getFailoverTarget(final Exchange exchange, final InvocationContext invocation) {
         if (circuits.isEmpty()) {
             LOG.log(Level.SEVERE, "No alternative addresses configured");
             return null;
         }
-        
+
         final List<String> alternateAddresses = updateContextAlternatives(exchange, invocation);
         if (alternateAddresses != null) {
             final Iterator<String> alternateAddressIterator = alternateAddresses.iterator();
-            
+
             while (alternateAddressIterator.hasNext()) {
                 final String alternateAddress = alternateAddressIterator.next();
                 final CircuitBreaker circuitBreaker = getCircuitBreaker(alternateAddress);
-                
+
                 if (!circuitBreaker.allowRequest()) {
                     alternateAddressIterator.remove();
                 }
@@ -165,7 +165,7 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
         Endpoint failoverTarget = null;
         if (alternateAddresses != null && !alternateAddresses.isEmpty()) {
             final String alternateAddress = getStrategy().selectAlternateAddress(alternateAddresses);
-            
+
             // Reuse current endpoint
             if (alternateAddress != null) {
                 failoverTarget = getEndpoint();
@@ -173,10 +173,10 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
             }
         } else {
             final List<Endpoint> alternateEndpoints = invocation.getAlternateEndpoints();
-            
+
             if (alternateEndpoints != null) {
                 final Iterator<Endpoint> alternateEndpointIterator = alternateEndpoints.iterator();
-                
+
                 while (alternateEndpointIterator.hasNext()) {
                     final Endpoint endpoint = alternateEndpointIterator.next();
                     final CircuitBreaker circuitBreaker = getCircuitBreaker(endpoint);
@@ -185,51 +185,51 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
                     }
                 }
             }
-            
+
             failoverTarget = getStrategy().selectAlternateEndpoint(alternateEndpoints);
         }
-        
+
         return failoverTarget;
     }
-    
+
     @Override
     public void prepare(Message message) {
         super.prepare(message);
     }
-    
+
     @Override
     protected void onFailure(InvocationContext context, Exception ex) {
         super.onFailure(context, ex);
-        
+
         final Map<String, Object> requestContext =
             CastUtils.cast((Map<?, ?>)context.getContext().get(Client.REQUEST_CONTEXT));
-        
+
         if (requestContext != null) {
             final String address = (String)requestContext.get(Message.ENDPOINT_ADDRESS);
             getCircuitBreaker(address).markFailure(ex);
         }
     }
-    
+
     @Override
     protected void onSuccess(InvocationContext context) {
         super.onSuccess(context);
-        
+
         final Map<String, Object> requestContext =
             CastUtils.cast((Map<?, ?>)context.getContext().get(Client.REQUEST_CONTEXT));
-        
+
         if (requestContext != null) {
             final String address = (String)requestContext.get(Message.ENDPOINT_ADDRESS);
             getCircuitBreaker(address).markSuccess();
         }
     }
-    
+
     private CircuitBreaker getCircuitBreaker(final Endpoint endpoint) {
         return getCircuitBreaker(endpoint.getEndpointInfo().getAddress());
     }
-    
+
     private synchronized CircuitBreaker getCircuitBreaker(final String alternateAddress) {
         CircuitBreaker circuitBreaker = null;
-        
+
         if (!StringUtils.isEmpty(alternateAddress)) {
             for (Map.Entry<String, CircuitBreaker> entry: circuits.entrySet()) {
                 if (alternateAddress.startsWith(entry.getKey())) {
@@ -237,33 +237,33 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
                     break;
                 }
             }
-            
+
             if (circuitBreaker == null) {
                 circuitBreaker = new ZestCircuitBreaker(threshold, timeout);
                 circuits.put(alternateAddress, circuitBreaker);
             }
         }
-        
+
         if (circuitBreaker == null) {
             circuitBreaker = NOOP_CIRCUIT_BREAKER;
         }
-        
+
         return circuitBreaker;
     }
-    
+
     private boolean isEndpointChanged(final String address, final Endpoint target) {
         if (!StringUtils.isEmpty(address)) {
             return !address.startsWith(target.getEndpointInfo().getAddress());
-        } 
-        
+        }
+
         if (getEndpoint().equals(target)) {
             return false;
         }
-        
+
         return !getEndpoint().getEndpointInfo().getAddress().startsWith(
             target.getEndpointInfo().getAddress());
     }
-    
+
     private boolean isFailoverRequired(final String address) {
         if (!StringUtils.isEmpty(address)) {
             for (final Map.Entry<String, CircuitBreaker> entry: circuits.entrySet()) {
@@ -272,7 +272,7 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
                 }
             }
         }
-        
+
         LOG.log(Level.WARNING, "No circuit breaker present for address: " + address);
         return false;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java
index d51408b..25d7a0b 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java
@@ -22,15 +22,15 @@ package org.apache.cxf.clustering;
 
 public class FailoverFailedException extends RuntimeException {
     private static final long serialVersionUID = 6987181998625258047L;
-    
+
     public FailoverFailedException() {
         super();
     }
-    
+
     public FailoverFailedException(String message) {
         super(message);
     }
-    
+
     public FailoverFailedException(String message, Throwable cause) {
         super(message, cause);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
index a911445..8d95b0f 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
@@ -44,14 +44,14 @@ public class FailoverFeature extends AbstractFeature {
     private FailoverStrategy failoverStrategy;
     private FailoverTargetSelector targetSelector;
     private String clientBootstrapAddress;
-    
+
     public FailoverFeature() {
-        
+
     }
     public FailoverFeature(String clientBootstrapAddress) {
         this.clientBootstrapAddress = clientBootstrapAddress;
     }
-    
+
     @Override
     protected void initializeProvider(InterceptorProvider provider, Bus bus) {
         if (provider instanceof ConduitSelectorHolder) {
@@ -76,22 +76,22 @@ public class FailoverFeature extends AbstractFeature {
         }
         return selector;
     }
-    
+
     public FailoverTargetSelector getTargetSelector() {
         if (this.targetSelector == null) {
             this.targetSelector = new FailoverTargetSelector(clientBootstrapAddress);
         }
         return this.targetSelector;
     }
-    
+
     public void setTargetSelector(FailoverTargetSelector selector) {
         this.targetSelector = selector;
     }
-    
+
     public void setStrategy(FailoverStrategy strategy) {
         failoverStrategy = strategy;
     }
-    
+
     public FailoverStrategy getStrategy()  {
         return failoverStrategy;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java
index 1eecc74..78d2714 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java
@@ -31,15 +31,15 @@ import org.apache.cxf.message.Exchange;
 public interface FailoverStrategy {
     /**
      * Get the alternate endpoints for this invocation.
-     * 
-     * @param exchange the current Exchange     
+     *
+     * @param exchange the current Exchange
      * @return a failover endpoint if one is available
      */
     List<Endpoint> getAlternateEndpoints(Exchange exchange);
-    
+
     /**
      * Select one of the alternate endpoints for a retried invocation.
-     * 
+     *
      * @param alternates List of alternate endpoints if available
      * @return the selected endpoint
      */
@@ -48,15 +48,15 @@ public interface FailoverStrategy {
     /**
      * Get the alternate addresses for this invocation.
      * These addresses over-ride any addresses specified in the WSDL.
-     * 
-     * @param exchange the current Exchange     
+     *
+     * @param exchange the current Exchange
      * @return a failover endpoint if one is available
      */
     List<String> getAlternateAddresses(Exchange exchange);
 
     /**
      * Select one of the alternate addresses for a retried invocation.
-     * 
+     *
      * @param addresses List of alternate addresses if available
      * @return the selected address
      */


Mime
View raw message