Fix merge issues

Author: jgallimore

spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java

@@ -76,7 +76,7 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati
 		String input = leftOp.getValue(state, String.class);
 		if (input == null) {
 			throw new SpelEvaluationException(leftOp.getStartPosition(),
-					SpelMessage.INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR, left);
+					SpelMessage.INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR, input);
 		}
 
 		Object right = rightOp.getValue(state);

spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java

@@ -215,12 +215,12 @@ public void matchesWithPatternLengthThreshold() {
 		String pattern = "(0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" +
 				"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" +
 				"01234567890123456789012345678901234567890123456789|abc)";
-		assertThat(pattern).hasSize(256);
+		assertEquals(256, pattern.length());
 		Expression expr = parser.parseExpression("'abc' matches '" + pattern + "'");
-		assertThat(expr.getValue(context, Boolean.class)).isTrue();
+		assertTrue(expr.getValue(context, Boolean.class));
 
 		pattern += "?";
-		assertThat(pattern).hasSize(257);
+		assertEquals(257, pattern.length());
 		evaluateAndCheckError("'abc' matches '" + pattern + "'", Boolean.class, SpelMessage.MAX_REGEX_LENGTH_EXCEEDED);
 	}
 

spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java

@@ -573,13 +573,13 @@ public void testStrings() {
 	}
 
 	@Test
-	void stringRepeat() {
+	public void stringRepeat() {
 		evaluate("'abc' * 0", "", String.class);
 		evaluate("'abc' * 1", "abc", String.class);
 		evaluate("'abc' * 2", "abcabc", String.class);
 
 		Expression expr = parser.parseExpression("'a' * 256");
-		assertThat(expr.getValue(context, String.class)).hasSize(256);
+		assertEquals(256, expr.getValue(context, String.class).length());
 
 		// 4 is the position of the '*' (repeat operator)
 		evaluateAndCheckError("'a' * 257", String.class, MAX_REPEATED_TEXT_SIZE_EXCEEDED, 4);