Skip to content

Create QueryProducer interface for Stage and Mutiny #2130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2025
Merged

Create QueryProducer interface for Stage and Mutiny #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,193 changes: 497 additions & 696 deletions hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/Mutiny.java
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions ...ate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@
*/
package org.hibernate.reactive.mutiny.impl;

import io.smallrye.mutiny.Uni;
import jakarta.persistence.CacheRetrieveMode;
import jakarta.persistence.CacheStoreMode;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.FlushModeType;
import jakarta.persistence.LockModeType;
import jakarta.persistence.PersistenceException;
import jakarta.persistence.TypedQueryReference;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.CriteriaUpdate;
import jakarta.persistence.metamodel.Attribute;
import org.hibernate.CacheMode;
import org.hibernate.Filter;
import org.hibernate.FlushMode;
Expand All @@ -40,6 +28,19 @@
import org.hibernate.reactive.session.ReactiveQueryProducer;
import org.hibernate.reactive.session.ReactiveSession;

import io.smallrye.mutiny.Uni;
import jakarta.persistence.CacheRetrieveMode;
import jakarta.persistence.CacheStoreMode;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.FlushModeType;
import jakarta.persistence.LockModeType;
import jakarta.persistence.PersistenceException;
import jakarta.persistence.TypedQueryReference;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.CriteriaUpdate;
import jakarta.persistence.metamodel.Attribute;
import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.concurrent.CompletionStage;
Expand All @@ -48,7 +49,6 @@

import static org.hibernate.reactive.util.impl.CompletionStages.applyToAll;


/**
* Implements the {@link Mutiny.Session} API. This delegating class is
* needed to avoid name clashes when implementing both
Expand Down Expand Up @@ -578,6 +578,11 @@ public Mutiny.SessionFactory getFactory() {
return factory;
}

@Override
public CriteriaBuilder getCriteriaBuilder() {
return getFactory().getCriteriaBuilder();
}

@Override
public <T> ResultSetMapping<T> getResultSetMapping(Class<T> resultType, String mappingName) {
return delegate.getResultSetMapping( resultType, mappingName );
Expand Down
76 changes: 46 additions & 30 deletions ...ive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinyStatelessSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@
*/
package org.hibernate.reactive.mutiny.impl;

import io.smallrye.mutiny.Uni;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.TypedQueryReference;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.CriteriaUpdate;
import org.hibernate.LockMode;
import org.hibernate.graph.spi.RootGraphImplementor;
import org.hibernate.query.criteria.JpaCriteriaInsert;
import org.hibernate.reactive.common.AffectedEntities;
import org.hibernate.reactive.common.ResultSetMapping;
import org.hibernate.reactive.mutiny.Mutiny;
import org.hibernate.reactive.mutiny.Mutiny.Query;
Expand All @@ -21,13 +17,19 @@
import org.hibernate.reactive.query.ReactiveQuery;
import org.hibernate.reactive.session.ReactiveStatelessSession;

import io.smallrye.mutiny.Uni;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.TypedQueryReference;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.CriteriaUpdate;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import java.util.function.Supplier;


