Release v5.2.22.RELEASE

.gitignore

@@ -23,7 +23,6 @@ buildSrc/build
 /spring-*/build
 /spring-core/kotlin-coroutines/build
 /framework-bom/build
-/framework-docs/build
 /integration-tests/build
 /src/asciidoc/build
 target/
@@ -42,5 +41,3 @@ out
 test-output
 atlassian-ide-plugin.xml
 .gradletasknamecache
-
-cached-antora-playbook.yml

ci/images/ci-image/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20230624
+FROM ubuntu:focal-20220302
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh

ci/images/get-jdk-url.sh

@@ -3,10 +3,10 @@ set -e
 
 case "$1" in
 	java8)
-		 echo "https://github.com/bell-sw/Liberica/releases/download/8u372+7/bellsoft-jdk8u372+7-linux-amd64.tar.gz"
+		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/bell-sw/Liberica/releases/download/11.0.19%2B7/bellsoft-jdk11.0.19+7-linux-amd64.tar.gz"
+		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz"
 	;;
   *)
 		echo $"Unknown java version"

ci/pipeline.yml

@@ -26,6 +26,7 @@ anchors:
   docker-resource-source: &docker-resource-source
     username: ((docker-hub-username))
     password: ((docker-hub-password))
+    tag: ((milestone))
   slack-fail-params: &slack-fail-params
     text: >
       :concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
@@ -43,34 +44,24 @@ anchors:
     GITHUB_TOKEN: ((github-ci-release-token))
 
 resource_types:
-- name: registry-image
-  type: registry-image
-  source:
-    <<: *docker-resource-source
-    repository: concourse/registry-image-resource
-    tag: 1.7.1
 - name: artifactory-resource
   type: registry-image
   source:
-    <<: *docker-resource-source
     repository: springio/artifactory-resource
     tag: 0.0.17
 - name: github-release
   type: registry-image
   source:
-    <<: *docker-resource-source
     repository: concourse/github-release-resource
     tag: 1.5.5
 - name: github-status-resource
   type: registry-image
   source:
-    <<: *docker-resource-source
     repository: dpb587/github-status-resource
     tag: master
 - name: slack-notification
   type: registry-image
   source:
-    <<: *docker-resource-source
     repository: cfcommunity/slack-notification-resource
     tag: latest
 resources:
@@ -99,14 +90,12 @@ resources:
   source:
     <<: *docker-resource-source
     repository: ((docker-hub-organization))/spring-framework-ci
-    tag: ((milestone))
 - name: ci-image-jdk11
   type: docker-image
   icon: docker
   source:
     <<: *docker-resource-source
     repository: ((docker-hub-organization))/spring-framework-ci-jdk11
-    tag: ((milestone))
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -277,6 +266,7 @@ jobs:
         download_artifacts: false
         save_build_info: true
     - task: promote
+      image: ci-image
       file: git-repo/ci/tasks/promote-version.yml
       params:
         RELEASE_TYPE: M
@@ -321,6 +311,7 @@ jobs:
         download_artifacts: false
         save_build_info: true
     - task: promote
+      image: ci-image
       file: git-repo/ci/tasks/promote-version.yml
       params:
         RELEASE_TYPE: RC
@@ -365,6 +356,7 @@ jobs:
         download_artifacts: true
         save_build_info: true
     - task: promote
+      image: ci-image
       file: git-repo/ci/tasks/promote-version.yml
       params:
         RELEASE_TYPE: RELEASE

ci/scripts/promote-version.sh

@@ -6,11 +6,11 @@ CONFIG_DIR=git-repo/ci/config
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json
 
-java -jar /concourse-release-scripts.jar \
+java -jar /opt/concourse-release-scripts.jar \
   --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
   publishToCentral $RELEASE_TYPE $BUILD_INFO_LOCATION artifactory-repo || { exit 1; }
 
-java -jar /concourse-release-scripts.jar \
+java -jar /opt/concourse-release-scripts.jar \
   --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
   promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }
 

ci/tasks/generate-changelog.yml

@@ -4,9 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: springio/github-changelog-generator
-    tag: '0.0.8'
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
+    tag: '0.0.7'
 inputs:
 - name: git-repo
 - name: artifactory-repo

ci/tasks/promote-version.yml

@@ -1,12 +1,5 @@
 ---
 platform: linux
-image_resource:
-  type: registry-image
-  source:
-    repository: springio/concourse-release-scripts
-    tag: '0.3.4'
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
 inputs:
 - name: git-repo
 - name: artifactory-repo

gradle.properties

@@ -1,4 +1,4 @@
-version=5.2.26.BUILD-SNAPSHOT
+version=5.2.22.RELEASE
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/docs.gradle

