cleanups in InjectionHelper

remove unnecessary call to ensureAccessibility()

Author: gavinking

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

@@ -9,11 +9,12 @@
 import org.hibernate.boot.query.NamedQueryDefinition;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.util.ReflectHelper;
+import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
 
 import java.lang.reflect.Field;
 
 import static java.lang.Character.charCount;
+import static java.lang.Character.isJavaIdentifierPart;
 
 public class InjectionHelper {
 	private static final CoreMessageLogger log = CoreLogging.messageLogger( MetadataContext.class );
@@ -23,13 +24,11 @@ public static void injectEntityGraph(
 			Class<?> metamodelClass,
 			JpaMetamodelImplementor jpaMetamodel) {
 		if ( metamodelClass != null ) {
+			final String name = definition.name();
+			final String fieldName = '_' + javaIdentifier( name );
+			final var graph = jpaMetamodel.findEntityGraphByName( name );
 			try {
-				injectField(
-						metamodelClass,
-						'_' + javaIdentifier( definition.name() ),
-						jpaMetamodel.findEntityGraphByName( definition.name() ),
-						false
-				);
+				injectField( metamodelClass, fieldName, graph, false );
 			}
 			catch ( NoSuchFieldException e ) {
 				// ignore
@@ -39,13 +38,10 @@ public static void injectEntityGraph(
 
 	public static void injectTypedQueryReference(NamedQueryDefinition<?> definition, Class<?> metamodelClass) {
 		if ( metamodelClass != null ) {
+			final String fieldName =
+					'_' + javaIdentifier( definition.getRegistrationName() ) + '_';
 			try {
-				injectField(
-						metamodelClass,
-						'_' + javaIdentifier( definition.getRegistrationName() ) + '_',
-						definition,
-						false
-				);
+				injectField( metamodelClass, fieldName, definition, false );
 			}
 			catch ( NoSuchFieldException e ) {
 				// ignore
@@ -58,12 +54,7 @@ public static String javaIdentifier(String name) {
 		int position = 0;
 		while ( position < name.length() ) {
 			final int codePoint = name.codePointAt( position );
-			if ( Character.isJavaIdentifierPart(codePoint) ) {
-				result.appendCodePoint( codePoint );
-			}
-			else {
-				result.append('_');
-			}
+			result.appendCodePoint( isJavaIdentifierPart( codePoint ) ? codePoint : '_' );
 			position += charCount( codePoint );
 		}
 		return result.toString();
@@ -73,12 +64,13 @@ public static void injectField(
 			Class<?> metamodelClass, String name, Object model,
 			boolean allowNonDeclaredFieldReference)
 			throws NoSuchFieldException {
-		final Field field = allowNonDeclaredFieldReference
-				? metamodelClass.getField(name)
-				: metamodelClass.getDeclaredField(name);
+		final Field field =
+				allowNonDeclaredFieldReference
+						? metamodelClass.getField( name )
+						: metamodelClass.getDeclaredField( name );
 		try {
 			// should be public anyway, but to be sure...
-			ReflectHelper.ensureAccessibility( field );
+//			ReflectHelper.ensureAccessibility( field );
 			field.set( null, model);
 		}
 		catch (IllegalAccessException e) {