Throw NGPageRestorationException from the page cache

Author: hugithordarson

ng-appserver/src/main/java/ng/appserver/NGComponentRequestHandler.java

@@ -64,13 +64,9 @@ public NGResponse handleRequest( NGRequest request ) {
 		}
 
 		// Now let's try to restore the page from the cache, using the contextID provided by the URL
+		// If no page is found (page probably pushed out of the session's page cache), NGPageRestorationException is thrown.
 		final NGComponent originalPage = session.pageCache().restorePageFromCache( originatingContextID );
 
-		// No page found in cache. If this happens, the page has probably been pushed out of the session's page cache.
-		if( originalPage == null ) {
-			throw new NGPageRestorationException( request, "No page found in the page cache for contextID %s. The page has probably been pushed out of the session's page cache".formatted( originatingContextID ) );
-		}
-
 		// Since we're working with the page we can safely assume it's become relevant again, so we give it another shot at life by moving it to the top of the page cache
 		session.pageCache().retainPageWithContextIDInCache( originatingContextID );
 

ng-appserver/src/main/java/ng/appserver/NGPageCache.java

@@ -140,9 +140,8 @@ public NGComponent restorePageFromCache( final String contextID ) {
 
 		final NGPageCacheEntry cacheEntry = _allEntries.get( contextID );
 
-		// FIXME: This might actually be the right place to throw a page restoration error // Hugi 2024-09-30
 		if( cacheEntry == null ) {
-			throw new IllegalStateException( "No cached page was found for contextID '%s'".formatted( contextID ) );
+			throw new NGPageRestorationException( "No page found in the page cache for contextID '%s'. The page has probably been pushed out of the session's page cache".formatted( contextID ) );
 		}
 
 		return cacheEntry.page();

ng-appserver/src/main/java/ng/appserver/NGPageRestorationException.java

@@ -2,14 +2,7 @@
 
 public class NGPageRestorationException extends RuntimeException {
 
-	private final NGRequest _request;
-
-	public NGPageRestorationException( NGRequest request, String message ) {
+	public NGPageRestorationException( String message ) {
 		super( message );
-		_request = request;
-	}
-
-	public NGRequest request() {
-		return _request;
 	}
 }