More cleanup and StringBuilder improvements

Author: AB-xdev

core/src/main/java/software/xdev/mockserver/formatting/StringFormatter.java

@@ -39,18 +39,19 @@ public static StringBuilder[] indentAndToString(final Object... objects)
 		return indentAndToString(1, objects);
 	}
 
+	@SuppressWarnings("checkstyle:MagicNumber")
 	public static StringBuilder[] indentAndToString(final int indent, final Object... objects)
 	{
 		final StringBuilder[] indentedObjects = new StringBuilder[objects.length];
 		for(int i = 0; i < objects.length; i++)
 		{
-			indentedObjects[i] =
-				new StringBuilder(NEW_LINE)
-					.append(NEW_LINE)
-					.append(PATTERN_MULTI_LINE_START
-						.matcher(String.valueOf(objects[i]))
-						.replaceAll(INDENTS.get(indent)))
-					.append(NEW_LINE);
+			indentedObjects[i] = new StringBuilder(64) // Default value of 16 is definitely to small here
+				.append(NEW_LINE)
+				.append(NEW_LINE)
+				.append(PATTERN_MULTI_LINE_START
+					.matcher(String.valueOf(objects[i]))
+					.replaceAll(INDENTS.get(indent)))
+				.append(NEW_LINE);
 		}
 		return indentedObjects;
 	}

server/src/main/java/software/xdev/mockserver/matchers/HttpRequestPropertiesMatcher.java

@@ -212,46 +212,44 @@ private void withProtocol(final Protocol protocol)
 	@Override
 	public boolean matches(final MatchDifference context, final RequestDefinition requestDefinition)
 	{
-		if(requestDefinition instanceof final HttpRequest request)
+		if(!(requestDefinition instanceof final HttpRequest request))
 		{
-			final StringBuilder becauseBuilder = new StringBuilder();
-			final boolean overallMatch = this.matches(context, request, becauseBuilder);
-			if(!this.controlPlaneMatcher)
+			return requestDefinition == null;
+		}
+		
+		final StringBuilder becauseBuilder = new StringBuilder();
+		final boolean overallMatch = this.matches(context, request, becauseBuilder);
+		if(!this.controlPlaneMatcher)
+		{
+			if(overallMatch)
 			{
-				if(overallMatch)
+				if(LOG.isInfoEnabled())
 				{
-					if(LOG.isInfoEnabled())
-					{
-						LOG.info(
-							this.expectation == null ? REQUEST_DID_MATCH : EXPECTATION_DID_MATCH,
-							request,
-							this.expectation == null ? this : this.expectation.clone());
-					}
+					LOG.info(
+						this.expectation == null ? REQUEST_DID_MATCH : EXPECTATION_DID_MATCH,
+						request,
+						this.expectation == null ? this : this.expectation.clone());
 				}
-				else
+			}
+			else
+			{
+				becauseBuilder.replace(0, 1, "");
+				final String because = becauseBuilder.toString();
+				if(LOG.isInfoEnabled())
 				{
-					becauseBuilder.replace(0, 1, "");
-					final String because = becauseBuilder.toString();
-					if(LOG.isInfoEnabled())
-					{
-						LOG.info(
-							this.expectation == null
-								? this.didNotMatchRequestBecause
-								: !becauseBuilder.isEmpty()
-								? this.didNotMatchExpectationBecause
-								: this.didNotMatchExpectationWithoutBecause,
-							request,
-							this.expectation == null ? this : this.expectation.clone(),
-							because);
-					}
+					LOG.info(
+						this.expectation == null
+							? this.didNotMatchRequestBecause
+							: !becauseBuilder.isEmpty()
+							? this.didNotMatchExpectationBecause
+							: this.didNotMatchExpectationWithoutBecause,
+						request,
+						this.expectation == null ? this : this.expectation.clone(),
+						because);
 				}
 			}
-			return overallMatch;
-		}
-		else
-		{
-			return requestDefinition == null;
 		}
+		return overallMatch;
 	}
 
 	@SuppressWarnings({