Skip to content

three code cleanups #2127

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
Feb 17, 2025
Merged

three code cleanups #2127

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
30 changes: 14 additions & 16 deletions ...re/src/main/java/org/hibernate/reactive/event/impl/AbstractReactiveSaveEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,23 +180,21 @@ private CompletionStage<Object> generateId(
EventSource source,
ReactiveIdentifierGenerator<?> generator,
EntityPersister persister) {
return generator
.generate( (ReactiveConnectionSupplier) source, entity )
return generator.generate( (ReactiveConnectionSupplier) source, entity )
.thenApply( id -> {
final Object generatedId = castToIdentifierType( id, persister );
if ( generatedId == null ) {
throw new IdentifierGenerationException( "null id generated for: " + entity.getClass() );
}
if ( LOG.isDebugEnabled() ) {
LOG.debugf(
"Generated identifier: %s, using strategy: %s",
persister.getIdentifierType().toLoggableString( generatedId, source.getFactory() ),
generator.getClass().getName()
);
}
return generatedId;
}
);
final Object generatedId = castToIdentifierType( id, persister );
if ( generatedId == null ) {
throw new IdentifierGenerationException( "null id generated for: " + entity.getClass() );
}
if ( LOG.isDebugEnabled() ) {
LOG.debugf(
"Generated identifier: %s, using strategy: %s",
persister.getIdentifierType().toLoggableString( generatedId, source.getFactory() ),
generator.getClass().getName()
);
}
return generatedId;
} );
}

