get rid of hangovers from HEM merge

make a rough start on cleaning up EntityManagerFactoryBuilderImpl

Signed-off-by: Gavin King <[email protected]>

Author: gavinking

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

@@ -143,7 +143,7 @@
  * @author Steve Ebersole
  */
 public abstract class AbstractSharedSessionContract implements SharedSessionContractImplementor {
-	private static final EntityManagerMessageLogger log = HEMLogging.messageLogger( SessionImpl.class );
+	private static final CoreMessageLogger log = CoreLogging.messageLogger( SessionImpl.class );
 
 	private transient SessionFactoryImpl factory;
 	protected transient FastSessionServices fastSessionServices;

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

@@ -48,7 +48,7 @@
  * New messages must be added after the last message defined to ensure message codes are unique.
  */
 @MessageLogger(projectCode = "HHH")
-@ValidIdRange(min=2,max = 10000)
+@ValidIdRange(min=2,max = 20000)
 public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
@@ -937,4 +937,37 @@ void cannotResolveNonNullableTransientDependencies(
 	@Message(value = "Flushing and evicting managed instance of type [%s] before removing detached instance with same id",
 			id = 530)
 	void flushAndEvictOnRemove(String entityName);
+
+	@LogMessage(level = ERROR)
+	@Message(value = "Illegal argument on static metamodel field injection : %s#%s; expected type :  %s; encountered type : %s", id = 15007)
+	void illegalArgumentOnStaticMetamodelFieldInjection(
+			String name,
+			String name2,
+			String name3,
+			String name4);
+
+	@LogMessage(level = WARN)
+	@Message(value = "Unable to locate static metamodel field : %s#%s; this may or may not indicate a problem with the static metamodel", id = 15011)
+	void unableToLocateStaticMetamodelField(
+			String name,
+			String name2);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = "Returning null (as required by JPA spec) rather than throwing EntityNotFoundException, " +
+			"as the entity (type=%s, id=%s) does not exist", id = 15013)
+	void ignoringEntityNotFound(String entityName, String identifier);
+
+	@LogMessage(level = DEBUG)
+	@Message(
+			id = 15015,
+			value = "Encountered a MappedSuperclass [%s] not used in any entity hierarchy"
+	)
+	void unusedMappedSuperclass(String name);
+
+	@LogMessage(level = WARN)
+	@Message(
+			id = 15018,
+			value = "Encountered multiple persistence-unit stanzas defining same name [%s]; persistence-unit names must be unique"
+	)
+	void duplicatedPersistenceUnitName(String name);
 }

hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java

@@ -44,7 +44,7 @@
  * @author Andrea Boriero
  */
 public class ExceptionConverterImpl implements ExceptionConverter {
-	private static final EntityManagerMessageLogger log = HEMLogging.messageLogger( ExceptionConverterImpl.class );
+	private static final CoreMessageLogger log = CoreLogging.messageLogger( ExceptionConverterImpl.class );
 
 	private final SharedSessionContractImplementor session;
 	private final boolean isJpaBootstrap;

hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java

@@ -218,7 +218,7 @@ public class SessionImpl
 		extends AbstractSharedSessionContract
 		implements Serializable, SharedSessionContractImplementor, JdbcSessionOwner, SessionImplementor, EventSource,
 				TransactionCoordinatorBuilder.Options, WrapperOptions, LoadAccessContext {
-	private static final EntityManagerMessageLogger log = HEMLogging.messageLogger( SessionImpl.class );
+	private static final CoreMessageLogger log = CoreLogging.messageLogger( SessionImpl.class );
 
 	// Defaults to null which means the properties are the default
 	// as defined in FastSessionServices#defaultSessionProperties

hibernate-core/src/main/java/org/hibernate/internal/HEMLogging.java

@@ -6,8 +6,6 @@
  */
 package org.hibernate.jpa;
 
-import static org.hibernate.internal.HEMLogging.messageLogger;
-
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
@@ -22,7 +20,8 @@
 import jakarta.persistence.spi.ProviderUtil;
 
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.internal.EntityManagerMessageLogger;
+import org.hibernate.internal.CoreLogging;
+import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.jpa.boot.spi.PersistenceConfigurationDescriptor;
 import org.hibernate.jpa.boot.spi.PersistenceXmlParser;
 import org.hibernate.jpa.boot.spi.Bootstrap;
@@ -39,7 +38,7 @@
  * @author Brett Meyer
  */
 public class HibernatePersistenceProvider implements PersistenceProvider {
-	private static final EntityManagerMessageLogger log = messageLogger( HibernatePersistenceProvider.class );
+	private static final CoreMessageLogger log = CoreLogging.messageLogger( HibernatePersistenceProvider.class );
 
 	private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();