diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index dadd872838d..4f0f8a7e62b 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -86,6 +86,11 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 
 	private static final String COMPONENT_ANNOTATION_CLASSNAME = "org.springframework.stereotype.Component";
 
+	private static final Adapt[] ADAPTATIONS = Adapt.values(false, true);
+
+
+	private static final Log logger = LogFactory.getLog(AnnotationBeanNameGenerator.class);
+
 	/**
 	 * Set used to track which stereotype annotations have already been checked
 	 * to see if they use a convention-based override for the {@code value}
@@ -95,11 +100,6 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 	 */
 	private static final Set<String> conventionBasedStereotypeCheckCache = ConcurrentHashMap.newKeySet();
 
-	private static final Adapt[] ADAPTATIONS = Adapt.values(false, true);
-
-
-	private final Log logger = LogFactory.getLog(AnnotationBeanNameGenerator.class);
-
 	private final Map<String, Set<String>> metaAnnotationTypesCache = new ConcurrentHashMap<>();
 
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
index 1243f18458e..e0973d204bc 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
@@ -576,23 +576,23 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 	}
 
 	/**
-	 * Return the {@link ObservationRegistry} used for recording
+	 * Set the {@link ObservationRegistry} to be used for recording
 	 * {@link JmsObservationDocumentation#JMS_MESSAGE_PROCESS JMS message processing observations}.
+	 * Defaults to no-op observations if the registry is not set.
 	 * @since 6.1
 	 */
-	@Nullable
-	public ObservationRegistry getObservationRegistry() {
-		return this.observationRegistry;
+	public void setObservationRegistry(@Nullable ObservationRegistry observationRegistry) {
+		this.observationRegistry = observationRegistry;
 	}
 
 	/**
-	 * Set the {@link ObservationRegistry} to be used for recording
+	 * Return the {@link ObservationRegistry} used for recording
 	 * {@link JmsObservationDocumentation#JMS_MESSAGE_PROCESS JMS message processing observations}.
-	 * Defaults to no-op observations if the registry is not set.
 	 * @since 6.1
 	 */
-	public void setObservationRegistry(@Nullable ObservationRegistry observationRegistry) {
-		this.observationRegistry = observationRegistry;
+	@Nullable
+	public ObservationRegistry getObservationRegistry() {
+		return this.observationRegistry;
 	}
 
 	/**