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

DATACASS-753 - Deferred Session retrieval from ReactiveSessionFactory.

Browse Source 
ReactiveSessionFactory.getSession() now returns a Mono that allows for accessing the Reactor Context while session retrieval.
This commit is contained in:
Mark Paluch
2020-04-23 10:43:10 +02:00
parent 719e22154a
commit 9e8385297c
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java
View File

@@ -15,6 +15,8 @@
*/
package org.springframework.data.cassandra;
import reactor.core.publisher.Mono;
/**
* Strategy interface to produce {@link ReactiveSession} instances.
* <p>
@@ -36,5 +38,5 @@ public interface ReactiveSessionFactory {
*
* @return a {@link ReactiveSession}.
*/
ReactiveSession getSession();
Mono<ReactiveSession> getSession();
}

14
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java
View File

@@ -742,9 +742,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re
applyStatementSettings(statement);
ReactiveSession session = getSession();
return Flux.defer(() -> callback.doInStatement(session, statement));
return getSession().flatMapMany(session -> callback.doInStatement(session, statement));
}
/**
@@ -759,9 +757,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re
applyStatementSettings(statement);
ReactiveSession session = getSession();
return Mono.defer(() -> Mono.from(callback.doInStatement(session, statement)));
return getSession().flatMap(session -> Mono.from(callback.doInStatement(session, statement)));
}
/**
@@ -774,9 +770,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re
Assert.notNull(callback, "ReactiveStatementCallback must not be null");
ReactiveSession session = getSession();
return Flux.defer(() -> callback.doInSession(session));
return getSession().flatMapMany(callback::doInSession);
}
/**
@@ -860,7 +854,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re
return new ArgumentPreparedStatementBinder(args);
}
private ReactiveSession getSession() {
private Mono<ReactiveSession> getSession() {
ReactiveSessionFactory sessionFactory = getSessionFactory();

8
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultReactiveSessionFactory.java
View File

@@ -15,6 +15,8 @@
*/
package org.springframework.data.cassandra.core.cql.session;
import reactor.core.publisher.Mono;
import org.springframework.data.cassandra.ReactiveSession;
import org.springframework.data.cassandra.ReactiveSessionFactory;
import org.springframework.data.cassandra.core.cql.ReactiveRowMapperResultSetExtractor;
@@ -29,7 +31,7 @@ import org.springframework.data.cassandra.core.cql.ReactiveRowMapperResultSetExt
*/
public class DefaultReactiveSessionFactory implements ReactiveSessionFactory {
private final ReactiveSession session;
private final Mono<ReactiveSession> session;
/**
* Create a new {@link ReactiveRowMapperResultSetExtractor}.
@@ -37,11 +39,11 @@ public class DefaultReactiveSessionFactory implements ReactiveSessionFactory {
* @param session the {@link ReactiveSession} provides connections to Cassandra, must not be {@literal null}.
*/
public DefaultReactiveSessionFactory(ReactiveSession session) {
this.session = session;
this.session = Mono.just(session);
}
@Override
public ReactiveSession getSession() {
public Mono<ReactiveSession> getSession() {
return session;
}
}

2
src/main/asciidoc/reference/migration-guide-2.2-to-3.0.adoc
View File

@@ -140,6 +140,8 @@ Paging state now uses `ByteBuffer`.
* Introduction of `StatementBuilder` to functionally build statements as the QueryBuilder API uses immutable statement types.
* `Session` bean renamed from `session` to `cassandraSession` and `SessionFactory` bean renamed from `sessionFactory` to `cassandraSessionFactory`.
* `ReactiveSession` bean renamed from `reactiveSession` to `reactiveCassandraSession` and `ReactiveSessionFactory` bean renamed from `reactiveSessionFactory` to `reactiveCassandraSessionFactory`.
* `ReactiveSessionFactory.getSession()` now returns a `Mono<ReactiveSession>`.
Previously it returned just `ReactiveSession`.
* Data type resolution was moved into `ColumnTypeResolver` so all `DataType`-related methods were moved from `CassandraPersistentEntity`/`CassandraPersistentProperty` into `ColumnTypeResolver` (affected methods are `MappingContext.getDataType(…)`, `CassandraPersistentProperty.getDataType()`, `CassandraPersistentEntity.getUserType()`, and `CassandraPersistentEntity.getTupleType()`).
* Schema creation was moved from `MappingContext` to `SchemaFactory` (affected methods are `CassandraMappingContext.getCreateTableSpecificationFor(…)`, `CassandraMappingContext.getCreateIndexSpecificationsFor(…)`, and `CassandraMappingContext.getCreateUserTypeSpecificationFor(…)`).