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
a7ef2580
Commit
a7ef2580
authored
Aug 17, 2017
by
Johnny Lim
Committed by
Stephane Nicoll
Aug 18, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-10032
parent
cc46977c
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
15 additions
and
15 deletions
+15
-15
EnableChildManagementContextConfiguration.java
...oconfigure/EnableChildManagementContextConfiguration.java
+1
-1
ManagementContextAutoConfiguration.java
...ate/autoconfigure/ManagementContextAutoConfiguration.java
+2
-2
package-info.java
.../org/springframework/boot/actuate/cache/package-info.java
+1
-1
EnvironmentEndpointTests.java
...ework/boot/actuate/endpoint/EnvironmentEndpointTests.java
+1
-1
ShutdownEndpointTests.java
...ramework/boot/actuate/endpoint/ShutdownEndpointTests.java
+2
-2
OperationRequestPredicate.java
...ramework/boot/endpoint/web/OperationRequestPredicate.java
+1
-1
JerseyEndpointResourceFactory.java
...ot/endpoint/web/jersey/JerseyEndpointResourceFactory.java
+4
-4
WebEndpointServletHandlerMapping.java
...ot/endpoint/web/mvc/WebEndpointServletHandlerMapping.java
+1
-1
WebEndpointReactiveHandlerMapping.java
...point/web/reactive/WebEndpointReactiveHandlerMapping.java
+1
-1
CachingOperationInvokerTests.java
...framework/boot/endpoint/CachingOperationInvokerTests.java
+1
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EnableChildManagementContextConfiguration.java
View file @
a7ef2580
...
@@ -19,7 +19,7 @@ package org.springframework.boot.actuate.autoconfigure;
...
@@ -19,7 +19,7 @@ package org.springframework.boot.actuate.autoconfigure;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
/**
/**
* Configur
ta
ion class used to enable configuration of a child management context.
* Configur
at
ion class used to enable configuration of a child management context.
*
*
* @author Andy Wilkinson
* @author Andy Wilkinson
*/
*/
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementContextAutoConfiguration.java
View file @
a7ef2580
...
@@ -77,7 +77,7 @@ public class ManagementContextAutoConfiguration {
...
@@ -77,7 +77,7 @@ public class ManagementContextAutoConfiguration {
@Override
@Override
public
void
afterSingletonsInstantiated
()
{
public
void
afterSingletonsInstantiated
()
{
veri
i
fySslConfiguration
();
verifySslConfiguration
();
verifyContextPathConfiguration
();
verifyContextPathConfiguration
();
if
(
this
.
environment
instanceof
ConfigurableEnvironment
)
{
if
(
this
.
environment
instanceof
ConfigurableEnvironment
)
{
addLocalManagementPortPropertyAlias
(
addLocalManagementPortPropertyAlias
(
...
@@ -85,7 +85,7 @@ public class ManagementContextAutoConfiguration {
...
@@ -85,7 +85,7 @@ public class ManagementContextAutoConfiguration {
}
}
}
}
private
void
veri
i
fySslConfiguration
()
{
private
void
verifySslConfiguration
()
{
if
(
this
.
environment
.
getProperty
(
"management.ssl.enabled"
,
Boolean
.
class
,
if
(
this
.
environment
.
getProperty
(
"management.ssl.enabled"
,
Boolean
.
class
,
false
))
{
false
))
{
throw
new
IllegalStateException
(
throw
new
IllegalStateException
(
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/package-info.java
View file @
a7ef2580
...
@@ -15,6 +15,6 @@
...
@@ -15,6 +15,6 @@
*/
*/
/**
/**
* Classes for cache stati
c
tics.
* Classes for cache stati
s
tics.
*/
*/
package
org
.
springframework
.
boot
.
actuate
.
cache
;
package
org
.
springframework
.
boot
.
actuate
.
cache
;
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java
View file @
a7ef2580
...
@@ -120,7 +120,7 @@ public class EnvironmentEndpointTests {
...
@@ -120,7 +120,7 @@ public class EnvironmentEndpointTests {
}
}
@Test
@Test
public
void
sensitiveKeysMatchingCusto
n
NameHaveTheirValuesSanitized
()
{
public
void
sensitiveKeysMatchingCusto
m
NameHaveTheirValuesSanitized
()
{
System
.
setProperty
(
"dbPassword"
,
"123456"
);
System
.
setProperty
(
"dbPassword"
,
"123456"
);
System
.
setProperty
(
"apiKey"
,
"123456"
);
System
.
setProperty
(
"apiKey"
,
"123456"
);
EnvironmentEndpoint
endpoint
=
new
EnvironmentEndpoint
(
new
StandardEnvironment
());
EnvironmentEndpoint
endpoint
=
new
EnvironmentEndpoint
(
new
StandardEnvironment
());
...
...
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java
View file @
a7ef2580
...
@@ -46,9 +46,9 @@ public class ShutdownEndpointTests {
...
@@ -46,9 +46,9 @@ public class ShutdownEndpointTests {
@Test
@Test
public
void
shutdown
()
throws
Exception
{
public
void
shutdown
()
throws
Exception
{
ApplicationContextRunner
contexRunner
=
new
ApplicationContextRunner
()
ApplicationContextRunner
contex
t
Runner
=
new
ApplicationContextRunner
()
.
withUserConfiguration
(
EndpointConfig
.
class
);
.
withUserConfiguration
(
EndpointConfig
.
class
);
contexRunner
.
run
((
context
)
->
{
contex
t
Runner
.
run
((
context
)
->
{
EndpointConfig
config
=
context
.
getBean
(
EndpointConfig
.
class
);
EndpointConfig
config
=
context
.
getBean
(
EndpointConfig
.
class
);
ClassLoader
previousTccl
=
Thread
.
currentThread
().
getContextClassLoader
();
ClassLoader
previousTccl
=
Thread
.
currentThread
().
getContextClassLoader
();
Map
<
String
,
Object
>
result
;
Map
<
String
,
Object
>
result
;
...
...
spring-boot/src/main/java/org/springframework/boot/endpoint/web/OperationRequestPredicate.java
View file @
a7ef2580
...
@@ -40,7 +40,7 @@ public class OperationRequestPredicate {
...
@@ -40,7 +40,7 @@ public class OperationRequestPredicate {
private
final
Collection
<
String
>
produces
;
private
final
Collection
<
String
>
produces
;
/**
/**
* Creates a new {@code
WebEndpointRequestPredict
}.
* Creates a new {@code
OperationRequestPredicate
}.
*
*
* @param path the path for the operation
* @param path the path for the operation
* @param httpMethod the HTTP method that the operation supports
* @param httpMethod the HTTP method that the operation supports
...
...
spring-boot/src/main/java/org/springframework/boot/endpoint/web/jersey/JerseyEndpointResourceFactory.java
View file @
a7ef2580
...
@@ -121,8 +121,8 @@ public class JerseyEndpointResourceFactory {
...
@@ -121,8 +121,8 @@ public class JerseyEndpointResourceFactory {
arguments
.
putAll
(
body
);
arguments
.
putAll
(
body
);
}
}
}
}
arguments
.
putAll
(
extractPathParmeters
(
data
));
arguments
.
putAll
(
extractPathPar
a
meters
(
data
));
arguments
.
putAll
(
extractQueryParmeters
(
data
));
arguments
.
putAll
(
extractQueryPar
a
meters
(
data
));
try
{
try
{
return
convertToJaxRsResponse
(
this
.
operationInvoker
.
invoke
(
arguments
),
return
convertToJaxRsResponse
(
this
.
operationInvoker
.
invoke
(
arguments
),
data
.
getRequest
().
getMethod
());
data
.
getRequest
().
getMethod
());
...
@@ -132,12 +132,12 @@ public class JerseyEndpointResourceFactory {
...
@@ -132,12 +132,12 @@ public class JerseyEndpointResourceFactory {
}
}
}
}
private
Map
<
String
,
Object
>
extractPathParmeters
(
private
Map
<
String
,
Object
>
extractPathPar
a
meters
(
ContainerRequestContext
requestContext
)
{
ContainerRequestContext
requestContext
)
{
return
extract
(
requestContext
.
getUriInfo
().
getPathParameters
());
return
extract
(
requestContext
.
getUriInfo
().
getPathParameters
());
}
}
private
Map
<
String
,
Object
>
extractQueryParmeters
(
private
Map
<
String
,
Object
>
extractQueryPar
a
meters
(
ContainerRequestContext
requestContext
)
{
ContainerRequestContext
requestContext
)
{
return
extract
(
requestContext
.
getUriInfo
().
getQueryParameters
());
return
extract
(
requestContext
.
getUriInfo
().
getQueryParameters
());
}
}
...
...
spring-boot/src/main/java/org/springframework/boot/endpoint/web/mvc/WebEndpointServletHandlerMapping.java
View file @
a7ef2580
...
@@ -95,7 +95,7 @@ public class WebEndpointServletHandlerMapping extends RequestMappingInfoHandlerM
...
@@ -95,7 +95,7 @@ public class WebEndpointServletHandlerMapping extends RequestMappingInfoHandlerM
* operations of the given {@code webEndpoints}.
* operations of the given {@code webEndpoints}.
* @param endpointPath the path beneath which all endpoints should be mapped
* @param endpointPath the path beneath which all endpoints should be mapped
* @param webEndpoints the web endpoints
* @param webEndpoints the web endpoints
* @param corsConfiguration the CORS configuraton for the endpoints
* @param corsConfiguration the CORS configurat
i
on for the endpoints
*/
*/
public
WebEndpointServletHandlerMapping
(
String
endpointPath
,
public
WebEndpointServletHandlerMapping
(
String
endpointPath
,
Collection
<
EndpointInfo
<
WebEndpointOperation
>>
webEndpoints
,
Collection
<
EndpointInfo
<
WebEndpointOperation
>>
webEndpoints
,
...
...
spring-boot/src/main/java/org/springframework/boot/endpoint/web/reactive/WebEndpointReactiveHandlerMapping.java
View file @
a7ef2580
...
@@ -97,7 +97,7 @@ public class WebEndpointReactiveHandlerMapping extends RequestMappingInfoHandler
...
@@ -97,7 +97,7 @@ public class WebEndpointReactiveHandlerMapping extends RequestMappingInfoHandler
* operations of the given {@code webEndpoints}.
* operations of the given {@code webEndpoints}.
* @param endpointPath the path beneath which all endpoints should be mapped
* @param endpointPath the path beneath which all endpoints should be mapped
* @param webEndpoints the web endpoints
* @param webEndpoints the web endpoints
* @param corsConfiguration the CORS configuraton for the endpoints
* @param corsConfiguration the CORS configurat
i
on for the endpoints
*/
*/
public
WebEndpointReactiveHandlerMapping
(
String
endpointPath
,
public
WebEndpointReactiveHandlerMapping
(
String
endpointPath
,
Collection
<
EndpointInfo
<
WebEndpointOperation
>>
webEndpoints
,
Collection
<
EndpointInfo
<
WebEndpointOperation
>>
webEndpoints
,
...
...
spring-boot/src/test/java/org/springframework/boot/endpoint/CachingOperationInvokerTests.java
View file @
a7ef2580
...
@@ -41,7 +41,7 @@ public class CachingOperationInvokerTests {
...
@@ -41,7 +41,7 @@ public class CachingOperationInvokerTests {
public
final
ExpectedException
thrown
=
ExpectedException
.
none
();
public
final
ExpectedException
thrown
=
ExpectedException
.
none
();
@Test
@Test
public
void
createInstanceWithT
l
lSetToZero
()
{
public
void
createInstanceWithT
t
lSetToZero
()
{
this
.
thrown
.
expect
(
IllegalStateException
.
class
);
this
.
thrown
.
expect
(
IllegalStateException
.
class
);
this
.
thrown
.
expectMessage
(
"TimeToLive"
);
this
.
thrown
.
expectMessage
(
"TimeToLive"
);
new
CachingOperationInvoker
(
mock
(
OperationInvoker
.
class
),
0
);
new
CachingOperationInvoker
(
mock
(
OperationInvoker
.
class
),
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