From 05d3c9cd3e867ba938c404ec8b5696c5f1c85b0b Mon Sep 17 00:00:00 2001
From: Koen De Groote <kdg.private@gmail.com>
Date: Sun, 17 Jun 2018 19:59:33 +0200
Subject: [PATCH] Minor string building improvements

---
 .../src/play-java-jdbc/src/main/java/play/db/Databases.java | 4 ++--
 framework/src/play-java/src/main/java/play/libs/Time.java   | 6 +++---
 framework/src/play/src/main/java/play/core/Paths.java       | 2 +-
 .../java/play/core/cookie/encoding/ClientCookieDecoder.java | 2 +-
 .../main/java/play/core/cookie/encoding/DefaultCookie.java  | 2 +-
 framework/src/play/src/main/java/play/mvc/Result.java       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/framework/src/play-java-jdbc/src/main/java/play/db/Databases.java b/framework/src/play-java-jdbc/src/main/java/play/db/Databases.java
index 9eab759c137..cb1e504a142 100644
--- a/framework/src/play-java-jdbc/src/main/java/play/db/Databases.java
+++ b/framework/src/play-java-jdbc/src/main/java/play/db/Databases.java
@@ -92,9 +92,9 @@ public static Database inMemory(String name, String url, Map<String, ? extends O
      * @return a configured in-memory h2 database
      */
     public static Database inMemory(String name, Map<String, String> urlOptions, Map<String, ? extends Object> config) {
-        String urlExtra = "";
+        StringBuilder urlExtra = new StringBuilder();
         for (Map.Entry<String, String> option : urlOptions.entrySet()) {
-            urlExtra += ";" + option.getKey() + "=" + option.getValue();
+            urlExtra.append(';').append(option.getKey()).append('=').append(option.getValue());
         }
         String url = "jdbc:h2:mem:" + name + urlExtra;
         return inMemory(name, url, config);
diff --git a/framework/src/play-java/src/main/java/play/libs/Time.java b/framework/src/play-java/src/main/java/play/libs/Time.java
index 0ca8a1d5d05..fdcc5faa737 100644
--- a/framework/src/play-java/src/main/java/play/libs/Time.java
+++ b/framework/src/play-java/src/main/java/play/libs/Time.java
@@ -1073,9 +1073,9 @@ protected TreeSet<Integer> getSet(int type) {
 
         protected ValueSet getValue(int v, String s, int i) {
             char c = s.charAt(i);
-            String s1 = String.valueOf(v);
+            StringBuilder s1 = new StringBuilder(String.valueOf(v));
             while (c >= '0' && c <= '9') {
-                s1 += c;
+                s1.append(c);
                 i++;
                 if (i >= s.length()) {
                     break;
@@ -1085,7 +1085,7 @@ protected ValueSet getValue(int v, String s, int i) {
             ValueSet val = new ValueSet();
 
             val.pos = (i < s.length()) ? i : i + 1;
-            val.value = Integer.parseInt(s1);
+            val.value = Integer.parseInt(s1.toString());
             return val;
         }
 
diff --git a/framework/src/play/src/main/java/play/core/Paths.java b/framework/src/play/src/main/java/play/core/Paths.java
index 41084a3b971..264629eedab 100644
--- a/framework/src/play/src/main/java/play/core/Paths.java
+++ b/framework/src/play/src/main/java/play/core/Paths.java
@@ -68,7 +68,7 @@ public static String canonical(String url) {
         String[] urlPath = toSegments(url);
         Stack<String> canonical = new Stack<>();
         for (String comp : urlPath) {
-            if (comp.equals("") || comp.equals(CURRENT_DIR))
+            if (comp.isEmpty() || comp.equals(CURRENT_DIR))
                 continue;
             if (!comp.equals(PARENT_DIR) || (!canonical.empty() && canonical.peek().equals(PARENT_DIR)))
                 canonical.push(comp);
diff --git a/framework/src/play/src/main/java/play/core/cookie/encoding/ClientCookieDecoder.java b/framework/src/play/src/main/java/play/core/cookie/encoding/ClientCookieDecoder.java
index fd86df07796..95ea11ea978 100644
--- a/framework/src/play/src/main/java/play/core/cookie/encoding/ClientCookieDecoder.java
+++ b/framework/src/play/src/main/java/play/core/cookie/encoding/ClientCookieDecoder.java
@@ -228,7 +228,7 @@ private void parse4(String header, int nameStart, String value) {
 
         private void parse6(String header, int nameStart, String value) {
             if (header.regionMatches(true, nameStart, CookieHeaderNames.DOMAIN, 0, 5)) {
-                domain = value.length() > 0 ? value.toString() : null;
+                domain = value.length() > 0 ? value : null;
             } else if (header.regionMatches(true, nameStart, CookieHeaderNames.SECURE, 0, 5)) {
                 secure = true;
             }
diff --git a/framework/src/play/src/main/java/play/core/cookie/encoding/DefaultCookie.java b/framework/src/play/src/main/java/play/core/cookie/encoding/DefaultCookie.java
index 8cd70aea226..34f3b8e85e5 100644
--- a/framework/src/play/src/main/java/play/core/cookie/encoding/DefaultCookie.java
+++ b/framework/src/play/src/main/java/play/core/cookie/encoding/DefaultCookie.java
@@ -244,7 +244,7 @@ public String toString() {
             buf.append(", HTTPOnly");
         }
         if (sameSite() != null) {
-            buf.append(", SameSite=" + sameSite);
+            buf.append(", SameSite=").append(sameSite);
         }
         return buf.toString();
     }
diff --git a/framework/src/play/src/main/java/play/mvc/Result.java b/framework/src/play/src/main/java/play/mvc/Result.java
index a9f63732f8d..03ade0fb282 100644
--- a/framework/src/play/src/main/java/play/mvc/Result.java
+++ b/framework/src/play/src/main/java/play/mvc/Result.java
@@ -191,7 +191,7 @@ public Map<String, String> headers() {
     public Optional<String> contentType() {
         return body.contentType().map(h -> {
             if (h.contains(";")) {
-                return h.substring(0, h.indexOf(";")).trim();
+                return h.substring(0, h.indexOf(';')).trim();
             } else {
                 return h.trim();
             }