Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1384 - Upgrade to Spring Framework 5.3.

Browse Source 
Other dependencies as well.

Tweaked the test verifying the WebFlux exchange strategies registered after some refactorings in Spring Framework.
This commit is contained in:
Oliver Drotbohm
2020-10-27 21:00:01 +01:00
parent 03abd3f169
commit b00774a480
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@@ -70,7 +70,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<source.level>1.8</source.level>
<assertj.version>3.15.0</assertj.version>
<assertj.version>3.18.0</assertj.version>
<docs.resources.version>0.2.2.RELEASE</docs.resources.version>
<evo.version>1.2.2</evo.version>
<logback.version>1.2.3</logback.version>
@@ -79,14 +79,14 @@
<jackson-bom.version>2.11.2</jackson-bom.version>
<java-module-name>spring.hateoas</java-module-name>
<jsonpath.version>2.4.0</jsonpath.version>
<junit.version>5.6.2</junit.version>
<reactor-bom.version>2020.0.0-M2</reactor-bom.version>
<junit.version>5.7.0</junit.version>
<reactor-bom.version>2020.0.0</reactor-bom.version>
<slf4j.version>1.7.30</slf4j.version>
<spring.version>5.3.0-RC1</spring.version>
<spring.version>5.3.0</spring.version>
<spring-plugin.version>2.0.0.RELEASE</spring-plugin.version>
<kotlin.version>1.4.0-rc</kotlin.version>
<kotlinx-coroutines.version>1.3.8-1.4.0-rc</kotlinx-coroutines.version>
<mockk.version>1.10.0</mockk.version>
<kotlin.version>1.4.10</kotlin.version>
<kotlinx-coroutines.version>1.4.0</kotlinx-coroutines.version>
<mockk.version>1.10.2</mockk.version>
</properties>
<profiles>
@@ -95,7 +95,7 @@
<id>spring-next</id>
<properties>
<reactor-bom.version>2020.0.0-SNAPSHOT</reactor-bom.version>
<spring.version>5.3.0-SNAPSHOT</spring.version>
<spring.version>5.3.1-SNAPSHOT</spring.version>
</properties>
</profile>

7
src/test/java/org/springframework/hateoas/config/HypermediaWebTestClientConfigurerTest.java
View File

@@ -24,7 +24,6 @@ import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.reactive.config.EnableWebFlux;
import org.springframework.web.reactive.function.client.ExchangeStrategies;
import org.springframework.web.reactive.function.client.WebClient;
public class HypermediaWebTestClientConfigurerTest {
@@ -118,12 +117,12 @@ public class HypermediaWebTestClientConfigurerTest {
* @param webTestClient
* @return
*/
@SuppressWarnings("null")
private static ExchangeStrategies exchangeStrategies(WebTestClient webTestClient) {
WebClient webClient = (WebClient) ReflectionTestUtils.getField(webTestClient, "webClient");
Object exchangeFunction = ReflectionTestUtils.getField(webTestClient, "exchangeFunction");
return (ExchangeStrategies) ReflectionTestUtils
.getField(ReflectionTestUtils.getField(webClient, "exchangeFunction"), "strategies");
return (ExchangeStrategies) ReflectionTestUtils.getField(exchangeFunction, "strategies");
}
@Configuration