use switch expressions in CacheModeHelper

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java

@@ -641,6 +641,10 @@ default JavaType<Object> getDefaultTenantIdentifierJavaType() {
 	 */
 	CacheRetrieveMode getCacheRetrieveMode(Map<String, Object> properties);
 
+	/**
+	 * @see org.hibernate.cfg.CacheSettings#JAKARTA_SHARED_CACHE_RETRIEVE_MODE
+	 * @see org.hibernate.cfg.CacheSettings#JAKARTA_SHARED_CACHE_STORE_MODE
+	 */
 	CacheMode getInitialSessionCacheMode();
 
 	FlushMode getInitialSessionFlushMode();

hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java

@@ -42,17 +42,12 @@ public static CacheMode interpretCacheMode(CacheStoreMode storeMode, CacheRetrie
 
 		final boolean get = CacheRetrieveMode.USE == retrieveMode;
 
-		switch ( storeMode ) {
-			case USE:
-				return get ? CacheMode.NORMAL : CacheMode.PUT;
-			case BYPASS:
-				return get ? CacheMode.GET : CacheMode.IGNORE;
-			case REFRESH:
-				// really (get == true) here is a bit of an invalid combo...
-				return CacheMode.REFRESH;
-			default:
-				throw new IllegalStateException( "Unrecognized CacheStoreMode: " + storeMode );
-		}
+		return switch ( storeMode ) {
+			case USE -> get ? CacheMode.NORMAL : CacheMode.PUT;
+			case BYPASS -> get ? CacheMode.GET : CacheMode.IGNORE;
+			// really (get == true) here is a bit of an invalid combo...
+			case REFRESH -> CacheMode.REFRESH;
+		};
 	}
 
 	/**
@@ -74,15 +69,11 @@ public static CacheStoreMode interpretCacheStoreMode(CacheMode cacheMode) {
 			cacheMode = DEFAULT_LEGACY_MODE;
 		}
 
-		switch (cacheMode) {
-			case NORMAL:
-			case PUT:
-				return CacheStoreMode.USE;
-			case REFRESH:
-				return CacheStoreMode.REFRESH;
-			default:
-				return CacheStoreMode.BYPASS;
-		}
+		return switch ( cacheMode ) {
+			case NORMAL, PUT -> CacheStoreMode.USE;
+			case REFRESH -> CacheStoreMode.REFRESH;
+			default -> CacheStoreMode.BYPASS;
+		};
 	}
 
 	public static CacheRetrieveMode interpretCacheRetrieveMode(CacheMode cacheMode) {