Skip to content

Commit 2fea5e7

Browse files
committed
[#1741] Format existing code
1 parent 6b35f86 commit 2fea5e7

File tree

4 files changed

+61
-64
lines changed

4 files changed

+61
-64
lines changed

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/GeneratorValueUtil.java

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
package org.hibernate.reactive.persister.entity.mutation;
77

88
import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
9+
910
import java.util.concurrent.CompletionStage;
11+
1012
import org.hibernate.engine.spi.SharedSessionContractImplementor;
1113
import org.hibernate.generator.BeforeExecutionGenerator;
1214
import org.hibernate.generator.EventType;
@@ -22,27 +24,26 @@
2224

2325
final class GeneratorValueUtil {
2426

25-
private GeneratorValueUtil() {
26-
}
27-
28-
29-
static CompletionStage<?> generateValue(
30-
SharedSessionContractImplementor session, Object entity, Object currentValue,
31-
BeforeExecutionGenerator generator, EventType eventType) {
32-
if (generator instanceof StageGenerator) {
33-
final Stage.Session stageSession = new StageSessionImpl( (ReactiveSession) session );
34-
return ((StageGenerator) generator).generate(stageSession, entity, currentValue, eventType);
35-
}
36-
37-
if (generator instanceof MutinyGenerator) {
38-
MutinySessionFactoryImpl mutinyFactory = new MutinySessionFactoryImpl( (SessionFactoryImpl) session.getFactory() );
39-
Mutiny.Session mutinySession = new MutinySessionImpl( (ReactiveSession) session, mutinyFactory );
40-
return ((MutinyGenerator) generator).generate(mutinySession, entity, currentValue, eventType).subscribeAsCompletionStage();
41-
}
42-
43-
44-
// We should throw an exception, but I don't want to break things for people using @CreationTimestamp or similar
45-
// annotations. We need an alternative for Hibernate Reactive.
46-
return completedFuture( generator.generate( session, entity, currentValue, eventType) );
47-
}
27+
private GeneratorValueUtil() {
28+
}
29+
30+
static CompletionStage<?> generateValue(
31+
SharedSessionContractImplementor session, Object entity, Object currentValue,
32+
BeforeExecutionGenerator generator, EventType eventType) {
33+
if ( generator instanceof StageGenerator ) {
34+
final Stage.Session stageSession = new StageSessionImpl( (ReactiveSession) session );
35+
return ( (StageGenerator) generator ).generate( stageSession, entity, currentValue, eventType );
36+
}
37+
38+
if ( generator instanceof MutinyGenerator ) {
39+
MutinySessionFactoryImpl mutinyFactory = new MutinySessionFactoryImpl( (SessionFactoryImpl) session.getFactory() );
40+
Mutiny.Session mutinySession = new MutinySessionImpl( (ReactiveSession) session, mutinyFactory );
41+
return ( (MutinyGenerator) generator ).generate( mutinySession, entity, currentValue, eventType )
42+
.subscribeAsCompletionStage();
43+
}
44+
45+
// We should throw an exception, but I don't want to break things for people using @CreationTimestamp or similar
46+
// annotations. We need an alternative for Hibernate Reactive.
47+
return completedFuture( generator.generate( session, entity, currentValue, eventType ) );
48+
}
4849
}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/tuple/MutinyGenerator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
public abstract class MutinyGenerator implements BeforeExecutionGenerator {
1717

1818
@Override
19-
public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue,
20-
EventType eventType) {
19+
public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue, EventType eventType) {
2120
throw new UnsupportedOperationException( "Use generate(Mutiny.Session, Object, Object, EventType) instead" );
2221
}
2322

hibernate-reactive-core/src/test/java/org/hibernate/reactive/CurrentUser.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ public EnumSet<EventType> getEventTypes() {
9191
public static abstract class AbstractLoggedUserGeneratorWithMutiny extends MutinyGenerator {
9292

9393
@Override
94-
public Uni<Object> generate(Mutiny.Session session, Object owner, Object currentValue,
95-
EventType eventType) {
94+
public Uni<Object> generate(Mutiny.Session session, Object owner, Object currentValue, EventType eventType) {
9695
Objects.requireNonNull( session );
9796
String value = CurrentUser.INSTANCE.get();
9897
return Uni.createFrom().item( value );

hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutinySequenceGeneratorTest.java

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,48 @@ protected Collection<Class<?>> annotatedEntities() {
3434

3535
@Test
3636
public void testSequenceGenerator(VertxTestContext context) {
37-
3837
SequenceId b = new SequenceId();
3938
b.string = "Hello World";
4039

41-
test( context,
42-
getMutinySessionFactory()
43-
.withSession( s -> s.persist(b).call( s::flush ) )
44-
.call( () -> getMutinySessionFactory().withSession(
45-
s2 -> s2.find( SequenceId.class, b.getId() )
46-
.map( bb -> {
47-
assertNotNull( bb );
48-
assertEquals( bb.id, 5 );
49-
assertEquals( bb.string, b.string );
50-
assertEquals( bb.version, 0 );
51-
52-
bb.string = "Goodbye";
53-
return null;
54-
} )
55-
.call( s2::flush )
56-
.chain( () -> s2.find( SequenceId.class, b.getId() ) )
57-
.map( bt -> {
58-
assertEquals( bt.version, 1 );
59-
return null;
60-
} )
61-
) )
62-
.call( () -> getMutinySessionFactory().withSession(
63-
s3 -> s3.find( SequenceId.class, b.getId() )
64-
.map( bb -> {
65-
assertEquals( bb.version, 1 );
66-
assertEquals( bb.string, "Goodbye" );
67-
return null;
68-
} )
69-
) )
40+
test( context, getMutinySessionFactory()
41+
.withSession( s -> s.persist( b ).call( s::flush ) )
42+
.call( () -> getMutinySessionFactory().withSession(
43+
s2 -> s2.find( SequenceId.class, b.getId() )
44+
.map( bb -> {
45+
assertNotNull( bb );
46+
assertEquals( bb.id, 5 );
47+
assertEquals( bb.string, b.string );
48+
assertEquals( bb.version, 0 );
49+
50+
bb.string = "Goodbye";
51+
return null;
52+
} )
53+
.call( s2::flush )
54+
.chain( () -> s2.find( SequenceId.class, b.getId() ) )
55+
.map( bt -> {
56+
assertEquals( bt.version, 1 );
57+
return null;
58+
} )
59+
) )
60+
.call( () -> getMutinySessionFactory().withSession(
61+
s3 -> s3.find( SequenceId.class, b.getId() )
62+
.map( bb -> {
63+
assertEquals( bb.version, 1 );
64+
assertEquals( bb.string, "Goodbye" );
65+
return null;
66+
} )
67+
) )
7068
);
7169
}
7270

7371
@Entity
74-
@SequenceGenerator(name = "seq",
75-
sequenceName = "test_id_seq",
76-
initialValue = 5)
72+
@SequenceGenerator(name = "seq", sequenceName = "test_id_seq", initialValue = 5)
7773
public static class SequenceId {
78-
@Id @GeneratedValue(generator = "seq")
74+
@Id
75+
@GeneratedValue(generator = "seq")
7976
Integer id;
80-
@Version Integer version;
77+
@Version
78+
Integer version;
8179
String string;
8280

8381
public SequenceId() {
@@ -118,12 +116,12 @@ public boolean equals(Object o) {
118116
return false;
119117
}
120118
SequenceId sequenceId = (SequenceId) o;
121-
return Objects.equals(string, sequenceId.string);
119+
return Objects.equals( string, sequenceId.string );
122120
}
123121

124122
@Override
125123
public int hashCode() {
126-
return Objects.hash(string);
124+
return Objects.hash( string );
127125
}
128126
}
129127
}

0 commit comments

Comments
 (0)