Revert "Code cleanup - It's better (for perfs) to use a chain of append() calls than a unique append with several Strings concatenations"

This reverts commit c8e94a5b08.

Decreases too much the code readibility

maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java

@@ -199,14 +199,13 @@ public class AbstractArtifactResolutionException
         if ( message == null || !message.contains( "from the specified remote repositories:" ) )
         {
             sb.append( LS );
-            sb.append( "  " ).append( groupId ).append( ":" ).append( artifactId ).append( ":" ).append( type ).append(
+            sb.append( "  " + groupId + ":" + artifactId + ":" + type + ":" + version );
-                ":" ).append( version );
             sb.append( LS );
             if ( remoteRepositories != null )
             {
                 sb.append( LS );
                 sb.append( "from the specified remote repositories:" );
-                sb.append( LS ).append( "  " );
+                sb.append( LS + "  " );
 
                 if ( remoteRepositories.isEmpty() )
                 {

maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java

@@ -85,8 +85,7 @@ public class ModelValidationResult
 //
         for ( int i = 0; i < messages.size(); i++ )
         {
-            message.append( indentation ).append( "[" ).append( i ).append( "]  " ).append( messages.get( i ) ).append(
+            message.append( indentation + "[" + i + "]  " + messages.get( i ) + NEWLINE );
-                NEWLINE );
         }
 
         return message.toString();

maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java

@@ -129,12 +129,12 @@ implements Iterable<ArtifactMetadata>
     public String toString()
     {
         StringBuilder sb = new StringBuilder( 256 );
-        sb.append( "[scope=" ).append( scope.getScope() );
+        sb.append( "[scope=" + scope.getScope() );
         if ( classpath != null )
         {
             for ( ArtifactMetadata md : classpath )
             {
-                sb.append( ": " ).append( md.toString() ).append( '{' ).append( md.getArtifactUri() ).append( '}' );
+                sb.append( ": " + md.toString() + '{' + md.getArtifactUri() + '}' );
             }
         }
         sb.append( ']' );

maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java

@@ -485,13 +485,13 @@ public class MetadataGraph
         }
         for ( MetadataGraphVertex v : vertices )
         {
-            sb.append( "Vertex:  " ).append( v.getMd().toString() ).append( "\n" );
+            sb.append( "Vertex:  " + v.getMd().toString() + "\n" );
             List<MetadataGraphEdge> ins = getIncidentEdges( v );
             if ( ins != null )
             {
                 for ( MetadataGraphEdge e : ins )
                 {
-                    sb.append( "       from :  " ).append( e.toString() ).append( "\n" );
+                    sb.append( "       from :  " + e.toString() + "\n" );
                 }
             }
             else
@@ -504,7 +504,7 @@ public class MetadataGraph
             {
                 for ( MetadataGraphEdge e : outs )
                 {
-                    sb.append( "        to :  " ).append( e.toString() ).append( "\n" );
+                    sb.append( "        to :  " + e.toString() + "\n" );
                 }
             }
             else

maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java

@@ -192,17 +192,17 @@ public class MetadataGraphVertex
             return super.hashCode();
         }
         StringBuilder hashString = new StringBuilder( 128 );
-        hashString.append( md.groupId ).append( "|" );
+        hashString.append( md.groupId + "|" );
-        hashString.append( md.artifactId ).append( "|" );
+        hashString.append( md.artifactId + "|" );
 
         if ( compareVersion )
         {
-            hashString.append( md.version ).append( "|" );
+            hashString.append( md.version + "|" );
         }
 
         if ( compareScope )
         {
-            hashString.append( md.getArtifactScope() ).append( "|" );
+            hashString.append( md.getArtifactScope() + "|" );
         }
 
         return hashString.toString().hashCode();

maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java

@@ -144,8 +144,8 @@ public class PluginParameterException
             String alias = param.getAlias();
             if ( StringUtils.isNotEmpty( alias ) && !alias.equals( param.getName() ) )
             {
-                messageBuffer.append( "\n\n-OR-\n\n<configuration>\n  ...\n  <" ).append( alias ).append(
+                messageBuffer.append(
-                    ">VALUE</" ).append( alias ).append( ">\n</configuration>\n" );
+                    "\n\n-OR-\n\n<configuration>\n  ...\n  <" + alias + ">VALUE</" + alias + ">\n</configuration>\n" );
             }
         }
 

maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java

@@ -55,14 +55,13 @@ public final class CLIReportingUtils
         version.append( createMavenVersionString( properties ) ).append( LS );
         version.append( reduce( properties.getProperty( "distributionShortName" ) + " home: "
                             + System.getProperty( "maven.home", "<unknown maven home>" ) ) ).append( LS );
-        version.append( "Java version: " ).append(
+        version.append( "Java version: " + System.getProperty( "java.version", "<unknown java version>" )
-            System.getProperty( "java.version", "<unknown java version>" ) ).append( ", vendor: " ).append(
+                            + ", vendor: " + System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( LS );
-            System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( LS );
+        version.append( "Java home: " + System.getProperty( "java.home", "<unknown java home>" ) ).append( LS );
-        version.append( "Java home: " ).append( System.getProperty( "java.home", "<unknown java home>" ) ).append( LS );
+        version.append( "Default locale: " + Locale.getDefault() + ", platform encoding: "
-        version.append( "Default locale: " ).append( Locale.getDefault() ).append( ", platform encoding: " ).append(
+                            + System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( LS );
-            System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( LS );
+        version.append( "OS name: \"" + Os.OS_NAME + "\", version: \"" + Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH
-        version.append( "OS name: \"" ).append( Os.OS_NAME ).append( "\", version: \"" ).append( Os.OS_VERSION ).append(
+            + "\", family: \"" + Os.OS_FAMILY + "\"" );
-            "\", arch: \"" ).append( Os.OS_ARCH ).append( "\", family: \"" ).append( Os.OS_FAMILY ).append( "\"" );
         return version.toString();
     }
 

maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java

@@ -70,7 +70,7 @@ public class CLIManagerTest
         for ( Option option : new CLIManagerExtension().getOptions() )
         {
             a = !a;
-            sb.append( "<tr class='" ).append( a ? 'a' : 'b' ).append( "'><td><code>-<a name='" );
+            sb.append( "<tr class='" + ( a ? 'a' : 'b' ) + "'><td><code>-<a name='" );
             sb.append( option.getOpt() );
             sb.append( "'>" );
             sb.append( option.getOpt() );