don't unnecessarily convert enums to strings

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java

@@ -110,6 +110,7 @@
 import static org.hibernate.internal.util.config.ConfigurationHelper.getInteger;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getString;
 import static org.hibernate.jpa.internal.util.CacheModeHelper.interpretCacheMode;
+import static org.hibernate.jpa.internal.util.ConfigurationHelper.getFlushMode;
 import static org.hibernate.type.format.jackson.JacksonIntegration.getJsonJacksonFormatMapperOrNull;
 import static org.hibernate.type.format.jackson.JacksonIntegration.getXMLJacksonFormatMapperOrNull;
 import static org.hibernate.type.format.jakartajson.JakartaJsonIntegration.getJakartaJsonBFormatMapperOrNull;
@@ -1620,9 +1621,8 @@ public LockOptions getDefaultLockOptions() {
 		return defaultLockOptions;
 	}
 
-	private static FlushMode defaultFlushMode(Map<String, Object> defaultSessionProperties) {
-		final Object setMode = defaultSessionProperties.get( HibernateHints.HINT_FLUSH_MODE );
-		return org.hibernate.jpa.internal.util.ConfigurationHelper.getFlushMode( setMode, FlushMode.AUTO );
+	private static FlushMode defaultFlushMode(Map<String, Object> properties) {
+		return getFlushMode( properties.get( HibernateHints.HINT_FLUSH_MODE ), FlushMode.AUTO );
 	}
 
 	private static LockOptions defaultLockOptions(Map<String, Object> defaultSessionProperties) {
@@ -1640,9 +1640,9 @@ private Map<String, Object> initializeDefaultSessionProperties(ConfigurationServ
 		final HashMap<String,Object> settings = new HashMap<>();
 
 		//Static defaults:
-		settings.putIfAbsent( HibernateHints.HINT_FLUSH_MODE, FlushMode.AUTO.name() );
-		settings.putIfAbsent( JPA_LOCK_SCOPE, PessimisticLockScope.EXTENDED.name() );
-		settings.putIfAbsent( JAKARTA_LOCK_SCOPE, PessimisticLockScope.EXTENDED.name() );
+		settings.putIfAbsent( HibernateHints.HINT_FLUSH_MODE, FlushMode.AUTO );
+		settings.putIfAbsent( JPA_LOCK_SCOPE, PessimisticLockScope.EXTENDED );
+		settings.putIfAbsent( JAKARTA_LOCK_SCOPE, PessimisticLockScope.EXTENDED );
 		settings.putIfAbsent( JPA_LOCK_TIMEOUT, LockOptions.WAIT_FOREVER );
 		settings.putIfAbsent( JAKARTA_LOCK_TIMEOUT, LockOptions.WAIT_FOREVER );
 		settings.putIfAbsent( JPA_SHARED_CACHE_RETRIEVE_MODE, CacheModeHelper.DEFAULT_RETRIEVE_MODE );

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

@@ -332,10 +332,14 @@ private Integer getHintedLockTimeout() {
 
 	private Object getSessionProperty(String propertyName) {
 		return properties == null
-				? getSessionFactoryOptions().getDefaultSessionProperties().get( propertyName )
+				? getDefaultProperties().get( propertyName )
 				: properties.get( propertyName );
 	}
 
+	private Map<String, Object> getDefaultProperties() {
+		return getSessionFactoryOptions().getDefaultSessionProperties();
+	}
+
 	@Override
 	public SharedSessionBuilder sessionWithOptions() {
 		return new SharedSessionBuilderImpl( this );
@@ -2810,7 +2814,7 @@ public void setProperty(String propertyName, Object value) {
 
 		// store property for future reference:
 		if ( properties == null ) {
-			properties = computeCurrentSessionProperties();
+			properties = computeCurrentProperties();
 		}
 		properties.put( propertyName, value );
 
@@ -2878,18 +2882,18 @@ private void interpretProperty(String propertyName, Object value) {
 		}
 	}
 
-	private Map<String, Object> computeCurrentSessionProperties() {
-		final Map<String, Object> map = new HashMap<>( getSessionFactoryOptions().getDefaultSessionProperties() );
+	private Map<String, Object> computeCurrentProperties() {
+		final var map = new HashMap<>( getDefaultProperties() );
 		//The FLUSH_MODE is always set at Session creation time,
 		//so it needs special treatment to not eagerly initialize this Map:
-		map.put( HINT_FLUSH_MODE, getHibernateFlushMode().name() );
+		map.put( HINT_FLUSH_MODE, getHibernateFlushMode() );
 		return map;
 	}
 
 	@Override
 	public Map<String, Object> getProperties() {
 		if ( properties == null ) {
-			properties = computeCurrentSessionProperties();
+			properties = computeCurrentProperties();
 		}
 		return unmodifiableMap( properties );
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java

@@ -344,7 +344,7 @@ public void testSetProperty() throws Exception {
 		em.getTransaction().commit();
 
 		em.clear();
-		assertEquals( em.getProperties().get(HibernateHints.HINT_FLUSH_MODE), "AUTO" );
+		assertEquals( em.getProperties().get(HibernateHints.HINT_FLUSH_MODE), FlushMode.AUTO );
 		assertNotNull(
 				"With default settings the entity should be persisted on commit.",
 				em.find( Wallet.class, wallet.getSerial() )