Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
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
openSource
spring-cloud-netflix
Commits
6d22a407
Commit
6d22a407
authored
May 31, 2017
by
pahli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use @ConfigurationProperties
parent
bdfbe3a8
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
5 deletions
+45
-5
DefaultServerIntrospector.java
...ework/cloud/netflix/ribbon/DefaultServerIntrospector.java
+5
-3
ServerIntrospectorProperties.java
...rk/cloud/netflix/ribbon/ServerIntrospectorProperties.java
+32
-0
DefaultServerIntrospectorDefaultTest.java
.../netflix/ribbon/DefaultServerIntrospectorDefaultTest.java
+2
-0
DefaultServerIntrospectorTest.java
...k/cloud/netflix/ribbon/DefaultServerIntrospectorTest.java
+6
-2
No files found.
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java
View file @
6d22a407
...
...
@@ -17,7 +17,9 @@
package
org
.
springframework
.
cloud
.
netflix
.
ribbon
;
import
com.netflix.loadbalancer.Server
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Configuration
;
import
java.util.Collections
;
import
java.util.List
;
...
...
@@ -28,12 +30,12 @@ import java.util.Map;
*/
public
class
DefaultServerIntrospector
implements
ServerIntrospector
{
@
Value
(
"#{T(java.util.Arrays).asList('${ribbon.securePorts:443,8443}')}"
)
private
List
<
Integer
>
securePort
s
;
@
Autowired
ServerIntrospectorProperties
serverIntrospectorPropertie
s
;
@Override
public
boolean
isSecure
(
Server
server
)
{
return
se
curePorts
.
contains
(
server
.
getPort
());
return
se
rverIntrospectorProperties
.
getSecurePorts
()
.
contains
(
server
.
getPort
());
}
@Override
...
...
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/ServerIntrospectorProperties.java
0 → 100644
View file @
6d22a407
/*
* Copyright 2013-2017 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
ribbon
;
import
lombok.Data
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
java.util.Arrays
;
import
java.util.List
;
/**
* @author Rico Pahlisch
*/
@Data
@ConfigurationProperties
(
"ribbon"
)
public
class
ServerIntrospectorProperties
{
private
List
<
Integer
>
securePorts
=
Arrays
.
asList
(
443
,
8443
);
}
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTest.java
View file @
6d22a407
...
...
@@ -21,6 +21,7 @@ import org.junit.Assert;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -52,6 +53,7 @@ public class DefaultServerIntrospectorDefaultTest {
}
@Configuration
@EnableConfigurationProperties
(
ServerIntrospectorProperties
.
class
)
protected
static
class
TestConfiguration
{
@Bean
public
DefaultServerIntrospector
defaultServerIntrospector
(){
...
...
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTest.java
View file @
6d22a407
...
...
@@ -21,6 +21,8 @@ import org.junit.Assert;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -35,7 +37,7 @@ import static org.mockito.Mockito.when;
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@SpringBootTest
(
classes
=
DefaultServerIntrospectorTest
.
TestConfiguration
.
class
)
@TestPropertySource
(
properties
=
{
"ribbon.securePorts=12345"
})
@TestPropertySource
(
properties
=
{
"ribbon.securePorts=12345
,556
"
})
public
class
DefaultServerIntrospectorTest
{
@Autowired
...
...
@@ -46,12 +48,14 @@ public class DefaultServerIntrospectorTest {
Server
serverMock
=
mock
(
Server
.
class
);
when
(
serverMock
.
getPort
()).
thenReturn
(
12345
);
Assert
.
assertTrue
(
serverIntrospector
.
isSecure
(
serverMock
));
when
(
serverMock
.
getPort
()).
thenReturn
(
556
);
Assert
.
assertTrue
(
serverIntrospector
.
isSecure
(
serverMock
));
when
(
serverMock
.
getPort
()).
thenReturn
(
443
);
Assert
.
assertFalse
(
serverIntrospector
.
isSecure
(
serverMock
));
}
@Configuration
@EnableConfigurationProperties
(
ServerIntrospectorProperties
.
class
)
protected
static
class
TestConfiguration
{
@Bean
public
DefaultServerIntrospector
defaultServerIntrospector
(){
...
...
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