Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
6431fef9
Commit
6431fef9
authored
Jan 30, 2014
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
a97bcfe3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
ConfigurationPropertiesReportEndpoint.java
...tuate/endpoint/ConfigurationPropertiesReportEndpoint.java
+9
-2
MongoRepositoriesAutoConfiguration.java
...utoconfigure/data/MongoRepositoriesAutoConfiguration.java
+2
-2
SpringApplication.java
...main/java/org/springframework/boot/SpringApplication.java
+0
-4
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java
View file @
6431fef9
...
...
@@ -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
(
"$$"
);
}
}
}
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfiguration.java
View file @
6431fef9
...
...
@@ -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
)
{
...
...
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @
6431fef9
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment