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

polish

Browse Source
This commit is contained in:
Spencer Gibb
2017-12-20 14:30:25 -05:00
parent ac1ac4d5b1
commit 0a689b5008
2 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/PatternServiceRouteMapperIntegrationTests.java
View File

@@ -8,19 +8,17 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
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.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.StaticServerList;
import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
import org.springframework.cloud.netflix.zuul.RoutesEndpoint;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -39,21 +37,21 @@ import com.netflix.zuul.context.RequestContext;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.cloud.netflix.zuul.filters.discovery.PatternServiceRouteMapperIntegrationTests.SERVICE_ID;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
/**
* @author Stéphane Leroy
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SampleCustomZuulProxyApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
"spring.application.name=regex-test-application", "spring.jmx.enabled=false",
@SpringBootTest(webEnvironment = RANDOM_PORT,
properties = { "spring.application.name=regex-test-application", "spring.jmx.enabled=false",
"eureka.client.enabled=false" })
@DirtiesContext
public class PatternServiceRouteMapperIntegrationTests {
protected static final String SERVICE_ID = "domain-service-v1";
@Value("${local.server.port}")
@LocalServerPort
private int port;
@Autowired
@@ -94,49 +92,44 @@ public class PatternServiceRouteMapperIntegrationTests {
assertEquals("Get 1", result.getBody());
}
}
@SpringBootConfiguration
@EnableAutoConfiguration
@RestController
@EnableZuulProxy
@RibbonClient(value = SERVICE_ID, configuration = SimpleRibbonClientConfiguration.class)
protected static class SampleCustomZuulProxyApplication {
@Configuration
@EnableAutoConfiguration
@RestController
@EnableZuulProxy
@RibbonClient(value = SERVICE_ID, configuration = SimpleRibbonClientConfiguration.class)
class SampleCustomZuulProxyApplication {
@Bean
public DiscoveryClient discoveryClient() {
DiscoveryClient discoveryClient = mock(DiscoveryClient.class);
List<String> services = new ArrayList<>();
services.add(SERVICE_ID);
when(discoveryClient.getServices()).thenReturn(services);
return discoveryClient;
}
@Bean
public DiscoveryClient discoveryClient() {
DiscoveryClient discoveryClient = mock(DiscoveryClient.class);
List<String> services = new ArrayList<>();
services.add(SERVICE_ID);
when(discoveryClient.getServices()).thenReturn(services);
return discoveryClient;
}
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
public String get(@PathVariable String id) {
return "Get " + id;
}
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
public String get(@PathVariable String id) {
return "Get " + id;
}
@Bean
public PatternServiceRouteMapper serviceRouteMapper() {
return new PatternServiceRouteMapper(
"(?<domain>^.+)-(?<name>.+)-(?<version>v.+$)",
"${version}/${domain}/${name}");
}
@Bean
public PatternServiceRouteMapper serviceRouteMapper() {
return new PatternServiceRouteMapper(
"(?<domain>^.+)-(?<name>.+)-(?<version>v.+$)",
"${version}/${domain}/${name}");
}
}
public static void main(String[] args) {
SpringApplication.run(SampleCustomZuulProxyApplication.class, args);
}
}
@Configuration
class SimpleRibbonClientConfiguration {
@Value("${local.server.port}")
private int port = 0;
@Bean
public ServerList<Server> ribbonServerList() {
return new StaticServerList<>(new Server("localhost", this.port));
protected static class SimpleRibbonClientConfiguration {
@LocalServerPort
private int port = 0;
@Bean
public ServerList<Server> ribbonServerList() {
return new StaticServerList<>(new Server("localhost", this.port));
}
}
}

7
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/LocationRewriteFilterTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.cloud.netflix.zuul.filters.post;
import com.netflix.util.Pair;
import com.netflix.zuul.context.RequestContext;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.cloud.netflix.zuul.filters.Route;
@@ -57,6 +58,12 @@ public class LocationRewriteFilterTests {
RequestContext.testSetCurrentContext(context);
}
@After
public void reset() {
RequestContext.getCurrentContext().clear();
}
@Test
public void shouldRewriteLocationHeadersWithRoutePrefix() {
RequestContext context = RequestContext.getCurrentContext();