From 5587d7907096d2fe253631d6bda5e1c47aa8ba69 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 27 Mar 2014 13:21:20 -0400 Subject: [PATCH] INT-3330 Fix JDK8 Javadoc Violations JIRA: https://jira.spring.io/browse/INT-3330 --- .../jmx/config/EnableIntegrationMBeanExport.java | 14 +++++++++----- .../IntegrationMBeanExportConfiguration.java | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/EnableIntegrationMBeanExport.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/EnableIntegrationMBeanExport.java index 73562db00b..3d22bf4c3e 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/EnableIntegrationMBeanExport.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/EnableIntegrationMBeanExport.java @@ -33,7 +33,7 @@ import org.springframework.jmx.support.RegistrationPolicy; * bean is defined under the name {@code integrationMbeanExporter}. Alternatively, consider defining a * custom {@link org.springframework.integration.monitor.IntegrationMBeanExporter} bean explicitly. * - *

This annotation is modeled after and functionally equivalent to Spring XML's + *

This annotation is modeled after and functionally equivalent to Spring Integration XML's * {@code } element. * * @author Artem Bilan @@ -47,15 +47,17 @@ public @interface EnableIntegrationMBeanExport { /** * The default domain to use when generating JMX ObjectNames. - * Supports property placeholders (e.g. {@code ${project.domain}). + * Supports property placeholders (e.g. {@code ${project.domain}}). + * @return the domain. */ String defaultDomain() default ""; /** * The bean name of the MBeanServer to which MBeans should be exported. Default is to * use the platform's default MBeanServer. - * Supports property placeholders (e.g. {@code ${project.mbeanServer}) - * and SpEL expression (e.g. {@code #{mbeanServer}). + * Supports property placeholders (e.g. {@code ${project.mbeanServer}}) + * and SpEL expression (e.g. {@code #{mbeanServer}}). + * @return the server. */ String server() default ""; @@ -63,6 +65,7 @@ public @interface EnableIntegrationMBeanExport { * The policy to use when attempting to register an MBean under an * {@link javax.management.ObjectName} that already exists. Defaults to * {@link org.springframework.jmx.support.RegistrationPolicy#FAIL_ON_EXISTING}. + * @return the registration policy. */ RegistrationPolicy registration() default RegistrationPolicy.FAIL_ON_EXISTING; @@ -72,7 +75,8 @@ public @interface EnableIntegrationMBeanExport { * the 'name' property of the ObjectName. A MessageChannel and a MessageHandler (for instance) * can share a name because they have a different type, so in that case they would either both * be included or both excluded. - * Supports property placeholders (e.g. {@code ${managed.components}). Can be applied for each element. + * Supports property placeholders (e.g. {@code ${managed.components}}). Can be applied for each element. + * @return the patterns. */ String[] managedComponents() default "*"; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java index a2e70eae6b..b7d461d335 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/IntegrationMBeanExportConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.util.StringUtils; /** * {@code @Configuration} class that registers a {@link IntegrationMBeanExporter} bean. - *

+ * *

This configuration class is automatically imported when using the * {@link EnableIntegrationMBeanExport} annotation. See its javadoc for complete usage details. *