Add initial implementation of improved partial rendering controls

Author: hugithordarson

ng-appserver/src/main/java/ng/appserver/templating/NGComponent.java

@@ -277,7 +277,7 @@ public NGResponse generateResponse() {
 			response.setHeader( "content-type", "text/html;charset=utf-8" ); // FIXME: This is most definitely not the place to set the encoding // Hugi 2023-03-12
 		}
 
-		appendToResponse( response, context() );
+		appendOrTraverse( response, context() );
 
 		// So, we've generated the page, and it's ready to return. Now we let the context tell us whether it should be stored in the page cache for future reference.
 		// CHECKME: This *still* feels a little like the wrong place to stash the page in the cache. Not yet sure where it *should* be but my gut *still* has a feeling // Hugi 2024-09-28
@@ -300,17 +300,8 @@ public NGActionResults invokeAction( NGRequest request, NGContext context ) {
 	}
 
 	@Override
-	public void appendToResponse( NGResponse response, NGContext context ) {
-
-		final NGElement template = template();
-
-		// FIXME: I think this actually belongs in NGComponentReference // Hugi 2025-04-15
-		if( context.shouldAppendToResponse() ) {
-			template.appendToResponse( response, context );
-		}
-		else if( template instanceof NGStructuralElement se ) {
-			se.appendStructureToResponse( response, context );
-		}
+	public void appendOrTraverse( NGResponse response, NGContext context ) {
+		template().appendOrTraverse( response, context );
 	}
 
 	/**

ng-appserver/src/main/java/ng/appserver/templating/NGElement.java

@@ -6,6 +6,8 @@
 import ng.appserver.NGContext;
 import ng.appserver.NGRequest;
 import ng.appserver.NGResponse;
+import ng.kvc.NGKeyValueCoding.UnknownKeyException;
+import ng.xperimental.NGErrorMessageElement;
 
 public interface NGElement extends WOElement {
 
@@ -16,4 +18,18 @@ public default NGActionResults invokeAction( NGRequest request, NGContext contex
 	}
 
 	public default void appendToResponse( NGResponse response, NGContext context ) {}
+
+	public default void appendOrTraverse( NGResponse response, NGContext context ) {
+		if( context.shouldAppendToResponse() ) {
+			try {
+				appendToResponse( response, context );
+			}
+			catch( UnknownKeyException unknownKeyException ) {
+				new NGErrorMessageElement( "VOFF! VOFF! Unknown key", getClass().getSimpleName(), unknownKeyException.getMessage() ).appendToResponse( response, context );
+			}
+		}
+		else if( this instanceof NGStructuralElement se ) {
+			se.appendStructureToResponse( response, context );
+		}
+	}
 }

ng-appserver/src/main/java/ng/appserver/templating/NGStructuralElement.java

@@ -8,7 +8,12 @@
  * See implementing elements and you'll know what that means.
  */
 
-public interface NGStructuralElement {
+public interface NGStructuralElement extends NGElement {
+
+	@Override
+	public default void appendToResponse( NGResponse response, NGContext context ) {
+		appendStructureToResponse( response, context );
+	}
 
 	public void appendStructureToResponse( NGResponse response, NGContext context );
 }

ng-appserver/src/main/java/ng/appserver/templating/elements/NGComponentContent.java

@@ -18,18 +18,13 @@ public NGComponentContent( String name, Map<String, NGAssociation> associations,
 		super( null, null, null );
 	}
 
-	@Override
-	public void appendToResponse( NGResponse response, NGContext context ) {
-		appendStructureToResponse( response, context );
-	}
-
 	@Override
 	public void appendStructureToResponse( NGResponse response, NGContext context ) {
 		final NGComponent component = context.component();
 
 		if( component.contentElement() != null ) {
 			context.setComponent( component.parent() );
-			component.contentElement().appendToResponse( response, context );
+			component.contentElement().appendOrTraverse( response, context );
 			context.setComponent( component );
 		}
 	}

ng-appserver/src/main/java/ng/appserver/templating/elements/NGComponentReference.java

@@ -97,15 +97,10 @@ private void afterComponent( final NGContext context ) {
 		context.setComponent( context.component().parent() );
 	}
 
-	@Override
-	public void appendToResponse( NGResponse response, NGContext context ) {
-		appendStructureToResponse( response, context );
-	}
-
 	@Override
 	public void appendStructureToResponse( NGResponse response, NGContext context ) {
 		beforeComponent( context );
-		context.component().appendToResponse( response, context );
+		context.component().appendOrTraverse( response, context );
 		afterComponent( context );
 	}
 

ng-appserver/src/main/java/ng/appserver/templating/elements/NGDynamicGroup.java

@@ -11,8 +11,6 @@
 import ng.appserver.templating.NGElement;
 import ng.appserver.templating.NGStructuralElement;
 import ng.appserver.templating.assications.NGAssociation;
-import ng.kvc.NGKeyValueCoding.UnknownKeyException;
-import ng.xperimental.NGErrorMessageElement;
 
 /**
  * A common superclass for dynamic elements that have multiple children in our template element tree
@@ -40,11 +38,6 @@ public NGDynamicGroup( final List<NGElement> children ) {
 		_children = children;
 	}
 
-	@Override
-	public void appendToResponse( NGResponse response, NGContext context ) {
-		appendChildrenToResponse( response, context );
-	}
-
 	@Override
 	public void appendStructureToResponse( NGResponse response, NGContext context ) {
 		appendChildrenToResponse( response, context );
@@ -55,19 +48,7 @@ protected void appendChildrenToResponse( NGResponse response, NGContext context
 			context.elementID().addBranch();
 
 			for( final NGElement child : children() ) {
-				if( context.shouldAppendToResponse() ) {
-					// FIXME: This try/catch clause is experimental, let's see how this works out and work from there // Hugi 2024-11-19
-					try {
-						child.appendToResponse( response, context );
-					}
-					catch( UnknownKeyException unknownKeyException ) {
-						new NGErrorMessageElement( "VOFF! VOFF! Unknown key", child.getClass().getSimpleName(), unknownKeyException.getMessage() ).appendToResponse( response, context );
-					}
-				}
-				else if( child instanceof NGStructuralElement structuralChild ) {
-					structuralChild.appendStructureToResponse( response, context );
-				}
-
+				child.appendOrTraverse( response, context );
 				context.elementID().increment();
 			}
 

ng-appserver/src/main/java/ng/appserver/templating/elements/NGSwitchComponent.java

@@ -143,7 +143,7 @@ public void appendStructureToResponse( NGResponse response, NGContext context )
 
 		final NGElement componentElement = realComponentWithName( name, id );
 
-		componentElement.appendToResponse( response, context );
+		componentElement.appendOrTraverse( response, context );
 
 		context.elementID().removeBranch();
 	}