fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Polish

Browse Source 
See gh-13790
This commit is contained in:
Johnny Lim 2018-07-17 04:19:36 +09:00 committed by Stephane Nicoll
parent ec2ebf52de
commit f363fe7dd1
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java
View File

@ -81,11 +81,9 @@ public class ServletEndpointManagementContextConfiguration {
private Set<String> getServletPaths(WebEndpointProperties properties,
DispatcherServletPathProvider servletPathProvider) {
Set<String> servletPaths = servletPathProvider.getServletPaths();
return servletPaths.stream().map((p) -> {
String path = cleanServletPath(p);
return path + properties.getBasePath();
}).collect(Collectors.toSet());
return servletPathProvider.getServletPaths().stream()
.map((p) -> cleanServletPath(p) + properties.getBasePath())
.collect(Collectors.toSet());
}
private String cleanServletPath(String servletPath) {

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsAutoConfiguration.java
View File

@ -82,12 +82,12 @@ public class RestTemplateMetricsAutoConfiguration {
}
/**
* {@link MeterFilter} to deny further client requests and log a warning.
* {@link MeterFilter} to deny further URI tags and log a warning.
*/
private static class MaximumUriTagsReachedMeterFilter implements MeterFilter {
private final Logger logger = LoggerFactory
.getLogger(RestTemplateMetricsAutoConfiguration.class);
.getLogger(MaximumUriTagsReachedMeterFilter.class);
private final String metricName;

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java
View File

@ -58,6 +58,12 @@ public abstract class AbstractDependsOnBeanFactoryPostProcessor
this.dependsOn = dependsOn;
}
/**
* Create an instance with target bean class and dependencies.
* @param beanClass target bean class
* @param dependsOn dependencies
* @since 2.0.4
*/
protected AbstractDependsOnBeanFactoryPostProcessor(Class<?> beanClass,
String... dependsOn) {
this(beanClass, null, dependsOn);

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@ -206,7 +206,7 @@ public class FlywayAutoConfiguration {
}
/**
* Additional configuration to ensure that {@link JdbcOperations} beans depend-on
* Additional configuration to ensure that {@link JdbcOperations} beans depend on
* the {@code flywayInitializer} bean.
*/
@Configuration
@ -240,16 +240,16 @@ public class FlywayAutoConfiguration {
}
/**
* Additional configuration to ensure that {@link JdbcOperations} beans depend-on the
* Additional configuration to ensure that {@link JdbcOperations} beans depend on the
* {@code flyway} bean.
*/
@Configuration
@ConditionalOnClass(JdbcOperations.class)
@ConditionalOnBean(JdbcOperations.class)
protected static class FlywayJdbcDependencyConfiguration
protected static class FlywayJdbcOperationsDependencyConfiguration
extends JdbcOperationsDependsOnPostProcessor {
public FlywayJdbcDependencyConfiguration() {
public FlywayJdbcOperationsDependencyConfiguration() {
super("flyway");
}

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfiguration.java
View File

@ -33,7 +33,7 @@ import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
/**
* Additional configuration to ensure that {@link EntityManagerFactory} beans depend-on
* Additional configuration to ensure that {@link EntityManagerFactory} beans depend on
* the {@code hazelcastInstance} bean.
*
* @author Stephane Nicoll

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
View File

@ -192,7 +192,7 @@ public class LiquibaseAutoConfiguration {
}
/**
* Additional configuration to ensure that {@link JdbcOperations} beans depend-on the
* Additional configuration to ensure that {@link JdbcOperations} beans depend on the
* liquibase bean.
*/
@Configuration