SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Turbine port listener class and add tests

Browse Source
This commit is contained in:
Dave Syer
2015-01-15 16:07:06 +00:00
parent e2e09c4616
commit 5847175344
3 changed files with 74 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbinePortSpringApplicationRunListener.java → spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbinePortApplicationListener.java
View File

@@ -7,7 +7,7 @@ import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEven
import org.springframework.context.ApplicationListener;
import org.springframework.core.env.MapPropertySource;
public class TurbinePortSpringApplicationRunListener implements
public class TurbinePortApplicationListener implements
ApplicationListener<ApplicationEnvironmentPreparedEvent> {
@Override
@@ -21,11 +21,20 @@ public class TurbinePortSpringApplicationRunListener implements
if (serverPort == null && managementPort == null) {
return;
}
if (serverPort != -1) {
if (serverPort != Integer.valueOf(-1)) {
Map<String, Object> ports = new HashMap<String, Object>();
ports.put("server.port", -1);
if (serverPort != null && turbinePort==null) {
ports.put("turbine.amqp.port", serverPort);
if (turbinePort == null) {
// The actual server.port used by the application forced to be -1 (no user
// endpoints) because no value was provided for turbine
ports.put("server.port", -1);
if (serverPort != null) {
// Turbine port defaults to server port value supplied by user
ports.put("turbine.amqp.port", serverPort);
}
}
else if (managementPort != null && serverPort == null) {
// User wants 2 ports, but hasn't specified server.port explicitly
ports.put("server.port", managementPort);
}
event.getEnvironment().getPropertySources()
.addFirst(new MapPropertySource("ports", ports));

2
spring-cloud-netflix-turbine-amqp/src/main/resources/META-INF/spring.factories
View File

@@ -2,4 +2,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.netflix.turbine.amqp.TurbineAmqpAutoConfiguration
org.springframework.context.ApplicationListener=\
org.springframework.cloud.netflix.turbine.amqp.TurbinePortSpringApplicationRunListener
org.springframework.cloud.netflix.turbine.amqp.TurbinePortApplicationListener

59
spring-cloud-netflix-turbine-amqp/src/test/java/org/springframework/cloud/netflix/turbine/amqp/TurbinePortApplicationListenerTests.java Normal file
View File

@@ -0,0 +1,59 @@
package org.springframework.cloud.netflix.turbine.amqp;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
import org.springframework.boot.test.EnvironmentTestUtils;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.StandardEnvironment;
public class TurbinePortApplicationListenerTests {
private TurbinePortApplicationListener listener = new TurbinePortApplicationListener();
private ConfigurableEnvironment environment = new StandardEnvironment();
private ApplicationEnvironmentPreparedEvent event = new ApplicationEnvironmentPreparedEvent(new SpringApplication(), null, environment);
@Test
public void noop() {
listener.onApplicationEvent(event);
}
@Test
public void serverPortOnly() {
EnvironmentTestUtils.addEnvironment(environment, "server.port=9999");
listener.onApplicationEvent(event);
assertEquals("-1", environment.resolvePlaceholders("${server.port}"));
assertEquals("9999", environment.resolvePlaceholders("${turbine.amqp.port}"));
}
@Test
public void turbinePortOnly() {
EnvironmentTestUtils.addEnvironment(environment, "turbine.amqp.port=9999");
listener.onApplicationEvent(event);
assertEquals("9999", environment.resolvePlaceholders("${turbine.amqp.port}"));
assertEquals("0", environment.resolvePlaceholders("${server.port:0}"));
}
@Test
public void turbineAndManagementPorts() {
EnvironmentTestUtils.addEnvironment(environment, "turbine.amqp.port=9999", "management.port=9000");
listener.onApplicationEvent(event);
assertEquals("9999", environment.resolvePlaceholders("${turbine.amqp.port}"));
assertEquals("9000", environment.resolvePlaceholders("${server.port:0}"));
assertEquals("9000", environment.resolvePlaceholders("${management.port:0}"));
}
@Test
public void turbineAndServerPorts() {
EnvironmentTestUtils.addEnvironment(environment, "turbine.amqp.port=9999", "server.port=9000");
listener.onApplicationEvent(event);
assertEquals("9999", environment.resolvePlaceholders("${turbine.amqp.port}"));
assertEquals("9000", environment.resolvePlaceholders("${server.port:0}"));
assertEquals("0", environment.resolvePlaceholders("${management.port:0}"));
}
}