Merge branch '6.0.x'

Author: sbrannen

Diff for: spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java

@@ -53,7 +53,6 @@
 import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.core.Constants;
 import org.springframework.jmx.export.assembler.AutodetectCapableMBeanInfoAssembler;
 import org.springframework.jmx.export.assembler.MBeanInfoAssembler;
 import org.springframework.jmx.export.assembler.SimpleReflectiveMBeanInfoAssembler;
@@ -92,6 +91,7 @@
  * @author Rick Evans
  * @author Mark Fisher
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 1.2
  * @see #setBeans
  * @see #setAutodetect
@@ -134,12 +134,18 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 	/** Constant for the JMX {@code mr_type} "ObjectReference". */
 	private static final String MR_TYPE_OBJECT_REFERENCE = "ObjectReference";
 
-	/** Prefix for the autodetect constants defined in this class. */
-	private static final String CONSTANT_PREFIX_AUTODETECT = "AUTODETECT_";
-
+	/**
+	 * Map of constant names to constant values for the autodetect constants defined
+	 * in this class.
+	 * @since 6.0.11
+	 */
+	private static final Map<String, Integer> constants = Map.of(
+			"AUTODETECT_NONE", AUTODETECT_NONE,
+			"AUTODETECT_MBEAN", AUTODETECT_MBEAN,
+			"AUTODETECT_ASSEMBLER", AUTODETECT_ASSEMBLER,
+			"AUTODETECT_ALL", AUTODETECT_ALL
+		);
 
-	/** Constants instance for this class. */
-	private static final Constants constants = new Constants(MBeanExporter.class);
 
 	/** The beans to be exposed as JMX managed resources, with JMX names as keys. */
 	@Nullable
@@ -222,38 +228,52 @@ public void setAutodetect(boolean autodetect) {
 		this.autodetectMode = (autodetect ? AUTODETECT_ALL : AUTODETECT_NONE);
 	}
 
+	/**
+	 * Set the autodetection mode to use by name.
+	 * @throws IllegalArgumentException if the supplied value is not resolvable
+	 * to one of the {@code AUTODETECT_} constants or is {@code null}
+	 * @see #setAutodetectMode(int)
+	 * @see #getAutodetectMode()
+	 * @see #AUTODETECT_ALL
+	 * @see #AUTODETECT_ASSEMBLER
+	 * @see #AUTODETECT_MBEAN
+	 * @see #AUTODETECT_NONE
+	 */
+	public void setAutodetectModeName(String constantName) {
+		Assert.hasText(constantName, "'constantName' must not be null or blank");
+		Integer mode = constants.get(constantName);
+		Assert.notNull(mode, "Only autodetect constants allowed");
+		this.autodetectMode = mode;
+	}
+
 	/**
 	 * Set the autodetection mode to use.
 	 * @throws IllegalArgumentException if the supplied value is not
 	 * one of the {@code AUTODETECT_} constants
 	 * @see #setAutodetectModeName(String)
+	 * @see #getAutodetectMode()
 	 * @see #AUTODETECT_ALL
 	 * @see #AUTODETECT_ASSEMBLER
 	 * @see #AUTODETECT_MBEAN
 	 * @see #AUTODETECT_NONE
 	 */
 	public void setAutodetectMode(int autodetectMode) {
-		if (!constants.getValues(CONSTANT_PREFIX_AUTODETECT).contains(autodetectMode)) {
-			throw new IllegalArgumentException("Only values of autodetect constants allowed");
-		}
+		Assert.isTrue(constants.containsValue(autodetectMode),
+				"Only values of autodetect constants allowed");
 		this.autodetectMode = autodetectMode;
 	}
 
 	/**
-	 * Set the autodetection mode to use by name.
-	 * @throws IllegalArgumentException if the supplied value is not resolvable
-	 * to one of the {@code AUTODETECT_} constants or is {@code null}
+	 * Get the autodetect mode to use for this {@code MBeanExporter}.
+	 * @return the configured autodetect mode, or {@code null} if not explicitly
+	 * configured
+	 * @since 6.0.11
+	 * @see #setAutodetectModeName(String)
 	 * @see #setAutodetectMode(int)
-	 * @see #AUTODETECT_ALL
-	 * @see #AUTODETECT_ASSEMBLER
-	 * @see #AUTODETECT_MBEAN
-	 * @see #AUTODETECT_NONE
 	 */
-	public void setAutodetectModeName(String constantName) {
-		if (!constantName.startsWith(CONSTANT_PREFIX_AUTODETECT)) {
-			throw new IllegalArgumentException("Only autodetect constants allowed");
-		}
-		this.autodetectMode = (Integer) constants.asNumber(constantName);
+	@Nullable
+	public Integer getAutodetectMode() {
+		return this.autodetectMode;
 	}
 
 	/**