@@ -3,7 +3,7 @@ configurations {
 }
 
 dependencies {
-	asciidoctorExt("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.6.1")
+	asciidoctorExt("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.4.0.RELEASE")
 }
 
 repositories {
@@ -107,8 +107,9 @@ dokka {
 }
 
 task downloadResources(type: Download) {
-	src "https://repo.spring.io/artifactory/snapshot/io/spring/docresources/" +
-		"spring-doc-resources/0.2.6-SNAPSHOT/spring-doc-resources-0.2.6-20210308.231804-2.zip"
+	def version = "0.2.1.RELEASE"
+	src "https://repo.spring.io/release/io/spring/docresources/" +
+			"spring-doc-resources/$version/spring-doc-resources-${version}.zip"
 	dest project.file("$buildDir/docs/spring-doc-resources.zip")
 	onlyIfModified true
 	useETag "all"

spring-expression/src/main/java/org/springframework/expression/EvaluationContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.expression;
 
 import java.util.List;
-import java.util.function.Supplier;
 
 import org.springframework.lang.Nullable;
 
@@ -25,21 +24,12 @@ import org.springframework.lang.Nullable;
  * Expressions are executed in an evaluation context. It is in this context that
  * references are resolved when encountered during expression evaluation.
  *
- * <p>There are two default implementations of this interface.
- * <ul>
- * <li>{@link org.springframework.expression.spel.support.SimpleEvaluationContext
- * SimpleEvaluationContext}: a simpler builder-style {@code EvaluationContext}
- * variant for data-binding purposes, which allows for opting into several SpEL
- * features as needed.</li>
- * <li>{@link org.springframework.expression.spel.support.StandardEvaluationContext
- * StandardEvaluationContext}: a powerful and highly configurable {@code EvaluationContext}
- * implementation, which can be extended, rather than having to implement everything
- * manually.</li>
- * </ul>
+ * <p>There is a default implementation of this EvaluationContext interface:
+ * {@link org.springframework.expression.spel.support.StandardEvaluationContext}
+ * which can be extended, rather than having to implement everything manually.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
- * @author Sam Brannen
  * @since 3.0
  */
 public interface EvaluationContext {
@@ -95,30 +85,7 @@ public interface EvaluationContext {
 	OperatorOverloader getOperatorOverloader();
 
 	/**
-	 * Assign the value created by the specified {@link Supplier} to a named variable
-	 * within this evaluation context.
-	 * <p>In contrast to {@link #setVariable(String, Object)}, this method should only
-	 * be invoked to support the assignment operator ({@code =}) within an expression.
-	 * <p>By default, this method delegates to {@code setVariable(String, Object)},
-	 * providing the value created by the {@code valueSupplier}. Concrete implementations
-	 * may override this <em>default</em> method to provide different semantics.
-	 * @param name the name of the variable to assign
-	 * @param valueSupplier the supplier of the value to be assigned to the variable
-	 * @return a {@link TypedValue} wrapping the assigned value
-	 * @since 5.2.24
-	 */
-	default TypedValue assignVariable(String name, Supplier<TypedValue> valueSupplier) {
-		TypedValue typedValue = valueSupplier.get();
-		setVariable(name, typedValue.getValue());
-		return typedValue;
-	}
-
-	/**
-	 * Set a named variable in this evaluation context to a specified value.
-	 * <p>In contrast to {@link #assignVariable(String, Supplier)}, this method
-	 * should only be invoked programmatically when interacting directly with the
-	 * {@code EvaluationContext} &mdash; for example, to provide initial
-	 * configuration for the context.
+	 * Set a named variable within this evaluation context to a specified value.
 	 * @param name the name of the variable to set
 	 * @param value the value to be placed in the variable
 	 */
@@ -126,7 +93,7 @@ public interface EvaluationContext {
 
 	/**
 	 * Look up a named variable within this evaluation context.
-	 * @param name the name of the variable to look up
+	 * @param name variable to lookup
 	 * @return the value of the variable, or {@code null} if not found
 	 */
 	@Nullable

spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.function.Supplier;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.EvaluationContext;
@@ -39,19 +38,18 @@ import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 /**
- * ExpressionState is for maintaining per-expression-evaluation state: any changes to
- * it are not seen by other expressions, but it gives a place to hold local variables and
+ * An ExpressionState is for maintaining per-expression-evaluation state, any changes to
+ * it are not seen by other expressions but it gives a place to hold local variables and
  * for component expressions in a compound expression to communicate state. This is in
  * contrast to the EvaluationContext, which is shared amongst expression evaluations, and
  * any changes to it will be seen by other expressions or any code that chooses to ask
  * questions of the context.
  *
- * <p>It also acts as a place to define common utility routines that the various AST
+ * <p>It also acts as a place for to define common utility routines that the various AST
  * nodes might need.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
- * @author Sam Brannen
  * @since 3.0
  */
 public class ExpressionState {
@@ -140,29 +138,6 @@ public class ExpressionState {
 		return this.scopeRootObjects.element();
 	}
 
-	/**
-	 * Assign the value created by the specified {@link Supplier} to a named variable
-	 * within the evaluation context.
-	 * <p>In contrast to {@link #setVariable(String, Object)}, this method should
-	 * only be invoked to support assignment within an expression.
-	 * @param name the name of the variable to assign
-	 * @param valueSupplier the supplier of the value to be assigned to the variable
-	 * @return a {@link TypedValue} wrapping the assigned value
-	 * @since 5.2.24
-	 * @see EvaluationContext#assignVariable(String, Supplier)
-	 */
-	public TypedValue assignVariable(String name, Supplier<TypedValue> valueSupplier) {
-		return this.relatedContext.assignVariable(name, valueSupplier);
-	}
-
-	/**
-	 * Set a named variable in the evaluation context to a specified value.
-	 * <p>In contrast to {@link #assignVariable(String, Supplier)}, this method
-	 * should only be invoked programmatically.
-	 * @param name the name of the variable to set
-	 * @param value the value to be placed in the variable
-	 * @see EvaluationContext#setVariable(String, Object)
-	 */
 	public void setVariable(String name, @Nullable Object value) {
 		this.relatedContext.setVariable(name, value);
 	}

spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -260,27 +260,7 @@ public enum SpelMessage {
 
 	/** @since 5.2.20 */
 	MAX_ARRAY_ELEMENTS_THRESHOLD_EXCEEDED(Kind.ERROR, 1075,
-			"Array declares too many elements, exceeding the threshold of ''{0}''"),
-
-	/** @since 5.2.23 */
-	MAX_REPEATED_TEXT_SIZE_EXCEEDED(Kind.ERROR, 1076,
-			"Repeated text is too long, exceeding the threshold of ''{0}'' characters"),
-
-	/** @since 5.2.23 */
-	MAX_REGEX_LENGTH_EXCEEDED(Kind.ERROR, 1077,
-			"Regular expression is too long, exceeding the threshold of ''{0}'' characters"),
-
-	/** @since 5.2.24 */
-	MAX_CONCATENATED_STRING_LENGTH_EXCEEDED(Kind.ERROR, 1078,
-			"Concatenated string is too long, exceeding the threshold of ''{0}'' characters"),
-
-	/** @since 5.2.24 */
-	MAX_EXPRESSION_LENGTH_EXCEEDED(Kind.ERROR, 1079,
-			"SpEL expression is too long, exceeding the threshold of ''{0}'' characters"),
-
-	/** @since 5.2.24 */
-	VARIABLE_ASSIGNMENT_NOT_SUPPORTED(Kind.ERROR, 1080,
-			"Assignment to variable ''{0}'' is not supported");
+			"Array declares too many elements, exceeding the threshold of ''{0}''");
 
 
 	private final Kind kind;

spring-expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,19 +25,11 @@ import org.springframework.lang.Nullable;
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @author Andy Clement
- * @author Sam Brannen
  * @since 3.0
  * @see org.springframework.expression.spel.standard.SpelExpressionParser#SpelExpressionParser(SpelParserConfiguration)
  */
 public class SpelParserConfiguration {
 
-	/**
-	 * Default maximum length permitted for a SpEL expression.
-	 * @since 5.2.24
-	 */
-	private static final int DEFAULT_MAX_EXPRESSION_LENGTH = 10_000;
-
-
 	private static final SpelCompilerMode defaultCompilerMode;
 
 	static {
@@ -58,8 +50,6 @@ public class SpelParserConfiguration {
 
 	private final int maximumAutoGrowSize;
 
-	private final int maximumExpressionLength;
-
 
 	/**
 	 * Create a new {@code SpelParserConfiguration} instance with default settings.
@@ -108,30 +98,11 @@ public class SpelParserConfiguration {
 	public SpelParserConfiguration(@Nullable SpelCompilerMode compilerMode, @Nullable ClassLoader compilerClassLoader,
 			boolean autoGrowNullReferences, boolean autoGrowCollections, int maximumAutoGrowSize) {
 
-		this(compilerMode, compilerClassLoader, autoGrowNullReferences, autoGrowCollections,
-				maximumAutoGrowSize, DEFAULT_MAX_EXPRESSION_LENGTH);
-	}
-
-	/**
-	 * Create a new {@code SpelParserConfiguration} instance.
-	 * @param compilerMode the compiler mode that parsers using this configuration object should use
-	 * @param compilerClassLoader the ClassLoader to use as the basis for expression compilation
-	 * @param autoGrowNullReferences if null references should automatically grow
-	 * @param autoGrowCollections if collections should automatically grow
-	 * @param maximumAutoGrowSize the maximum size that a collection can auto grow
-	 * @param maximumExpressionLength the maximum length of a SpEL expression;
-	 * must be a positive number
-	 * @since 5.2.25
-	 */
-	public SpelParserConfiguration(@Nullable SpelCompilerMode compilerMode, @Nullable ClassLoader compilerClassLoader,
-			boolean autoGrowNullReferences, boolean autoGrowCollections, int maximumAutoGrowSize, int maximumExpressionLength) {
-
 		this.compilerMode = (compilerMode != null ? compilerMode : defaultCompilerMode);
 		this.compilerClassLoader = compilerClassLoader;
 		this.autoGrowNullReferences = autoGrowNullReferences;
 		this.autoGrowCollections = autoGrowCollections;
 		this.maximumAutoGrowSize = maximumAutoGrowSize;
-		this.maximumExpressionLength = maximumExpressionLength;
 	}
 
 
@@ -171,12 +142,4 @@ public class SpelParserConfiguration {
 		return this.maximumAutoGrowSize;
 	}
 
-	/**
-	 * Return the maximum number of characters that a SpEL expression can contain.
-	 * @since 5.2.25
-	 */
-	public int getMaximumExpressionLength() {
-		return this.maximumExpressionLength;
-	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.springframework.expression.spel.ExpressionState;
  * <p>Example: 'someNumberProperty=42'
  *
  * @author Andy Clement
- * @author Sam Brannen
  * @since 3.0
  */
 public class Assign extends SpelNodeImpl {
@@ -39,7 +38,9 @@ public class Assign extends SpelNodeImpl {
 
 	@Override
 	public TypedValue getValueInternal(ExpressionState state) throws EvaluationException {
-		return this.children[0].setValueInternal(state, () -> this.children[1].getValueInternal(state));
+		TypedValue newValue = this.children[1].getValueInternal(state);
+		getChild(0).setValue(state, newValue.getValue());
+		return newValue;
 	}
 
 	@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.expression.spel.ast;
 
 import java.util.StringJoiner;
-import java.util.function.Supplier;
 
 import org.springframework.asm.MethodVisitor;
 import org.springframework.expression.EvaluationException;
@@ -25,13 +24,13 @@ import org.springframework.expression.TypedValue;
 import org.springframework.expression.spel.CodeFlow;
 import org.springframework.expression.spel.ExpressionState;
 import org.springframework.expression.spel.SpelEvaluationException;
+import org.springframework.lang.Nullable;
 
 /**
  * Represents a DOT separated expression sequence, such as
  * {@code 'property1.property2.methodOne()'}.
  *
  * @author Andy Clement
- * @author Sam Brannen
  * @since 3.0
  */
 public class CompoundExpression extends SpelNodeImpl {
@@ -96,12 +95,8 @@ public class CompoundExpression extends SpelNodeImpl {
 	}
 
 	@Override
-	public TypedValue setValueInternal(ExpressionState state, Supplier<TypedValue> valueSupplier)
-			throws EvaluationException {
-
-		TypedValue typedValue = valueSupplier.get();
-		getValueRef(state).setValue(typedValue.getValue());
-		return typedValue;
+	public void setValue(ExpressionState state, @Nullable Object value) throws EvaluationException {
+		getValueRef(state).setValue(value);
 	}
 
 	@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.StringJoiner;
-import java.util.function.Supplier;
 
 import org.springframework.asm.MethodVisitor;
 import org.springframework.core.convert.TypeDescriptor;
@@ -46,12 +45,11 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * An Indexer can index into some proceeding structure to access a particular piece of it.
- * <p>Supported structures are: strings / collections (lists/sets) / arrays.
+ * Supported structures are: strings / collections (lists/sets) / arrays.
  *
  * @author Andy Clement
  * @author Phillip Webb
  * @author Stephane Nicoll
- * @author Sam Brannen
  * @since 3.0
  */
 // TODO support multidimensional arrays
@@ -104,12 +102,8 @@ public class Indexer extends SpelNodeImpl {
 	}
 
 	@Override
-	public TypedValue setValueInternal(ExpressionState state, Supplier<TypedValue> valueSupplier)
-			throws EvaluationException {
-
-		TypedValue typedValue = valueSupplier.get();
-		getValueRef(state).setValue(typedValue.getValue());
-		return typedValue;
+	public void setValue(ExpressionState state, @Nullable Object newValue) throws EvaluationException {
+		getValueRef(state).setValue(newValue);
 	}
 
 	@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@ import org.springframework.expression.Operation;
 import org.springframework.expression.TypedValue;
 import org.springframework.expression.spel.CodeFlow;
 import org.springframework.expression.spel.ExpressionState;
-import org.springframework.expression.spel.SpelEvaluationException;
-import org.springframework.expression.spel.SpelMessage;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 
@@ -54,13 +52,6 @@ import org.springframework.util.NumberUtils;
  */
 public class OpMultiply extends Operator {
 
-	/**
-	 * Maximum number of characters permitted in repeated text.
-	 * @since 5.2.23
-	 */
-	private static final int MAX_REPEATED_TEXT_SIZE = 256;
-
-
 	public OpMultiply(int startPos, int endPos, SpelNodeImpl... operands) {
 		super("*", startPos, endPos, operands);
 	}
@@ -118,13 +109,10 @@ public class OpMultiply extends Operator {
 		}
 
 		if (leftOperand instanceof String && rightOperand instanceof Integer) {
-			String text = (String) leftOperand;
-			int count = (Integer) rightOperand;
-			int requestedSize = text.length() * count;
-			checkRepeatedTextSize(requestedSize);
-			StringBuilder result = new StringBuilder(requestedSize);
-			for (int i = 0; i < count; i++) {
-				result.append(text);
+			int repeats = (Integer) rightOperand;
+			StringBuilder result = new StringBuilder();
+			for (int i = 0; i < repeats; i++) {
+				result.append(leftOperand);
 			}
 			return new TypedValue(result.toString());
 		}
@@ -132,13 +120,6 @@ public class OpMultiply extends Operator {
 		return state.operate(Operation.MULTIPLY, leftOperand, rightOperand);
 	}
 
-	private void checkRepeatedTextSize(int requestedSize) {
-		if (requestedSize > MAX_REPEATED_TEXT_SIZE) {
-			throw new SpelEvaluationException(getStartPosition(),
-					SpelMessage.MAX_REPEATED_TEXT_SIZE_EXCEEDED, MAX_REPEATED_TEXT_SIZE);
-		}
-	}
-
 	@Override
 	public boolean isCompilable() {
 		if (!getLeftOperand().isCompilable()) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,6 @@ import org.springframework.expression.TypeConverter;
 import org.springframework.expression.TypedValue;
 import org.springframework.expression.spel.CodeFlow;
 import org.springframework.expression.spel.ExpressionState;
-import org.springframework.expression.spel.SpelEvaluationException;
-import org.springframework.expression.spel.SpelMessage;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
@@ -48,18 +46,10 @@ import org.springframework.util.NumberUtils;
  * @author Juergen Hoeller
  * @author Ivo Smid
  * @author Giovanni Dall'Oglio Risso
- * @author Sam Brannen
  * @since 3.0
  */
 public class OpPlus extends Operator {
 
-	/**
-	 * Maximum number of characters permitted in a concatenated string.
-	 * @since 5.2.24
-	 */
-	private static final int MAX_CONCATENATED_STRING_LENGTH = 100_000;
-
-
 	public OpPlus(int startPos, int endPos, SpelNodeImpl... operands) {
 		super("+", startPos, endPos, operands);
 		Assert.notEmpty(operands, "Operands must not be empty");
@@ -133,45 +123,22 @@ public class OpPlus extends Operator {
 
 		if (leftOperand instanceof String && rightOperand instanceof String) {
 			this.exitTypeDescriptor = "Ljava/lang/String";
-			String leftString = (String) leftOperand;
-			String rightString = (String) rightOperand;
-			checkStringLength(leftString);
-			checkStringLength(rightString);
-			return concatenate(leftString, rightString);
+			return new TypedValue((String) leftOperand + rightOperand);
 		}
 
 		if (leftOperand instanceof String) {
-			String leftString = (String) leftOperand;
-			checkStringLength(leftString);
-			String rightString = (rightOperand == null ? "null" : convertTypedValueToString(operandTwoValue, state));
-			checkStringLength(rightString);
-			return concatenate(leftString, rightString);
+			return new TypedValue(
+					leftOperand + (rightOperand == null ? "null" : convertTypedValueToString(operandTwoValue, state)));
 		}
 
 		if (rightOperand instanceof String) {
-			String rightString = (String) rightOperand;
-			checkStringLength(rightString);
-			String leftString = (leftOperand == null ? "null" : convertTypedValueToString(operandOneValue, state));
-			checkStringLength(leftString);
-			return concatenate(leftString, rightString);
+			return new TypedValue(
+					(leftOperand == null ? "null" : convertTypedValueToString(operandOneValue, state)) + rightOperand);
 		}
 
 		return state.operate(Operation.ADD, leftOperand, rightOperand);
 	}
 
-	private void checkStringLength(String string) {
-		if (string.length() > MAX_CONCATENATED_STRING_LENGTH) {
-			throw new SpelEvaluationException(getStartPosition(),
-					SpelMessage.MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, MAX_CONCATENATED_STRING_LENGTH);
-		}
-	}
-
-	private TypedValue concatenate(String leftString, String rightString) {
-		String result = leftString + rightString;
-		checkStringLength(result);
-		return new TypedValue(result);
-	}
-
 	@Override
 	public String toStringAST() {
 		if (this.children.length < 2) {  // unary plus

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,41 +36,19 @@ import org.springframework.expression.spel.support.BooleanTypedValue;
  *
  * @author Andy Clement
  * @author Juergen Hoeller
- * @author Sam Brannen
  * @since 3.0
  */
 public class OperatorMatches extends Operator {
 
 	private static final int PATTERN_ACCESS_THRESHOLD = 1000000;
 
-	/**
-	 * Maximum number of characters permitted in a regular expression.
-	 * @since 5.2.23
-	 */
-	private static final int MAX_REGEX_LENGTH = 1000;
-
-	private final ConcurrentMap<String, Pattern> patternCache;
+	private final ConcurrentMap<String, Pattern> patternCache = new ConcurrentHashMap<>();
 
 
-	/**
-	 * Create a new {@link OperatorMatches} instance.
-	 * @deprecated as of Spring Framework 5.2.23 in favor of invoking
-	 * {@link #OperatorMatches(ConcurrentMap, int, int, SpelNodeImpl...)}
-	 * with a shared pattern cache instead
-	 */
-	@Deprecated
 	public OperatorMatches(int startPos, int endPos, SpelNodeImpl... operands) {
-		this(new ConcurrentHashMap<>(), startPos, endPos, operands);
+		super("matches", startPos, endPos, operands);
 	}
 
-	/**
-	 * Create a new {@link OperatorMatches} instance with a shared pattern cache.
-	 * @since 5.2.23
-	 */
-	public OperatorMatches(ConcurrentMap<String, Pattern> patternCache, int startPos, int endPos, SpelNodeImpl... operands) {
-		super("matches", startPos, endPos, operands);
-		this.patternCache = patternCache;
-	}
 
 	/**
 	 * Check the first operand matches the regex specified as the second operand.
@@ -84,28 +62,26 @@ public class OperatorMatches extends Operator {
 	public BooleanTypedValue getValueInternal(ExpressionState state) throws EvaluationException {
 		SpelNodeImpl leftOp = getLeftOperand();
 		SpelNodeImpl rightOp = getRightOperand();
+		String left = leftOp.getValue(state, String.class);
+		Object right = getRightOperand().getValue(state);
 
-		String input = leftOp.getValue(state, String.class);
-		if (input == null) {
+		if (left == null) {
 			throw new SpelEvaluationException(leftOp.getStartPosition(),
 					SpelMessage.INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR, (Object) null);
 		}
-
-		Object right = rightOp.getValue(state);
 		if (!(right instanceof String)) {
 			throw new SpelEvaluationException(rightOp.getStartPosition(),
 					SpelMessage.INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR, right);
 		}
-		String regex = (String) right;
 
 		try {
-			Pattern pattern = this.patternCache.get(regex);
+			String rightString = (String) right;
+			Pattern pattern = this.patternCache.get(rightString);
 			if (pattern == null) {
-				checkRegexLength(regex);
-				pattern = Pattern.compile(regex);
-				this.patternCache.putIfAbsent(regex, pattern);
+				pattern = Pattern.compile(rightString);
+				this.patternCache.putIfAbsent(rightString, pattern);
 			}
-			Matcher matcher = pattern.matcher(new MatcherInput(input, new AccessCount()));
+			Matcher matcher = pattern.matcher(new MatcherInput(left, new AccessCount()));
 			return BooleanTypedValue.forValue(matcher.matches());
 		}
 		catch (PatternSyntaxException ex) {
@@ -118,13 +94,6 @@ public class OperatorMatches extends Operator {
 		}
 	}
 
-	private void checkRegexLength(String regex) {
-		if (regex.length() > MAX_REGEX_LENGTH) {
-			throw new SpelEvaluationException(getStartPosition(),
-					SpelMessage.MAX_REGEX_LENGTH_EXCEEDED, MAX_REGEX_LENGTH);
-		}
-	}
-
 
 	private static class AccessCount {
 
@@ -142,7 +111,7 @@ public class OperatorMatches extends Operator {
 
 		private final CharSequence value;
 
-		private final AccessCount access;
+		private AccessCount access;
 
 		public MatcherInput(CharSequence value, AccessCount access) {
 			this.value = value;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Supplier;
 
 import org.springframework.asm.Label;
 import org.springframework.asm.MethodVisitor;
@@ -47,7 +46,6 @@ import org.springframework.util.ReflectionUtils;
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Clark Duplichien
- * @author Sam Brannen
  * @since 3.0
  */
 public class PropertyOrFieldReference extends SpelNodeImpl {
@@ -149,12 +147,8 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
 	}
 
 	@Override
-	public TypedValue setValueInternal(ExpressionState state, Supplier<TypedValue> valueSupplier)
-			throws EvaluationException {
-
-		TypedValue typedValue = valueSupplier.get();
-		writeProperty(state.getActiveContextObject(), state.getEvaluationContext(), this.name, typedValue.getValue());
-		return typedValue;
+	public void setValue(ExpressionState state, @Nullable Object newValue) throws EvaluationException {
+		writeProperty(state.getActiveContextObject(), state.getEvaluationContext(), this.name, newValue);
 	}
 
 	@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.expression.spel.ast;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
-import java.util.function.Supplier;
 
 import org.springframework.asm.MethodVisitor;
 import org.springframework.asm.Opcodes;
@@ -41,7 +40,6 @@ import org.springframework.util.ObjectUtils;
  *
  * @author Andy Clement
  * @author Juergen Hoeller
- * @author Sam Brannen
  * @since 3.0
  */
 public abstract class SpelNodeImpl implements SpelNode, Opcodes {
@@ -66,7 +64,7 @@ public abstract class SpelNodeImpl implements SpelNode, Opcodes {
 	 * <p>The descriptor is like the bytecode form but is slightly easier to work with.
 	 * It does not include the trailing semicolon (for non array reference types).
 	 * Some examples: Ljava/lang/String, I, [I
-	 */
+     */
 	@Nullable
 	protected volatile String exitTypeDescriptor;
 
@@ -85,8 +83,8 @@ public abstract class SpelNodeImpl implements SpelNode, Opcodes {
 
 
 	/**
-	 * Return {@code true} if the next child is one of the specified classes.
-	 */
+     * Return {@code true} if the next child is one of the specified classes.
+     */
 	protected boolean nextChildIs(Class<?>... classes) {
 		if (this.parent != null) {
 			SpelNodeImpl[] peers = this.parent.children;
@@ -127,28 +125,6 @@ public abstract class SpelNodeImpl implements SpelNode, Opcodes {
 
 	@Override
 	public void setValue(ExpressionState expressionState, @Nullable Object newValue) throws EvaluationException {
-		setValueInternal(expressionState, () -> new TypedValue(newValue));
-	}
-
-	/**
-	 * Evaluate the expression to a node and then set the new value created by the
-	 * specified {@link Supplier} on that node.
-	 * <p>For example, if the expression evaluates to a property reference, then the
-	 * property will be set to the new value.
-	 * <p>Favor this method over {@link #setValue(ExpressionState, Object)} when
-	 * the value should be lazily computed.
-	 * <p>By default, this method throws a {@link SpelEvaluationException},
-	 * effectively disabling this feature. Subclasses may override this method to
-	 * provide an actual implementation.
-	 * @param expressionState the current expression state (includes the context)
-	 * @param valueSupplier a supplier of the new value
-	 * @throws EvaluationException if any problem occurs evaluating the expression or
-	 * setting the new value
-	 * @since 5.2.24
-	 */
-	public TypedValue setValueInternal(ExpressionState expressionState, Supplier<TypedValue> valueSupplier)
-			throws EvaluationException {
-
 		throw new SpelEvaluationException(getStartPosition(), SpelMessage.SETVALUE_NOT_SUPPORTED, getClass());
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,9 @@
 package org.springframework.expression.spel.ast;
 
 import java.lang.reflect.Modifier;
-import java.util.function.Supplier;
 
 import org.springframework.asm.MethodVisitor;
 import org.springframework.expression.EvaluationContext;
-import org.springframework.expression.EvaluationException;
 import org.springframework.expression.TypedValue;
 import org.springframework.expression.spel.CodeFlow;
 import org.springframework.expression.spel.ExpressionState;
@@ -29,11 +27,10 @@ import org.springframework.expression.spel.SpelEvaluationException;
 import org.springframework.lang.Nullable;
 
 /**
- * Represents a variable reference — for example, {@code #someVar}. Note
- * that this is different than a <em>local</em> variable like {@code $someVar}.
+ * Represents a variable reference, eg. #someVar. Note this is different to a *local*
+ * variable like $someVar
  *
  * @author Andy Clement
- * @author Sam Brannen
  * @since 3.0
  */
 public class VariableReference extends SpelNodeImpl {
@@ -56,14 +53,14 @@ public class VariableReference extends SpelNodeImpl {
 	@Override
 	public ValueRef getValueRef(ExpressionState state) throws SpelEvaluationException {
 		if (this.name.equals(THIS)) {
-			return new ValueRef.TypedValueHolderValueRef(state.getActiveContextObject(), this);
+			return new ValueRef.TypedValueHolderValueRef(state.getActiveContextObject(),this);
 		}
 		if (this.name.equals(ROOT)) {
-			return new ValueRef.TypedValueHolderValueRef(state.getRootContextObject(), this);
+			return new ValueRef.TypedValueHolderValueRef(state.getRootContextObject(),this);
 		}
 		TypedValue result = state.lookupVariable(this.name);
 		// a null value will mean either the value was null or the variable was not found
-		return new VariableRef(this.name, result, state.getEvaluationContext());
+		return new VariableRef(this.name,result,state.getEvaluationContext());
 	}
 
 	@Override
@@ -93,10 +90,8 @@ public class VariableReference extends SpelNodeImpl {
 	}
 
 	@Override
-	public TypedValue setValueInternal(ExpressionState state, Supplier<TypedValue> valueSupplier)
-			throws EvaluationException {
-
-		return state.assignVariable(this.name, valueSupplier);
+	public void setValue(ExpressionState state, @Nullable Object value) throws SpelEvaluationException {
+		state.setVariable(this.name, value);
 	}
 
 	@Override

spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,15 +21,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Pattern;
 
 import org.springframework.expression.ParseException;
 import org.springframework.expression.ParserContext;
 import org.springframework.expression.common.TemplateAwareExpressionParser;
 import org.springframework.expression.spel.InternalParseException;
-import org.springframework.expression.spel.SpelEvaluationException;
 import org.springframework.expression.spel.SpelMessage;
 import org.springframework.expression.spel.SpelParseException;
 import org.springframework.expression.spel.SpelParserConfiguration;
@@ -86,21 +83,18 @@ import org.springframework.util.StringUtils;
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Phillip Webb
- * @author Sam Brannen
  * @since 3.0
  */
 class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
 
 	private static final Pattern VALID_QUALIFIED_ID_PATTERN = Pattern.compile("[\\p{L}\\p{N}_$]+");
 
+
 	private final SpelParserConfiguration configuration;
 
 	// For rules that build nodes, they are stacked here for return
 	private final Deque<SpelNodeImpl> constructedNodes = new ArrayDeque<>();
 
-	// Shared cache for compiled regex patterns
-	private final ConcurrentMap<String, Pattern> patternCache = new ConcurrentHashMap<>();
-
 	// The expression being parsed
 	private String expressionString = "";
 
@@ -127,8 +121,6 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
 	protected SpelExpression doParseExpression(String expressionString, @Nullable ParserContext context)
 			throws ParseException {
 
-		checkExpressionLength(expressionString);
-
 		try {
 			this.expressionString = expressionString;
 			Tokenizer tokenizer = new Tokenizer(expressionString);
@@ -150,15 +142,6 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
 		}
 	}
 
-	private void checkExpressionLength(String string) {
-		if (string != null) {
-			int maxLength = this.configuration.getMaximumExpressionLength();
-			if (string.length() > maxLength) {
-				throw new SpelEvaluationException(SpelMessage.MAX_EXPRESSION_LENGTH_EXCEEDED, maxLength);
-			}
-		}
-	}
-
 	//	expression
 	//    : logicalOrExpression
 	//      ( (ASSIGN^ logicalOrExpression)
@@ -265,7 +248,7 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
 			}
 
 			if (tk == TokenKind.MATCHES) {
-				return new OperatorMatches(this.patternCache, t.startPos, t.endPos, expr, rhExpr);
+				return new OperatorMatches(t.startPos, t.endPos, expr, rhExpr);
 			}
 
 			Assert.isTrue(tk == TokenKind.BETWEEN, "Between token expected");

spring-expression/src/main/java/org/springframework/expression/spel/support/SimpleEvaluationContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Supplier;
 
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
@@ -79,7 +78,6 @@ import org.springframework.lang.Nullable;
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
- * @author Sam Brannen
  * @since 4.3.15
  * @see #forPropertyAccessors
  * @see #forReadOnlyDataBinding()
@@ -202,17 +200,6 @@ public final class SimpleEvaluationContext implements EvaluationContext {
 		return this.operatorOverloader;
 	}
 
-	/**
-	 * {@code SimpleEvaluationContext} does not support variable assignment within
-	 * expressions.
-	 * @throws SpelEvaluationException with {@link SpelMessage#VARIABLE_ASSIGNMENT_NOT_SUPPORTED}
-	 * @since 5.2.24
-	 */
-	@Override
-	public TypedValue assignVariable(String name, Supplier<TypedValue> valueSupplier) {
-		throw new SpelEvaluationException(SpelMessage.VARIABLE_ASSIGNMENT_NOT_SUPPORTED, "#" + name);
-	}
-
 	@Override
 	public void setVariable(String name, @Nullable Object value) {
 		this.variables.put(name, value);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -164,24 +164,6 @@ public abstract class AbstractExpressionTests {
 	 */
 	protected void evaluateAndCheckError(String expression, Class<?> expectedReturnType, SpelMessage expectedMessage,
 			Object... otherProperties) {
-
-		evaluateAndCheckError(this.parser, expression, expectedReturnType, expectedMessage, otherProperties);
-	}
-
-	/**
-	 * Evaluate the specified expression and ensure the expected message comes out.
-	 * The message may have inserts and they will be checked if otherProperties is specified.
-	 * The first entry in otherProperties should always be the position.
-	 * @param parser the expression parser to use
-	 * @param expression the expression to evaluate
-	 * @param expectedReturnType ask the expression return value to be of this type if possible
-	 * ({@code null} indicates don't ask for conversion)
-	 * @param expectedMessage the expected message
-	 * @param otherProperties the expected inserts within the message
-	 */
-	protected void evaluateAndCheckError(ExpressionParser parser, String expression, Class<?> expectedReturnType, SpelMessage expectedMessage,
-			Object... otherProperties) {
-
 		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() -> {
 			Expression expr = parser.parseExpression(expression);
 			assertThat(expr).as("expression").isNotNull();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
 
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.AccessException;
@@ -40,7 +38,6 @@ import org.springframework.expression.MethodResolver;
 import org.springframework.expression.ParseException;
 import org.springframework.expression.spel.standard.SpelExpression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.SimpleEvaluationContext;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.expression.spel.support.StandardTypeLocator;
 import org.springframework.expression.spel.testresources.TestPerson;
@@ -62,40 +59,6 @@ import static org.assertj.core.api.Assertions.within;
  */
 public class EvaluationTests extends AbstractExpressionTests {
 
-	@Test
-	void expressionLength() {
-		String expression = String.format("'X' + '%s'", repeat(" ", 9_992));
-		assertThat(expression).hasSize(10_000);
-		Expression expr = parser.parseExpression(expression);
-		String result = expr.getValue(context, String.class);
-		assertThat(result).hasSize(9_993);
-		assertThat(result.trim()).isEqualTo("X");
-
-		expression = String.format("'X' + '%s'", repeat(" ", 9_993));
-		assertThat(expression).hasSize(10_001);
-		evaluateAndCheckError(expression, String.class, SpelMessage.MAX_EXPRESSION_LENGTH_EXCEEDED);
-	}
-
-	@Test
-	void maxExpressionLengthIsConfigurable() {
-		int maximumExpressionLength = 20_000;
-
-		String expression = String.format("'%s'", repeat("Y", 19_998));
-		assertThat(expression).hasSize(maximumExpressionLength);
-
-		SpelParserConfiguration configuration =
-				new SpelParserConfiguration(null, null, false, false, 0, maximumExpressionLength);
-		ExpressionParser parser = new SpelExpressionParser(configuration);
-
-		Expression expr = parser.parseExpression(expression);
-		String result = expr.getValue(String.class);
-		assertThat(result).hasSize(19_998);
-
-		expression = String.format("'%s'", repeat("Y", 25_000));
-		assertThat(expression).hasSize(25_002);
-		evaluateAndCheckError(parser, expression, String.class, SpelMessage.MAX_EXPRESSION_LENGTH_EXCEEDED);
-	}
-
 	@Test
 	public void testCreateListsOnAttemptToIndexNull01() throws EvaluationException, ParseException {
 		ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
@@ -205,47 +168,39 @@ public class EvaluationTests extends AbstractExpressionTests {
 	}
 
 	@Test
-	void matchesTrue() {
-		evaluate("'5.00' matches '^-?\\d+(\\.\\d{2})?$'", "true", Boolean.class);
-	}
-
-	@Test
-	void matchesFalse() {
+	public void testRelOperatorsMatches01() {
 		evaluate("'5.0067' matches '^-?\\d+(\\.\\d{2})?$'", "false", Boolean.class);
 	}
 
 	@Test
-	void matchesWithInputConversion() {
-		evaluate("27 matches '^.*2.*$'", true, Boolean.class);  // conversion int --> string
+	public void testRelOperatorsMatches02() {
+		evaluate("'5.00' matches '^-?\\d+(\\.\\d{2})?$'", "true", Boolean.class);
 	}
 
 	@Test
-	void matchesWithNullInput() {
+	public void testRelOperatorsMatches03() {
 		evaluateAndCheckError("null matches '^.*$'", SpelMessage.INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR, 0, null);
 	}
 
 	@Test
-	void matchesWithNullPattern() {
+	public void testRelOperatorsMatches04() {
 		evaluateAndCheckError("'abc' matches null", SpelMessage.INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR, 14, null);
 	}
 
-	@Test  // SPR-16731
-	void matchesWithPatternAccessThreshold() {
-		String pattern = "^(?=[a-z0-9-]{1,47})([a-z0-9]+[-]{0,1}){1,47}[a-z0-9]{1}$";
-		String expression = "'abcde-fghijklmn-o42pasdfasdfasdf.qrstuvwxyz10x.xx.yyy.zasdfasfd' matches '" + pattern + "'";
-		evaluateAndCheckError(expression, SpelMessage.FLAWED_PATTERN);
+	@Test
+	public void testRelOperatorsMatches05() {
+		evaluate("27 matches '^.*2.*$'", true, Boolean.class);  // conversion int>string
 	}
 
-	@Test
-	void matchesWithPatternLengthThreshold() {
-		String pattern = String.format("^(%s|X)", repeat("12345", 199));
-		assertThat(pattern).hasSize(1000);
-		Expression expr = parser.parseExpression("'X' matches '" + pattern + "'");
-		assertThat(expr.getValue(context, Boolean.class)).isTrue();
-
-		pattern += "?";
-		assertThat(pattern).hasSize(1001);
-		evaluateAndCheckError("'abc' matches '" + pattern + "'", Boolean.class, SpelMessage.MAX_REGEX_LENGTH_EXCEEDED);
+	@Test  // SPR-16731
+	public void testMatchesWithPatternAccessThreshold() {
+		String pattern = "^(?=[a-z0-9-]{1,47})([a-z0-9]+[-]{0,1}){1,47}[a-z0-9]{1}$";
+		String expression = "'abcde-fghijklmn-o42pasdfasdfasdf.qrstuvwxyz10x.xx.yyy.zasdfasfd' matches \'" + pattern + "\'";
+		Expression expr = parser.parseExpression(expression);
+		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(
+				expr::getValue)
+			.withCauseInstanceOf(IllegalStateException.class)
+			.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.FLAWED_PATTERN));
 	}
 
 	// mixing operators
@@ -390,26 +345,9 @@ public class EvaluationTests extends AbstractExpressionTests {
 	}
 
 	// assignment
-
 	@Test
-	void assignmentToVariableWithStandardEvaluationContext() {
-		evaluate("#var1 = 'value1'", "value1", String.class);
-	}
-
-	@ParameterizedTest
-	@CsvSource(delimiterString = "->", value = {
-		"'#var1 = \"value1\"'    -> #var1",
-		"'true ? #myVar = 4 : 0' -> #myVar"
-	})
-	void assignmentToVariableWithSimpleEvaluationContext(String expression, String varName) {
-		EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().build();
-		Expression expr = parser.parseExpression(expression);
-		assertThatExceptionOfType(SpelEvaluationException.class)
-			.isThrownBy(() -> expr.getValue(context))
-			.satisfies(ex -> {
-				assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.VARIABLE_ASSIGNMENT_NOT_SUPPORTED);
-				assertThat(ex.getInserts()).as("inserts").containsExactly(varName);
-			});
+	public void testAssignmentToVariables01() {
+		evaluate("#var1='value1'", "value1", String.class);
 	}
 
 	@Test
@@ -1419,15 +1357,6 @@ public class EvaluationTests extends AbstractExpressionTests {
 	}
 
 
-	private static String repeat(String str, int count) {
-		String result = "";
-		for (int i = 0; i < count; i++) {
-			result += str;
-		}
-		return result;
-	}
-
-
 	@SuppressWarnings("rawtypes")
 	static class TestClass {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,10 @@ import java.math.BigInteger;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.expression.Expression;
 import org.springframework.expression.spel.ast.Operator;
 import org.springframework.expression.spel.standard.SpelExpression;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.expression.spel.SpelMessage.MAX_CONCATENATED_STRING_LENGTH_EXCEEDED;
-import static org.springframework.expression.spel.SpelMessage.MAX_REPEATED_TEXT_SIZE_EXCEEDED;
 
 /**
  * Tests the evaluation of expressions using relational operators.
@@ -35,7 +32,6 @@ import static org.springframework.expression.spel.SpelMessage.MAX_REPEATED_TEXT_
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Giovanni Dall'Oglio Risso
- * @author Sam Brannen
  */
 public class OperatorTests extends AbstractExpressionTests {
 
@@ -328,6 +324,11 @@ public class OperatorTests extends AbstractExpressionTests {
 		evaluate("3.5", 3.5d, Double.class);
 	}
 
+	@Test
+	public void testMultiplyStringInt() {
+		evaluate("'a' * 5", "aaaaa", String.class);
+	}
+
 	@Test
 	public void testMultiplyDoubleDoubleGivesDouble() {
 		evaluate("3.0d * 5.0d", 15.0d, Double.class);
@@ -392,7 +393,11 @@ public class OperatorTests extends AbstractExpressionTests {
 		evaluate("3.0f + 5.0f", 8.0f, Float.class);
 		evaluate("3.0d + 5.0d", 8.0d, Double.class);
 		evaluate("3 + new java.math.BigDecimal('5')", new BigDecimal("8"), BigDecimal.class);
-		evaluate("5 + new Integer('37')", 42, Integer.class);
+
+		evaluate("'ab' + 2", "ab2", String.class);
+		evaluate("2 + 'a'", "2a", String.class);
+		evaluate("'ab' + null", "abnull", String.class);
+		evaluate("null + 'ab'", "nullab", String.class);
 
 		// AST:
 		SpelExpression expr = (SpelExpression)parser.parseExpression("+3");
@@ -401,11 +406,11 @@ public class OperatorTests extends AbstractExpressionTests {
 		assertThat(expr.toStringAST()).isEqualTo("(2 + 3)");
 
 		// use as a unary operator
-		evaluate("+5d", 5d, Double.class);
-		evaluate("+5L", 5L, Long.class);
-		evaluate("+5", 5, Integer.class);
-		evaluate("+new java.math.BigDecimal('5')", new BigDecimal("5"), BigDecimal.class);
-		evaluateAndCheckError("+'abc'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
+		evaluate("+5d",5d,Double.class);
+		evaluate("+5L",5L,Long.class);
+		evaluate("+5",5,Integer.class);
+		evaluate("+new java.math.BigDecimal('5')", new BigDecimal("5"),BigDecimal.class);
+		evaluateAndCheckError("+'abc'",SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 
 		// string concatenation
 		evaluate("'abc'+'def'","abcdef",String.class);
@@ -571,72 +576,6 @@ public class OperatorTests extends AbstractExpressionTests {
 		evaluate("'abc' != 'def'", true, Boolean.class);
 	}
 
-	@Test
-	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);
-
-		// 4 is the position of the '*' (repeat operator)
-		evaluateAndCheckError("'a' * 257", String.class, MAX_REPEATED_TEXT_SIZE_EXCEEDED, 4);
-	}
-
-	@Test
-	void stringConcatenation() {
-		evaluate("'' + ''", "", String.class);
-		evaluate("'' + null", "null", String.class);
-		evaluate("null + ''", "null", String.class);
-		evaluate("'ab' + null", "abnull", String.class);
-		evaluate("null + 'ab'", "nullab", String.class);
-		evaluate("'ab' + 2", "ab2", String.class);
-		evaluate("2 + 'ab'", "2ab", String.class);
-		evaluate("'abc' + 'def'", "abcdef", String.class);
-
-		// Text is big but not too big
-		final int maxSize = 100_000;
-		context.setVariable("text1", createString(maxSize));
-		Expression expr = parser.parseExpression("#text1 + ''");
-		assertThat(expr.getValue(context, String.class)).hasSize(maxSize);
-
-		expr = parser.parseExpression("'' + #text1");
-		assertThat(expr.getValue(context, String.class)).hasSize(maxSize);
-
-		context.setVariable("text1", createString(maxSize / 2));
-		expr = parser.parseExpression("#text1 + #text1");
-		assertThat(expr.getValue(context, String.class)).hasSize(maxSize);
-
-		// Text is too big
-		context.setVariable("text1", createString(maxSize + 1));
-		evaluateAndCheckError("#text1 + ''", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 7);
-		evaluateAndCheckError("#text1 + true", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 7);
-		evaluateAndCheckError("'' + #text1", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 3);
-		evaluateAndCheckError("true + #text1", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 5);
-
-		context.setVariable("text1", createString(maxSize / 2));
-		context.setVariable("text2", createString((maxSize / 2) + 1));
-		evaluateAndCheckError("#text1 + #text2", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 7);
-		evaluateAndCheckError("#text1 + #text2 + true", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 7);
-		evaluateAndCheckError("#text1 + true + #text2", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 14);
-		evaluateAndCheckError("true + #text1 + #text2", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 14);
-
-		evaluateAndCheckError("#text2 + #text1", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 7);
-		evaluateAndCheckError("#text2 + #text1 + true", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 7);
-		evaluateAndCheckError("#text2 + true + #text1", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 14);
-		evaluateAndCheckError("true + #text2 + #text1", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 14);
-
-		context.setVariable("text1", createString((maxSize / 3) + 1));
-		evaluateAndCheckError("#text1 + #text1 + #text1", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 16);
-		evaluateAndCheckError("(#text1 + #text1) + #text1", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 18);
-		evaluateAndCheckError("#text1 + (#text1 + #text1)", String.class, MAX_CONCATENATED_STRING_LENGTH_EXCEEDED, 7);
-	}
-
-	private static String createString(int size) {
-		return new String(new char[size]);
-	}
-
 	@Test
 	public void testLongs() {
 		evaluate("3L == 4L", false, Boolean.class);

spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,7 @@ import java.util.function.Consumer;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationContext;
-import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionException;
-import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.SpelMessage;
 import org.springframework.expression.spel.SpelNode;
 import org.springframework.expression.spel.SpelParseException;
@@ -37,19 +35,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 /**
  * @author Andy Clement
  * @author Juergen Hoeller
- * @author Sam Brannen
  */
 public class SpelParserTests {
 
-	@Test  // gh-30464
-	public void nullExpression() {
-		ExpressionParser parser = new SpelExpressionParser();
-		String expression = null;
-		Expression expr = parser.parseExpression(expression);
-		Object result = expr.getValue();
-		assertThat(result).isNull();
-	}
-
 	@Test
 	public void theMostBasic() {
 		SpelExpressionParser parser = new SpelExpressionParser();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.http.server.PathContainer;
-import org.springframework.util.StringUtils;
 
 /**
  * Parser for URI path patterns producing {@link PathPattern} instances that can
@@ -104,17 +103,6 @@ public class PathPatternParser {
 	}
 
 
-	/**
-	 * Prepare the given pattern for use in matching to full URL paths.
-	 * <p>By default, prepend a leading slash if needed for non-empty patterns.
-	 * @param pattern the pattern to initialize
-	 * @return the updated pattern
-	 * @since 5.2.25
-	 */
-	public String initFullPathPattern(String pattern) {
-		return (StringUtils.hasLength(pattern) && !pattern.startsWith("/") ? "/" + pattern : pattern);
-	}
-
 	/**
 	 * Process the path pattern content, a character at a time, breaking it into
 	 * path elements around separator boundaries and verifying the structure at each

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,9 +109,10 @@ public abstract class RequestPredicates {
 	 */
 	public static RequestPredicate path(String pattern) {
 		Assert.notNull(pattern, "'pattern' must not be null");
-		PathPatternParser parser = PathPatternParser.defaultInstance;
-		pattern = parser.initFullPathPattern(pattern);
-		return pathPredicates(parser).apply(pattern);
+		if (!pattern.isEmpty() && !pattern.startsWith("/")) {
+			pattern = "/" + pattern;
+		}
+		return pathPredicates(PathPatternParser.defaultInstance).apply(pattern);
 	}
 
 	/**

spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,9 @@ import org.springframework.beans.BeansException;
 import org.springframework.http.server.PathContainer;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.util.pattern.PathPattern;
-import org.springframework.web.util.pattern.PathPatternParser;
 
 /**
  * Abstract base class for URL-mapped
@@ -185,9 +185,8 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping {
 		Object resolvedHandler = handler;
 
 		// Parse path pattern
-		PathPatternParser parser = getPathPatternParser();
-		urlPath = parser.initFullPathPattern(urlPath);
-		PathPattern pattern = parser.parse(urlPath);
+		urlPath = prependLeadingSlash(urlPath);
+		PathPattern pattern = getPathPatternParser().parse(urlPath);
 		if (this.handlerMap.containsKey(pattern)) {
 			Object existingHandler = this.handlerMap.get(pattern);
 			if (existingHandler != null && existingHandler != resolvedHandler) {
@@ -216,4 +215,14 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping {
 		return (handler instanceof String ? "'" + handler + "'" : handler.toString());
 	}
 
+
+	private static String prependLeadingSlash(String pattern) {
+		if (StringUtils.hasLength(pattern) && !pattern.startsWith("/")) {
+			return "/" + pattern;
+		}
+		else {
+			return pattern;
+		}
+	}
+
 }

spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.http.server.PathContainer;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.util.pattern.PathPattern;
@@ -85,9 +86,8 @@ public class ResourceUrlProvider implements ApplicationListener<ContextRefreshed
 	public void registerHandlers(Map<String, ResourceWebHandler> handlerMap) {
 		this.handlerMap.clear();
 		handlerMap.forEach((rawPattern, resourceWebHandler) -> {
-			PathPatternParser parser = PathPatternParser.defaultInstance;
-			rawPattern = parser.initFullPathPattern(rawPattern);
-			PathPattern pattern = parser.parse(rawPattern);
+			rawPattern = prependLeadingSlash(rawPattern);
+			PathPattern pattern = PathPatternParser.defaultInstance.parse(rawPattern);
 			this.handlerMap.put(pattern, resourceWebHandler);
 		});
 	}
@@ -173,4 +173,14 @@ public class ResourceUrlProvider implements ApplicationListener<ContextRefreshed
 				});
 	}
 
+
+	private static String prependLeadingSlash(String pattern) {
+		if (StringUtils.hasLength(pattern) && !pattern.startsWith("/")) {
+			return "/" + pattern;
+		}
+		else {
+			return pattern;
+		}
+	}
+
 }

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -564,9 +564,11 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 				return Collections.emptyList();
 			}
 			List<PathPattern> result = new ArrayList<>(patterns.length);
-			for (String pattern : patterns) {
-				pattern = parser.initFullPathPattern(pattern);
-				result.add(parser.parse(pattern));
+			for (String path : patterns) {
+				if (StringUtils.hasText(path) && !path.startsWith("/")) {
+					path = "/" + path;
+				}
+				result.add(parser.parse(path));
 			}
 			return result;
 		}

spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,9 +107,10 @@ public abstract class RequestPredicates {
 	 */
 	public static RequestPredicate path(String pattern) {
 		Assert.notNull(pattern, "'pattern' must not be null");
-		PathPatternParser parser = PathPatternParser.defaultInstance;
-		pattern = parser.initFullPathPattern(pattern);
-		return pathPredicates(parser).apply(pattern);
+		if (!pattern.isEmpty() && !pattern.startsWith("/")) {
+			pattern = "/" + pattern;
+		}
+		return pathPredicates(PathPatternParser.defaultInstance).apply(pattern);
 	}
 
 	/**
@@ -332,14 +333,14 @@ public abstract class RequestPredicates {
 		void method(Set<HttpMethod> methods);
 
 		/**
-		 * Receive notification of a path predicate.
+		 * Receive notification of an path predicate.
 		 * @param pattern the path pattern that makes up the predicate
 		 * @see RequestPredicates#path(String)
 		 */
 		void path(String pattern);
 
 		/**
-		 * Receive notification of a path extension predicate.
+		 * Receive notification of an path extension predicate.
 		 * @param extension the path extension that makes up the predicate
 		 * @see RequestPredicates#pathExtension(String)
 		 */
@@ -425,11 +426,11 @@ public abstract class RequestPredicates {
 		void unknown(RequestPredicate predicate);
 	}
 
-
 	private static class HttpMethodPredicate implements RequestPredicate {
 
 		private final Set<HttpMethod> httpMethods;
 
+
 		public HttpMethodPredicate(HttpMethod httpMethod) {
 			Assert.notNull(httpMethod, "HttpMethod must not be null");
 			this.httpMethods = EnumSet.of(httpMethod);
@@ -640,14 +641,12 @@ public abstract class RequestPredicates {
 		}
 	}
 
-
 	private static class PathExtensionPredicate implements RequestPredicate {
 
 		private final Predicate<String> extensionPredicate;
 
 		@Nullable
 		private final String extension;
-
 		public PathExtensionPredicate(Predicate<String> extensionPredicate) {
 			Assert.notNull(extensionPredicate, "Predicate must not be null");
 			this.extensionPredicate = extensionPredicate;

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ import org.springframework.util.PathMatcher;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.util.UrlPathHelper;
-import org.springframework.web.util.pattern.PathPatternParser;
 
 /**
  * A logical disjunction (' || ') request condition that matches a request
@@ -143,7 +142,9 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR
 		}
 		Set<String> result = new LinkedHashSet<>(patterns.length);
 		for (String pattern : patterns) {
-			pattern = PathPatternParser.defaultInstance.initFullPathPattern(pattern);
+			if (StringUtils.hasLength(pattern) && !pattern.startsWith("/")) {
+				pattern = "/" + pattern;
+			}
 			result.add(pattern);
 		}
 		return result;

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,6 @@ import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 import org.springframework.web.util.UriComponentsBuilder;
-import org.springframework.web.util.pattern.PathPatternParser;
 
 /**
  * Creates instances of {@link org.springframework.web.util.UriComponentsBuilder}
@@ -546,7 +545,9 @@ public class MvcUriComponentsBuilder {
 		String typePath = getClassMapping(controllerType);
 		String methodPath = getMethodMapping(method);
 		String path = pathMatcher.combine(typePath, methodPath);
-		path = PathPatternParser.defaultInstance.initFullPathPattern(path);
+		if (StringUtils.hasLength(path) && !path.startsWith("/")) {
+			path = "/" + path;
+		}
 		builder.path(path);
 
 		return applyContributors(builder, method, args);