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
d61c3816
Commit
d61c3816
authored
Jul 01, 2015
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting
parent
533d36a4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
18 deletions
+20
-18
EndpointWebMvcAutoConfiguration.java
...ctuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
+12
-10
WelcomePageMockMvcTests.java
...ework/boot/autoconfigure/web/WelcomePageMockMvcTests.java
+8
-8
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
View file @
d61c3816
...
...
@@ -89,7 +89,7 @@ import org.springframework.web.servlet.DispatcherServlet;
EmbeddedServletContainerAutoConfiguration
.
class
,
WebMvcAutoConfiguration
.
class
,
ManagementServerPropertiesAutoConfiguration
.
class
})
public
class
EndpointWebMvcAutoConfiguration
implements
ApplicationContextAware
,
SmartInitializingSingleton
{
SmartInitializingSingleton
{
private
static
Log
logger
=
LogFactory
.
getLog
(
EndpointWebMvcAutoConfiguration
.
class
);
...
...
@@ -329,9 +329,11 @@ SmartInitializingSingleton {
if
((
managementPort
==
null
)
||
(
serverPort
==
null
&&
managementPort
.
equals
(
8080
))
||
(
managementPort
!=
0
&&
managementPort
.
equals
(
serverPort
)))
{
return
ConditionOutcome
.
match
(
"The main context is the management context"
);
return
ConditionOutcome
.
match
(
"The main context is the management context"
);
}
return
ConditionOutcome
.
noMatch
(
"The main context is not the management context"
);
return
ConditionOutcome
.
noMatch
(
"The main context is not the management context"
);
}
private
<
T
>
T
getBeanCarefully
(
ConditionContext
context
,
Class
<
T
>
type
)
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java
View file @
d61c3816
...
...
@@ -16,9 +16,6 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
web
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.
get
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultMatchers
.
status
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.Retention
;
...
...
@@ -39,6 +36,9 @@ import org.springframework.test.web.servlet.MockMvc;
import
org.springframework.test.web.servlet.setup.MockMvcBuilders
;
import
org.springframework.web.context.ConfigurableWebApplicationContext
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.
get
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultMatchers
.
status
;
/**
* Tests for welcome page using {@link MockMvc} and {@link SpringJUnit4ClassRunner}.
*
...
...
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