diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixManagementContextConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixManagementContextConfiguration.java index 229481c7..35a53402 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixManagementContextConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixManagementContextConfiguration.java @@ -16,7 +16,6 @@ package org.springframework.cloud.netflix.hystrix; -import com.netflix.hystrix.contrib.javanica.aop.aspectj.HystrixCommandAspect; import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration; import org.springframework.boot.actuate.autoconfigure.web.servlet.ManagementServletContext; import org.springframework.boot.actuate.health.Health; @@ -29,6 +28,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.cloud.client.actuator.HasFeatures; import org.springframework.context.annotation.Bean; +import com.netflix.hystrix.contrib.javanica.aop.aspectj.HystrixCommandAspect; import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet; /** @@ -55,7 +55,7 @@ class HystrixManagementContextConfiguration { @Bean public ServletRegistrationBean hystrixMetricsStreamServlet() { - String path = this.managementServletContext.getContextPath() + String path = this.managementServletContext.getServletPath() + this.properties.getPath(); String urlMapping = (path.endsWith("/") ? path + "*" : path + "/*"); ServletRegistrationBean registration = new ServletRegistrationBean<>( diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java index 5ebe796a..fab8f3f0 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java @@ -96,7 +96,7 @@ public class HystrixOnlyTests { private Map getHealth() { return new TestRestTemplate().exchange( - "http://localhost:" + this.port + "/admin/health", HttpMethod.GET, + "http://localhost:" + this.port + "/application/health", HttpMethod.GET, new HttpEntity(createBasicAuthHeader(USER, PASSWORD)), Map.class).getBody(); } diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java index d6e60150..7571d497 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java @@ -76,7 +76,7 @@ public class HystrixStreamEndpointTests { String.class); assertEquals("bad response code", HttpStatus.OK, response.getStatusCode()); - URL hystrixUrl = new URL(url + "/admin/hystrix.stream"); + URL hystrixUrl = new URL(url + "/application/hystrix.stream"); List data = new ArrayList<>(); for (int i = 0; i < 5; i++) { diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java index ddc6da61..e9fda7ca 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager; public class TestAutoConfiguration { public static final String USER = "user"; - public static final String PASSWORD = "password"; + public static final String PASSWORD = "{noop}password"; @Configuration @Order(Ordered.HIGHEST_PRECEDENCE) diff --git a/spring-cloud-netflix-core/src/test/resources/application.yml b/spring-cloud-netflix-core/src/test/resources/application.yml index 532aefee..2060ce21 100644 --- a/spring-cloud-netflix-core/src/test/resources/application.yml +++ b/spring-cloud-netflix-core/src/test/resources/application.yml @@ -35,8 +35,6 @@ badClients: ribbon: MaxAutoRetriesNextServer: 10 ReadTimeout: 200 -management: - context-path: /admin endpoints: health: sensitive: false diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java index 0f9d7b72..2c9cbb36 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java @@ -142,7 +142,7 @@ public class EurekaServerMockApplication { @Bean public UserDetailsService userDetailsService() { InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager(); - manager.createUser(User.withUsername("test").password("test").roles("USER").build()); + manager.createUser(User.withUsername("test").password("{noop}test").roles("USER").build()); return manager; } diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index b679a9b3..edb97b94 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -103,12 +103,6 @@ compile true - - com.jayway.restassured - rest-assured - test - 2.8.0 - org.springframework.restdocs spring-restdocs-restassured diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java index 410ed1af..08c2dde3 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java @@ -18,14 +18,14 @@ package org.springframework.cloud.netflix.eureka.server.doc; import java.util.UUID; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.filter.Filter; -import com.jayway.restassured.specification.RequestSpecification; import com.netflix.appinfo.ApplicationInfoManager; import com.netflix.appinfo.InstanceInfo; import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.filter.Filter; +import io.restassured.specification.RequestSpecification; import org.junit.After; import org.junit.Rule; import org.junit.runner.RunWith; @@ -42,8 +42,8 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; import org.springframework.cloud.netflix.eureka.server.doc.AbstractDocumentationTests.Application; import org.springframework.context.annotation.Configuration; import org.springframework.restdocs.JUnitRestDocumentation; -import org.springframework.restdocs.restassured.RestAssuredRestDocumentation; -import org.springframework.restdocs.restassured.RestDocumentationFilter; +import org.springframework.restdocs.restassured3.RestAssuredRestDocumentation; +import org.springframework.restdocs.restassured3.RestDocumentationFilter; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.util.ReflectionTestUtils; @@ -51,8 +51,8 @@ import org.springframework.test.util.ReflectionTestUtils; import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest; import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse; import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint; -import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration; -import static org.springframework.restdocs.restassured.operation.preprocess.RestAssuredPreprocessors.modifyUris; +import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration; +import static org.springframework.restdocs.restassured3.operation.preprocess.RestAssuredPreprocessors.modifyUris; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/EurekaObjectMapper.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/EurekaObjectMapper.java index c5b28ef0..3d10e3c3 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/EurekaObjectMapper.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/EurekaObjectMapper.java @@ -20,12 +20,12 @@ import java.io.IOException; import javax.ws.rs.core.MediaType; -import com.jayway.restassured.mapper.ObjectMapperDeserializationContext; -import com.jayway.restassured.mapper.ObjectMapperSerializationContext; import com.netflix.discovery.converters.EntityBodyConverter; +import io.restassured.mapper.ObjectMapperDeserializationContext; +import io.restassured.mapper.ObjectMapperSerializationContext; final class EurekaObjectMapper - implements com.jayway.restassured.mapper.ObjectMapper { + implements io.restassured.mapper.ObjectMapper { private EntityBodyConverter converter = new EntityBodyConverter(); @Override diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/RequestVerifierFilter.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/RequestVerifierFilter.java index d3475a72..8fd9eb27 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/RequestVerifierFilter.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/RequestVerifierFilter.java @@ -35,13 +35,13 @@ import com.github.tomakehurst.wiremock.http.RequestMethod; import com.github.tomakehurst.wiremock.matching.MatchResult; import com.github.tomakehurst.wiremock.stubbing.StubMapping; import com.jayway.jsonpath.JsonPath; -import com.jayway.restassured.filter.Filter; -import com.jayway.restassured.filter.FilterContext; -import com.jayway.restassured.response.Header; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.FilterableRequestSpecification; -import com.jayway.restassured.specification.FilterableResponseSpecification; +import io.restassured.filter.Filter; +import io.restassured.filter.FilterContext; +import io.restassured.http.Header; +import io.restassured.response.Response; +import io.restassured.specification.FilterableRequestSpecification; +import io.restassured.specification.FilterableResponseSpecification; import org.springframework.util.Base64Utils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; @@ -87,7 +87,7 @@ public class RequestVerifierFilter implements Filter { @Override public Response filter(FilterableRequestSpecification requestSpec, - FilterableResponseSpecification responseSpec, FilterContext context) { + FilterableResponseSpecification responseSpec, FilterContext context) { Map configuration = getConfiguration(requestSpec, context); configuration.put("contract.jsonPaths", this.jsonPaths.keySet()); Response response = context.next(requestSpec, responseSpec); @@ -213,7 +213,7 @@ class WireMockRestAssuredRequestAdapter implements Request { @Override public RequestMethod getMethod() { - return RequestMethod.fromString(request.getMethod().name()); + return RequestMethod.fromString(request.getMethod()); } @Override @@ -282,7 +282,7 @@ class WireMockRestAssuredRequestAdapter implements Request { @Override public Map getCookies() { Map map = new LinkedHashMap<>(); - for (com.jayway.restassured.response.Cookie cookie : request.getCookies()) { + for (io.restassured.http.Cookie cookie : request.getCookies()) { Cookie value = new Cookie(cookie.getValue()); map.put(cookie.getName(), value); } diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointIntegrationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointIntegrationTests.java index d4263f35..1bd10afc 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointIntegrationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointIntegrationTests.java @@ -63,13 +63,13 @@ public class RoutesEndpointIntegrationTests { @Test public void getRoutesTest() { - Map routes = restTemplate.getForObject("/admin/routes", Map.class); + Map routes = restTemplate.getForObject("/application/routes", Map.class); assertEquals("https://localhost:8443", routes.get("/sslservice/**")); } @Test public void postRoutesTest() { - Map routes = restTemplate.postForObject("/admin/routes", null, Map.class); + Map routes = restTemplate.postForObject("/application/routes", null, Map.class); assertEquals("https://localhost:8443", routes.get("/sslservice/**")); assertTrue(refreshListener.wasCalled()); } @@ -77,7 +77,7 @@ public class RoutesEndpointIntegrationTests { @Test public void getRouteDetailsTest() { ResponseEntity> responseEntity = restTemplate.exchange( - "/admin/routes/details", HttpMethod.GET, null, new ParameterizedTypeReference>() { + "/application/routes/details", HttpMethod.GET, null, new ParameterizedTypeReference>() { }); assertThat(responseEntity.getStatusCode(), is(HttpStatus.OK));