Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish contribution

Browse Source 
See gh-17962
This commit is contained in:
Stephane Nicoll
2019-08-28 10:55:32 +02:00
parent 7ee3656188
commit 96596f8ecc
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java
View File

@@ -136,8 +136,7 @@ class AutoConfigurationSorter {
}
Set<String> getClassesRequestedAfter(String className) {
Set<String> setOfClassesRequestedAfter = get(className).getAfter();
Set<String> classesRequestedAfter = new LinkedHashSet<>(setOfClassesRequestedAfter);
Set<String> classesRequestedAfter = new LinkedHashSet<>(get(className).getAfter());
this.classes.forEach((name, autoConfigurationClass) -> {
if (autoConfigurationClass.getBefore().contains(className)) {
classesRequestedAfter.add(name);

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java
View File

@@ -17,7 +17,6 @@
package org.springframework.boot.autoconfigure.jmx;
import java.util.Hashtable;
import java.util.Map;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -58,8 +57,7 @@ public class ParentAwareNamingStrategy extends MetadataNamingStrategy implements
@Override
public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
ObjectName name = super.getObjectName(managedBean, beanKey);
Map<String, String> keyPropertyList = name.getKeyPropertyList();
Hashtable<String, String> properties = new Hashtable<>(keyPropertyList);
Hashtable<String, String> properties = new Hashtable<>(name.getKeyPropertyList());
if (this.ensureUniqueRuntimeObjectNames) {
properties.put("identity", ObjectUtils.getIdentityHexString(managedBean));
}