Skip to content

Update MutinyGenerator#generate signature #1742

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 2 commits into from
Sep 1, 2023
Merged

Update MutinyGenerator#generate signature #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8e08d7
[#1741] Change MutinyGenerator#generate return type
DavideD Aug 31, 2023
7ba0431
[#1741] Format existing code
DavideD Aug 31, 2023
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
47 changes: 24 additions & 23 deletions ...re/src/main/java/org/hibernate/reactive/persister/entity/mutation/GeneratorValueUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
package org.hibernate.reactive.persister.entity.mutation;

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

import java.util.concurrent.CompletionStage;

import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.generator.BeforeExecutionGenerator;
import org.hibernate.generator.EventType;
Expand All @@ -22,27 +24,26 @@

final class GeneratorValueUtil {

private GeneratorValueUtil() {
}


static CompletionStage<?> generateValue(
SharedSessionContractImplementor session, Object entity, Object currentValue,
BeforeExecutionGenerator generator, EventType eventType) {
if (generator instanceof StageGenerator) {
final Stage.Session stageSession = new StageSessionImpl( (ReactiveSession) session );
return ((StageGenerator) generator).generate(stageSession, entity, currentValue, eventType);
}

if (generator instanceof MutinyGenerator) {
MutinySessionFactoryImpl mutinyFactory = new MutinySessionFactoryImpl( (SessionFactoryImpl) session.getFactory() );
Mutiny.Session mutinySession = new MutinySessionImpl( (ReactiveSession) session, mutinyFactory );
return ((MutinyGenerator) generator).generate(mutinySession, entity, currentValue, eventType).subscribeAsCompletionStage();
}


// We should throw an exception, but I don't want to break things for people using @CreationTimestamp or similar
// annotations. We need an alternative for Hibernate Reactive.
return completedFuture( generator.generate( session, entity, currentValue, eventType) );
}
private GeneratorValueUtil() {
}

static CompletionStage<?> generateValue(
SharedSessionContractImplementor session, Object entity, Object currentValue,
BeforeExecutionGenerator generator, EventType eventType) {
if ( generator instanceof StageGenerator ) {
final Stage.Session stageSession = new StageSessionImpl( (ReactiveSession) session );
return ( (StageGenerator) generator ).generate( stageSession, entity, currentValue, eventType );
}

if ( generator instanceof MutinyGenerator ) {
MutinySessionFactoryImpl mutinyFactory = new MutinySessionFactoryImpl( (SessionFactoryImpl) session.getFactory() );
Mutiny.Session mutinySession = new MutinySessionImpl( (ReactiveSession) session, mutinyFactory );
return ( (MutinyGenerator) generator ).generate( mutinySession, entity, currentValue, eventType )
.subscribeAsCompletionStage();
}

// We should throw an exception, but I don't want to break things for people using @CreationTimestamp or similar
// annotations. We need an alternative for Hibernate Reactive.
return completedFuture( generator.generate( session, entity, currentValue, eventType ) );
}
}
6 changes: 2 additions & 4 deletions hibernate-reactive-core/src/main/java/org/hibernate/reactive/tuple/MutinyGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@
public abstract class MutinyGenerator implements BeforeExecutionGenerator {

@Override
public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue,
EventType eventType) {
public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue, EventType eventType) {
throw new UnsupportedOperationException( "Use generate(Mutiny.Session, Object, Object, EventType) instead" );
}

public abstract Uni<Object> generate(Mutiny.Session session, Object owner, Object currentValue,
EventType eventType);
public abstract Uni<?> generate(Mutiny.Session session, Object owner, Object currentValue, EventType eventType);

Check notice

Code scanning / CodeQL

Useless parameter

The parameter 'owner' is never used.

Check notice

Code scanning / CodeQL

Useless parameter

The parameter 'currentValue' is never used.

Check notice

Code scanning / CodeQL

Useless parameter

The parameter 'eventType' is never used.
}
3 changes: 1 addition & 2 deletions hibernate-reactive-core/src/test/java/org/hibernate/reactive/CurrentUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ public EnumSet<EventType> getEventTypes() {
public static abstract class AbstractLoggedUserGeneratorWithMutiny extends MutinyGenerator {

@Override
public Uni<Object> generate(Mutiny.Session session, Object owner, Object currentValue,
EventType eventType) {
public Uni<Object> generate(Mutiny.Session session, Object owner, Object currentValue, EventType eventType) {
Objects.requireNonNull( session );
String value = CurrentUser.INSTANCE.get();
return Uni.createFrom().item( value );
Expand Down
72 changes: 35 additions & 37 deletions ...rnate-reactive-core/src/test/java/org/hibernate/reactive/MutinySequenceGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,50 +34,48 @@ protected Collection<Class<?>> annotatedEntities() {

@Test
public void testSequenceGenerator(VertxTestContext context) {

SequenceId b = new SequenceId();
b.string = "Hello World";

test( context,
getMutinySessionFactory()
.withSession( s -> s.persist(b).call( s::flush ) )
.call( () -> getMutinySessionFactory().withSession(
s2 -> s2.find( SequenceId.class, b.getId() )
.map( bb -> {
assertNotNull( bb );
assertEquals( bb.id, 5 );
assertEquals( bb.string, b.string );
assertEquals( bb.version, 0 );

bb.string = "Goodbye";
return null;
} )
.call( s2::flush )
.chain( () -> s2.find( SequenceId.class, b.getId() ) )
.map( bt -> {
assertEquals( bt.version, 1 );
return null;
} )
) )
.call( () -> getMutinySessionFactory().withSession(
s3 -> s3.find( SequenceId.class, b.getId() )
.map( bb -> {
assertEquals( bb.version, 1 );
assertEquals( bb.string, "Goodbye" );
return null;
} )
) )
test( context, getMutinySessionFactory()
.withSession( s -> s.persist( b ).call( s::flush ) )
.call( () -> getMutinySessionFactory().withSession(
s2 -> s2.find( SequenceId.class, b.getId() )
.map( bb -> {
assertNotNull( bb );
assertEquals( bb.id, 5 );
assertEquals( bb.string, b.string );
assertEquals( bb.version, 0 );

bb.string = "Goodbye";
return null;
} )
.call( s2::flush )
.chain( () -> s2.find( SequenceId.class, b.getId() ) )
.map( bt -> {
assertEquals( bt.version, 1 );
return null;
} )
) )
.call( () -> getMutinySessionFactory().withSession(
s3 -> s3.find( SequenceId.class, b.getId() )
.map( bb -> {
assertEquals( bb.version, 1 );
assertEquals( bb.string, "Goodbye" );
return null;
} )
) )
);
}

@Entity
@SequenceGenerator(name = "seq",
sequenceName = "test_id_seq",
initialValue = 5)
@SequenceGenerator(name = "seq", sequenceName = "test_id_seq", initialValue = 5)
public static class SequenceId {
@Id @GeneratedValue(generator = "seq")
@Id
@GeneratedValue(generator = "seq")
Integer id;
@Version Integer version;
@Version
Integer version;
String string;

public SequenceId() {
Expand Down Expand Up @@ -118,12 +116,12 @@ public boolean equals(Object o) {
return false;
}
SequenceId sequenceId = (SequenceId) o;
return Objects.equals(string, sequenceId.string);
return Objects.equals( string, sequenceId.string );
}

@Override
public int hashCode() {
return Objects.hash(string);
return Objects.hash( string );
}
}
}