From 3ff81a47c95bb28a1f9d49b458601ab5270ede20 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 2 Aug 2023 10:33:34 +0300
Subject: [PATCH 1/2] Polish PathPatternParser

---
 .../web/util/pattern/PathPatternParser.java               | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
index 30ff6ff55c5..b4d90bd2003 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
@@ -43,7 +43,7 @@ public class PathPatternParser {
 
 
 	/**
-	 * Whether a {@link PathPattern} produced by this parser should
+	 * Configure whether a {@link PathPattern} produced by this parser should
 	 * automatically match request paths with a trailing slash.
 	 * <p>If set to {@code true} a {@code PathPattern} without a trailing slash
 	 * will also match request paths with a trailing slash. If set to
@@ -70,7 +70,7 @@ public class PathPatternParser {
 	}
 
 	/**
-	 * Whether path pattern matching should be case-sensitive.
+	 * Configure whether path pattern matching should be case-sensitive.
 	 * <p>The default is {@code true}.
 	 */
 	public void setCaseSensitive(boolean caseSensitive) {
@@ -96,7 +96,7 @@ public class PathPatternParser {
 	}
 
 	/**
-	 * Return the {@link #setPathOptions configured} pattern parsing options.
+	 * Get the {@link #setPathOptions configured} pattern parsing options.
 	 * @since 5.2
 	 */
 	public PathContainer.Options getPathOptions() {
@@ -160,5 +160,7 @@ public class PathPatternParser {
 			throw new UnsupportedOperationException(
 					"This is a read-only, shared instance that cannot be modified");
 		}
+
 	};
+
 }

From 9ba5622efd0d7d1774adeec90c1a505fc7e63db1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 2 Aug 2023 10:35:00 +0300
Subject: [PATCH 2/2] Update outdated Javadoc for
 PathPatternParser.defaultInstance

Spring Framework 6.0 changed the default value of
matchOptionalTrailingSeparator from true to false.

Closes gh-30976
---
 .../web/util/pattern/PathPatternParser.java              | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
index b4d90bd2003..5e177a1a39f 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
@@ -131,11 +131,12 @@ public class PathPatternParser {
 
 
 	/**
-	 * Shared, read-only instance of {@code PathPatternParser}. Uses default settings:
+	 * Shared, read-only instance of {@code PathPatternParser}.
+	 * <p>Uses default settings:
 	 * <ul>
-	 * <li>{@code matchOptionalTrailingSeparator=true}
-	 * <li>{@code caseSensitivetrue}
-	 * <li>{@code pathOptions=PathContainer.Options.HTTP_PATH}
+	 * <li>{@code matchOptionalTrailingSeparator = false}
+	 * <li>{@code caseSensitive = true}
+	 * <li>{@code pathOptions = PathContainer.Options.HTTP_PATH}
 	 * </ul>
 	 */
 	public final static PathPatternParser defaultInstance = new PathPatternParser() {