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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2018-02-12 10:02:51 -08:00
parent e49d50fe9d
commit 0348889fd7
11 changed files with 27 additions and 24 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/data/mongo/MongoReactiveDataAutoConfiguration.java
View File

@@ -48,7 +48,8 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
@Configuration
@ConditionalOnClass({ MongoClient.class, ReactiveMongoTemplate.class })
@EnableConfigurationProperties(MongoProperties.class)
@AutoConfigureAfter({ MongoReactiveAutoConfiguration.class, MongoDataAutoConfiguration.class })
@AutoConfigureAfter({ MongoReactiveAutoConfiguration.class,
MongoDataAutoConfiguration.class })
public class MongoReactiveDataAutoConfiguration {
private final MongoProperties properties;

22
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzer.java
View File

@@ -51,17 +51,24 @@ class DataSourceBeanCreationFailureAnalyzer
}
private FailureAnalysis getFailureAnalysis(DataSourceBeanCreationException cause) {
String description = getDescription(cause);
String action = getAction(cause);
return new FailureAnalysis(description, action, cause);
}
private String getDescription(DataSourceBeanCreationException cause) {
StringBuilder description = new StringBuilder();
boolean datasourceUrlSpecified = this.environment.containsProperty(
"spring.datasource.url");
description.append("Failed to auto-configure a DataSource: ");
if (!datasourceUrlSpecified) {
if (!this.environment.containsProperty("spring.datasource.url")) {
description.append("'spring.datasource.url' is not specified and ");
}
description.append(String.format(
"no embedded datasource could be auto-configured.%n"));
description.append(
String.format("no embedded datasource could be auto-configured.%n"));
description.append(String.format("%nReason: %s%n", cause.getMessage()));
return description.toString();
}
private String getAction(DataSourceBeanCreationException cause) {
StringBuilder action = new StringBuilder();
action.append(String.format("Consider the following:%n"));
if (EmbeddedDatabaseConnection.NONE == cause.getConnection()) {
@@ -69,11 +76,12 @@ class DataSourceBeanCreationFailureAnalyzer
+ "Derby), please put it on the classpath.%n"));
}
else {
action.append(String.format("\tReview the configuration of %s%n.", cause.getConnection()));
action.append(String.format("\tReview the configuration of %s%n.",
cause.getConnection()));
}
action.append("\tIf you have database settings to be loaded from a particular "
+ "profile you may need to activate it").append(getActiveProfiles());
return new FailureAnalysis(description.toString(), action.toString(), cause);
return action.toString();
}
private String getActiveProfiles() {

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

@@ -47,8 +47,7 @@ import org.springframework.util.StringUtils;
* @since 1.1.0
*/
@ConfigurationProperties(prefix = "spring.datasource")
public class DataSourceProperties
implements BeanClassLoaderAware, InitializingBean {
public class DataSourceProperties implements BeanClassLoaderAware, InitializingBean {
private ClassLoader classLoader;