Use StringBuilder instead of StringBuffer (#10154)

26 files changed, 39 insertions, 39 deletions

diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java
index 1c6b02268c..4cb5d70019 100644
--- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java
+++ b/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java
@@ -91,7 +91,7 @@ public class CompileTheme {
     private static void processSassTheme(String themeFolder, String themeName,
             String variant, String version) throws Exception {
 
-        StringBuffer cssHeader = new StringBuffer();
+        StringBuilder cssHeader = new StringBuilder();
 
         String stylesCssDir = themeFolder + File.separator + themeName
                 + File.separator;
diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java
index fec19a4d05..c82303e3e1 100644
--- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java
+++ b/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java
@@ -26,7 +26,7 @@ import java.util.Date;
 import java.util.jar.Manifest;
 
 public class ManifestWriter {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
 
     public ManifestWriter() {
     }
diff --git a/client/src/main/java/com/vaadin/client/ui/Action.java b/client/src/main/java/com/vaadin/client/ui/Action.java
index ed81eefb1c..d0a05ca6e7 100644
--- a/client/src/main/java/com/vaadin/client/ui/Action.java
+++ b/client/src/main/java/com/vaadin/client/ui/Action.java
@@ -40,7 +40,7 @@ public abstract class Action implements Command {
     public abstract void execute();
 
     public String getHTML() {
-        final StringBuffer sb = new StringBuffer();
+        final StringBuilder sb = new StringBuilder();
         sb.append("<div>");
         // Could store the icon in a field instead, but it doesn't really matter
         // right now because Actions are recreated every time they are needed
diff --git a/client/src/main/java/com/vaadin/client/ui/VComboBox.java b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
index f38d76e11d..37b94ef8d6 100644
--- a/client/src/main/java/com/vaadin/client/ui/VComboBox.java
+++ b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
@@ -136,7 +136,7 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
 
         @Override
         public String getDisplayString() {
-            final StringBuffer sb = new StringBuffer();
+            final StringBuilder sb = new StringBuilder();
             ApplicationConnection client = connector.getConnection();
             final Icon icon = client
                     .getIcon(client.translateVaadinUri(untranslatedIconUri));
diff --git a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
index 2a1ba37ac8..8f0026dc14 100644
--- a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
@@ -220,7 +220,7 @@ public class VMenuBar extends SimpleFocusablePanel
      */
     public String buildItemHTML(UIDL item) {
         // Construct html from the text and the optional icon
-        StringBuffer itemHTML = new StringBuffer();
+        StringBuilder itemHTML = new StringBuilder();
         if (item.hasAttribute("separator")) {
             itemHTML.append("<span>---</span>");
         } else {
diff --git a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java
index aa0ee3ab7b..69fe368768 100644
--- a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java
@@ -73,7 +73,7 @@ public class MenuBarConnector extends AbstractComponentConnector
         if (null != getState()
                 && !ComponentStateUtil.isUndefinedWidth(getState())) {
             UIDL moreItemUIDL = options.getChildUIDL(0);
-            StringBuffer itemHTML = new StringBuffer();
+            StringBuilder itemHTML = new StringBuilder();
 
             if (moreItemUIDL.hasAttribute("icon")) {
                 Icon icon = client
diff --git a/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java b/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java
index 5e4fdb4d7d..07a1660965 100644
--- a/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java
@@ -102,7 +102,7 @@ public class PopupViewConnector extends AbstractHasComponentsConnector
             getWidget().preparePopup(getWidget().popup);
             getWidget().popup.setPopupConnector(getChildComponents().get(0));
 
-            final StringBuffer styleBuf = new StringBuffer();
+            final StringBuilder styleBuf = new StringBuilder();
             final String primaryName = getWidget().popup.getStylePrimaryName();
             styleBuf.append(primaryName);
 
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index 81f6756930..2b623804cf 100755
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -4081,7 +4081,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         }
 
         private String createHTML(Column<?, T> column) {
-            final StringBuffer buf = new StringBuffer();
+            final StringBuilder buf = new StringBuilder();
             buf.append("<span class=\"");
             if (column.isHidden()) {
                 buf.append("v-off");
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java
index 9bfb6c1eeb..b825cec550 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java
@@ -136,7 +136,7 @@ public class VFilterSelect extends Composite
 
         @Override
         public String getDisplayString() {
-            final StringBuffer sb = new StringBuffer();
+            final StringBuilder sb = new StringBuilder();
             final Icon icon = client
                     .getIcon(client.translateVaadinUri(untranslatedIconUri));
             if (icon != null) {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java
index af7b78b271..ce97348589 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java
@@ -3987,7 +3987,7 @@ public class VScrollTable extends FlowPanel
 
             @Override
             public String getHTML() {
-                final StringBuffer buf = new StringBuffer();
+                final StringBuilder buf = new StringBuilder();
                 buf.append("<span class=\"");
                 if (collapsed) {
                     buf.append("v-off");
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
index 366257c0e2..3f5e798b7d 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
@@ -4048,7 +4048,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         }
 
         private String createHTML(Column<?, T> column) {
-            final StringBuffer buf = new StringBuffer();
+            final StringBuilder buf = new StringBuilder();
             buf.append("<span class=\"");
             if (column.isHidden()) {
                 buf.append("v-off");
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java
index b7e6a4f38e..3cb4103521 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java
@@ -125,7 +125,7 @@ public final class RowItem implements Item {
 
     @Override
     public String toString() {
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder();
         s.append("ID:");
         s.append(getId().toString());
         for (Object propId : getItemPropertyIds()) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java
index bc5cfc56a3..4575a51904 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java
@@ -465,7 +465,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
 
     private String modifyWhereClause(Object... keys) {
         // Build the where rules for the provided keys
-        StringBuffer where = new StringBuffer();
+        StringBuilder where = new StringBuilder();
         for (int ix = 0; ix < primaryKeyColumns.size(); ix++) {
             where.append(QueryBuilder.quote(primaryKeyColumns.get(ix)));
             if (keys[ix] == null) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
index 3f5c60d8e8..cb02c496b5 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
@@ -137,7 +137,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
             throw new IllegalArgumentException("Updated item must be given.");
         }
         StatementHelper sh = getStatementHelper();
-        StringBuffer query = new StringBuffer();
+        StringBuilder query = new StringBuilder();
         query.append("UPDATE ").append(tableName).append(" SET");
 
         /* Generate column<->value and rowidentifiers map */
@@ -191,7 +191,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
                     "Cannot generate an insert query for item already in database.");
         }
         StatementHelper sh = getStatementHelper();
-        StringBuffer query = new StringBuffer();
+        StringBuilder query = new StringBuilder();
         query.append("INSERT INTO ").append(tableName).append(" (");
 
         /* Generate column<->value map */
@@ -246,7 +246,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
                     "Valid keyColumnNames must be provided.");
         }
         StatementHelper sh = getStatementHelper();
-        StringBuffer query = new StringBuffer();
+        StringBuilder query = new StringBuilder();
         query.append("DELETE FROM ").append(tableName).append(" WHERE ");
         int count = 1;
         for (String keyColName : primaryKeyColumns) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
index 4b8c8ebd6f..273b4433c5 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
@@ -505,7 +505,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>,
      */
     private String stripTags(String xml) {
 
-        final StringBuffer res = new StringBuffer();
+        final StringBuilder res = new StringBuilder();
 
         int processed = 0;
         final int xmlLen = xml.length();
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTest.java
index 1842b41734..aae3ffd687 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTest.java
@@ -1705,7 +1705,7 @@ public class SQLContainerTest {
                                         .getQueryString();
                             }
                         } else {
-                            StringBuffer query = new StringBuffer(
+                            StringBuilder query = new StringBuilder(
                                     "SELECT * FROM people");
                             if (!orderBys.isEmpty()) {
                                 query.append(" ORDER BY ");
@@ -1823,7 +1823,7 @@ public class SQLContainerTest {
                                         .getQueryString();
                             }
                         } else {
-                            StringBuffer query = new StringBuffer(
+                            StringBuilder query = new StringBuilder(
                                     "SELECT * FROM people");
                             if (!orderBys.isEmpty()) {
                                 query.append(" ORDER BY ");
@@ -1911,7 +1911,7 @@ public class SQLContainerTest {
                     @Override
                     public StatementHelper answer() throws Throwable {
                         StatementHelper sh = new StatementHelper();
-                        StringBuffer query = new StringBuffer(
+                        StringBuilder query = new StringBuilder(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
                             query.append(QueryBuilder
@@ -1982,7 +1982,7 @@ public class SQLContainerTest {
                     @Override
                     public StatementHelper answer() throws Throwable {
                         StatementHelper sh = new StatementHelper();
-                        StringBuffer query = new StringBuffer(
+                        StringBuilder query = new StringBuilder(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
                             query.append(QueryBuilder
@@ -2052,7 +2052,7 @@ public class SQLContainerTest {
                     @Override
                     public StatementHelper answer() throws Throwable {
                         StatementHelper sh = new StatementHelper();
-                        StringBuffer query = new StringBuffer(
+                        StringBuilder query = new StringBuilder(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
                             query.append(QueryBuilder
@@ -2123,7 +2123,7 @@ public class SQLContainerTest {
                     @Override
                     public StatementHelper answer() throws Throwable {
                         StatementHelper sh = new StatementHelper();
-                        StringBuffer query = new StringBuffer(
+                        StringBuilder query = new StringBuilder(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
                             query.append(QueryBuilder
@@ -2200,7 +2200,7 @@ public class SQLContainerTest {
                     @Override
                     public StatementHelper answer() throws Throwable {
                         StatementHelper sh = new StatementHelper();
-                        StringBuffer query = new StringBuffer(
+                        StringBuilder query = new StringBuilder(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
                             query.append(QueryBuilder
@@ -2277,7 +2277,7 @@ public class SQLContainerTest {
                     @Override
                     public StatementHelper answer() throws Throwable {
                         StatementHelper sh = new StatementHelper();
-                        StringBuffer query = new StringBuffer(
+                        StringBuilder query = new StringBuilder(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
                             query.append(QueryBuilder
@@ -2408,7 +2408,7 @@ public class SQLContainerTest {
                                         .getQueryString();
                             }
                         } else {
-                            StringBuffer query = new StringBuffer(
+                            StringBuilder query = new StringBuilder(
                                     "SELECT * FROM people");
                             if (!orderBys.isEmpty()) {
                                 query.append(" ORDER BY ");
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/TicketTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/TicketTest.java
index f48524b338..a00961edb5 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/TicketTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/TicketTest.java
@@ -92,7 +92,7 @@ public class TicketTest {
                     @Override
                     public StatementHelper answer() throws Throwable {
                         StatementHelper sh = new StatementHelper();
-                        StringBuffer query = new StringBuffer(
+                        StringBuilder query = new StringBuilder(
                                 "SELECT COUNT(*) FROM people");
                         if (!filters.isEmpty()) {
                             query.append(QueryBuilder
diff --git a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java
index 04dc907799..fdcb578f01 100644
--- a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java
+++ b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java
@@ -124,7 +124,7 @@ public class ComponentSizeValidator implements Serializable {
     private static void printServerError(String msg,
             Deque<ComponentInfo> attributes, boolean widthError,
             PrintStream errorStream) {
-        StringBuffer err = new StringBuffer();
+        StringBuilder err = new StringBuilder();
         err.append("Vaadin DEBUG\n");
 
         StringBuilder indent = new StringBuilder();
@@ -369,7 +369,7 @@ public class ComponentSizeValidator implements Serializable {
     }
 
     private static void showComponent(Component component, String attribute,
-            StringBuffer err, StringBuilder indent, boolean widthError) {
+            StringBuilder err, StringBuilder indent, boolean widthError) {
 
         FileLocation createLoc = creationLocations.get(component);
 
diff --git a/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java b/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java
index 2cfc489c11..286e1475f2 100644
--- a/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java
@@ -79,7 +79,7 @@ public class ResourceWriter implements Serializable {
 
                 writer.write((resourceIndex++ > 0 ? ", " : "") + "\"" + resource
                         + "\" : ");
-                final StringBuffer layout = new StringBuffer();
+                final StringBuilder layout = new StringBuilder();
 
                 try (InputStreamReader r = new InputStreamReader(is,
                         StandardCharsets.UTF_8)) {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
index 0f4c0440ea..f5a8f1a72f 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
@@ -100,7 +100,7 @@ public class TestForContainerFilterable extends CustomComponent {
 
     private String randomWord() {
         int len = (int) (Math.random() * 4);
-        final StringBuffer buf = new StringBuffer();
+        final StringBuilder buf = new StringBuilder();
         while (len-- >= 0) {
             buf.append(parts[(int) (Math.random() * parts.length)]);
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
index 9da1e2250e..6894eec2e3 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
@@ -156,7 +156,7 @@ public class TestForStyledUpload extends LegacyApplication
     }
 
     public void readState() {
-        final StringBuffer sb = new StringBuffer();
+        final StringBuilder sb = new StringBuilder();
 
         if (up.isUploading()) {
             sb.append("Uploading...");
@@ -293,7 +293,7 @@ public class TestForStyledUpload extends LegacyApplication
 
     private void refreshMemUsage() {
         // memoryStatus.setValue("Not available in Java 1.4");
-        StringBuffer mem = new StringBuffer();
+        StringBuilder mem = new StringBuilder();
         MemoryMXBean mmBean = ManagementFactory.getMemoryMXBean();
         mem.append("Heap (M):");
         mem.append(mmBean.getHeapMemoryUsage().getUsed() / 1048576);
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
index 22ece0d45a..31dff4e350 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -273,7 +273,7 @@ public class TestForUpload extends CustomComponent
     }
 
     public void readState() {
-        final StringBuffer sb = new StringBuffer();
+        final StringBuilder sb = new StringBuilder();
 
         if (up.isUploading()) {
             sb.append("Uploading...");
@@ -442,7 +442,7 @@ public class TestForUpload extends CustomComponent
     private void refreshMemUsage() {
         memoryStatus.setValue("Not available in Java 1.4");
 
-        StringBuffer mem = new StringBuffer();
+        StringBuilder mem = new StringBuilder();
         MemoryMXBean mmBean = ManagementFactory.getMemoryMXBean();
         mem.append("Heap (M):");
         mem.append(mmBean.getHeapMemoryUsage().getUsed() / 1048576);
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
index 95602fb78b..31ecf12927 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
@@ -235,7 +235,7 @@ public class TestSizeableIncomponents extends LegacyApplication {
         }
 
         public String getTestableName() {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append(classToTest.getName().replaceAll("com.vaadin.ui.", ""));
             sb.append('[');
             for (Iterator<Configuration> i = configurations.iterator(); i
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
index af091b9036..e51facb6d9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
@@ -53,7 +53,7 @@ public class HiddenColumnsExpandRatios extends TestBase {
 
     private String genValue() {
         Random rnd = new Random();
-        StringBuffer str = new StringBuffer();
+        StringBuilder str = new StringBuilder();
         String[] strings = { "foo", "bar", "baz" };
         for (int i = 0; i < 5; i++) {
             str.append(strings[Math.abs(rnd.nextInt() % strings.length)])
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
index 8e6b17d81e..3426cb1b7e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
@@ -38,7 +38,7 @@ public class TabSheetIndexOperations extends TestBase {
                     @Override
                     public void buttonClick(ClickEvent event) {
                         Tab tab = tabs.getTab(2);
-                        tab.setCaption(new StringBuffer(tab.getCaption())
+                        tab.setCaption(new StringBuilder(tab.getCaption())
                                 .reverse().toString());
                     }
                 });
diff --git a/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java b/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java
index 2d11a94598..76c5ad8f55 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java
@@ -9,7 +9,7 @@ import java.io.Writer;
  */
 public class LogPrintWriter extends PrintWriter {
 
-    private final StringBuffer result = new StringBuffer(256);
+    private final StringBuilder result = new StringBuilder(256);
 
     public LogPrintWriter(Writer out) {
         super(out);