Commit 96596f8e authored by Stephane Nicoll's avatar Stephane Nicoll

Polish contribution

See gh-17962
parent 7ee36561
...@@ -136,8 +136,7 @@ class AutoConfigurationSorter { ...@@ -136,8 +136,7 @@ class AutoConfigurationSorter {
} }
Set<String> getClassesRequestedAfter(String className) { Set<String> getClassesRequestedAfter(String className) {
Set<String> setOfClassesRequestedAfter = get(className).getAfter(); Set<String> classesRequestedAfter = new LinkedHashSet<>(get(className).getAfter());
Set<String> classesRequestedAfter = new LinkedHashSet<>(setOfClassesRequestedAfter);
this.classes.forEach((name, autoConfigurationClass) -> { this.classes.forEach((name, autoConfigurationClass) -> {
if (autoConfigurationClass.getBefore().contains(className)) { if (autoConfigurationClass.getBefore().contains(className)) {
classesRequestedAfter.add(name); classesRequestedAfter.add(name);
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
package org.springframework.boot.autoconfigure.jmx; package org.springframework.boot.autoconfigure.jmx;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Map;
import javax.management.MalformedObjectNameException; import javax.management.MalformedObjectNameException;
import javax.management.ObjectName; import javax.management.ObjectName;
...@@ -58,8 +57,7 @@ public class ParentAwareNamingStrategy extends MetadataNamingStrategy implements ...@@ -58,8 +57,7 @@ public class ParentAwareNamingStrategy extends MetadataNamingStrategy implements
@Override @Override
public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException { public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
ObjectName name = super.getObjectName(managedBean, beanKey); ObjectName name = super.getObjectName(managedBean, beanKey);
Map<String, String> keyPropertyList = name.getKeyPropertyList(); Hashtable<String, String> properties = new Hashtable<>(name.getKeyPropertyList());
Hashtable<String, String> properties = new Hashtable<>(keyPropertyList);
if (this.ensureUniqueRuntimeObjectNames) { if (this.ensureUniqueRuntimeObjectNames) {
properties.put("identity", ObjectUtils.getIdentityHexString(managedBean)); properties.put("identity", ObjectUtils.getIdentityHexString(managedBean));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment