pahli 8 years ago
parent
commit
6d22a407cc
  1. 8
      spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java
  2. 32
      spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/ServerIntrospectorProperties.java
  3. 2
      spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTest.java
  4. 8
      spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTest.java

8
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java

@ -17,7 +17,9 @@
package org.springframework.cloud.netflix.ribbon; package org.springframework.cloud.netflix.ribbon;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -28,12 +30,12 @@ import java.util.Map;
*/ */
public class DefaultServerIntrospector implements ServerIntrospector { public class DefaultServerIntrospector implements ServerIntrospector {
@Value("#{T(java.util.Arrays).asList('${ribbon.securePorts:443,8443}')}") @Autowired
private List<Integer> securePorts; ServerIntrospectorProperties serverIntrospectorProperties;
@Override @Override
public boolean isSecure(Server server) { public boolean isSecure(Server server) {
return securePorts.contains(server.getPort()); return serverIntrospectorProperties.getSecurePorts().contains(server.getPort());
} }
@Override @Override

32
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/ServerIntrospectorProperties.java

@ -0,0 +1,32 @@
/*
* 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);
}

2
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTest.java

@ -21,6 +21,7 @@ import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -52,6 +53,7 @@ public class DefaultServerIntrospectorDefaultTest {
} }
@Configuration @Configuration
@EnableConfigurationProperties(ServerIntrospectorProperties.class)
protected static class TestConfiguration { protected static class TestConfiguration {
@Bean @Bean
public DefaultServerIntrospector defaultServerIntrospector(){ public DefaultServerIntrospector defaultServerIntrospector(){

8
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTest.java

@ -21,6 +21,8 @@ import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; 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.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -35,7 +37,7 @@ import static org.mockito.Mockito.when;
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = DefaultServerIntrospectorTest.TestConfiguration.class) @SpringBootTest(classes = DefaultServerIntrospectorTest.TestConfiguration.class)
@TestPropertySource(properties = { "ribbon.securePorts=12345" }) @TestPropertySource(properties = { "ribbon.securePorts=12345,556" })
public class DefaultServerIntrospectorTest { public class DefaultServerIntrospectorTest {
@Autowired @Autowired
@ -46,12 +48,14 @@ public class DefaultServerIntrospectorTest {
Server serverMock = mock(Server.class); Server serverMock = mock(Server.class);
when(serverMock.getPort()).thenReturn(12345); when(serverMock.getPort()).thenReturn(12345);
Assert.assertTrue(serverIntrospector.isSecure(serverMock)); Assert.assertTrue(serverIntrospector.isSecure(serverMock));
when(serverMock.getPort()).thenReturn(556);
Assert.assertTrue(serverIntrospector.isSecure(serverMock));
when(serverMock.getPort()).thenReturn(443); when(serverMock.getPort()).thenReturn(443);
Assert.assertFalse(serverIntrospector.isSecure(serverMock)); Assert.assertFalse(serverIntrospector.isSecure(serverMock));
} }
@Configuration @Configuration
@EnableConfigurationProperties(ServerIntrospectorProperties.class)
protected static class TestConfiguration { protected static class TestConfiguration {
@Bean @Bean
public DefaultServerIntrospector defaultServerIntrospector(){ public DefaultServerIntrospector defaultServerIntrospector(){

Loading…
Cancel
Save