Merge branch '6.0.x'

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

@@ -137,7 +137,6 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 	/**
 	 * 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,
@@ -153,7 +152,7 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 
 	/** The autodetect mode to use for this MBeanExporter. */
 	@Nullable
-	private Integer autodetectMode;
+	Integer autodetectMode;
 
 	/** Whether to eagerly initialize candidate beans when autodetecting MBeans. */
 	private boolean allowEagerInit = false;
@@ -263,19 +262,6 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 		this.autodetectMode = autodetectMode;
 	}
 
-	/**
-	 * 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)
-	 */
-	@Nullable
-	public Integer getAutodetectMode() {
-		return this.autodetectMode;
-	}
-
 	/**
 	 * Specify whether to allow eager initialization of candidate beans
 	 * when autodetecting MBeans in the Spring application context.