Use NGResourceManager to load component template files

Author: hugithordarson

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

@@ -11,7 +11,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import ng.appserver.privates.NGResourceLoader;
 import ng.appserver.templating.NGDeclarationFormatException;
 import ng.appserver.templating.NGElementUtils;
 import ng.appserver.templating.NGHTMLFormatException;
@@ -201,7 +200,7 @@ private NGElement _loadTemplate() {
 
 			// If that fails, let's go for the single file html template
 			if( htmlTemplateStringOptional.isEmpty() ) {
-				final Optional<byte[]> htmlTemplate = NGResourceLoader.bytesForComponentResource( name() + ".html" );
+				final Optional<byte[]> htmlTemplate = NGApplication.application().resourceManager().bytesForComponentResourceNamed( name() + ".html" );
 
 				if( htmlTemplate.isPresent() ) {
 					htmlTemplateStringOptional = Optional.of( new String( htmlTemplate.get(), StandardCharsets.UTF_8 ) );
@@ -261,7 +260,7 @@ private static Optional<String> loadStringFromTemplateFolder( final String templ
 
 		final String htmlTemplateFilename = templateName + ".wo/" + templateName + "." + extension;
 
-		final Optional<byte[]> templateBytes = NGResourceLoader.bytesForComponentResource( htmlTemplateFilename );
+		final Optional<byte[]> templateBytes = NGApplication.application().resourceManager().bytesForComponentResourceNamed( htmlTemplateFilename );
 
 		if( templateBytes.isEmpty() ) {
 			return Optional.empty();

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

@@ -26,9 +26,10 @@ public class NGResourceManager {
 	/**
 	 * FIXME: Experimental caches. Resource caches should be located centrally.
 	 */
+	private final Map<String, Optional<byte[]>> _appResourceCache = new ConcurrentHashMap<>();
 	private final Map<String, Optional<byte[]>> _webserverResourceCache = new ConcurrentHashMap<>();
+	private final Map<String, Optional<byte[]>> _componentResourceCache = new ConcurrentHashMap<>();
 	private final Map<String, Optional<byte[]>> _publicResourceCache = new ConcurrentHashMap<>();
-	private final Map<String, Optional<byte[]>> _appResourceCache = new ConcurrentHashMap<>();
 
 	/**
 	 * Specifies if we want to use the resources cache.
@@ -47,6 +48,11 @@ public Optional<byte[]> bytesForWebserverResourceNamed( final String resourceNam
 		return bytesForAnyResource( resourceName, _webserverResourceCache, NGResourceLoader::bytesForWebserverResource );
 	}
 
+	public Optional<byte[]> bytesForComponentResourceNamed( final String resourceName ) {
+		Objects.requireNonNull( resourceName );
+		return bytesForAnyResource( resourceName, _componentResourceCache, NGResourceLoader::bytesForComponentResource );
+	}
+
 	public Optional<byte[]> bytesForPublicResourceNamed( final String resourceName ) {
 		Objects.requireNonNull( resourceName );
 		return bytesForAnyResource( resourceName, _publicResourceCache, NGResourceLoader::bytesForPublicResource );