clean up obsolete code in EnabledCaching

Author: gavinking

hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java

@@ -4,9 +4,6 @@
  */
 package org.hibernate.cache.internal;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -71,9 +68,6 @@ public class EnabledCaching implements CacheImplementor, DomainDataRegionBuildin
 	private final Map<String, QueryResultsCache> namedQueryResultsCacheMap = new ConcurrentHashMap<>();
 
 
-	private final Set<String> legacySecondLevelCacheNames = new LinkedHashSet<>();
-	private final Map<String,Set<NaturalIdDataAccess>> legacyNaturalIdAccessesForRegion = new ConcurrentHashMap<>();
-
 	public EnabledCaching(SessionFactoryImplementor sessionFactory) {
 		this.sessionFactory = sessionFactory;
 		final var options = sessionFactory.getSessionFactoryOptions();
@@ -105,7 +99,6 @@ private TimestampsCache buildTimestampsCache(SessionFactoryImplementor sessionFa
 						DEFAULT_UPDATE_TIMESTAMPS_REGION_UNQUALIFIED_NAME,
 						sessionFactory
 				);
-		legacySecondLevelCacheNames.add( timestampsRegion.getName() );
 		return sessionFactory.getSessionFactoryOptions().getTimestampsCacheFactory()
 				.buildTimestampsCache( this, timestampsRegion );
 	}
@@ -134,27 +127,16 @@ public void prime(Set<DomainDataRegionConfig> cacheRegionConfigs) {
 			for ( var entityAccessConfig : regionConfig.getEntityCaching() ) {
 				final var navigableRole = entityAccessConfig.getNavigableRole();
 				entityAccessMap.put( navigableRole, region.getEntityDataAccess( navigableRole ) );
-				legacySecondLevelCacheNames.add( qualifiedRegionName( region ) );
 			}
 
 
 			// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			// Natural-id caching
 
-			final var naturalIdCaching = regionConfig.getNaturalIdCaching();
-			if ( naturalIdCaching.isEmpty() ) {
-				legacyNaturalIdAccessesForRegion.put( region.getName(), Collections.emptySet() );
-			}
-			else {
-				final Set<NaturalIdDataAccess> accesses = new HashSet<>();
-				for ( var naturalIdAccessConfig : naturalIdCaching ) {
-					final var navigableRole = naturalIdAccessConfig.getNavigableRole();
-					final var naturalIdDataAccess =
-							naturalIdAccessMap.put( navigableRole,
-									region.getNaturalIdDataAccess( navigableRole ) );
-					accesses.add( naturalIdDataAccess );
-				}
-				legacyNaturalIdAccessesForRegion.put( region.getName(), accesses );
+			for ( var naturalIdAccessConfig : regionConfig.getNaturalIdCaching() ) {
+				final var navigableRole = naturalIdAccessConfig.getNavigableRole();
+				naturalIdAccessMap.put( navigableRole,
+						region.getNaturalIdDataAccess( navigableRole ) );
 			}
 
 
@@ -165,7 +147,6 @@ public void prime(Set<DomainDataRegionConfig> cacheRegionConfigs) {
 				final var navigableRole = collectionAccessConfig.getNavigableRole();
 				collectionAccessMap.put( navigableRole,
 						region.getCollectionDataAccess( navigableRole ) );
-				legacySecondLevelCacheNames.add( qualifiedRegionName( region ) );
 			}
 		}
 
@@ -213,7 +194,6 @@ public Region getRegion(String regionName) {
 	}
 
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Entity data
 
@@ -309,7 +289,6 @@ public void evictEntityData() {
 	}
 
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Natural-id data
 
@@ -341,7 +320,6 @@ private void evictNaturalIdData(NavigableRole rootEntityRole, NaturalIdDataAcces
 	}
 
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Collection data
 
@@ -427,7 +405,7 @@ private void evictQueryResultRegion(QueryResultsCache cache) {
 	public void evictQueryRegions() {
 		LOG.evictingAllQueryRegions();
 		evictQueryResultRegion( defaultQueryResultsCache );
-		for ( QueryResultsCache cache : namedQueryResultsCacheMap.values() ) {
+		for ( var cache : namedQueryResultsCacheMap.values() ) {
 			evictQueryResultRegion( cache );
 		}
 	}
@@ -470,7 +448,7 @@ else if ( regionName == null || regionName.equals( getDefaultResultCacheName() )
 		}
 		else {
 			final var existing = namedQueryResultsCacheMap.get( regionName );
-			return existing != null ? existing : makeQueryResultsRegionAccess( regionName );
+			return existing != null ? existing : makeQueryResultsCache( regionName );
 		}
 	}
 
@@ -487,21 +465,20 @@ else if ( regionName == null || regionName.equals( getDefaultResultCacheName() )
 		}
 	}
 
-	protected QueryResultsCache makeQueryResultsRegionAccess(String regionName) {
-		final var regionAccess = new QueryResultsCacheImpl( getQueryResultsRegion( regionName ), timestampsCache );
+	protected QueryResultsCache makeQueryResultsCache(String regionName) {
+		final var regionAccess = new QueryResultsCacheImpl( queryResultsRegion( regionName ), timestampsCache );
 		namedQueryResultsCacheMap.put( regionName, regionAccess );
-		legacySecondLevelCacheNames.add( regionName );
 		return regionAccess;
 	}
 
-	private QueryResultsRegion getQueryResultsRegion(String regionName) {
-		final Region region = regionsByName.computeIfAbsent( regionName, this::makeQueryResultsRegion );
-		return region instanceof QueryResultsRegion queryResultsRegion
+	private QueryResultsRegion queryResultsRegion(String regionName) {
+		return regionsByName.computeIfAbsent( regionName, this::buildQueryResultsRegion )
+					instanceof QueryResultsRegion queryResultsRegion
 				? queryResultsRegion // There was already a different type of Region with the same name.
-				: queryResultsRegionsByDuplicateName.computeIfAbsent( regionName, this::makeQueryResultsRegion );
+				: queryResultsRegionsByDuplicateName.computeIfAbsent( regionName, this::buildQueryResultsRegion );
 	}
 
-	protected QueryResultsRegion makeQueryResultsRegion(String regionName) {
+	protected QueryResultsRegion buildQueryResultsRegion(String regionName) {
 		return regionFactory.buildQueryResultsRegion( regionName, getSessionFactory() );
 	}
 
@@ -544,7 +521,6 @@ public void close() {
 	}
 
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// JPA-defined methods
 
@@ -567,8 +543,6 @@ public void evict(Class cls) {
 	}
 
 
-
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Deprecations