Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-26 13:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-646 - Adapt to Spring Framework 5.2 RC2.

Browse Source 
Implement missing methods in RawActionResponse. Consistent versions actross netty dependencies.
This commit is contained in:
Mark Paluch 2019-09-04 12:13:01 +02:00
parent 054c02bd41
commit aae7734bc0
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -22,6 +22,7 @@
<elasticsearch>6.8.1</elasticsearch> <elasticsearch>6.8.1</elasticsearch>
<log4j>2.9.1</log4j> <log4j>2.9.1</log4j>
<springdata.commons>2.2.0.BUILD-SNAPSHOT</springdata.commons> <springdata.commons>2.2.0.BUILD-SNAPSHOT</springdata.commons>
<netty>4.1.39.Final</netty>
<java-module-name>spring.data.elasticsearch</java-module-name> <java-module-name>spring.data.elasticsearch</java-module-name>
</properties> </properties>
@ -72,6 +73,19 @@
<url>https://jira.spring.io/browse/DATAES</url> <url>https://jira.spring.io/browse/DATAES</url>
</issueManagement> </issueManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${netty}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<!-- Spring --> <!-- Spring -->

19
src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java
View File

@ -37,6 +37,7 @@ import org.springframework.web.reactive.function.client.WebClientResponseExcepti
* *
* @author Christoph Strobl * @author Christoph Strobl
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Mark Paluch
* @since 3.2 * @since 3.2
*/ */
class RawActionResponse extends ActionResponse implements ClientResponse { class RawActionResponse extends ActionResponse implements ClientResponse {
@ -141,6 +142,15 @@ class RawActionResponse extends ActionResponse implements ClientResponse {
return delegate.bodyToFlux(typeReference); return delegate.bodyToFlux(typeReference);
} }
/*
* (non-Javadoc)
* @see org.springframework.web.reactive.function.client.ClientResponse#releaseBody()
*/
@Override
public Mono<Void> releaseBody() {
return delegate.releaseBody();
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.springframework.web.reactive.function.client.ClientResponse#toEntity(java.lang.Class) * @see org.springframework.web.reactive.function.client.ClientResponse#toEntity(java.lang.Class)
@ -168,6 +178,15 @@ class RawActionResponse extends ActionResponse implements ClientResponse {
return delegate.toEntityList(elementType); return delegate.toEntityList(elementType);
} }
/*
* (non-Javadoc)
* @see org.springframework.web.reactive.function.client.ClientResponse#toBodilessEntity()
*/
@Override
public Mono<ResponseEntity<Void>> toBodilessEntity() {
return delegate.toBodilessEntity();
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.springframework.web.reactive.function.client.ClientResponse#toEntityList(org.springframework.core.ParameterizedTypeReference) * @see org.springframework.web.reactive.function.client.ClientResponse#toEntityList(org.springframework.core.ParameterizedTypeReference)