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
5f3f1a1f
Commit
5f3f1a1f
authored
Aug 15, 2018
by
Johnny Lim
Committed by
Madhura Bhave
Aug 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-14067
parent
ca4ca15e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
16 deletions
+13
-16
ConfigurationPropertiesReportEndpointTests.java
...roperties/ConfigurationPropertiesReportEndpointTests.java
+4
-4
OnWebApplicationCondition.java
...ot/autoconfigure/condition/OnWebApplicationCondition.java
+7
-10
production-ready-features.adoc
...oot-docs/src/main/asciidoc/production-ready-features.adoc
+2
-2
No files found.
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java
View file @
5f3f1a1f
...
@@ -315,14 +315,14 @@ public class ConfigurationPropertiesReportEndpointTests {
...
@@ -315,14 +315,14 @@ public class ConfigurationPropertiesReportEndpointTests {
this
.
simpleBoolean
=
simpleBoolean
;
this
.
simpleBoolean
=
simpleBoolean
;
}
}
public
void
setMixedBoolean
(
Boolean
mixedBoolean
)
{
this
.
mixedBoolean
=
mixedBoolean
;
}
public
boolean
isMixedBoolean
()
{
public
boolean
isMixedBoolean
()
{
return
(
this
.
mixedBoolean
!=
null
)
?
this
.
mixedBoolean
:
false
;
return
(
this
.
mixedBoolean
!=
null
)
?
this
.
mixedBoolean
:
false
;
}
}
public
void
setMixedBoolean
(
Boolean
mixedBoolean
)
{
this
.
mixedBoolean
=
mixedBoolean
;
}
public
String
getmIxedCase
()
{
public
String
getmIxedCase
()
{
return
this
.
mIxedCase
;
return
this
.
mIxedCase
;
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java
View file @
5f3f1a1f
...
@@ -62,14 +62,14 @@ class OnWebApplicationCondition extends SpringBootCondition {
...
@@ -62,14 +62,14 @@ class OnWebApplicationCondition extends SpringBootCondition {
private
ConditionOutcome
isWebApplication
(
ConditionContext
context
,
private
ConditionOutcome
isWebApplication
(
ConditionContext
context
,
AnnotatedTypeMetadata
metadata
,
boolean
required
)
{
AnnotatedTypeMetadata
metadata
,
boolean
required
)
{
Type
type
=
deduceType
(
metadata
);
switch
(
deduceType
(
metadata
))
{
if
(
Type
.
SERVLET
==
type
)
{
case
SERVLET:
return
isServletWebApplication
(
context
);
return
isServletWebApplication
(
context
);
}
else
if
(
Type
.
REACTIVE
==
type
)
{
case
REACTIVE:
return
isReactiveWebApplication
(
context
);
return
isReactiveWebApplication
(
context
);
}
else
{
default
:
return
isAnyWebApplication
(
context
,
required
);
return
isAnyWebApplication
(
context
,
required
);
}
}
}
}
...
@@ -88,10 +88,7 @@ class OnWebApplicationCondition extends SpringBootCondition {
...
@@ -88,10 +88,7 @@ class OnWebApplicationCondition extends SpringBootCondition {
return
new
ConditionOutcome
(
reactiveOutcome
.
isMatch
(),
return
new
ConditionOutcome
(
reactiveOutcome
.
isMatch
(),
message
.
because
(
reactiveOutcome
.
getMessage
()));
message
.
because
(
reactiveOutcome
.
getMessage
()));
}
}
boolean
finalOutcome
=
(
required
return
new
ConditionOutcome
(
servletOutcome
.
isMatch
()
||
reactiveOutcome
.
isMatch
(),
?
servletOutcome
.
isMatch
()
&&
reactiveOutcome
.
isMatch
()
:
servletOutcome
.
isMatch
()
||
reactiveOutcome
.
isMatch
());
return
new
ConditionOutcome
(
finalOutcome
,
message
.
because
(
servletOutcome
.
getMessage
()).
append
(
"and"
)
message
.
because
(
servletOutcome
.
getMessage
()).
append
(
"and"
)
.
append
(
reactiveOutcome
.
getMessage
()));
.
append
(
reactiveOutcome
.
getMessage
()));
}
}
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View file @
5f3f1a1f
...
@@ -1470,8 +1470,8 @@ server] to use can be provided using:
...
@@ -1470,8 +1470,8 @@ server] to use can be provided using:
==== JMX
==== JMX
Micrometer provides a hierarchical mapping to
Micrometer provides a hierarchical mapping to
{micrometer-registry-documentation}/jmx[JMX], primarily as a cheap and portable way to
{micrometer-registry-documentation}/jmx[JMX], primarily as a cheap and portable way to
view metrics locally.By default, metrics are exported to the `metrics` JMX domain. The
view metrics locally.
By default, metrics are exported to the `metrics` JMX domain. The
domain to use can be provided
provided
using:
domain to use can be provided using:
[source,properties,indent=0]
[source,properties,indent=0]
----
----
...
...
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