Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb 2014-01-30 12:54:58 -08:00
parent a97bcfe3cd
commit 6431fef91e
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java
View File

@ -109,9 +109,14 @@ public class ConfigurationPropertiesReportEndpoint extends
protected void configureObjectMapper(ObjectMapper mapper) {
mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
applyCglibFilters(mapper);
}
// configure PropertyFiler to make sure Jackson doesn't process CGLIB generated
// bean properties
/**
* configure PropertyFiler to make sure Jackson doesn't process CGLIB generated bean
* properties
*/
private void applyCglibFilters(ObjectMapper mapper) {
mapper.setAnnotationIntrospector(new CglibAnnotationIntrospector());
mapper.setFilters(new SimpleFilterProvider().addFilter(CGLIB_FILTER_ID,
new CglibBeanPropertyFilter()));
@ -161,6 +166,7 @@ public class ConfigurationPropertiesReportEndpoint extends
}
return id;
}
}
/**
@ -182,6 +188,7 @@ public class ConfigurationPropertiesReportEndpoint extends
private boolean include(String name) {
return !name.startsWith("$$");
}
}
}

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfiguration.java
View File

@ -101,8 +101,8 @@ public class MongoRepositoriesAutoConfiguration {
}
public Mongo mongo() throws UnknownHostException {
return this.host != null ? new MongoClient(this.host, this.port)
: new MongoClient(new MongoClientURI(this.uri));
return (this.host != null ? new MongoClient(this.host, this.port)
: new MongoClient(new MongoClientURI(this.uri)));
}
public void setHost(String host) {

4
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -501,7 +501,6 @@ public class SpringApplication {
/**
* Called to log startup information, subclasses may override to add additional
* logging.
*
* @param isRoot true if this application is the root of a context hierarchy
*/
protected void logStartupInfo(boolean isRoot) {
@ -601,7 +600,6 @@ public class SpringApplication {
/**
* The ResourceLoader that will be used in the ApplicationContext.
*
* @return the resourceLoader the resource loader that will be used in the
* ApplicationContext (or null if the default)
*/
@ -613,7 +611,6 @@ public class SpringApplication {
* Either the ClassLoader that will be used in the ApplicationContext (if
* {@link #setResourceLoader(ResourceLoader) resourceLoader} is set, or the context
* class loader (if not null), or the loader of the Spring {@link ClassUtils} class.
*
* @return a ClassLoader (never null)
*/
public ClassLoader getClassLoader() {
@ -739,7 +736,6 @@ public class SpringApplication {
/**
* Convenient alternative to {@link #setDefaultProperties(Map)}.
*
* @param defaultProperties some {@link Properties}
*/
public void setDefaultProperties(Properties defaultProperties) {