Merge 13fbbd1020 into 7e6874ad80

Closes gh-35580

framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired.adoc

@@ -37,18 +37,18 @@ Kotlin::
 ----
 ======
 
-[NOTE]
+[TIP]
 ====
-As of Spring Framework 4.3, an `@Autowired` annotation on such a constructor is no longer
+An `@Autowired` annotation on such a constructor is not necessary if the target bean
-necessary if the target bean defines only one constructor to begin with. However, if
+defines only one constructor. However, if several constructors are available and there is
-several constructors are available and there is no primary/default constructor, at least
+no primary or default constructor, at least one of the constructors must be annotated
-one of the constructors must be annotated with `@Autowired` in order to instruct the
+with `@Autowired` in order to instruct the container which one to use. See the discussion
-container which one to use. See the discussion on
+on xref:core/beans/annotation-config/autowired.adoc#beans-autowired-annotation-constructor-resolution[constructor resolution]
-xref:core/beans/annotation-config/autowired.adoc#beans-autowired-annotation-constructor-resolution[constructor resolution] for details.
+for details.
 ====
 
-You can also apply the `@Autowired` annotation to _traditional_ setter methods,
+You can apply the `@Autowired` annotation to _traditional_ setter methods, as the
-as the following example shows:
+following example shows:
 
 [tabs]
 ======
@@ -84,8 +84,8 @@ Kotlin::
 ----
 ======
 
-You can also apply the annotation to methods with arbitrary names and multiple
+You can apply `@Autowired` to methods with arbitrary names and multiple arguments, as the
-arguments, as the following example shows:
+following example shows:
 
 [tabs]
 ======
@@ -176,14 +176,15 @@ Kotlin::
 ====
 Make sure that your target components (for example, `MovieCatalog` or `CustomerPreferenceDao`)
 are consistently declared by the type that you use for your `@Autowired`-annotated
-injection points. Otherwise, injection may fail due to a "no type match found" error at runtime.
+injection points. Otherwise, injection may fail due to a "no type match found" error at
+runtime.
 
 For XML-defined beans or component classes found via classpath scanning, the container
 usually knows the concrete type up front. However, for `@Bean` factory methods, you need
 to make sure that the declared return type is sufficiently expressive. For components
 that implement several interfaces or for components potentially referred to by their
-implementation type, consider declaring the most specific return type on your factory
+implementation type, declare the most specific return type on your factory method (at
-method (at least as specific as required by the injection points referring to your bean).
+least as specific as required by the injection points referring to your bean).
 ====
 
 .[[beans-autowired-annotation-self-injection]]Self Injection
@@ -312,8 +313,8 @@ through `@Order` values in combination with `@Primary` on a single bean for each
 ====
 
 Even typed `Map` instances can be autowired as long as the expected key type is `String`.
-The map values contain all beans of the expected type, and the keys contain the
+The map values are all beans of the expected type, and the keys are the corresponding
-corresponding bean names, as the following example shows:
+bean names, as the following example shows:
 
 [tabs]
 ======
@@ -431,7 +432,7 @@ annotated constructor does not have to be public.
 ====
 
 Alternatively, you can express the non-required nature of a particular dependency
-through Java 8's `java.util.Optional`, as the following example shows:
+through Java's `java.util.Optional`, as the following example shows:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
@@ -445,8 +446,8 @@ through Java 8's `java.util.Optional`, as the following example shows:
 ----
 
 You can also use a parameter-level `@Nullable` annotation (of any kind in any package --
-for example, `javax.annotation.Nullable` from JSR-305) or just leverage Kotlin built-in
+for example, `org.jspecify.annotations.Nullable` from JSpecify) or just leverage Kotlin's
-null-safety support:
+built-in null-safety support:
 
 [tabs]
 ======
@@ -477,13 +478,6 @@ Kotlin::
 ----
 ======
 
-[NOTE]
-====
-A type-level `@Nullable` annotation such as from JSpecify is not supported in Spring
-Framework 6.2 yet. You need to upgrade to Spring Framework 7.0 where the framework
-detects type-level annotations and consistently declares JSpecify in its own codebase.
-====
-
 You can also use `@Autowired` for interfaces that are well-known resolvable
 dependencies: `BeanFactory`, `ApplicationContext`, `Environment`, `ResourceLoader`,
 `ApplicationEventPublisher`, and `MessageSource`. These interfaces and their extended
@@ -528,5 +522,6 @@ class MovieRecommender {
 The `@Autowired`, `@Inject`, `@Value`, and `@Resource` annotations are handled by Spring
 `BeanPostProcessor` implementations. This means that you cannot apply these annotations
 within your own `BeanPostProcessor` or `BeanFactoryPostProcessor` types (if any).
+
 These types must be 'wired up' explicitly by using XML or a Spring `@Bean` method.
 ====

spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java

@@ -714,22 +714,20 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 	 */
 	private class CracResourceAdapter implements org.crac.Resource {
 
-		private @Nullable CyclicBarrier barrier;
+		private CyclicBarrier stepToRestore = new CyclicBarrier(2);
+		private CyclicBarrier finishRestore = new CyclicBarrier(2);
+
+		private void preventShutdown() {
+			waitBarrier(this.stepToRestore);
+			// Checkpoint happens here
+			waitBarrier(this.finishRestore);
+		}
 
 		@Override
 		public void beforeCheckpoint(org.crac.Context<? extends org.crac.Resource> context) {
-			// A non-daemon thread for preventing an accidental JVM shutdown before the checkpoint
+			Thread thread = new Thread(this::preventShutdown, "prevent-shutdown");
-			this.barrier = new CyclicBarrier(2);
-
-			Thread thread = new Thread(() -> {
-				awaitPreventShutdownBarrier();
-				// Checkpoint happens here
-				awaitPreventShutdownBarrier();
-			}, "prevent-shutdown");
-
 			thread.setDaemon(false);
 			thread.start();
-			awaitPreventShutdownBarrier();
 
 			logger.debug("Stopping Spring-managed lifecycle beans before JVM checkpoint");
 			stopForRestart();
@@ -737,11 +735,24 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 
 		@Override
 		public void afterRestore(org.crac.Context<? extends org.crac.Resource> context) {
+			// Unlock barrier for beforeCheckpoint
+			try {
+				this.stepToRestore.await();
+			}
+			catch (Exception ex) {
+				logger.trace("Exception from stepToRestore barrier", ex);
+			}
+
 			logger.info("Restarting Spring-managed lifecycle beans after JVM restore");
 			restartAfterStop();
 
-			// Barrier for prevent-shutdown thread not needed anymore
+			// Unlock barrier for afterRestore to shutdown "prevent-shutdown" thread
-			this.barrier = null;
+			try {
+				this.finishRestore.await();
+			}
+			catch (Exception ex) {
+				logger.trace("Exception from stepToRestore barrier", ex);
+			}
 
 			if (!checkpointOnRefresh) {
 				logger.info("Spring-managed lifecycle restart completed (restored JVM running for " +
@@ -749,11 +760,9 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 			}
 		}
 
-		private void awaitPreventShutdownBarrier() {
+		private void waitBarrier(CyclicBarrier barrier) {
 			try {
-				if (this.barrier != null) {
+				barrier.await();
-					this.barrier.await();
-				}
 			}
 			catch (Exception ex) {
 				logger.trace("Exception from prevent-shutdown barrier", ex);