Merge branch '2.0.x'

Author: wilkinsona

spring-restdocs-mockmvc/build.gradle

@@ -21,5 +21,4 @@ dependencies {
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.hamcrest:hamcrest-library")
 	testImplementation("org.mockito:mockito-core")
-	testImplementation("org.springframework.hateoas:spring-hateoas")
 }

spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationConfigurerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -16,17 +16,16 @@
 
 package org.springframework.restdocs.mockmvc;
 
-import java.net.URI;
-
 import org.junit.Rule;
 import org.junit.Test;
 
-import org.springframework.hateoas.mvc.BasicLinkBuilder;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.springframework.web.util.UriComponents;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -89,10 +88,10 @@ private void assertUriConfiguration(String scheme, String host, int port) {
 		assertThat(port).isEqualTo(this.request.getServerPort());
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(this.request));
 		try {
-			URI uri = BasicLinkBuilder.linkToCurrentMapping().toUri();
-			assertThat(scheme).isEqualTo(uri.getScheme());
-			assertThat(host).isEqualTo(uri.getHost());
-			assertThat(port).isEqualTo(uri.getPort());
+			UriComponents uriComponents = ServletUriComponentsBuilder.fromCurrentServletMapping().build();
+			assertThat(scheme).isEqualTo(uriComponents.getScheme());
+			assertThat(host).isEqualTo(uriComponents.getHost());
+			assertThat(port).isEqualTo(uriComponents.getPort());
 		}
 		finally {
 			RequestContextHolder.resetRequestAttributes();

spring-restdocs-platform/build.gradle

@@ -26,7 +26,6 @@ dependencies {
 		api("org.jruby:jruby-complete:9.1.13.0")
 		api("org.junit.jupiter:junit-jupiter-api:5.0.0")
 		api("org.mockito:mockito-core:1.10.19")
-		api("org.springframework.hateoas:spring-hateoas:0.23.0.RELEASE")
 	}
 	api(enforcedPlatform("org.springframework:spring-framework-bom:$springFrameworkVersion"))
 }