Moved suppling of pages/elements from NGApplication to NGElementManager

Author: hugithordarson

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

@@ -4,13 +4,10 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.ServiceLoader.Provider;
@@ -33,7 +30,6 @@
 import ng.appserver.resources.StandardResourceType;
 import ng.appserver.routing.NGRouteTable;
 import ng.appserver.templating.NGElementManager;
-import ng.appserver.templating.NGElementNotFoundException;
 import ng.appserver.wointegration.NGDefaultLifeBeatThread;
 import ng.appserver.wointegration.WOMPRequestHandler;
 import ng.classes.NGClassManager;
@@ -356,6 +352,10 @@ public NGResourceManager resourceManager() {
 		return _resourceManager;
 	}
 
+	public NGElementManager elementManager() {
+		return _elementManager;
+	}
+
 	public NGResourceManagerDynamic resourceManagerDynamic() {
 		return _resourceManagerDynamic;
 	}
@@ -648,112 +648,19 @@ public void terminate() {
 
 	/**
 	 * @return The named component, where [componentName] can be either the component's simple class name or full class name.
+	 *
+	 * CHECKME: The implementation of this method is in elementManager, we're currently nly keeping this method around for API compatibility with older projects.
 	 */
 	public NGComponent pageWithName( final String componentName, final NGContext context ) {
-		Objects.requireNonNull( componentName, "'componentName' must not be null. I can't create components from nothing." );
-		Objects.requireNonNull( context, "'context' must not be null. What's life without context?" );
-
-		final NGComponentDefinition definition = _componentDefinition( componentName );
-		return pageWithName( definition, context );
+		return elementManager().pageWithName( componentName, context );
 	}
 
 	/**
 	 * @return A new instance of [componentClass] in the given [context]
-	 */
-	@SuppressWarnings("unchecked") // Our cast to the component class is fine
-	public <E extends NGComponent> E pageWithName( final Class<E> componentClass, final NGContext context ) {
-		Objects.requireNonNull( componentClass, "'componentClass' must not be null. I can't create components from nothing." );
-		Objects.requireNonNull( context, "'context' must not be null. What's life without context?" );
-
-		final NGComponentDefinition definition = _componentDefinition( componentClass );
-		return (E)pageWithName( definition, context );
-	}
-
-	/**
-	 * @return A new instance of [componentDefinition] in the given [context]
-	 */
-	private NGComponent pageWithName( final NGComponentDefinition componentDefinition, final NGContext context ) {
-		Objects.requireNonNull( componentDefinition );
-		Objects.requireNonNull( context );
-
-		return componentDefinition.componentInstanceInContext( context );
-	}
-
-	/**
-	 * @return The componentDefinition corresponding to the given NGComponent class.
-	 *
-	 * FIXME: This should not be static // Hugi 2023-04-14
-	 */
-	private static NGComponentDefinition _componentDefinition( final Class<? extends NGComponent> componentClass ) {
-		Objects.requireNonNull( componentClass );
-		return NGComponentDefinition.get( componentClass );
-	}
-
-	/**
-	 * @return The componentDefinition corresponding to the named NGComponent
-	 *
-	 * FIXME: This should not be static // Hugi 2023-04-14
-	 */
-	public static NGComponentDefinition _componentDefinition( final String componentName ) {
-		Objects.requireNonNull( componentName );
-		return NGComponentDefinition.get( componentName );
-	}
-
-	/**
-	 * FIXME: This should not be static // Hugi 2023-04-14
-	 *
-	 * @param name The name identifying what element we're getting
-	 * @param associations Associations used to bind the generated element to it's parent
-	 * @param contentTemplate The content wrapped by the element (if a container element)
 	 *
-	 * @return An instance of the named dynamic element. This can be a classless component (in which case it's the template name), a simple class name or a full class name
+	 * CHECKME: The implementation of this method is in elementManager, we're currently nly keeping this method around for API compatibility with older projects.
 	 */
-	public static NGElement dynamicElementWithName( final String elementIdentifier, final Map<String, NGAssociation> associations, final NGElement contentTemplate ) {
-		Objects.requireNonNull( elementIdentifier );
-		Objects.requireNonNull( associations );
-
-		// First we're going to check if we have a tag alias present.
-		final String elementName = NGElementUtils.tagShortcutMap().getOrDefault( elementIdentifier, elementIdentifier );
-
-		// Check if we can find a class representing the element we're going to render.
-		final Class<? extends NGElement> elementClass = NGElementUtils.classWithNameNullIfNotFound( elementName );
-
-		// If we don't find a class for the element, we're going to try going down the route of a classless component.
-		if( elementClass == null ) {
-			final NGComponentDefinition componentDefinition = _componentDefinition( elementName );
-			return componentDefinition.componentReferenceWithAssociations( associations, contentTemplate );
-		}
-
-		// First we check if this is a dynamic element
-		if( NGDynamicElement.class.isAssignableFrom( elementClass ) ) {
-			return createDynamicElementInstance( elementClass, elementName, associations, contentTemplate );
-		}
-
-		// If it's not an element, let's move on to creating a component reference instead
-		if( NGComponent.class.isAssignableFrom( elementClass ) ) {
-			final NGComponentDefinition componentDefinition = _componentDefinition( (Class<? extends NGComponent>)elementClass );
-			return componentDefinition.componentReferenceWithAssociations( associations, contentTemplate );
-		}
-
-		// We should never end up here unless we got an incorrect/non-existent element name
-		throw new NGElementNotFoundException( "I could not construct a dynamic element named '%s'".formatted( elementName ), elementName );
-	}
-
-	/**
-	 * @return A new NGDynamicElement constructed using the given parameters
-	 *
-	 * CHECKME: Not sure this is the final home for this functionality. It's just a method shortcut to invoking the dynamic element's constructor via reflection.
-	 */
-	private static <E extends NGElement> E createDynamicElementInstance( final Class<E> elementClass, final String name, final Map<String, NGAssociation> associations, final NGElement contentTemplate ) {
-		final Class<?>[] parameterTypes = { String.class, Map.class, NGElement.class };
-		final Object[] parameters = { name, associations, contentTemplate };
-
-		try {
-			final Constructor<E> constructor = elementClass.getDeclaredConstructor( parameterTypes );
-			return constructor.newInstance( parameters );
-		}
-		catch( NoSuchMethodException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e ) {
-			throw new RuntimeException( e );
-		}
+	public <E extends NGComponent> E pageWithName( final Class<E> componentClass, final NGContext context ) {
+		return elementManager().pageWithName( componentClass, context );
 	}
 }

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

@@ -57,7 +57,7 @@ private void beforeComponent( final NGContext context ) {
 		// If no instance was obtained, we need to create the component instance and insert it into the parent's child map.
 		if( newComponentInstance == null ) {
 			// Load up our component's definition
-			final NGComponentDefinition componentDefinition = NGApplication.application()._componentDefinition( _componentName );
+			final NGComponentDefinition componentDefinition = NGApplication.application().elementManager()._componentDefinition( _componentName );
 
 			// ...and obtain an instance of the component
 			newComponentInstance = componentDefinition.componentInstanceInContext( context );

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

@@ -83,7 +83,7 @@ public NGElement _realComponentWithName( final String name, final String element
 
 		// No component instance found so we're going to have to construct a new one
 		if( localWOElement == null ) {
-			localWOElement = NGApplication.application().dynamicElementWithName( name, _componentAssociations, _contentTemplate );
+			localWOElement = NGApplication.application().elementManager().dynamicElementWithName( name, _componentAssociations, _contentTemplate );
 
 			if( localWOElement == null ) {
 				throw new RuntimeException( "<" + getClass().getName() + "> : cannot find component or dynamic element named " + name );

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

@@ -1,3 +1,128 @@
 package ng.appserver.templating;
 
-public class NGElementManager {}
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+import java.util.Objects;
+
+import ng.appserver.NGAssociation;
+import ng.appserver.NGComponent;
+import ng.appserver.NGComponentDefinition;
+import ng.appserver.NGContext;
+import ng.appserver.NGDynamicElement;
+import ng.appserver.NGElement;
+import ng.appserver.NGElementUtils;
+
+public class NGElementManager {
+
+	/**
+	 * @return The named component, where [componentName] can be either the component's simple class name or full class name.
+	 */
+	public NGComponent pageWithName( final String componentName, final NGContext context ) {
+		Objects.requireNonNull( componentName, "'componentName' must not be null. I can't create components from nothing." );
+		Objects.requireNonNull( context, "'context' must not be null. What's life without context?" );
+
+		final NGComponentDefinition definition = _componentDefinition( componentName );
+		return pageWithName( definition, context );
+	}
+
+	/**
+	 * @return A new instance of [componentClass] in the given [context]
+	 */
+	@SuppressWarnings("unchecked") // Our cast to the component class is fine
+	public <E extends NGComponent> E pageWithName( final Class<E> componentClass, final NGContext context ) {
+		Objects.requireNonNull( componentClass, "'componentClass' must not be null. I can't create components from nothing." );
+		Objects.requireNonNull( context, "'context' must not be null. What's life without context?" );
+
+		final NGComponentDefinition definition = _componentDefinition( componentClass );
+		return (E)pageWithName( definition, context );
+	}
+
+	/**
+	 * @return A new instance of [componentDefinition] in the given [context]
+	 */
+	private NGComponent pageWithName( final NGComponentDefinition componentDefinition, final NGContext context ) {
+		Objects.requireNonNull( componentDefinition );
+		Objects.requireNonNull( context );
+
+		return componentDefinition.componentInstanceInContext( context );
+	}
+
+	/**
+	 * @return The componentDefinition corresponding to the given NGComponent class.
+	 *
+	 * FIXME: This should not be static // Hugi 2023-04-14
+	 */
+	private static NGComponentDefinition _componentDefinition( final Class<? extends NGComponent> componentClass ) {
+		Objects.requireNonNull( componentClass );
+		return NGComponentDefinition.get( componentClass );
+	}
+
+	/**
+	 * @return The componentDefinition corresponding to the named NGComponent
+	 *
+	 * FIXME: This should not be static // Hugi 2023-04-14
+	 */
+	public static NGComponentDefinition _componentDefinition( final String componentName ) {
+		Objects.requireNonNull( componentName );
+		return NGComponentDefinition.get( componentName );
+	}
+
+	/**
+	 * FIXME: This should not be static // Hugi 2023-04-14
+	 *
+	 * @param name The name identifying what element we're getting
+	 * @param associations Associations used to bind the generated element to it's parent
+	 * @param contentTemplate The content wrapped by the element (if a container element)
+	 *
+	 * @return An instance of the named dynamic element. This can be a classless component (in which case it's the template name), a simple class name or a full class name
+	 */
+	public static NGElement dynamicElementWithName( final String elementIdentifier, final Map<String, NGAssociation> associations, final NGElement contentTemplate ) {
+		Objects.requireNonNull( elementIdentifier );
+		Objects.requireNonNull( associations );
+
+		// First we're going to check if we have a tag alias present.
+		final String elementName = NGElementUtils.tagShortcutMap().getOrDefault( elementIdentifier, elementIdentifier );
+
+		// Check if we can find a class representing the element we're going to render.
+		final Class<? extends NGElement> elementClass = NGElementUtils.classWithNameNullIfNotFound( elementName );
+
+		// If we don't find a class for the element, we're going to try going down the route of a classless component.
+		if( elementClass == null ) {
+			final NGComponentDefinition componentDefinition = _componentDefinition( elementName );
+			return componentDefinition.componentReferenceWithAssociations( associations, contentTemplate );
+		}
+
+		// First we check if this is a dynamic element
+		if( NGDynamicElement.class.isAssignableFrom( elementClass ) ) {
+			return createDynamicElementInstance( elementClass, elementName, associations, contentTemplate );
+		}
+
+		// If it's not an element, let's move on to creating a component reference instead
+		if( NGComponent.class.isAssignableFrom( elementClass ) ) {
+			final NGComponentDefinition componentDefinition = _componentDefinition( (Class<? extends NGComponent>)elementClass );
+			return componentDefinition.componentReferenceWithAssociations( associations, contentTemplate );
+		}
+
+		// We should never end up here unless we got an incorrect/non-existent element name
+		throw new NGElementNotFoundException( "I could not construct a dynamic element named '%s'".formatted( elementName ), elementName );
+	}
+
+	/**
+	 * @return A new NGDynamicElement constructed using the given parameters
+	 *
+	 * Really just a shortcut for invoking a dynamic element class' constructor via reflection.
+	 */
+	private static <E extends NGElement> E createDynamicElementInstance( final Class<E> elementClass, final String name, final Map<String, NGAssociation> associations, final NGElement contentTemplate ) {
+		final Class<?>[] parameterTypes = { String.class, Map.class, NGElement.class };
+		final Object[] parameters = { name, associations, contentTemplate };
+
+		try {
+			final Constructor<E> constructor = elementClass.getDeclaredConstructor( parameterTypes );
+			return constructor.newInstance( parameters );
+		}
+		catch( NoSuchMethodException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e ) {
+			throw new RuntimeException( e );
+		}
+	}
+}

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

@@ -73,7 +73,7 @@ private static NGElement toDynamicElement( final PBasicNode node ) {
 		final NGElement childTemplate = toTemplate( node.children() );
 
 		try {
-			return NGApplication.dynamicElementWithName( type, associations, childTemplate );
+			return NGApplication.application().elementManager().dynamicElementWithName( type, associations, childTemplate );
 		}
 		catch( NGElementNotFoundException e ) {
 			// FIXME: Experimental functionality, probably doesn't belong with the parser part of the framework.