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 2015/02/19 14:39:52 UTC

cxf git commit: Removing StringBuffer, mainly from test code

Repository: cxf
Updated Branches:
  refs/heads/master 0b81bdec5 -> 857b55796


Removing StringBuffer, mainly from test code


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/857b5579
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/857b5579
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/857b5579

Branch: refs/heads/master
Commit: 857b55796dc7fc2b302e26d99f84df1712ff9c58
Parents: 0b81bde
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 19 13:39:27 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 19 13:39:27 2015 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/attachment/AttachmentDeserializer.java | 4 ++--
 core/src/main/java/org/apache/cxf/bus/ManagedBus.java          | 2 +-
 .../src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java | 2 +-
 .../java/org/apache/cxf/staxutils/transform/ParsingEvent.java  | 2 +-
 .../org/apache/cxf/attachment/AttachmentDeserializerTest.java  | 2 +-
 core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java | 4 ++--
 .../src/main/java/demo/jaxrs/client/WebSocketTestClient.java   | 2 +-
 .../client/controllers/GetProtectedResourceController.java     | 6 +++---
 .../demo/oauth/server/spring/AuthenticationFailureHandler.java | 2 +-
 .../oauth/server/spring/AuthenticationSuccessfullHandler.java  | 2 +-
 .../java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java  | 4 ++--
 .../src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java | 6 +++---
 .../cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java     | 4 ++--
 .../java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java    | 2 +-
 .../java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java    | 4 ++--
 .../org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java | 2 +-
 .../cxf/rs/security/cors/CrossOriginResourceSharingFilter.java | 2 +-
 .../cxf/rs/security/oauth/provider/MD5SequenceGenerator.java   | 2 +-
 .../java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java  | 2 +-
 .../org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java     | 2 +-
 .../org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java   | 2 +-
 .../org/apache/cxf/sts/token/realm/RelationshipResolver.java   | 2 +-
 .../cxf/xkms/x509/repo/file/FileCertificateRepoTest.java       | 2 +-
 .../apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java   | 2 +-
 .../org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java   | 2 +-
 .../cxf/systest/jaxrs/websocket/WebSocketTestClient.java       | 2 +-
 .../cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java   | 6 +++---
 .../org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java   | 2 +-
 .../apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java   | 6 +++---
 .../cxf/systest/jaxrs/security/oauth/OAuthTestUtils.java       | 2 +-
 .../org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java | 2 +-
 .../test/java/org/apache/cxf/systest/callback/ServerImpl.java  | 4 ++--
 .../org/apache/cxf/systest/nested_callback/ServerImpl.java     | 4 ++--
 .../cxf/systest/resolver/JarServiceContractResolver.java       | 2 +-
 .../apache/cxf/systest/type_test/AbstractTypeTestClient.java   | 4 ++--
 .../test/java/org/apache/cxf/systest/ws/util/MessageFlow.java  | 2 +-
 .../test/java/org/apache/cxf/systest/ws/util/MessageFlow.java  | 2 +-
 .../java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java     | 2 +-
 .../java/org/apache/cxf/testutil/common/ServerLauncher.java    | 2 +-
 .../src/main/java/org/apache/cxf/testutil/common/TestUtil.java | 2 +-
 .../test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java    | 2 +-
 .../test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java    | 4 ++--
 .../cxf/tools/fortest/cxf523/Operation0ResponseType.java       | 2 +-
 .../test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java   | 2 +-
 .../cxf/tools/misc/processor/XSDToWSDLProcessorTest.java       | 4 ++--
 45 files changed, 63 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 35bdc5b..38e01ce 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -320,7 +320,7 @@ public class AttachmentDeserializer {
 
     private Map<String, List<String>> loadPartHeaders(InputStream in) throws IOException {
         List<String> headerLines = new ArrayList<String>(10);
-        StringBuffer buffer = new StringBuffer(128);
+        StringBuilder buffer = new StringBuilder(128);
         String line;
         // loop until we hit the end or a null line
         while ((line = readLine(in)) != null) {
@@ -384,7 +384,7 @@ public class AttachmentDeserializer {
     }
 
     private String readLine(InputStream in) throws IOException {
-        StringBuffer buffer = new StringBuffer(128);
+        StringBuilder buffer = new StringBuilder(128);
 
         int c;
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/ManagedBus.java b/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
index 4371fb1..b249e4e 100644
--- a/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
@@ -54,7 +54,7 @@ public class ManagedBus implements ManagedComponent {
         // Added the instance id to make the ObjectName unique
         String instanceId = (String)bus.getProperties().get(INSTANCE_ID);
         if (StringUtils.isEmpty(instanceId)) {
-            instanceId = new StringBuffer().append(bus.hashCode()).toString();
+            instanceId = new StringBuilder().append(bus.hashCode()).toString();
         }
         buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(instanceId);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java b/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
index c548adf..165f3b7 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
@@ -112,7 +112,7 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
         buffer.append(ManagementConstants.PORT_NAME_PROP).append('=').append(endpointName).append(',');
         String instanceId = (String)endpoint.get(INSTANCE_ID);
         if (StringUtils.isEmpty(instanceId)) {
-            instanceId = new StringBuffer().append(endpoint.hashCode()).toString();
+            instanceId = new StringBuilder().append(endpoint.hashCode()).toString();
         }
         // Added the instance id to make the ObjectName unique
         buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(instanceId);

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java b/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
index a273d0f..baede8a 100755
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
@@ -36,7 +36,7 @@ class ParsingEvent {
     }
         
     public String toString() {
-        return new StringBuffer().append("Event(").
+        return new StringBuilder().append("Event(").
             append(event).append(", ").append(name).append(", ").append(value).append(")").
             toString();
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index 3abcb7e..3559602 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -359,7 +359,7 @@ public class AttachmentDeserializerTest extends Assert {
     
     @Test
     public void testCXF2542() throws Exception {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("------=_Part_0_2180223.1203118300920\n");
         buf.append("Content-Type: application/xop+xml; charset=UTF-8; type=\"text/xml\"\n");
         buf.append("Content-Transfer-Encoding: 8bit\n");

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 56e35c1..c62ad71 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -292,7 +292,7 @@ public abstract class CachedStreamTestBase extends Assert {
     }
  
     protected static String readFromReader(Reader is) throws IOException {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         try {
             char[] b = new char[100];
             for (;;) {
@@ -309,7 +309,7 @@ public abstract class CachedStreamTestBase extends Assert {
     }
     
     protected static String readPartiallyFromReader(Reader is, int len) throws IOException {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         char[] b = new char[len];
         int rn = 0;
         for (;;) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
index ba5a7e8..b22dd0b 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
@@ -264,7 +264,7 @@ class WebSocketTestClient {
         }
 
         public String toString() {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("Status: ").append(statusCode).append("\r\n");
             sb.append("Type: ").append(contentType).append("\r\n");
             sb.append("Entity: ").append(gettext(entity)).append("\r\n");

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
index 119f1d1..1e275fb 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
@@ -88,7 +88,7 @@ public class GetProtectedResourceController {
 
         msg = client.access(msg, ParameterStyle.QUERY_STRING);
 
-        StringBuffer bodyBuffer = readBody(msg);
+        StringBuilder bodyBuffer = readBody(msg);
 
         oAuthParams.setResourceResponse(bodyBuffer.toString());
         String authHeader = msg.getHeader("WWW-Authenticate");
@@ -109,8 +109,8 @@ public class GetProtectedResourceController {
         return new ModelAndView("accessToken");
     }
 
-    private StringBuffer readBody(OAuthMessage msg) throws IOException {
-        StringBuffer body = new StringBuffer();
+    private StringBuilder readBody(OAuthMessage msg) throws IOException {
+        StringBuilder body = new StringBuilder();
         InputStream responseBody = null;
         BufferedReader br = null;
         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationFailureHandler.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationFailureHandler.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationFailureHandler.java
index 9b0e217..656424a 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationFailureHandler.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationFailureHandler.java
@@ -41,7 +41,7 @@ public class AuthenticationFailureHandler extends SimpleUrlAuthenticationFailure
         String oauthToken = request.getParameter(OAuth.OAUTH_TOKEN);
         String xScope = request.getParameter(OAuthConstants.X_OAUTH_SCOPE);
 
-        StringBuffer url = new StringBuffer(authorizeUrl).append("?").append(OAuth.OAUTH_TOKEN).append("=")
+        StringBuilder url = new StringBuilder(authorizeUrl).append("?").append(OAuth.OAUTH_TOKEN).append("=")
             .append(oauthToken);
 
         if (!StringUtils.isEmpty(xScope)) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationSuccessfullHandler.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationSuccessfullHandler.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationSuccessfullHandler.java
index 8ea1cfc..0b1e31e 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationSuccessfullHandler.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/spring/AuthenticationSuccessfullHandler.java
@@ -52,7 +52,7 @@ public class AuthenticationSuccessfullHandler extends SavedRequestAwareAuthentic
             return super.determineTargetUrl(request, response);
         }
 
-        StringBuffer url = new StringBuffer(confirmationUrl).append("?").append(OAuth.OAUTH_TOKEN).append("=")
+        StringBuilder url = new StringBuilder(confirmationUrl).append("?").append(OAuth.OAUTH_TOKEN).append("=")
                 .append(oauthToken).append("&").append(OAuthConstants.AUTHENTICITY_TOKEN)
                 .append("=")
                 .append(authToken);

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index addd797..f2e9535 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -659,7 +659,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
         String cmdLine = CommandLineUtils.toString(cmd.getCommandline());
 
         if (exitCode != 0) {
-            StringBuffer msg = new StringBuffer("\nExit code: ");
+            StringBuilder msg = new StringBuilder("\nExit code: ");
             msg.append(exitCode);
             msg.append('\n');
             msg.append("Command line was: ").append(cmdLine).append('\n').append('\n');
@@ -669,7 +669,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
 
         file.delete();
         if (b.toString().contains("WSDL2Java Error")) {
-            StringBuffer msg = new StringBuffer();
+            StringBuilder msg = new StringBuilder();
             msg.append(b.toString());
             msg.append('\n');
             msg.append("Command line was: ").append(cmdLine).append('\n').append('\n');

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index 6582f88..06c2433 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
@@ -364,7 +364,7 @@ public class Java2WSMojo extends AbstractMojo {
             } catch (OutOfMemoryError e) {
                 getLog().debug(e);
 
-                StringBuffer msg = new StringBuffer();
+                StringBuilder msg = new StringBuilder();
                 msg.append(e.getMessage()).append('\n');
                 msg.append("Try to run this goal using the <fork>true</fork> and "
                         + "<additionalJvmArgs>-Xms128m -Xmx128m</additionalJvmArgs> parameters.");
@@ -408,7 +408,7 @@ public class Java2WSMojo extends AbstractMojo {
                     getLog().info(output);
                 }
 
-                StringBuffer msg = new StringBuffer("\nExit code: ");
+                StringBuilder msg = new StringBuilder("\nExit code: ");
                 msg.append(exitCode);
                 if (StringUtils.isNotEmpty(err.getOutput())) {
                     msg.append(" - ").append(err.getOutput());
@@ -420,7 +420,7 @@ public class Java2WSMojo extends AbstractMojo {
             }
 
             if (StringUtils.isNotEmpty(err.getOutput()) && err.getOutput().contains("JavaToWS Error")) {
-                StringBuffer msg = new StringBuffer();
+                StringBuilder msg = new StringBuilder();
                 msg.append(err.getOutput());
                 msg.append('\n');
                 msg.append("Command line was: ").append(cmdLine).append('\n').append('\n');

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
index 7e32372..22dd57a 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
@@ -506,7 +506,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
                 getLog().info(output);
             }
 
-            StringBuffer msg = new StringBuffer("\nExit code: ");
+            StringBuilder msg = new StringBuilder("\nExit code: ");
             msg.append(exitCode);
             if (StringUtils.isNotEmpty(err.getOutput())) {
                 msg.append(" - ").append(err.getOutput());
@@ -521,7 +521,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
             file.delete();
         }
         if (StringUtils.isNotEmpty(err.getOutput()) && err.getOutput().contains("WADL2Java Error")) {
-            StringBuffer msg = new StringBuffer();
+            StringBuilder msg = new StringBuilder();
             msg.append(err.getOutput());
             msg.append('\n');
             msg.append("Command line was: ").append(cmdLine).append('\n').append('\n');

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 2cc3710..cca96df 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -257,7 +257,7 @@ public class CXFOSGiTestSupport {
      */
     private static String explode(Dictionary<String, String> dictionary) {
         Enumeration<String> keys = dictionary.keys();
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         while (keys.hasMoreElements()) {
             Object key = keys.nextElement();
             result.append(String.format("%s=%s", key, dictionary.get(key)));

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
index 5ba0745..67aa8c8 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
@@ -39,7 +39,7 @@ public class ArrayServiceImpl implements ArrayService {
     }
 
     public String arrayInput(@WebParam(name = "input")String[] inputs) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (String s : inputs) {
             buf.append(s);
         }
@@ -47,7 +47,7 @@ public class ArrayServiceImpl implements ArrayService {
     }
 
     public String listInput(@WebParam(name = "input")List<String> inputs) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (String s : inputs) {
             buf.append(s);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java
index dfa824e..b275c6c 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java
@@ -479,7 +479,7 @@ public class StructureImpl extends DataObjectBase implements Structure {
             return super.toString();
         }
 
-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
         result.append(" (text: ");
         if (text_set_) {
             result.append(text);

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
index f976a50..169e336 100644
--- a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
+++ b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
@@ -512,7 +512,7 @@ public class CrossOriginResourceSharingFilter implements ContainerRequestFilter,
     }
 
     private String concatValues(List<String> values, boolean spaceSeparated) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int x = 0; x < values.size(); x++) {
             sb.append(values.get(x));
             if (x != values.size() - 1) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java
index 901e7df..0896988 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/MD5SequenceGenerator.java
@@ -39,7 +39,7 @@ public class MD5SequenceGenerator {
             algorithm.reset();
             algorithm.update(input);
             byte[] messageDigest = algorithm.digest();
-            StringBuffer hexString = new StringBuffer();
+            StringBuilder hexString = new StringBuilder();
             for (int i = 0; i < messageDigest.length; i++) {
                 hexString.append(Integer.toHexString(0xFF & messageDigest[i]));
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
index c298db2..1ad6779 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
@@ -1330,7 +1330,7 @@ public class RMTxStore implements RMStore {
     }
      
     private static String buildCreateTableStatement(String name, String[][] cols, String[] keys) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("CREATE TABLE ").append(name).append(" (");
         for (String[] col : cols) {
             buf.append(col[0]).append(" ").append(col[1]).append(", ");

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java
index ee8b61b..a30bc16 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java
@@ -36,7 +36,7 @@ public class LoggerPatternLayoutLog4J extends PatternLayout {
             return this.header + System.getProperty("line.separator");
         }
         MapEventLogger ll = new MapEventLogger();
-        StringBuffer line = new StringBuffer();
+        StringBuilder line = new StringBuilder();
         for (String item : ll.getFieldOrder()) {
             line.append(item).append(";");
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
index 2efe09b..4acbc82 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
@@ -33,7 +33,7 @@ public class LoggerPatternLayoutLogback extends PatternLayout {
             return this.header + System.getProperty("line.separator");
         }
         MapEventLogger ll = new MapEventLogger();
-        StringBuffer line = new StringBuffer();
+        StringBuilder line = new StringBuilder();
         for (String item : ll.getFieldOrder()) {
             line.append(item).append(";");
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RelationshipResolver.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RelationshipResolver.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RelationshipResolver.java
index 1c0e540..6538459 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RelationshipResolver.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/RelationshipResolver.java
@@ -43,7 +43,7 @@ public class RelationshipResolver {
     
     
     private String generateKey(String sourceRealm, String targetRealm) {
-        return new StringBuffer().append(sourceRealm).append(">").append(targetRealm).toString();
+        return new StringBuilder().append(sourceRealm).append(">").append(targetRealm).toString();
         
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java
index cc9a7d8..8fa3f56 100644
--- a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java
+++ b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java
@@ -72,7 +72,7 @@ public class FileCertificateRepoTest {
     }
 
     private String read(InputStream is) throws java.io.IOException {
-        StringBuffer fileData = new StringBuffer(1000);
+        StringBuilder fileData = new StringBuilder(1000);
         BufferedReader reader = new BufferedReader(new InputStreamReader(is));
         char[] buf = new char[1024];
         int numRead = 0;

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
index ef3dc25..830e5f2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
@@ -92,7 +92,7 @@ public class CrossOriginSimpleTest extends AbstractBusClientServerTestBase {
         HttpClient httpclient = HttpClientBuilder.create().build();
         HttpGet httpget = new HttpGet("http://localhost:" + PORT + "/untest/simpleGet/HelloThere");
         if (requestOrigins != null) {
-            StringBuffer ob = new StringBuffer();
+            StringBuilder ob = new StringBuilder();
             for (String requestOrigin : requestOrigins) {
                 ob.append(requestOrigin);
                 ob.append(" "); // extra trailing space won't hurt.

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
index 9feffde..23454df 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
@@ -480,7 +480,7 @@ public class StructureImpl extends DataObjectBase implements Structure {
             return super.toString();
         }
 
-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
         result.append(" (text: ");
         if (text_set_) {
             result.append(text);

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
index 54ec042..1124199 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
@@ -281,7 +281,7 @@ class WebSocketTestClient {
         }
 
         public String toString() {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("Status: ").append(statusCode).append("\r\n");
             sb.append("Type: ").append(contentType).append("\r\n");
             sb.append("Entity: ").append(gettext(entity)).append("\r\n");

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
index 19a05b4..7d195e2 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
@@ -75,7 +75,7 @@ public class DocLitWrappedCodeFirstServiceImpl implements DocLitWrappedCodeFirst
         if (context == null) {
             throw new RuntimeException("No CONTEXT!!!");
         }
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (String s : inputs) {
             buf.append(s);
         }
@@ -94,7 +94,7 @@ public class DocLitWrappedCodeFirstServiceImpl implements DocLitWrappedCodeFirst
         if (context == null) {
             throw new RuntimeException("No CONTEXT!!!");
         }
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (inputs != null) {
             for (String s : inputs) {
                 buf.append(s);
@@ -107,7 +107,7 @@ public class DocLitWrappedCodeFirstServiceImpl implements DocLitWrappedCodeFirst
         if (context == null) {
             throw new RuntimeException("No CONTEXT!!!");
         }
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (String s : inputs1) {
             buf.append(s);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
index 3c3b1de..84e6e40 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
@@ -54,7 +54,7 @@ public class JaxWsDynamicClientTest extends AbstractBusClientServerTestBase {
         algorithm.update(bytes);
         byte messageDigest[] = algorithm.digest();
 
-        StringBuffer hexString = new StringBuffer();
+        StringBuilder hexString = new StringBuilder();
         for (int i = 0; i < messageDigest.length; i++) {
             hexString.append(Integer.toHexString(0xFF & messageDigest[i]));
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
index 085ccaf..bbc4951 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
@@ -45,7 +45,7 @@ public class RpcLitCodeFirstServiceImpl implements RpcLitCodeFirstService {
     }
 
     public String arrayInput(String[] inputs) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (String s : inputs) {
             buf.append(s);
         }
@@ -53,7 +53,7 @@ public class RpcLitCodeFirstServiceImpl implements RpcLitCodeFirstService {
     }
 
     public String listInput(List<String> inputs) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (inputs != null) {
             for (String s : inputs) {
                 buf.append(s);
@@ -63,7 +63,7 @@ public class RpcLitCodeFirstServiceImpl implements RpcLitCodeFirstService {
     }
     
     public String multiListInput(List<String> inputs1, List<String> inputs2, String x, int y) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (String s : inputs1) {
             buf.append(s);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/OAuthTestUtils.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/OAuthTestUtils.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/OAuthTestUtils.java
index d8360b2..68ffac0 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/OAuthTestUtils.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/OAuthTestUtils.java
@@ -65,7 +65,7 @@ public final class OAuthTestUtils {
     }
 
     public static String readBody(OAuthMessage msg) throws IOException {
-        StringBuffer body = new StringBuffer();
+        StringBuilder body = new StringBuilder();
         InputStream responseBody = null;
         BufferedReader br = null;
         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
index 2ef713e..2f68449 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
@@ -476,7 +476,7 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
         }
         
         private String getTrustNames() {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             for (int i = 0; i < trustName.length; i++) {
                 sb.append("\"OU=");
                 sb.append(trustName[i]);

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
index ac48059..2e816b5 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
@@ -68,7 +68,7 @@ public class ServerImpl implements ServerPortType  {
             
             QName portName = new QName(serviceName.getNamespaceURI(), portString);
             
-            StringBuffer seiName = new StringBuffer();
+            StringBuilder seiName = new StringBuilder();
             seiName.append(JAXBUtils.namespaceURIToPackage(interfaceName.getNamespaceURI()));
             seiName.append(".");
             seiName.append(JAXBUtils.nameToIdentifier(interfaceName.getLocalPart(),
@@ -98,4 +98,4 @@ public class ServerImpl implements ServerPortType  {
 
     
         
-}    
\ No newline at end of file
+}    

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
index 42f20ba..e2731ab 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
@@ -71,7 +71,7 @@ public class ServerImpl implements ServerPortType  {
             
             QName portName = new QName(serviceName.getNamespaceURI(), portString);
             
-            StringBuffer seiName = new StringBuffer();
+            StringBuilder seiName = new StringBuilder();
             seiName.append(JAXBUtils.namespaceURIToPackage(interfaceName.getNamespaceURI()));
             seiName.append(".");
             seiName.append(JAXBUtils.nameToIdentifier(interfaceName.getLocalPart(),
@@ -104,4 +104,4 @@ public class ServerImpl implements ServerPortType  {
 
     
         
-}    
\ No newline at end of file
+}    

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java
index 9b4f822..5096261 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarServiceContractResolver.java
@@ -46,7 +46,7 @@ public class JarServiceContractResolver implements ServiceContractResolver {
         String[] hostStrings = ns.getHost().split("\\.");
         String[] pathStrings = ns.getPath().split("\\/");
         String local = qname.getLocalPart();
-        StringBuffer path = new StringBuffer();
+        StringBuilder path = new StringBuilder();
         for (int i = hostStrings.length - 1; i >= 0; i--) {
             path.append(hostStrings[i]).append("/");
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
index 4b213fc..be285e4 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
@@ -539,8 +539,8 @@ public abstract class AbstractTypeTestClient
             return;
         }
         int bufferSize = 1000;
-        StringBuffer buffer = new StringBuffer(bufferSize);
-        StringBuffer buffer2 = new StringBuffer(bufferSize);
+        StringBuilder buffer = new StringBuilder(bufferSize);
+        StringBuilder buffer2 = new StringBuilder(bufferSize);
         for (int x = 0; x < bufferSize; x++) {
             buffer.append((char)('a' + (x % 26)));
             buffer2.append((char)('A' + (x % 26)));

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index 75d5c32..7d17d7b 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -523,7 +523,7 @@ public class MessageFlow extends Assert {
     }
     
     private String dump(List<byte[]> streams) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         try {
             buf.append(System.getProperty("line.separator"));
             for (int i = 0; i < streams.size(); i++) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
index 75d5c32..7d17d7b 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java
@@ -523,7 +523,7 @@ public class MessageFlow extends Assert {
     }
     
     private String dump(List<byte[]> streams) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         try {
             buf.append(System.getProperty("line.separator"));
             for (int i = 0; i < streams.size(); i++) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java b/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
index 4f68172..011cc8b 100644
--- a/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
@@ -42,7 +42,7 @@ public class NoBodyPartsImpl implements NoBodyPartsSEI {
         algorithm.update(bytes);
         byte messageDigest[] = algorithm.digest();
 
-        StringBuffer hexString = new StringBuffer();
+        StringBuilder hexString = new StringBuilder();
         for (int i = 0; i < messageDigest.length; i++) {
             hexString.append(Integer.toHexString(0xFF & messageDigest[i]));
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
index 8e39c80..6c85c15 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
@@ -405,7 +405,7 @@ public class ServerLauncher {
         cmd.add("-classpath");
         
         ClassLoader loader = this.getClass().getClassLoader();
-        StringBuffer classpath = new StringBuffer(System.getProperty("java.class.path"));
+        StringBuilder classpath = new StringBuilder(System.getProperty("java.class.path"));
         if (classpath.indexOf("/.compatibility/") != -1) {
             classpath.append(":");
             //on OSX, the compatibility lib brclasspath.indexOf("/.compatibility/")

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java b/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
index 472ef07..98b39cf 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
@@ -92,7 +92,7 @@ public final class TestUtil {
     }
     
     public static String getClassPath(ClassLoader loader) throws URISyntaxException {
-        StringBuffer classPath = new StringBuffer();
+        StringBuilder classPath = new StringBuilder();
         if (loader instanceof URLClassLoader) {
             URLClassLoader urlLoader = (URLClassLoader)loader;
             for (URL url : urlLoader.getURLs()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
index 9f1c34f..9dd6dbb 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
@@ -135,7 +135,7 @@ public class IDLToWSDLTest extends ToolTestBase {
         String[] cmdArgs = {};
         int exc = execute(cmdArgs);
         assertEquals("IDLToWSDL Failed", error, exc);
-        StringBuffer strBuf = new StringBuffer();
+        StringBuilder strBuf = new StringBuilder();
         strBuf.append("Missing argument: idl\n\n");
         strBuf.append(usageBuf.toString());
         checkStrings(strBuf.toString().getBytes(), bout.toByteArray());

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
index 3c04c95..6316fcb 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
@@ -238,7 +238,7 @@ public class WSDLToIDLTest extends ToolTestBase {
         String[] cmdArgs = {};
         int exc = execute(cmdArgs);
         assertEquals("WSDLToIDL Failed", error, exc);
-        StringBuffer strBuf = new StringBuffer();
+        StringBuilder strBuf = new StringBuilder();
         strBuf.append("Missing argument: wsdlurl\n\n");
         strBuf.append(usageBuf.toString());
         checkStrings(strBuf.toString().getBytes(), bout.toByteArray());
@@ -248,7 +248,7 @@ public class WSDLToIDLTest extends ToolTestBase {
         String[] cmdArgs = {"-i", " interfaceName"};
         int exc = execute(cmdArgs);
         assertEquals("WSDLToIDL Failed", error, exc);
-        StringBuffer expected = new StringBuffer();
+        StringBuilder expected = new StringBuilder();
         expected.append("Missing argument: wsdlurl\n\n");
         expected.append(usageBuf.toString());
         checkStrings(expected.toString().getBytes(), bout.toByteArray());

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java
index 9433b60..5c646b3 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java
@@ -91,7 +91,7 @@ public class Operation0ResponseType {
     }
 
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         if (name != null) {
             buffer.append("name : " + name + "\n");
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
index ba12120..74e1d84 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
@@ -397,7 +397,7 @@ public class JavaToWSTest extends ToolTestBase {
 
     protected String getClassPath() throws URISyntaxException {
         ClassLoader loader = getClass().getClassLoader();
-        StringBuffer classPath = new StringBuffer();
+        StringBuilder classPath = new StringBuilder();
         if (loader instanceof URLClassLoader) {
             for (URL url : ((URLClassLoader)loader).getURLs()) {
                 File file;

http://git-wip-us.apache.org/repos/asf/cxf/blob/857b5579/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java b/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
index 482ccb7..491b966 100644
--- a/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
+++ b/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
@@ -43,7 +43,7 @@ public class XSDToWSDLProcessorTest
         FileReader fileReader = new FileReader(outputFile);
         char[] chars = new char[100];
         int size = 0;
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         while (size < outputFile.length()) {
             int readLen = fileReader.read(chars);
             sb.append(chars, 0, readLen);
@@ -73,7 +73,7 @@ public class XSDToWSDLProcessorTest
         FileReader fileReader = new FileReader(outputFile);
         char[] chars = new char[100];
         int size = 0;
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         while (size < outputFile.length()) {
             int readLen = fileReader.read(chars);
             sb.append(chars, 0, readLen);