HHH-19672 - Add overloads of #find accepting entity-name

Author: sebersole

hibernate-core/src/main/java/org/hibernate/Session.java

@@ -527,6 +527,28 @@ public interface Session extends SharedSessionContract, EntityManager {
 	@Override
 	<T> T find(Class<T> entityType, Object id);
 
+	/**
+	 * Return the persistent instance of the named entity type with the given identifier,
+	 * or null if there is no such persistent instance.
+	 * <p/>
+	 * Differs from {@linkplain #find(Class, Object)} in that this form accepts
+	 * the entity name of a {@linkplain org.hibernate.metamodel.RepresentationMode#MAP dynamic entity}.
+	 *
+	 * @see #find(Class, Object)
+	 */
+	Object find(String entityName, Object primaryKey);
+
+	/**
+	 * Return the persistent instance of the named entity type with the given identifier
+	 * using the specified options, or null if there is no such persistent instance.
+	 * <p/>
+	 * Differs from {@linkplain #find(Class, Object, FindOption...)} in that this form accepts
+	 * the entity name of a {@linkplain org.hibernate.metamodel.RepresentationMode#MAP dynamic entity}.
+	 *
+	 * @see #find(Class, Object, FindOption...)
+	 */
+	Object find(String entityName, Object primaryKey, FindOption... options);
+
 	/**
 	 * Return the persistent instances of the given entity class with the given identifiers
 	 * as a list. The position of an instance in the returned list matches the position of its

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java

@@ -875,6 +875,16 @@ public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... o
 		return delegate.find( entityGraph, primaryKey, options );
 	}
 
+	@Override
+	public Object find(String entityName, Object primaryKey) {
+		return delegate.find( entityName, primaryKey );
+	}
+
+	@Override
+	public Object find(String entityName, Object primaryKey, FindOption... options) {
+		return delegate.find( entityName, primaryKey, options );
+	}
+
 	@Override
 	public <T> T getReference(Class<T> entityClass, Object id) {
 		return delegate.getReference( entityClass, id );

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java

@@ -804,6 +804,16 @@ public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... o
 		return this.lazySession.get().find( entityGraph, primaryKey, options );
 	}
 
+	@Override
+	public Object find(String entityName, Object primaryKey) {
+		return this.lazySession.get().find( entityName, primaryKey );
+	}
+
+	@Override
+	public Object find(String entityName, Object primaryKey, FindOption... options) {
+		return this.lazySession.get().find( entityName, primaryKey, options );
+	}
+
 	@Override
 	public void lock(Object entity, LockModeType lockMode) {
 		this.lazySession.get().lock( entity, lockMode );

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

@@ -2598,6 +2598,19 @@ private void checkTransactionNeededForUpdateOperation() {
 		checkTransactionNeededForUpdateOperation( "No active transaction" );
 	}
 
+	@Override
+	public Object find(String entityName, Object primaryKey) {
+		final IdentifierLoadAccessImpl<Object> loadAccess = byId( entityName );
+		return loadAccess.load( primaryKey );
+	}
+
+	@Override
+	public Object find(String entityName, Object primaryKey, FindOption... options) {
+		final IdentifierLoadAccessImpl<Object> loadAccess = byId( entityName );
+		setLoadAccessOptions( options, loadAccess );
+		return loadAccess.load( primaryKey );
+	}
+
 	@Override
 	public <T> T getReference(Class<T> entityClass, Object id) {
 		checkOpen();

hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/FindOperationTests.java

@@ -0,0 +1,80 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.dynamicmap;
+
+import org.hibernate.ReadOnlyMode;
+import org.hibernate.graph.RootGraph;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Steve Ebersole
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(xmlMappings = "org/hibernate/orm/test/dynamicmap/artist.xml")
+@SessionFactory
+public class FindOperationTests {
+	@BeforeEach
+	void setUp(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			final Map<String,Object> entity = new HashMap<>();
+			entity.put( "id", 1 );
+			entity.put( "name", "Led Zepplin" );
+			session.persist( "artist", entity );
+		} );
+	}
+
+	@AfterEach
+	void tearDown(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
+	}
+
+	@Test
+	void testSimpleFind(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			final Object artist = session.find( "artist", 1 );
+			checkResult( artist );
+
+		} );
+	}
+
+	@Test
+	void testFindWithOptions(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			final Object artist = session.find( "artist", 1, ReadOnlyMode.READ_ONLY );
+			checkResult( artist );
+			assertThat( session.isReadOnly( artist ) ).isTrue();
+		} );
+	}
+
+	@Test
+	void testFindWithGraph(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			final RootGraph<Map<String, ?>> artistGraph = session.getFactory().createGraphForDynamicEntity( "artist" );
+			artistGraph.addAttributeNodes( "id", "name" );
+			final Object artist = session.find( artistGraph, 1, ReadOnlyMode.READ_ONLY );
+			checkResult( artist );
+			assertThat( session.isReadOnly( artist ) ).isTrue();
+		} );
+	}
+
+	private void checkResult(Object incoming) {
+		assertThat( incoming ).isNotNull();
+
+		//noinspection unchecked
+		final Map<String, Object> artist = (Map<String, Object>) incoming;
+		assertThat( artist.get( "id" ) ).isEqualTo( 1 );
+		assertThat( artist.get( "name" ) ).isEqualTo( "Led Zepplin" );
+	}
+}