From 77916c83044ac8d986968c4f3b4530d5142b5da4 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 23 Mar 2024 22:28:30 +0100 Subject: [PATCH] 10 years is more than long enough for users to be fully WARNed --- .../hibernate/boot/model/internal/EntityBinder.java | 6 ------ .../java/org/hibernate/internal/CoreMessageLogger.java | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java index c938131e91..2fb4fbddfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java @@ -1032,12 +1032,6 @@ public class EntityBinder { if ( ignore ) { LOG.debugf( "Ignoring explicit @DiscriminatorColumn annotation on: %s", annotatedClass.getName() ); } - else { - LOG.applyingExplicitDiscriminatorColumnForJoined( - annotatedClass.getName(), - AvailableSettings.IGNORE_EXPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS - ); - } return !ignore; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index 7571f53904..dbf38e7cd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -1594,16 +1594,6 @@ public interface CoreMessageLogger extends BasicLogger { @Message(value = "Named parameters are used for a callable statement, but database metadata indicates named parameters are not supported.", id = 456) void unsupportedNamedParameters(); - @LogMessage(level = WARN) - @Message( - id = 457, - value = "Joined inheritance hierarchy [%1$s] defined explicit @DiscriminatorColumn. Legacy Hibernate behavior " + - "was to ignore the @DiscriminatorColumn. However, as part of issue HHH-6911 we now apply the " + - "explicit @DiscriminatorColumn. If you would prefer the legacy behavior, enable the `%2$s` setting " + - "(%2$s=true)" - ) - void applyingExplicitDiscriminatorColumnForJoined(String className, String overrideSetting); - // 458-466 reserved for use by main branch (ORM 5.0.0) @LogMessage(level = DEBUG)