Merge some string literals

Author: garydgregory

src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java

@@ -623,7 +623,7 @@ private static Type getClosestParentType(final Class<?> cls, final Class<?> supe
                 } else if (midType instanceof Class<?>) {
                     midClass = (Class<?>) midType;
                 } else {
-                    throw new IllegalStateException("Unexpected generic" + " interface type found: " + midType);
+                    throw new IllegalStateException("Unexpected generic interface type found: " + midType);
                 }
                 // check if this interface is further up the inheritance chain
                 // than the previously found match

src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java

@@ -234,7 +234,7 @@ void testEscapeJava() throws IOException {
         assertEscapeJava("Should use capitalized Unicode hex", "\\uABCD", "\uabcd");
 
         assertEscapeJava("He didn't say, \\\"stop!\\\"", "He didn't say, \"stop!\"");
-        assertEscapeJava("non-breaking space", "This space is non-breaking:" + "\\u00A0", "This space is non-breaking:\u00a0");
+        assertEscapeJava("non-breaking space", "This space is non-breaking:\\u00A0", "This space is non-breaking:\u00a0");
         assertEscapeJava("\\uABCD\\u1234\\u012C", "\uABCD\u1234\u012C");
     }
 

src/test/java/org/apache/commons/lang3/StringUtilsAbbreviateTest.java

@@ -176,7 +176,7 @@ void testAbbreviateMiddle() {
         assertEquals("ab.f", StringUtils.abbreviateMiddle("abcdef", ".", 4));
         // JIRA issue (LANG-405) example (slightly different than actual expected result)
         assertEquals("A very long text with un...f the text is complete.", StringUtils.abbreviateMiddle(
-                "A very long text with unimportant stuff in the middle but interesting start and " + "end to see if the text is complete.", "...", 50));
+                "A very long text with unimportant stuff in the middle but interesting start and end to see if the text is complete.", "...", 50));
         // Test a much longer text :)
         final String longText = "Start text" + StringUtils.repeat("x", 10000) + "Close text";
         assertEquals("Start text->Close text", StringUtils.abbreviateMiddle(longText, "->", 22));

src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java

@@ -433,7 +433,7 @@ public String toString() {
         object.pid = "dummy-text";
         object.map = baseMap;
 
-        assertEquals("{\"object\":{\"pid\":\"dummy-text\",\"map\":{\"k1\":\"v1\"," + "\"k2\":{\"k2.1\":\"v2.1\",\"k2.2\":\"v2.2\"}}}}",
+        assertEquals("{\"object\":{\"pid\":\"dummy-text\",\"map\":{\"k1\":\"v1\",\"k2\":{\"k2.1\":\"v2.1\",\"k2.2\":\"v2.2\"}}}}",
                 new ToStringBuilder(base).append("object", object).toString());
     }
 

src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java

@@ -790,7 +790,7 @@ void testReflectionArrayAndObjectCycle() {
         final Object[] objects = new Object[1];
         final SimpleReflectionTestFixture simple = new SimpleReflectionTestFixture(objects);
         objects[0] = simple;
-        assertEquals(toBaseString(objects) + "[{" + toBaseString(simple) + "[o=" + toBaseString(objects) + "]" + "}]",
+        assertEquals(toBaseString(objects) + "[{" + toBaseString(simple) + "[o=" + toBaseString(objects) + "]}]",
                 ToStringBuilder.reflectionToString(objects));
         assertEquals(toBaseString(simple) + "[o={" + toBaseString(simple) + "}]", ToStringBuilder.reflectionToString(simple));
     }

src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java

@@ -182,9 +182,9 @@ void test6() {
 
         assertEquals(expected.length, tokens.length, ArrayUtils.toString(tokens));
 
-        assertEquals(nextCount, expected.length, "could not cycle through entire token list" + " using the 'hasNext' and 'next' methods");
+        assertEquals(nextCount, expected.length, "could not cycle through entire token list using the 'hasNext' and 'next' methods");
 
-        assertEquals(prevCount, expected.length, "could not cycle through entire token list" + " using the 'hasPrevious' and 'previous' methods");
+        assertEquals(prevCount, expected.length, "could not cycle through entire token list using the 'hasPrevious' and 'previous' methods");
 
     }
 

src/test/java/org/apache/commons/lang3/tuple/PairTest.java

@@ -320,7 +320,7 @@ void testToStringCustom() {
         final Calendar date = Calendar.getInstance();
         date.set(2011, Calendar.APRIL, 25);
         final Pair<String, Calendar> pair = Pair.of("DOB", date);
-        assertEquals("Test created on " + "04-25-2011", pair.toString("Test created on %2$tm-%2$td-%2$tY"));
+        assertEquals("Test created on 04-25-2011", pair.toString("Test created on %2$tm-%2$td-%2$tY"));
     }
 
 }

src/test/java/org/apache/commons/lang3/tuple/TripleTest.java

@@ -133,7 +133,7 @@ void testToStringCustom() {
         final Calendar date = Calendar.getInstance();
         date.set(2011, Calendar.APRIL, 25);
         final Triple<String, String, Calendar> triple = Triple.of("DOB", "string", date);
-        assertEquals("Test created on " + "04-25-2011", triple.toString("Test created on %3$tm-%3$td-%3$tY"));
+        assertEquals("Test created on 04-25-2011", triple.toString("Test created on %3$tm-%3$td-%3$tY"));
     }
 
     @Test