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
c8c3f59e
Commit
c8c3f59e
authored
Oct 18, 2018
by
Johnny Lim
Committed by
Stephane Nicoll
Oct 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-14884
parent
2a0451c4
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
17 deletions
+14
-17
AppOpticsProperties.java
...nfigure/metrics/export/appoptics/AppOpticsProperties.java
+3
-3
DiskSpaceHealthIndicatorProperties.java
...oconfigure/system/DiskSpaceHealthIndicatorProperties.java
+2
-1
MvcWebEndpointIntegrationTests.java
.../endpoint/web/servlet/MvcWebEndpointIntegrationTests.java
+2
-2
OnBeanCondition.java
...amework/boot/autoconfigure/condition/OnBeanCondition.java
+1
-6
Neo4jBookmarkManagementConfiguration.java
...gure/data/neo4j/Neo4jBookmarkManagementConfiguration.java
+2
-3
ServerProperties.java
...ingframework/boot/autoconfigure/web/ServerProperties.java
+1
-1
DeferredLog.java
...in/java/org/springframework/boot/logging/DeferredLog.java
+2
-0
AbstractJsonParserTests.java
...rg/springframework/boot/json/AbstractJsonParserTests.java
+1
-1
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsProperties.java
View file @
c8c3f59e
...
...
@@ -33,17 +33,17 @@ public class AppOpticsProperties extends StepRegistryProperties {
/**
* URI to ship metrics to.
*/
p
ublic
String
uri
=
"https://api.appoptics.com/v1/measurements"
;
p
rivate
String
uri
=
"https://api.appoptics.com/v1/measurements"
;
/**
* AppOptics API token.
*/
p
ublic
String
apiToken
;
p
rivate
String
apiToken
;
/**
* Tag that will be mapped to "@host" when shipping metrics to AppOptics.
*/
p
ublic
String
hostTag
=
"instance"
;
p
rivate
String
hostTag
=
"instance"
;
/**
* Number of measurements per request to use for this backend. If more measurements
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java
View file @
c8c3f59e
...
...
@@ -58,7 +58,8 @@ public class DiskSpaceHealthIndicatorProperties {
}
public
void
setThreshold
(
DataSize
threshold
)
{
Assert
.
isTrue
(!
threshold
.
isNegative
(),
"threshold must be greater than 0"
);
Assert
.
isTrue
(!
threshold
.
isNegative
(),
"threshold must be greater than or equal to 0"
);
this
.
threshold
=
threshold
;
}
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java
View file @
c8c3f59e
...
...
@@ -116,9 +116,9 @@ public class MvcWebEndpointIntegrationTests extends
assertThat
(
getMatchResult
(
"/spring.do"
)).
isNull
();
}
private
RequestMatchResult
getMatchResult
(
String
s
)
{
private
RequestMatchResult
getMatchResult
(
String
s
ervletPath
)
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
();
request
.
setServletPath
(
s
);
request
.
setServletPath
(
s
ervletPath
);
AnnotationConfigServletWebServerApplicationContext
context
=
createApplicationContext
();
context
.
register
(
TestEndpointConfiguration
.
class
);
context
.
refresh
();
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
View file @
c8c3f59e
...
...
@@ -426,12 +426,7 @@ class OnBeanCondition extends FilteringSpringBootCondition
}
private
boolean
hasAtLeastOne
(
List
<?>...
lists
)
{
for
(
List
<?>
list
:
lists
)
{
if
(!
list
.
isEmpty
())
{
return
true
;
}
}
return
false
;
return
Arrays
.
stream
(
lists
).
anyMatch
((
list
)
->
!
list
.
isEmpty
());
}
protected
String
annotationName
()
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java
View file @
c8c3f59e
...
...
@@ -36,11 +36,10 @@ import org.springframework.web.context.WebApplicationContext;
/**
* Provides a {@link BookmarkManager} for Neo4j's bookmark support based on Caffeine if
* available. Depending on the application
s kind (web or not) the bookmark manager will be
* bound to the application or the request, as recommend by Spring Data Neo4j.
* available. Depending on the application
's type (web or not) the bookmark manager will
* b
e b
ound to the application or the request, as recommend by Spring Data Neo4j.
*
* @author Michael Simons
* @since 2.1.0
*/
@Configuration
@ConditionalOnClass
({
Caffeine
.
class
,
CaffeineCacheManager
.
class
})
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
View file @
c8c3f59e
...
...
@@ -330,7 +330,7 @@ public class ServerProperties {
private
DataSize
maxHttpPostSize
=
DataSize
.
ofMegabytes
(
2
);
/**
* Maximum size
in bytes
of the HTTP message header.
* Maximum size of the HTTP message header.
*/
private
DataSize
maxHttpHeaderSize
=
DataSize
.
ofBytes
(
0
);
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java
View file @
c8c3f59e
...
...
@@ -151,6 +151,7 @@ public class DeferredLog implements Log {
/**
* Switch from deferred logging to immediate logging to the specified destination.
* @param destination the new log destination
* @since 2.1.0
*/
public
void
switchTo
(
Class
<?>
destination
)
{
switchTo
(
LogFactory
.
getLog
(
destination
));
...
...
@@ -159,6 +160,7 @@ public class DeferredLog implements Log {
/**
* Switch from deferred logging to immediate logging to the specified destination.
* @param destination the new log destination
* @since 2.1.0
*/
public
void
switchTo
(
Log
destination
)
{
synchronized
(
this
.
lines
)
{
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/AbstractJsonParserTests.java
View file @
c8c3f59e
...
...
@@ -167,7 +167,7 @@ public abstract class AbstractJsonParserTests {
}
@Test
public
void
escapeQuote
()
{
public
void
escape
Double
Quote
()
{
String
input
=
"{\"foo\": \"\\\"bar\\\"\"}"
;
Map
<
String
,
Object
>
map
=
this
.
parser
.
parseMap
(
input
);
assertThat
(
map
.
get
(
"foo"
)).
isEqualTo
(
"\"bar\""
);
...
...
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