Browse Source

Remove getAutodetectMode() in MBeanExporter

After further consideration, the team has decided to remove the
getAutodetectMode() method since its return type conflicts with the
parameter type in setAutodetectMode(int), making it an invalid bean
property.

See gh-30855
pull/30915/head
Sam Brannen 1 year ago
parent
commit
07422d709e
  1. 15
      spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
  2. 16
      spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java

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

@ -153,7 +153,7 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo @@ -153,7 +153,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 +263,6 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo @@ -263,19 +263,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.

16
spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java

@ -446,7 +446,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { @@ -446,7 +446,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
assertThatIllegalArgumentException()
.isThrownBy(() -> exporter.setAutodetectMode(-1))
.withMessage("Only values of autodetect constants allowed");
assertThat(exporter.getAutodetectMode()).isNull();
assertThat(exporter.autodetectMode).isNull();
}
@Test
@ -454,7 +454,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { @@ -454,7 +454,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
assertThatIllegalArgumentException()
.isThrownBy(() -> exporter.setAutodetectMode(5))
.withMessage("Only values of autodetect constants allowed");
assertThat(exporter.getAutodetectMode()).isNull();
assertThat(exporter.autodetectMode).isNull();
}
/**
@ -471,7 +471,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { @@ -471,7 +471,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
@Test
void setAutodetectModeToSupportedValue() {
exporter.setAutodetectMode(MBeanExporter.AUTODETECT_ASSEMBLER);
assertThat(exporter.getAutodetectMode()).isEqualTo(MBeanExporter.AUTODETECT_ASSEMBLER);
assertThat(exporter.autodetectMode).isEqualTo(MBeanExporter.AUTODETECT_ASSEMBLER);
}
@Test
@ -479,7 +479,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { @@ -479,7 +479,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
assertThatIllegalArgumentException()
.isThrownBy(() -> exporter.setAutodetectModeName(null))
.withMessage("'constantName' must not be null or blank");
assertThat(exporter.getAutodetectMode()).isNull();
assertThat(exporter.autodetectMode).isNull();
}
@Test
@ -487,7 +487,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { @@ -487,7 +487,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
assertThatIllegalArgumentException()
.isThrownBy(() -> exporter.setAutodetectModeName(""))
.withMessage("'constantName' must not be null or blank");
assertThat(exporter.getAutodetectMode()).isNull();
assertThat(exporter.autodetectMode).isNull();
}
@Test
@ -495,7 +495,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { @@ -495,7 +495,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
assertThatIllegalArgumentException()
.isThrownBy(() -> exporter.setAutodetectModeName(" \t"))
.withMessage("'constantName' must not be null or blank");
assertThat(exporter.getAutodetectMode()).isNull();
assertThat(exporter.autodetectMode).isNull();
}
@Test
@ -503,7 +503,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { @@ -503,7 +503,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
assertThatIllegalArgumentException()
.isThrownBy(() -> exporter.setAutodetectModeName("Bogus"))
.withMessage("Only autodetect constants allowed");
assertThat(exporter.getAutodetectMode()).isNull();
assertThat(exporter.autodetectMode).isNull();
}
/**
@ -520,7 +520,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests { @@ -520,7 +520,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
@Test
void setAutodetectModeNameToSupportedValue() {
exporter.setAutodetectModeName("AUTODETECT_ASSEMBLER");
assertThat(exporter.getAutodetectMode()).isEqualTo(MBeanExporter.AUTODETECT_ASSEMBLER);
assertThat(exporter.autodetectMode).isEqualTo(MBeanExporter.AUTODETECT_ASSEMBLER);
}
@Test

Loading…
Cancel
Save