GH-427: Evaluate multiplierSupplier only at runtime

src/main/java/org/springframework/retry/annotation/AnnotationAwareRetryOperationsInterceptor.java

@@ -453,7 +453,7 @@ private BackOffPolicy getBackoffPolicy(Backoff backoff, boolean stateless) {
 		String randomExpression = (String) attrs.get("randomExpression");
 		Expression parsedRandomExp = null;
 
-		if (getMultiplier(multiplier, parsedMultExp, stateless) > 0) {
+		if (multiplier > 0 || multiplierExpression != null) {
 			isRandom = backoff.random();
 			if (StringUtils.hasText(randomExpression)) {
 				parsedRandomExp = parse(randomExpression);
@@ -467,11 +467,6 @@ private BackOffPolicy getBackoffPolicy(Backoff backoff, boolean stateless) {
 				stateless);
 	}
 
-	private Double getMultiplier(Double multiplier, Expression parsedMultiplierExpression, Boolean stateless) {
-		return parsedMultiplierExpression != null ? evaluate(parsedMultiplierExpression, Double.class, stateless)
-				: multiplier;
-	}
-
 	private BackOffPolicy buildBackOff(long min, Expression minExp, long max, Expression maxExp, double multiplier,
 			Expression multExp, boolean isRandom, Expression randomExp, boolean stateless) {
 

src/main/java/org/springframework/retry/annotation/Backoff.java

@@ -131,10 +131,10 @@
 	 * this to true to have the backoff delays randomized, so that the maximum delay is
 	 * multiplier times the previous delay and the distribution is uniform between the two
 	 * values. Use {@code #{...}} for one-time evaluation during initialization, omit the
-	 * delimiters for evaluation at runtime. This expression is evaluated at configuration
-	 * phase. If it returns true and ({@link #multiplier()} > 1.0) then
-	 * {@link org.springframework.retry.backoff.ExponentialRandomBackOffPolicy} is created
-	 * else {@link org.springframework.retry.backoff.ExponentialBackOffPolicy} is created
+	 * delimiters for evaluation at runtime. This expression is always evaluated at
+	 * configuration phase. If the expression returns true then
+	 * {@link org.springframework.retry.backoff.ExponentialRandomBackOffPolicy} is used
+	 * else {@link org.springframework.retry.backoff.ExponentialBackOffPolicy} is used.
 	 * @return the flag to signal randomization is required (default false)
 	 */
 	String randomExpression() default "";