Direct matches by URL path work again

This commit fixes a recent regression as a result of 5225a57
with the determination of non-pattern vs pattern URLs. That in turn affects the ability to perform
direct matches by URL path.

There is also a fix in PathPattern to recognize "catch-all" patterns as pattern syntax.

See gh-24945

Author: rstoyanchev

spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java

@@ -190,7 +190,7 @@ public String getPatternString() {
 	 * @since 5.2
 	 */
 	public boolean hasPatternSyntax() {
-		return (this.score > 0 || this.patternString.indexOf('?') != -1);
+		return (this.score > 0 || this.catchAll || this.patternString.indexOf('?') != -1);
 	}
 
 	/**

spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java

@@ -54,8 +54,8 @@ public void pathContainer() {
 	public void hasPatternSyntax() {
 		PathPatternParser parser = new PathPatternParser();
 		assertThat(parser.parse("/foo/*").hasPatternSyntax()).isTrue();
-		assertThat(parser.parse("/foo/**").hasPatternSyntax()).isFalse();
-		assertThat(parser.parse("/foo/{*elem}").hasPatternSyntax()).isFalse();
+		assertThat(parser.parse("/foo/**").hasPatternSyntax()).isTrue();
+		assertThat(parser.parse("/foo/{*elem}").hasPatternSyntax()).isTrue();
 		assertThat(parser.parse("/f?o").hasPatternSyntax()).isTrue();
 		assertThat(parser.parse("/f*").hasPatternSyntax()).isTrue();
 		assertThat(parser.parse("/foo/{bar}/baz").hasPatternSyntax()).isTrue();

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestCondition.java

@@ -129,7 +129,7 @@ public Set<String> getDirectPaths() {
 		}
 		Set<String> result = Collections.emptySet();
 		for (PathPattern pattern : this.patterns) {
-			if (pattern.hasPatternSyntax()) {
+			if (!pattern.hasPatternSyntax()) {
 				result = (result.isEmpty() ? new HashSet<>(1) : result);
 				result.add(pattern.getPatternString());
 			}

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java

@@ -218,7 +218,7 @@ public Set<String> getDirectPaths() {
 		}
 		Set<String> result = Collections.emptySet();
 		for (String pattern : this.patterns) {
-			if (this.pathMatcher.isPattern(pattern)) {
+			if (!this.pathMatcher.isPattern(pattern)) {
 				result = (result.isEmpty() ? new HashSet<>(1) : result);
 				result.add(pattern);
 			}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestConditionTests.java

@@ -48,6 +48,12 @@ void prependNonEmptyPatternsOnly() {
 				.isEqualTo("");
 	}
 
+	@Test
+	void getDirectUrls() {
+		PathPatternsRequestCondition condition = createCondition("/something", "/else/**");
+		assertThat(condition.getDirectPaths()).containsExactly("/something");
+	}
+
 	@Test
 	void combineEmptySets() {
 		PathPatternsRequestCondition c1 = createCondition();

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java

@@ -47,6 +47,12 @@ void prependNonEmptyPatternsOnly() {
 				.isEqualTo("");
 	}
 
+	@Test
+	void getDirectUrls() {
+		PatternsRequestCondition condition = new PatternsRequestCondition("/something", "/else/**");
+		assertThat(condition.getDirectPaths()).containsExactly("/something");
+	}
+
 	@Test
 	void combineEmptySets() {
 		PatternsRequestCondition c1 = new PatternsRequestCondition();