Skip to content

Commit 8457c76

Browse files
committed
Polishing
1 parent 6dc79b5 commit 8457c76

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
8686

8787
private static final String COMPONENT_ANNOTATION_CLASSNAME = "org.springframework.stereotype.Component";
8888

89+
private static final Adapt[] ADAPTATIONS = Adapt.values(false, true);
90+
91+
92+
private static final Log logger = LogFactory.getLog(AnnotationBeanNameGenerator.class);
93+
8994
/**
9095
* Set used to track which stereotype annotations have already been checked
9196
* to see if they use a convention-based override for the {@code value}
@@ -95,11 +100,6 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
95100
*/
96101
private static final Set<String> conventionBasedStereotypeCheckCache = ConcurrentHashMap.newKeySet();
97102

98-
private static final Adapt[] ADAPTATIONS = Adapt.values(false, true);
99-
100-
101-
private final Log logger = LogFactory.getLog(AnnotationBeanNameGenerator.class);
102-
103103
private final Map<String, Set<String>> metaAnnotationTypesCache = new ConcurrentHashMap<>();
104104

105105

spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -576,23 +576,23 @@ public ErrorHandler getErrorHandler() {
576576
}
577577

578578
/**
579-
* Return the {@link ObservationRegistry} used for recording
579+
* Set the {@link ObservationRegistry} to be used for recording
580580
* {@link JmsObservationDocumentation#JMS_MESSAGE_PROCESS JMS message processing observations}.
581+
* Defaults to no-op observations if the registry is not set.
581582
* @since 6.1
582583
*/
583-
@Nullable
584-
public ObservationRegistry getObservationRegistry() {
585-
return this.observationRegistry;
584+
public void setObservationRegistry(@Nullable ObservationRegistry observationRegistry) {
585+
this.observationRegistry = observationRegistry;
586586
}
587587

588588
/**
589-
* Set the {@link ObservationRegistry} to be used for recording
589+
* Return the {@link ObservationRegistry} used for recording
590590
* {@link JmsObservationDocumentation#JMS_MESSAGE_PROCESS JMS message processing observations}.
591-
* Defaults to no-op observations if the registry is not set.
592591
* @since 6.1
593592
*/
594-
public void setObservationRegistry(@Nullable ObservationRegistry observationRegistry) {
595-
this.observationRegistry = observationRegistry;
593+
@Nullable
594+
public ObservationRegistry getObservationRegistry() {
595+
return this.observationRegistry;
596596
}
597597

598598
/**

0 commit comments

Comments
 (0)