/**
* Implements the {@link Mutiny.StatelessSession} API. This delegating
* class is needed to avoid name clashes when implementing both
Expand All @@ -47,7 +49,6 @@ public ReactiveConnection getReactiveConnection() {
return delegate.getReactiveConnection();
}


<T> Uni<T> uni(Supplier<CompletionStage<T>> stageSupplier) {
return factory.uni( stageSupplier );
}
Expand Down Expand Up @@ -91,12 +92,42 @@ public <R> SelectionQuery<R> createQuery(String queryString, Class<R> resultType

@Override
public <R> SelectionQuery<R> createSelectionQuery(String queryString, Class<R> resultType) {
return new MutinySelectionQueryImpl<>( delegate.createReactiveSelectionQuery( queryString, resultType), factory );
return new MutinySelectionQueryImpl<>( delegate.createReactiveSelectionQuery( queryString, resultType ), factory );
}

@Override
public Mutiny.MutationQuery createMutationQuery(String queryString) {
return new MutinyMutationQueryImpl<>( delegate.createReactiveMutationQuery( queryString), factory );
return new MutinyMutationQueryImpl<>( delegate.createReactiveMutationQuery( queryString ), factory );
}

@Override
public Mutiny.MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery) {
return new MutinyMutationQueryImpl<>( delegate.createReactiveMutationQuery( updateQuery ), factory );
}

@Override
public Mutiny.MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery) {
return new MutinyMutationQueryImpl<>( delegate.createReactiveMutationQuery( deleteQuery ) , factory );
}

@Override
public Mutiny.MutationQuery createMutationQuery(JpaCriteriaInsert<?> insert) {
return new MutinyMutationQueryImpl<>( delegate.createReactiveMutationQuery( insert ) , factory );
}

@Override
public <R> Query<R> createNativeQuery(String queryString, AffectedEntities affectedEntities) {
return new MutinyQueryImpl<>( delegate.createReactiveNativeQuery( queryString, affectedEntities ), factory );
}

@Override
public <R> SelectionQuery<R> createNativeQuery(String queryString, Class<R> resultType, AffectedEntities affectedEntities) {
return new MutinyQueryImpl<>( delegate.createReactiveNativeQuery( queryString, resultType, affectedEntities ), factory );
}

@Override
public <R> SelectionQuery<R> createNativeQuery(String queryString, ResultSetMapping<R> resultSetMapping, AffectedEntities affectedEntities) {
return new MutinyQueryImpl<>( delegate.createReactiveNativeQuery( queryString, resultSetMapping, affectedEntities ), factory );
}

@Override
Expand Down Expand Up @@ -259,26 +290,6 @@ public Object getIdentifier(Object entity) {
return delegate.getIdentifier(entity);
}

// @Override
// public <T> ResultSetMapping<T> getResultSetMapping(Class<T> resultType, String mappingName) {
// return delegate.getResultSetMapping( resultType, mappingName );
// }
//
// @Override
// public <T> EntityGraph<T> getEntityGraph(Class<T> entity, String name) {
// return delegate.getEntityGraph( entity, name );
// }
//
// @Override
// public <T> EntityGraph<T> createEntityGraph(Class<T> entity) {
// return delegate.createEntityGraph( entity );
// }
//
// @Override
// public <T> EntityGraph<T> createEntityGraph(Class<T> entity, String name) {
// return delegate.createEntityGraph( entity, name );
// }

@Override
public <T> Uni<T> withTransaction(Function<Mutiny.Transaction, Uni<T>> work) {
return currentTransaction == null ? new Transaction<T>().execute( work ) : work.apply( currentTransaction );
Expand Down Expand Up @@ -359,6 +370,11 @@ public MutinySessionFactoryImpl getFactory() {
return factory;
}

@Override
public CriteriaBuilder getCriteriaBuilder() {
return getFactory().getCriteriaBuilder();
}

@Override
public <T> ResultSetMapping<T> getResultSetMapping(Class<T> resultType, String mappingName) {
return delegate.getResultSetMapping( resultType, mappingName );
Expand Down
5 changes: 2 additions & 3 deletions ...ate-reactive-core/src/main/java/org/hibernate/reactive/session/ReactiveQueryProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
*/
package org.hibernate.reactive.session;

import jakarta.persistence.TypedQueryReference;
import java.util.concurrent.CompletionStage;

import org.hibernate.Incubating;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.spi.SessionFactoryImplementor;
Expand All @@ -22,9 +19,11 @@
import org.hibernate.reactive.query.ReactiveSelectionQuery;

import jakarta.persistence.EntityGraph;
import jakarta.persistence.TypedQueryReference;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.CriteriaUpdate;
import java.util.concurrent.CompletionStage;


/**
Expand Down
Loading
Loading