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

Polish

Browse Source 
See gh-17962
This commit is contained in:
Kant
2019-08-26 20:32:28 +08:00
committed by Stephane Nicoll
parent 2726540e76
commit 7ee3656188
7 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,8 +136,8 @@ class AutoConfigurationSorter {
}
Set<String> getClassesRequestedAfter(String className) {
Set<String> classesRequestedAfter = new LinkedHashSet<>();
classesRequestedAfter.addAll(get(className).getAfter());
Set<String> setOfClassesRequestedAfter = get(className).getAfter();
Set<String> classesRequestedAfter = new LinkedHashSet<>(setOfClassesRequestedAfter);
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/ImportAutoConfigurationImportSelector.java
View File

@@ -58,8 +58,8 @@ class ImportAutoConfigurationImportSelector extends AutoConfigurationImportSelec
@Override
public Set<Object> determineImports(AnnotationMetadata metadata) {
Set<String> result = new LinkedHashSet<>();
result.addAll(getCandidateConfigurations(metadata, null));
List<String> candidateConfigurations = getCandidateConfigurations(metadata, null);
Set<String> result = new LinkedHashSet<>(candidateConfigurations);
result.removeAll(getExclusions(metadata, null));
return Collections.unmodifiableSet(result);
}

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
View File

@@ -376,9 +376,7 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat
return result;
}
result = (result != null) ? result : new LinkedHashSet<>();
for (String addition : additional) {
result.add(addition);
}
Collections.addAll(result, additional);
return result;
}
@@ -454,9 +452,7 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat
}
private void merge(Set<String> result, String... additional) {
for (String addition : additional) {
result.add(addition);
}
Collections.addAll(result, additional);
}
private Set<Class<?>> resolveWhenPossible(Set<String> classNames) {

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java
View File

@@ -102,10 +102,7 @@ public class GroovyTemplateAutoConfiguration {
try {
ProtectionDomain domain = MarkupTemplateEngine.class.getProtectionDomain();
CodeSource codeSource = domain.getCodeSource();
if (codeSource != null && codeSource.getLocation().toString().contains("-all")) {
return true;
}
return false;
return codeSource != null && codeSource.getLocation().toString().contains("-all");
}
catch (Exception ex) {
return false;

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

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

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java
View File

@@ -112,10 +112,7 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
: "none");
Map<String, Object> hibernate = this.hibernateProperties.determineHibernateProperties(
this.jpaProperties.getProperties(), new HibernateSettings().ddlAuto(defaultDdlAuto));
if (hibernate.containsKey("hibernate.hbm2ddl.auto")) {
return true;
}
return false;
return hibernate.containsKey("hibernate.hbm2ddl.auto");
}
/**

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Properties;
@@ -192,9 +193,7 @@ class AutoConfigurationSorterTests {
for (Class<?> type : value) {
items.add(type.getName());
}
for (String type : name) {
items.add(type);
}
Collections.addAll(items, name);
return StringUtils.collectionToCommaDelimitedString(items);
}