Align after merge from 6.1.x

Author: jhoeller

spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java

@@ -20,6 +20,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;

spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java

@@ -679,6 +679,32 @@ void nonEmptyParamList() {
 	}
 
 
+	static ScheduledMethodRunnableAssert assertThatScheduledRunnable(Runnable runnable) {
+		return new ScheduledMethodRunnableAssert(runnable);
+	}
+
+
+	static class ScheduledMethodRunnableAssert extends AbstractAssert<ScheduledMethodRunnableAssert, Runnable> {
+
+		public ScheduledMethodRunnableAssert(Runnable actual) {
+			super(actual, ScheduledMethodRunnableAssert.class);
+			assertThat(actual).extracting("runnable").isInstanceOf(ScheduledMethodRunnable.class);
+		}
+
+		public ScheduledMethodRunnableAssert hasTarget(Object target) {
+			isNotNull();
+			assertThat(actual).extracting("runnable.target").isEqualTo(target);
+			return this;
+		}
+
+		public ScheduledMethodRunnableAssert hasMethodName(String name) {
+			isNotNull();
+			assertThat(actual).extracting("runnable.method.name").isEqualTo(name);
+			return this;
+		}
+	}
+
+
 	static class FixedDelay {
 
 		@Scheduled(fixedDelay = 5_000)
@@ -1019,29 +1045,4 @@ public Class<?> convert(Object beanClassName, ParameterContext context) throws A
 		}
 	}
 
-	static ScheduledMethodRunnableAssert assertThatScheduledRunnable(Runnable runnable) {
-		return new ScheduledMethodRunnableAssert(runnable);
-	}
-
-	static class ScheduledMethodRunnableAssert extends AbstractAssert<ScheduledMethodRunnableAssert, Runnable> {
-
-		public ScheduledMethodRunnableAssert(Runnable actual) {
-			super(actual, ScheduledMethodRunnableAssert.class);
-			assertThat(actual).extracting("runnable").isInstanceOf(ScheduledMethodRunnable.class);
-		}
-
-		public ScheduledMethodRunnableAssert hasTarget(Object target) {
-			isNotNull();
-			assertThat(actual).extracting("runnable.target").isEqualTo(target);
-			return this;
-		}
-
-		public ScheduledMethodRunnableAssert hasMethodName(String name) {
-			isNotNull();
-			assertThat(actual).extracting("runnable.method.name").isEqualTo(name);
-			return this;
-		}
-
-	}
-
 }