Skip to content

Commit bab9928

Browse files
dreab8DavideD
dreab8
authored and
DavideD
committed
[#2640] Fix compilation errors due to changes in ORM Loggers
1 parent 9016443 commit bab9928

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import org.hibernate.LockMode;
1212
import org.hibernate.LockOptions;
13-
import org.hibernate.bytecode.BytecodeLogging;
13+
import org.hibernate.bytecode.enhance.internal.BytecodeEnhancementLogging;
1414
import org.hibernate.engine.spi.SharedSessionContractImplementor;
1515
import org.hibernate.generator.values.GeneratedValues;
1616
import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
@@ -183,7 +183,7 @@ static CompletionStage<Object> forceInitialize(
183183
Object entityId,
184184
String entityName,
185185
SharedSessionContractImplementor session) {
186-
BytecodeLogging.LOGGER.tracef(
186+
BytecodeEnhancementLogging.ENHANCEMENT_LOGGER.tracef(
187187
"EnhancementAsProxyLazinessInterceptor#forceInitialize : %s#%s -> %s )",
188188
entityName,
189189
entityId,

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/OracleSqlReactiveInformationExtractorImpl.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@
1111
import java.util.List;
1212

1313
import org.hibernate.boot.model.naming.Identifier;
14-
import org.hibernate.internal.CoreLogging;
15-
import org.hibernate.internal.CoreMessageLogger;
1614
import org.hibernate.tool.schema.extract.spi.ExtractionContext;
1715

1816
public class OracleSqlReactiveInformationExtractorImpl extends AbstractReactiveInformationSchemaBasedExtractorImpl {
1917

20-
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( PostgreSqlReactiveInformationExtractorImpl.class );
2118

2219
public OracleSqlReactiveInformationExtractorImpl(ExtractionContext extractionContext) {
2320
super( extractionContext );

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/PostgreSqlReactiveInformationExtractorImpl.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import java.util.List;
1313

1414
import org.hibernate.boot.model.naming.Identifier;
15-
import org.hibernate.internal.CoreLogging;
16-
import org.hibernate.internal.CoreMessageLogger;
1715
import org.hibernate.tool.schema.extract.spi.ExtractionContext;
1816
import org.hibernate.type.SqlTypes;
1917

@@ -26,8 +24,6 @@
2624
*/
2725
public class PostgreSqlReactiveInformationExtractorImpl extends AbstractReactiveInformationSchemaBasedExtractorImpl {
2826

29-
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( PostgreSqlReactiveInformationExtractorImpl.class );
30-
3127
public PostgreSqlReactiveInformationExtractorImpl(ExtractionContext extractionContext) {
3228
super( extractionContext );
3329
}

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/internal/ReactiveStandardRowReader.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
3030
import static org.hibernate.reactive.util.impl.CompletionStages.loop;
3131
import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
32-
import static org.hibernate.sql.results.LoadingLogger.LOGGER;
32+
import static org.hibernate.sql.results.LoadingLogger.LOADING_LOGGER;
3333

3434

3535
/**
@@ -121,7 +121,7 @@ public R readRow(RowProcessingState processingState) {
121121

122122
@Override
123123
public CompletionStage<R> reactiveReadRow(ReactiveRowProcessingState rowProcessingState, JdbcValuesSourceProcessingOptions options) {
124-
LOGGER.trace( "ReactiveStandardRowReader#readRow" );
124+
LOADING_LOGGER.trace( "ReactiveStandardRowReader#readRow" );
125125

126126
return coordinateInitializers( rowProcessingState )
127127
.thenCompose( v -> {
@@ -160,7 +160,7 @@ private CompletionStage<R> booleanComponent(
160160
final boolean[] resultRow = new boolean[resultAssemblers.length];
161161
return loop( 0, assemblerCount, i -> {
162162
final DomainResultAssembler<?> assembler = resultAssemblers[i];
163-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
163+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
164164
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
165165
return ( (ReactiveDomainResultsAssembler) assembler )
166166
.reactiveAssemble( rowProcessingState, options )
@@ -181,7 +181,7 @@ private CompletionStage<R> byteComponent(
181181
final byte[] resultRow = new byte[resultAssemblers.length];
182182
return loop( 0, assemblerCount, i -> {
183183
final DomainResultAssembler<?> assembler = resultAssemblers[i];
184-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
184+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
185185
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
186186
return ( (ReactiveDomainResultsAssembler) assembler )
187187
.reactiveAssemble( rowProcessingState, options )
@@ -202,7 +202,7 @@ private CompletionStage<R> charComponent(
202202
final char[] resultRow = new char[resultAssemblers.length];
203203
return loop( 0, assemblerCount, i -> {
204204
final DomainResultAssembler<?> assembler = resultAssemblers[i];
205-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
205+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
206206
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
207207
return ( (ReactiveDomainResultsAssembler) assembler )
208208
.reactiveAssemble( rowProcessingState, options )
@@ -223,7 +223,7 @@ private CompletionStage<R> shortComponent(
223223
final short[] resultRow = new short[resultAssemblers.length];
224224
return loop( 0, assemblerCount, i -> {
225225
final DomainResultAssembler<?> assembler = resultAssemblers[i];
226-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
226+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
227227
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
228228
return ( (ReactiveDomainResultsAssembler) assembler )
229229
.reactiveAssemble( rowProcessingState, options )
@@ -244,7 +244,7 @@ private CompletionStage<R> intComponent(
244244
final int[] resultRow = new int[resultAssemblers.length];
245245
return loop( 0, assemblerCount, i -> {
246246
final DomainResultAssembler<?> assembler = resultAssemblers[i];
247-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
247+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
248248
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
249249
return ( (ReactiveDomainResultsAssembler) assembler )
250250
.reactiveAssemble( rowProcessingState, options )
@@ -265,7 +265,7 @@ private CompletionStage<R> longComponent(
265265
final long[] resultRow = new long[resultAssemblers.length];
266266
return loop( 0, assemblerCount, i -> {
267267
final DomainResultAssembler<?> assembler = resultAssemblers[i];
268-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
268+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
269269
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
270270
return ( (ReactiveDomainResultsAssembler) assembler )
271271
.reactiveAssemble( rowProcessingState, options )
@@ -286,7 +286,7 @@ private CompletionStage<R> floatComponent(
286286
final float[] resultRow = new float[resultAssemblers.length];
287287
return loop( 0, assemblerCount, i -> {
288288
final DomainResultAssembler<?> assembler = resultAssemblers[i];
289-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
289+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
290290
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
291291
return ( (ReactiveDomainResultsAssembler) assembler )
292292
.reactiveAssemble( rowProcessingState, options )
@@ -307,7 +307,7 @@ private CompletionStage<R> doubleComponent(
307307
final double[] resultRow = new double[resultAssemblers.length];
308308
return loop( 0, assemblerCount, i -> {
309309
final DomainResultAssembler<?> assembler = resultAssemblers[i];
310-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
310+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
311311
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
312312
return ( (ReactiveDomainResultsAssembler) assembler )
313313
.reactiveAssemble( rowProcessingState, options )
@@ -328,7 +328,7 @@ private CompletionStage<R> objectComponent(
328328
final Object[] resultRow = (Object[]) Array.newInstance( resultElementClass, resultAssemblers.length );
329329
return loop( 0, assemblerCount, i -> {
330330
final DomainResultAssembler<?> assembler = resultAssemblers[i];
331-
LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
331+
LOADING_LOGGER.debugf( "Calling top-level assembler (%s / %s) : %s", i, assemblerCount, assembler );
332332
if ( assembler instanceof ReactiveDomainResultsAssembler ) {
333333
return ( (ReactiveDomainResultsAssembler) assembler )
334334
.reactiveAssemble( rowProcessingState, options )
@@ -362,7 +362,7 @@ public List<JavaType<?>> getResultJavaTypes() {
362362
}
363363

364364
private void afterRow(RowProcessingState rowProcessingState) {
365-
LOGGER.trace( "ReactiveStandardRowReader#afterRow" );
365+
LOADING_LOGGER.trace( "ReactiveStandardRowReader#afterRow" );
366366
finishUpRow();
367367
}
368368

0 commit comments

Comments
 (0)