HHH-18649 fix NPE

Author: gavinking

hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java

@@ -691,12 +691,9 @@ private Property getMappedSuperclassProperty(String propertyName, MappedSupercla
 
 	private <X> void populateStaticMetamodel(ManagedDomainType<X> managedType, Set<String> processedMetamodelClassName) {
 		final Class<X> managedTypeClass = managedType.getJavaType();
-		if ( managedTypeClass == null ) {
-			// should indicate MAP entity mode, skip...
-			return;
-		}
-		if ( processedMetamodelClassName.add( metamodelClassName( managedTypeClass ) ) ) {
-			final Class<?> metamodelClass = metamodelClass( managedTypeClass );
+		if ( managedTypeClass != null // can be null for MAP entity mode, so skip...
+				&& processedMetamodelClassName.add( metamodelClassName( managedType ) ) ) {
+			final Class<?> metamodelClass = metamodelClass( managedType );
 			if ( metamodelClass != null ) {
 				populateMetamodelClass( managedType, metamodelClass );
 			}
@@ -724,18 +721,23 @@ private static <X> void injectManagedType(ManagedDomainType<X> managedType, Clas
 		}
 	}
 
-	private static String metamodelClassName(Class<?> managedTypeClass) {
-		return managedTypeClass.getName() + '_';
+	private static String metamodelClassName(ManagedDomainType<?> managedTypeClass) {
+		return managedTypeClass.getJavaType().getName() + '_';
 	}
 
-	public Class<?> metamodelClass(Class<?> managedTypeClass) {
-		final String metamodelClassName = metamodelClassName( managedTypeClass );
-		try {
-			return classLoaderService.classForName( metamodelClassName );
-		}
-		catch ( ClassLoadingException ignore ) {
+	public Class<?> metamodelClass(ManagedDomainType<?> managedDomainType) {
+		if ( managedDomainType == null ) {
 			return null;
 		}
+		else {
+			final String metamodelClassName = metamodelClassName( managedDomainType );
+			try {
+				return classLoaderService.classForName( metamodelClassName );
+			}
+			catch ( ClassLoadingException ignore ) {
+				return null;
+			}
+		}
 	}
 
 	private <X> void registerAttributes(Class<?> metamodelClass, ManagedDomainType<X> managedType) {

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java

@@ -680,11 +680,11 @@ private void populateStaticMetamodel(MetadataImplementor bootMetamodel, Metadata
 
 	private Class<?> namedQueryMetamodelClass(NamedQueryDefinition<?> definition, MetadataContext context) {
 		final AnnotationTarget location = definition.getLocation();
-		return location == null ? null : context.metamodelClass( managedTypeByName.get( location.getName() ).getJavaType() );
+		return location == null ? null : context.metamodelClass( managedTypeByName.get( location.getName() ) );
 	}
 
 	private Class<?> graphMetamodelClass(NamedEntityGraphDefinition definition, MetadataContext context) {
-		return context.metamodelClass( managedTypeByName.get( definition.getEntityName() ).getJavaType() );
+		return context.metamodelClass( managedTypeByName.get( definition.getEntityName() ) );
 	}
 
 	public static void addAllowedEnumLiteralsToEnumTypesMap(

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/package-info.java

@@ -5,5 +5,6 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 @NamedQuery(name = "allMouse",
-			query = "select m from ApplicationServer m") package org.hibernate.orm.test.jpa.pack.defaultpar;
+			query = "select m from ApplicationServer m")
+package org.hibernate.orm.test.jpa.pack.defaultpar;
 import org.hibernate.annotations.NamedQuery;