From ddd9f8ee4e5dba39ca6f5859ccc4d6483a7a27c9 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 19 Jan 2024 13:31:45 +0100 Subject: [PATCH] [#1838] Remove unused code This code causes a failure with Quarkus at start up: https://github.com/quarkusio/quarkus/issues/38263 CI still works when I remove it, and a `DeleteOrUpsertOperation` cannot be cast to `OptionalTableUpdate` anyway. So I don't think this code is useful. --- ...ReactiveMergeCoordinatorStandardScopeFactory.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveMergeCoordinatorStandardScopeFactory.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveMergeCoordinatorStandardScopeFactory.java index 0b9bf87a0..17bcc50e2 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveMergeCoordinatorStandardScopeFactory.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveMergeCoordinatorStandardScopeFactory.java @@ -6,7 +6,6 @@ package org.hibernate.reactive.persister.entity.impl; -import org.hibernate.dialect.OracleDialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.persister.entity.AbstractEntityPersister; import org.hibernate.persister.entity.mutation.MergeCoordinator; @@ -22,7 +21,6 @@ import org.hibernate.sql.model.ast.TableMutation; import org.hibernate.sql.model.internal.MutationOperationGroupFactory; import org.hibernate.sql.model.internal.OptionalTableUpdate; -import org.hibernate.sql.model.jdbc.DeleteOrUpsertOperation; import org.hibernate.sql.model.jdbc.OptionalTableUpdateOperation; public class ReactiveMergeCoordinatorStandardScopeFactory extends MergeCoordinator @@ -46,6 +44,7 @@ public ReactiveScopedUpdateCoordinator makeScopedCoordinator() { ); } + // We override the whole method but we just need to plug in our custom createOperation(...) method @Override protected MutationOperationGroup createOperationGroup(ValuesAnalysis valuesAnalysis, MutationGroup mutationGroup) { final int numberOfTableMutations = mutationGroup.getNumberOfTableMutations(); @@ -101,15 +100,6 @@ protected MutationOperation createOperation(ValuesAnalysis valuesAnalysis, Table factory() ); } - if ( operation instanceof DeleteOrUpsertOperation - && factory().getJdbcServices().getDialect() instanceof OracleDialect ) { - OracleDialect dialect = ( (OracleDialect) factory().getJdbcServices().getDialect() ); - return dialect.createOptionalTableUpdateOperation( - ( (OptionalTableUpdate) operation ).getMutationTarget(), - (OptionalTableUpdate) operation, - factory() - ); - } return operation; } }