/**
Expand Down
3 changes: 3 additions & 0 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 @@ -63,10 +63,13 @@ public interface ReactiveQueryProducer extends ReactiveConnectionSupplier {

<R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, Class<R> resultClass);

@Deprecated(forRemoval = true)
<R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, Class<R> resultClass, String tableAlias);

@Deprecated(forRemoval = true)
<R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, String resultSetMappingName);

@Deprecated(forRemoval = true)
<R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, String resultSetMappingName, Class<R> resultClass);

<R> ReactiveSelectionQuery<R> createReactiveSelectionQuery(String hqlString, Class<R> resultType);
Expand Down
34 changes: 19 additions & 15 deletions ...-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,23 +415,21 @@ public void prepareForQueryExecution(boolean requiresTxn) {
@Override
public <T> ReactiveNativeQuery<T> createReactiveNativeQuery(String sqlString, Class<T> resultClass) {
final ReactiveNativeQuery<T> query = createReactiveNativeQuery( sqlString );
return addResultType( resultClass, query );
handleTupleResultType( resultClass, query );
addEntityOrResultType( resultClass, query );
return query;
}

private <T> ReactiveNativeQuery<T> addResultType(Class<T> resultClass, ReactiveNativeQuery<T> query) {
if ( Tuple.class.equals( resultClass ) ) {
query.setTupleTransformer( new NativeQueryTupleTransformer() );
}
else if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
private <T> void addEntityOrResultType(Class<T> resultClass, ReactiveNativeQuery<T> query) {
if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
}
else if ( resultClass != Object.class && resultClass != Object[].class ) {
else if ( resultClass != Object.class && resultClass != Object[].class && resultClass != Tuple.class ) {
query.addResultTypeClass( resultClass );
}
return query;
}

@Override
@Override @Deprecated(forRemoval = true)
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, Class<R> resultClass, String tableAlias) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString );
if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
Expand All @@ -443,7 +441,7 @@ public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, Cl
}
}

@Override
@Override @Deprecated(forRemoval = true)
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, String resultSetMappingName) {
checkOpen();
pulseTransactionCoordinator();
Expand All @@ -460,12 +458,10 @@ public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, St
}
}

@Override
@Override @Deprecated(forRemoval = true)
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, String resultSetMappingName, Class<R> resultClass) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString, resultSetMappingName );
if ( Tuple.class.equals( resultClass ) ) {
query.setTupleTransformer( new NativeQueryTupleTransformer() );
}
handleTupleResultType( resultClass, query );
return query;
}

Expand Down Expand Up @@ -610,7 +606,15 @@ private void addAffectedEntities(AffectedEntities affectedEntities, NativeQueryI
@Override
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String queryString, Class<R> resultType, AffectedEntities affectedEntities) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( queryString, affectedEntities );
return addResultType( resultType, query );
handleTupleResultType( resultType, query );
addEntityOrResultType( resultType, query );
return query;
}

private static <R> void handleTupleResultType(Class<R> resultType, ReactiveNativeQuery<R> query) {
if ( Tuple.class.equals(resultType) ) {
query.setTupleTransformer( NativeQueryTupleTransformer.INSTANCE );
}
}

@Override
Expand Down
90 changes: 39 additions & 51 deletions ...-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@
import org.hibernate.query.criteria.JpaCriteriaQuery;
import org.hibernate.query.criteria.JpaRoot;
import org.hibernate.query.hql.spi.SqmQueryImplementor;
import org.hibernate.query.named.NamedResultSetMappingMemento;
import org.hibernate.query.spi.HqlInterpretation;
import org.hibernate.query.spi.QueryImplementor;
import org.hibernate.query.sql.internal.NativeQueryImpl;
import org.hibernate.query.sql.spi.NativeQueryImplementor;
import org.hibernate.query.sqm.internal.SqmUtil;
import org.hibernate.query.sqm.tree.SqmStatement;
Expand Down Expand Up @@ -372,12 +370,18 @@ private void firePostInsert(Object entity, Object id, Object[] state, EntityPers

private CompletionStage<?> generateId(EntityPersister persister, Object entity, Generator generator) {
if ( generator.generatesOnInsert() ) {
return generator instanceof ReactiveIdentifierGenerator
? ( (ReactiveIdentifierGenerator<?>) generator ).generate( this, this )
: completedFuture( ( (BeforeExecutionGenerator) generator ).generate( this, entity, null, INSERT ) );
}
if ( generator instanceof ReactiveIdentifierGenerator<?> reactiveGenerator ) {
return reactiveGenerator.generate(this, this);
}
else if ( generator instanceof BeforeExecutionGenerator beforeExecutionGenerator ) {
return completedFuture( beforeExecutionGenerator.generate(this, entity, null, INSERT) );
}
else {
throw new IllegalArgumentException( "Unsupported generator type: " + generator.getClass().getName() );
}
}
else {
Object id = persister.getIdentifier( entity, this );
final Object id = persister.getIdentifier( entity, this );
if ( id == null ) {
throw new IdentifierGenerationException( "Identifier of entity '" + persister.getEntityName() + "' must be manually assigned before calling 'insert()'" );
}
Expand Down Expand Up @@ -878,8 +882,7 @@ public <R> ReactiveNativeQueryImplementor<R> createReactiveNativeQuery(String sq
delayedAfterCompletion();

try {
ReactiveNativeQueryImpl<R> query = new ReactiveNativeQueryImpl<>( sqlString, this);

final ReactiveNativeQueryImpl<R> query = new ReactiveNativeQueryImpl<>( sqlString, this );
if ( isEmpty( query.getComment() ) ) {
query.setComment( "dynamic native SQL query" );
}
Expand All @@ -893,69 +896,60 @@ public <R> ReactiveNativeQueryImplementor<R> createReactiveNativeQuery(String sq

@Override
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, Class<R> resultClass) {
ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString );
if ( Tuple.class.equals( resultClass ) ) {
query.setTupleTransformer( new NativeQueryTupleTransformer() );
}
else if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString );
handleTupleResultType( resultClass, query );
addEntityOrResultType( resultClass, query );
return query;
}

private <R> void addEntityOrResultType(Class<R> resultClass, ReactiveNativeQuery<R> query) {
if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
}
else {
( (NativeQueryImpl<?>) query ).addScalar( 1, resultClass );
else if ( resultClass != Object.class && resultClass != Object[].class && resultClass != Tuple.class ) {
query.addResultTypeClass( resultClass );
}
return query;
}

@Override
@Override @Deprecated(forRemoval = true)
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(
String sqlString,
Class<R> resultClass,
String tableAlias) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString );
if ( getFactory().getMappingMetamodel().isEntityClass(resultClass) ) {
if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
query.addEntity( tableAlias, resultClass.getName(), LockMode.READ );
return query;
}

throw new UnknownEntityTypeException( "unable to locate persister: " + resultClass.getName() );
else {
throw new UnknownEntityTypeException( "unable to locate persister: " + resultClass.getName() );
}
}

@Override
@Override @Deprecated(forRemoval = true)
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(String sqlString, String resultSetMappingName) {
checkOpen();
pulseTransactionCoordinator();
delayedAfterCompletion();

try {
if ( isNotEmpty( resultSetMappingName ) ) {
final NamedResultSetMappingMemento resultSetMappingMemento = getFactory().getQueryEngine()
.getNamedObjectRepository()
.getResultSetMappingMemento( resultSetMappingName );

if ( resultSetMappingMemento == null ) {
throw new HibernateException( "Could not resolve specified result-set mapping name : " + resultSetMappingName );
}
return new ReactiveNativeQueryImpl<>( sqlString, resultSetMappingMemento, this );
}
else {
return new ReactiveNativeQueryImpl<>( sqlString, this );
}
return isNotEmpty( resultSetMappingName )
? new ReactiveNativeQueryImpl<>( sqlString, getResultSetMappingMemento( resultSetMappingName ), this )
: new ReactiveNativeQueryImpl<>( sqlString, this );
//TODO: why no applyQuerySettingsAndHints( query ); ???
}
catch (RuntimeException he) {
throw getExceptionConverter().convert( he );
}
}

@Override
@Override @Deprecated(forRemoval = true)
public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(
String sqlString,
String resultSetMappingName,
Class<R> resultClass) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( sqlString, resultSetMappingName );
if ( Tuple.class.equals( resultClass ) ) {
query.setTupleTransformer( new NativeQueryTupleTransformer() );
}
handleTupleResultType( resultClass, query );
return query;
}

Expand Down Expand Up @@ -1097,21 +1091,15 @@ public <R> ReactiveNativeQuery<R> createReactiveNativeQuery(
Class<R> resultType,
AffectedEntities affectedEntities) {
final ReactiveNativeQuery<R> query = createReactiveNativeQuery( queryString, affectedEntities );
return addResultType( resultType, query );
handleTupleResultType( resultType, query );
addEntityOrResultType( resultType, query );
return query;
}

//TODO: copy/paste from ORM, change visibility
private <T> ReactiveNativeQuery<T> addResultType(Class<T> resultClass, ReactiveNativeQuery<T> query) {
if ( Tuple.class.equals( resultClass ) ) {
query.setTupleTransformer( new NativeQueryTupleTransformer() );
private static <R> void handleTupleResultType(Class<R> resultType, ReactiveNativeQuery<R> query) {
if ( Tuple.class.equals(resultType) ) {
query.setTupleTransformer( NativeQueryTupleTransformer.INSTANCE );
}
else if ( getFactory().getMappingMetamodel().isEntityClass( resultClass ) ) {
query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
}
else if ( resultClass != Object.class && resultClass != Object[].class ) {
query.addScalar( 1, resultClass );
}
return query;
}

@Override
Expand Down
Loading