|
|
@ -54,17 +54,17 @@ class DefaultEndpointObjectNameFactory implements EndpointObjectNameFactory {
|
|
|
|
@SuppressWarnings("deprecation")
|
|
|
|
@SuppressWarnings("deprecation")
|
|
|
|
private static boolean determineUniqueNames(Environment environment,
|
|
|
|
private static boolean determineUniqueNames(Environment environment,
|
|
|
|
JmxEndpointProperties properties) {
|
|
|
|
JmxEndpointProperties properties) {
|
|
|
|
Boolean uniqueName = environment.getProperty("spring.jmx.unique-names",
|
|
|
|
Boolean uniqueNames = environment.getProperty("spring.jmx.unique-names",
|
|
|
|
Boolean.class);
|
|
|
|
Boolean.class);
|
|
|
|
Boolean endpointUniqueNames = properties.getUniqueNames();
|
|
|
|
Boolean endpointUniqueNames = properties.getUniqueNames();
|
|
|
|
if (uniqueName == null) {
|
|
|
|
if (uniqueNames == null) {
|
|
|
|
return (endpointUniqueNames != null) ? endpointUniqueNames : false;
|
|
|
|
return (endpointUniqueNames != null) ? endpointUniqueNames : false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (endpointUniqueNames != null & !uniqueName.equals(endpointUniqueNames)) {
|
|
|
|
if (endpointUniqueNames != null & !uniqueNames.equals(endpointUniqueNames)) {
|
|
|
|
throw new IllegalArgumentException(
|
|
|
|
throw new IllegalArgumentException(
|
|
|
|
"Configuration mismatch, 'management.endpoints.jmx.unique-names' is deprecated, use only 'spring.jmx.unique-names'");
|
|
|
|
"Configuration mismatch, 'management.endpoints.jmx.unique-names' is deprecated, use only 'spring.jmx.unique-names'");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return uniqueName;
|
|
|
|
return uniqueNames;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|