split out SessionFactoryRegistryMessageLogger

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

Author: gavinking

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

@@ -23,15 +23,15 @@ public class CoreLogging {
 	private CoreLogging() {
 	}
 
-	public static CoreMessageLogger messageLogger(Class classNeedingLogging) {
+	public static CoreMessageLogger messageLogger(Class<?> classNeedingLogging) {
 		return messageLogger( classNeedingLogging.getName() );
 	}
 
 	public static CoreMessageLogger messageLogger(String loggerName) {
 		return Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, loggerName );
 	}
 
-	public static Logger logger(Class classNeedingLogging) {
+	public static Logger logger(Class<?> classNeedingLogging) {
 		return Logger.getLogger( classNeedingLogging );
 	}
 

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

@@ -14,16 +14,13 @@
 import java.util.Properties;
 import java.util.ServiceConfigurationError;
 import java.util.Set;
-import javax.naming.NamingException;
 
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.LockMode;
 import org.hibernate.cache.CacheException;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.env.internal.LobCreationLogging;
-import org.hibernate.engine.jndi.JndiException;
-import org.hibernate.engine.jndi.JndiNameException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.id.IntegralDataTypeHolder;
 import org.hibernate.service.Service;
@@ -194,22 +191,6 @@ public interface CoreMessageLogger extends BasicLogger {
 	void expectedType(String name,
 			@Nullable String string);
 
-	@LogMessage(level = INFO)
-	@Message(value = "Bound factory to JNDI name: %s", id = 94)
-	void factoryBoundToJndiName(String name);
-
-	@LogMessage(level = INFO)
-	@Message(value = "A factory was renamed from [%s] to [%s] in JNDI", id = 96)
-	void factoryJndiRename(String oldName, String newName);
-
-	@LogMessage(level = INFO)
-	@Message(value = "Unbound factory from JNDI name: %s", id = 97)
-	void factoryUnboundFromJndiName(String name);
-
-	@LogMessage(level = INFO)
-	@Message(value = "A factory was unbound from name: %s", id = 98)
-	void factoryUnboundFromName(String name);
-
 	@LogMessage(level = ERROR)
 	@Message(value = "an assertion failure occurred" + " (this may indicate a bug in Hibernate, but is more likely due"
 			+ " to unsafe use of the session): %s", id = 99)
@@ -261,10 +242,6 @@ void honoringOptimizerSetting(
 	@Message(value = "IllegalArgumentException in class: %s, setter method of property: %s", id = 123)
 	void illegalPropertySetterArgument(String name, String propertyName);
 
-	@LogMessage(level = DEBUG)
-	@Message(value = "Could not bind JNDI listener", id = 127)
-	void couldNotBindJndiListener();
-
 	@LogMessage(level = INFO)
 	@Message(value = "Instantiating explicit connection provider: %s", id = 130)
 	void instantiatingExplicitConnectionProvider(String providerClassName);
@@ -273,10 +250,6 @@ void honoringOptimizerSetting(
 	@Message(value = "Array element type error\n%s", id = 132)
 	void invalidArrayElementType(String message);
 
-	@LogMessage(level = ERROR)
-	@Message(value = "Invalid JNDI name: %s", id = 135)
-	void invalidJndiName(String name, @Cause JndiNameException e);
-
 	@LogMessage(level = INFO)
 	@Message(value = "java.sql.Types mapped the same code [%s] multiple times; was [%s]; now [%s]", id = 141)
 	void JavaSqlTypesMappedSameCodeMultipleTimes(int code, String old, String name);
@@ -299,10 +272,6 @@ void missingArguments(
 			int anticipatedNumberOfArguments,
 			int numberOfArguments);
 
-	@LogMessage(level = WARN)
-	@Message(value = "Naming exception occurred accessing factory: %s", id = 178)
-	void namingExceptionAccessingFactory(NamingException exception);
-
 	@LogMessage(level = WARN)
 	@Message(value = "Narrowing proxy to %s - this operation breaks ==", id = 179)
 	void narrowingProxy(Class<?> concreteProxyClass);
@@ -471,10 +440,6 @@ void synchronizationFailed(
 	@Message(value = "Unable to apply constraints on DDL for %s", id = 274)
 	void unableToApplyConstraints(String className, @Cause Exception e);
 
-	@LogMessage(level = WARN)
-	@Message(value = "Could not bind factory to JNDI", id = 277)
-	void unableToBindFactoryToJndi(@Cause JndiException e);
-
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to cleanup temporary id table after use [%s]", id = 283)
 	void unableToCleanupTemporaryIdTable(Throwable t);
@@ -623,10 +588,6 @@ void synchronizationFailed(
 	@Message(value = "Error stopping service [%s]", id = 369)
 	void unableToStopService(Class<? extends Service> class1, @Cause Exception e);
 
-	@LogMessage(level = WARN)
-	@Message(value = "Could not unbind factory from JNDI", id = 374)
-	void unableToUnbindFactoryFromJndi(@Cause JndiException e);
-
 	@LogMessage(level = ERROR)
 	@Message(value = "Could not updateQuery hi value in: %s", id = 376)
 	void unableToUpdateQueryHiValue(String tableName, @Cause SQLException e);

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

@@ -6,18 +6,13 @@
  */
 package org.hibernate.internal;
 
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
 import org.jboss.logging.annotations.ValidIdRange;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.ERROR;
-import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
 
 /**

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

@@ -21,7 +21,8 @@
 import org.hibernate.engine.jndi.JndiNameException;
 import org.hibernate.engine.jndi.spi.JndiService;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.StringHelper;
+
+import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 
 /**
  * A registry of all {@link SessionFactory} instances for the same classloader as this class.
@@ -31,7 +32,7 @@
  * @author Steve Ebersole
  */
 public class SessionFactoryRegistry {
-	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SessionFactoryRegistry.class );
+	private static final SessionFactoryRegistryMessageLogger LOG = SessionFactoryRegistryMessageLogger.INSTANCE;
 
 	/**
 	 * Singleton access
@@ -71,14 +72,14 @@ public void addSessionFactory(
 			throw new IllegalArgumentException( "SessionFactory UUID cannot be null" );
 		}
 
-		LOG.debugf( "Registering SessionFactory: %s (%s)", uuid, name == null ? "<unnamed>" : name );
+		LOG.registeringSessionFactory( uuid, name == null ? "<unnamed>" : name );
 		sessionFactoryMap.put( uuid, instance );
 		if ( name != null ) {
 			nameUuidXref.put( name, uuid );
 		}
 
 		if ( jndiName == null ) {
-			LOG.debug( "Not binding SessionFactory to JNDI, no JNDI name configured" );
+			LOG.notBindingSessionFactory();
 			return;
 		}
 
@@ -87,7 +88,7 @@ public void addSessionFactory(
 
 	private void bindToJndi(String jndiName, SessionFactoryImplementor instance, JndiService jndiService) {
 		try {
-			LOG.debugf( "Attempting to bind SessionFactory [%s] to JNDI", jndiName );
+			LOG.attemptingToBindFactoryToJndi( jndiName );
 			jndiService.bind( jndiName, instance );
 			LOG.factoryBoundToJndiName( jndiName );
 			try {
@@ -124,7 +125,7 @@ public void removeSessionFactory(
 
 		if ( jndiName != null ) {
 			try {
-				LOG.tracef( "Unbinding SessionFactory from JNDI : %s", jndiName );
+				LOG.attemptingToUnbindFactoryFromJndi( jndiName );
 				jndiService.unbind( jndiName );
 				LOG.factoryUnboundFromJndiName( jndiName );
 			}
@@ -164,17 +165,15 @@ public SessionFactoryImplementor getSessionFactory(String uuid) {
 	}
 
 	public SessionFactoryImplementor findSessionFactory(String uuid, String name) {
-		SessionFactoryImplementor sessionFactory = getSessionFactory( uuid );
-		if ( sessionFactory == null && StringHelper.isNotEmpty( name ) ) {
-			sessionFactory = getNamedSessionFactory( name );
-		}
-		return sessionFactory;
+		final SessionFactoryImplementor sessionFactory = getSessionFactory( uuid );
+		return sessionFactory == null && isNotEmpty( name )
+				? getNamedSessionFactory( name )
+				: sessionFactory;
+
 	}
 
 	/**
 	 * Does this registry currently contain registrations?
-	 *
-	 * @return true/false
 	 */
 	public boolean hasRegistrations() {
 		return !sessionFactoryMap.isEmpty();
@@ -200,7 +199,7 @@ public void clearRegistrations() {
 		@Override
 		public void objectAdded(NamingEvent evt) {
 			if ( LOG.isDebugEnabled() ) {
-				LOG.debugf( "A factory was successfully bound to name: %s", evt.getNewBinding().getName() );
+				LOG.factoryBoundToJndi( evt.getNewBinding().getName() );
 			}
 		}
 
@@ -223,16 +222,13 @@ public void objectRemoved(NamingEvent evt) {
 		public void objectRenamed(NamingEvent evt) {
 			final String oldJndiName = evt.getOldBinding().getName();
 			final String newJndiName = evt.getNewBinding().getName();
-
 			LOG.factoryJndiRename( oldJndiName, newJndiName );
-
 			final String uuid = nameUuidXref.remove( oldJndiName );
 			nameUuidXref.put( newJndiName, uuid );
 		}
 
 		@Override
 		public void namingExceptionThrown(NamingExceptionEvent evt) {
-			//noinspection ThrowableResultOfMethodCallIgnored
 			LOG.namingExceptionAccessingFactory( evt.getException() );
 		}
 	};

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

@@ -0,0 +1,95 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.internal;
+
+import org.hibernate.engine.jndi.JndiException;
+import org.hibernate.engine.jndi.JndiNameException;
+import org.hibernate.internal.log.SubSystemLogging;
+import org.jboss.logging.BasicLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
+import org.jboss.logging.annotations.ValidIdRange;
+
+import javax.naming.NamingException;
+import java.lang.invoke.MethodHandles;
+
+import static org.jboss.logging.Logger.Level.DEBUG;
+import static org.jboss.logging.Logger.Level.ERROR;
+import static org.jboss.logging.Logger.Level.INFO;
+import static org.jboss.logging.Logger.Level.WARN;
+import static org.jboss.logging.Logger.getMessageLogger;
+
+@MessageLogger(projectCode = "HHH")
+@ValidIdRange( min = 20100, max = 20400 )
+@SubSystemLogging(
+		name = SessionFactoryRegistryMessageLogger.LOGGER_NAME,
+		description = "Logging related to session factory registry"
+)
+public interface SessionFactoryRegistryMessageLogger extends BasicLogger  {
+	String LOGGER_NAME = SubSystemLogging.BASE + ".factoryRegistry";
+
+	SessionFactoryRegistryMessageLogger INSTANCE =
+			getMessageLogger( MethodHandles.lookup(), SessionFactoryRegistryMessageLogger.class, LOGGER_NAME );
+
+	@LogMessage(level = WARN)
+	@Message(value = "Naming exception occurred accessing factory: %s", id = 20178)
+	void namingExceptionAccessingFactory(NamingException exception);
+
+	@LogMessage(level = INFO)
+	@Message(value = "Bound factory to JNDI name: %s", id = 20194)
+	void factoryBoundToJndiName(String name);
+
+	@LogMessage(level = INFO)
+	@Message(value = "A factory was renamed from [%s] to [%s] in JNDI", id = 20196)
+	void factoryJndiRename(String oldName, String newName);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = "Could not bind JNDI listener", id = 20127)
+	void couldNotBindJndiListener();
+
+	@LogMessage(level = ERROR)
+	@Message(value = "Invalid JNDI name: %s", id = 20135)
+	void invalidJndiName(String name, @Cause JndiNameException e);
+
+	@LogMessage(level = WARN)
+	@Message(value = "Could not bind factory to JNDI", id = 20277)
+	void unableToBindFactoryToJndi(@Cause JndiException e);
+
+	@LogMessage(level = INFO)
+	@Message(value = "Unbound factory from JNDI name: %s", id = 20197)
+	void factoryUnboundFromJndiName(String name);
+
+	@LogMessage(level = INFO)
+	@Message(value = "A factory was unbound from name: %s", id = 20198)
+	void factoryUnboundFromName(String name);
+
+	@LogMessage(level = WARN)
+	@Message(value = "Could not unbind factory from JNDI", id = 20374)
+	void unableToUnbindFactoryFromJndi(@Cause JndiException e);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = "Registering SessionFactory: %s (%s)", id = 20384)
+	void registeringSessionFactory(String uuid, String name);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = "Attempting to bind SessionFactory [%s] to JNDI", id = 20280)
+	void attemptingToBindFactoryToJndi(String name);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = "Attempting to unbind SessionFactory [%s] from JNDI", id = 20281)
+	void attemptingToUnbindFactoryFromJndi(String name);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = "A SessionFactory was successfully bound to name: %s", id = 20282)
+	void factoryBoundToJndi(String name);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = "Not binding SessionFactory to JNDI, no JNDI name configured", id = 20385)
+	void notBindingSessionFactory();
+}