Fix test post spring-projectsgh-34801 cherry-pick

Author: cesarhernandezgt

spring-context/src/main/java/org/springframework/validation/DataBinder.java

@@ -293,7 +293,7 @@ protected AbstractPropertyBindingResult createBeanPropertyBindingResult() {
 	public void initDirectFieldAccess() {
 		Assert.state(this.bindingResult == null,
 				"DataBinder is already initialized - call initDirectFieldAccess before other configuration methods");
-		this.directFieldAccess = true;
+		this.bindingResult = createDirectFieldBindingResult();
 	}
 
 	/**
@@ -585,7 +585,7 @@ public void setValidator(Validator validator) {
 		this.validators.clear();
 		this.validators.add(validator);
 	}
-		}
+
 
 	private void assertValidators(Validator... validators) {
 		Assert.notNull(validators, "Validators required");

spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java

@@ -16,7 +16,6 @@
 
 package org.springframework.util;
 
-import org.springframework.lang.Nullable;
 
 /**
  * Utility methods for simple pattern matching, in particular for
@@ -35,18 +34,18 @@ public abstract class PatternMatchUtils {
 	 * @param str the String to match
 	 * @return whether the String matches the given pattern
 	 */
-	public static boolean simpleMatch(@Nullable String pattern, @Nullable String str) {
+	public static boolean simpleMatch(String pattern, String str) {
 		return simpleMatch(pattern, str, false);
 	}
 
 	/**
 	 * Variant of {@link #simpleMatch(String, String)} that ignores upper/lower case.
 	 */
-	public static boolean simpleMatchIgnoreCase(@Nullable String pattern, @Nullable String str) {
+	public static boolean simpleMatchIgnoreCase(String pattern, String str) {
 		return simpleMatch(pattern, str, true);
 	}
 
-	private static boolean simpleMatch(@Nullable String pattern, @Nullable String str, boolean ignoreCase) {
+	private static boolean simpleMatch( String pattern, String str, boolean ignoreCase) {
 		if (pattern == null || str == null) {
 			return false;
 		}
@@ -109,7 +108,7 @@ private static int indexOf(String str, String otherStr, int startIndex, boolean
 	 * @param str the String to match
 	 * @return whether the String matches any of the given patterns
 	 */
-	public static boolean simpleMatch(@Nullable String[] patterns, String str) {
+	public static boolean simpleMatch(String[] patterns, String str) {
 		if (patterns != null) {
 			for (String pattern : patterns) {
 				if (simpleMatch(pattern, str)) {
@@ -123,7 +122,7 @@ public static boolean simpleMatch(@Nullable String[] patterns, String str) {
 	/**
 	 * Variant of {@link #simpleMatch(String[], String)}  that ignores upper/lower case.
 	 */
-	public static boolean simpleMatchIgnoreCase(@Nullable String[] patterns, @Nullable String str) {
+	public static boolean simpleMatchIgnoreCase(String[] patterns, String str) {
 		if (patterns != null) {
 			for (String pattern : patterns) {
 				if (simpleMatch(pattern, str, true)) {

spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java

@@ -28,7 +28,7 @@ public class PatternMatchUtilsTests {
 
 
 	@Test
-	void nullAndEmptyValues() {
+	public void nullAndEmptyValues() {
 		assertDoesNotMatch((String) null, null);
 		assertDoesNotMatch((String) null, "");
 		assertDoesNotMatch("123", null);
@@ -125,18 +125,18 @@ private void doTest(String pattern, String str, boolean shouldMatch) {
 	}
 
 	private void testMixedCaseMatch(String pattern, String str) {
-		assertThat(PatternMatchUtils.simpleMatch(pattern, str)).isFalse();
-		assertThat(PatternMatchUtils.simpleMatchIgnoreCase(pattern, str)).isTrue();
+		assertFalse(PatternMatchUtils.simpleMatch(pattern, str));
+		assertTrue(PatternMatchUtils.simpleMatchIgnoreCase(pattern, str));
 	}
 
 	private void assertDoesNotMatch(String pattern, String str) {
-		assertThat(PatternMatchUtils.simpleMatch(pattern, str)).isFalse();
-		assertThat(PatternMatchUtils.simpleMatchIgnoreCase(pattern, str)).isFalse();
+		assertFalse(PatternMatchUtils.simpleMatch(pattern, str));
+		assertFalse(PatternMatchUtils.simpleMatchIgnoreCase(pattern, str));
 	}
 
 	private void assertDoesNotMatch(String[] patterns, String str) {
-		assertThat(PatternMatchUtils.simpleMatch(patterns, str)).isFalse();
-		assertThat(PatternMatchUtils.simpleMatchIgnoreCase(patterns, str)).isFalse();
+		assertFalse(PatternMatchUtils.simpleMatch(patterns, str));
+		assertFalse(PatternMatchUtils.simpleMatchIgnoreCase(patterns, str));
 	}
 
 }