Skip to content

Commit b6d9fd3

Browse files
committed
Support @ManagedNotification & @ManagedOperationParameter as merged annotations
Issue: SPR-13973
1 parent 6b7731c commit b6d9fd3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.beans.factory.BeanFactoryAware;
3030
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
3131
import org.springframework.beans.factory.config.EmbeddedValueResolver;
32+
import org.springframework.core.annotation.AnnotatedElementUtils;
3233
import org.springframework.core.annotation.AnnotationUtils;
3334
import org.springframework.jmx.export.metadata.InvalidMetadataException;
3435
import org.springframework.jmx.export.metadata.JmxAttributeSource;
@@ -106,7 +107,7 @@ public org.springframework.jmx.export.metadata.ManagedOperation getManagedOperat
106107
public org.springframework.jmx.export.metadata.ManagedOperationParameter[] getManagedOperationParameters(Method method)
107108
throws InvalidMetadataException {
108109

109-
Set<ManagedOperationParameter> anns = AnnotationUtils.getRepeatableAnnotations(
110+
Set<ManagedOperationParameter> anns = AnnotatedElementUtils.getMergedRepeatableAnnotations(
110111
method, ManagedOperationParameter.class, ManagedOperationParameters.class);
111112
return copyPropertiesToBeanArray(anns, org.springframework.jmx.export.metadata.ManagedOperationParameter.class);
112113
}
@@ -115,7 +116,7 @@ public org.springframework.jmx.export.metadata.ManagedOperationParameter[] getMa
115116
public org.springframework.jmx.export.metadata.ManagedNotification[] getManagedNotifications(Class<?> clazz)
116117
throws InvalidMetadataException {
117118

118-
Set<ManagedNotification> anns = AnnotationUtils.getRepeatableAnnotations(
119+
Set<ManagedNotification> anns = AnnotatedElementUtils.getMergedRepeatableAnnotations(
119120
clazz, ManagedNotification.class, ManagedNotifications.class);
120121
return copyPropertiesToBeanArray(anns, org.springframework.jmx.export.metadata.ManagedNotification.class);
121122
}

0 commit comments

Comments
 (0)