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
3c169b4e
Commit
3c169b4e
authored
Apr 11, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bean name of EnvironmentEndpointWebExtension
Closes gh-12827
parent
8d81bcd1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
EnvironmentEndpointAutoConfiguration.java
...toconfigure/env/EnvironmentEndpointAutoConfiguration.java
+2
-2
ManagementPortAndPathSampleActuatorApplicationTests.java
.../ManagementPortAndPathSampleActuatorApplicationTests.java
+16
-0
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfiguration.java
View file @
3c169b4e
/*
* Copyright 2012-201
7
the original author or authors.
* Copyright 2012-201
8
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -61,7 +61,7 @@ public class EnvironmentEndpointAutoConfiguration {
@ConditionalOnMissingBean
@ConditionalOnEnabledEndpoint
@ConditionalOnBean
(
EnvironmentEndpoint
.
class
)
public
EnvironmentEndpointWebExtension
environment
WebEndpoint
Extension
(
public
EnvironmentEndpointWebExtension
environment
EndpointWeb
Extension
(
EnvironmentEndpoint
environmentEndpoint
)
{
return
new
EnvironmentEndpointWebExtension
(
environmentEndpoint
);
}
...
...
spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java
View file @
3c169b4e
...
...
@@ -21,11 +21,13 @@ import java.util.Map;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest.WebEnvironment
;
import
org.springframework.boot.test.web.client.TestRestTemplate
;
import
org.springframework.boot.web.server.LocalServerPort
;
import
org.springframework.core.env.Environment
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.test.context.junit4.SpringRunner
;
...
...
@@ -49,6 +51,9 @@ public class ManagementPortAndPathSampleActuatorApplicationTests {
@LocalManagementPort
private
int
managementPort
=
9011
;
@Autowired
private
Environment
environment
;
@Test
public
void
testHome
()
{
@SuppressWarnings
(
"rawtypes"
)
...
...
@@ -79,6 +84,17 @@ public class ManagementPortAndPathSampleActuatorApplicationTests {
assertThat
(
entity
.
getBody
()).
isEqualTo
(
"{\"status\":\"UP\"}"
);
}
@Test
public
void
testEnvNotFound
()
{
String
unknownProperty
=
"test-does-not-exist"
;
assertThat
(
this
.
environment
.
containsProperty
(
unknownProperty
)).
isFalse
();
ResponseEntity
<
String
>
entity
=
new
TestRestTemplate
()
.
withBasicAuth
(
"user"
,
getPassword
()).
getForEntity
(
"http://localhost:"
+
this
.
managementPort
+
"/admin/env/"
+
unknownProperty
,
String
.
class
);
assertThat
(
entity
.
getStatusCode
()).
isEqualTo
(
HttpStatus
.
NOT_FOUND
);
}
@Test
public
void
testMissing
()
{
ResponseEntity
<
String
>
entity
=
new
TestRestTemplate
(
"user"
,
getPassword
())
...
...
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