fix dynamic application loading

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/application/Application.java

@@ -31,7 +31,6 @@
 import net.lecousin.framework.exception.NoException;
 import net.lecousin.framework.io.IO;
 import net.lecousin.framework.io.provider.IOProvider;
-import net.lecousin.framework.io.provider.IOProviderFromPathUsingClassloader;
 import net.lecousin.framework.locale.LocalizedProperties;
 import net.lecousin.framework.log.Logger;
 import net.lecousin.framework.log.LoggerFactory;
@@ -67,6 +66,9 @@ private Application(
 			this.properties = new Hashtable<>(properties);
 		else
 			this.properties = new Hashtable<>();
+		this.properties.put("groupId", artifact.groupId);
+		this.properties.put("artifactId", artifact.artifactId);
+		this.properties.put("version", artifact.version.toString());
 		this.debugMode = debugMode;
 		this.threadFactory = threadFactory;
 		this.librariesManager = librariesManager;
@@ -81,8 +83,7 @@ private Application(
 	private boolean debugMode;
 	private ThreadFactory threadFactory;
 	private LibrariesManager librariesManager;
-	private ApplicationClassLoader rootClassLoader;
-	private IOProviderFromPathUsingClassloader rootClassLoaderIOProvider;
+	private ApplicationClassLoader appClassLoader;
 	private Console console;
 	private Properties preferences = null;
 	private Locale locale;
@@ -183,14 +184,13 @@ public LibrariesManager getLibrariesManager() {
 	}
 
 	/** Return the application class loader. */
-	@SuppressWarnings("unchecked")
-	public <T extends ClassLoader & ApplicationClassLoader> T getClassLoader() {
-		return (T)rootClassLoader;
+	public ApplicationClassLoader getClassLoader() {
+		return appClassLoader;
 	}
 
 	/** Get a resource from the class loader as an IO.Readable. */
 	public IO.Readable getResource(String filename, byte priority) {
-		IOProvider.Readable provider = rootClassLoaderIOProvider.get(filename);
+		IOProvider.Readable provider = appClassLoader.getIOProvider(filename);
 		if (provider == null)
 			return null;
 		try {
@@ -341,8 +341,7 @@ public Void run() {
 		loading.start();
 		SynchronizationPoint<Exception> sp = new SynchronizationPoint<>();
 		loading.listenInline(() -> {
-			app.rootClassLoader = librariesManager.start(app);
-			app.rootClassLoaderIOProvider = new IOProviderFromPathUsingClassloader((ClassLoader)app.rootClassLoader);
+			app.appClassLoader = librariesManager.start(app);
 			librariesManager.onLibrariesLoaded().listenInline(sp);
 		});
 

net.lecousin.core/src/main/java/net/lecousin/framework/application/ApplicationClassLoader.java

@@ -1,5 +1,9 @@
 package net.lecousin.framework.application;
 
+import java.net.URL;
+
+import net.lecousin.framework.io.provider.IOProvider;
+
 /**
  * ClassLoader dedicated to an application.
  */
@@ -8,4 +12,13 @@ public interface ApplicationClassLoader {
 	/** Return the application. */
 	Application getApplication();
 
+	/** Return an IOProvider for the given application's resource. */
+	IOProvider.Readable getIOProvider(String filename);
+	
+	/** Load a class. */
+	Class<?> loadClass(String className) throws ClassNotFoundException;
+	
+	/** Search a resource. */
+	URL getResource(String filename);
+	
 }

net.lecousin.core/src/main/java/net/lecousin/framework/application/development/package-info.java

@@ -215,6 +215,7 @@ else if (args[i].startsWith("-maven-repository=")) {
 						startApp.getError().printStackTrace(System.err);
 					}
 					LCCore.stop(true);
+					return;
 				}
 				ISynchronizationPoint<Exception> appClosed = startApp.getResult();
 				if (appClosed != null) {

net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/DevLauncher.java

@@ -15,6 +15,7 @@
 
 import net.lecousin.framework.application.Application;
 import net.lecousin.framework.application.ApplicationBootstrap;
+import net.lecousin.framework.application.ApplicationClassLoader;
 import net.lecousin.framework.application.ApplicationConfiguration;
 import net.lecousin.framework.application.Artifact;
 import net.lecousin.framework.application.SplashScreen;
@@ -29,7 +30,6 @@
 import net.lecousin.framework.application.libraries.artifacts.LoadedLibrary;
 import net.lecousin.framework.application.libraries.classloader.AbstractClassLoader;
 import net.lecousin.framework.application.libraries.classloader.AppClassLoader;
-import net.lecousin.framework.application.libraries.classpath.DefaultApplicationClassLoader;
 import net.lecousin.framework.application.libraries.classpath.LoadLibraryExtensionPointsFile;
 import net.lecousin.framework.application.libraries.classpath.LoadLibraryPluginsFile;
 import net.lecousin.framework.collections.TreeWithParent;
@@ -75,7 +75,6 @@ public DynamicLibrariesManager(
 	private Application app;
 	private File appDir;
 	private AppClassLoader appClassLoader;
-	private DefaultApplicationClassLoader defaultClassLoader;
 	private ArrayList<File> devPaths;
 	private SplashScreen splash;
 	private List<LibraryDescriptorLoader> loaders;
@@ -92,12 +91,10 @@ private static class Lib {
 
 	private Map<String, Lib> libraries = new HashMap<>();
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public DefaultApplicationClassLoader start(Application app) {
+	public ApplicationClassLoader start(Application app) {
 		this.app = app;
 		this.appClassLoader = new AppClassLoader(app);
-		this.defaultClassLoader = new DefaultApplicationClassLoader(app, null);
 
 		app.getDefaultLogger().debug("Start loading application in development mode");
 
@@ -139,7 +136,7 @@ public Void run() {
 			developmentMode(stepDevProjects, stepDependencies, stepVersionConflicts);
 		else
 			productionMode(stepDependencies, stepVersionConflicts);
-		return defaultClassLoader;
+		return this.appClassLoader;
 	}
 
 	private void developmentMode(long stepDevProjects, long stepDependencies, long stepVersionConflicts) {
@@ -608,8 +605,7 @@ public Void run() {
 			AsyncWork<Void, Exception> ep = null;
 			try {
 				IO.Readable io = ((AbstractClassLoader)lib.library.getClassLoader())
-					.get("META-INF/net.lecousin/extensionpoints")
-					.provideIOReadable(Task.PRIORITY_IMPORTANT);
+					.open("META-INF/net.lecousin/extensionpoints", Task.PRIORITY_IMPORTANT);
 				PreBufferedReadable bio = new PreBufferedReadable(io, 512, Task.PRIORITY_IMPORTANT, 1024,
 					Task.PRIORITY_RATHER_IMPORTANT, 8);
 				BufferedReadableCharacterStream stream = new BufferedReadableCharacterStream(bio, StandardCharsets.UTF_8, 256, 32);
@@ -629,7 +625,7 @@ public Void run() {
 				if (path == null) continue;
 				try {
 					IO.Readable io = ((AbstractClassLoader)lib.library.getClassLoader())
-						.get(path).provideIOReadable(Task.PRIORITY_IMPORTANT);
+						.open(path, Task.PRIORITY_IMPORTANT);
 					previous = custom.loadPluginConfiguration(io, lib.library.getClassLoader(), previous);
 					jp.addToJoin(previous);
 				} catch (FileNotFoundException e) {
@@ -643,7 +639,7 @@ public Void run() {
 			// plugins
 			try {
 				IO.Readable io = ((AbstractClassLoader)lib.library.getClassLoader())
-					.get("META-INF/net.lecousin/plugins").provideIOReadable(Task.PRIORITY_IMPORTANT);
+					.open("META-INF/net.lecousin/plugins", Task.PRIORITY_IMPORTANT);
 				PreBufferedReadable bio = new PreBufferedReadable(io, 512, Task.PRIORITY_IMPORTANT, 1024,
 					Task.PRIORITY_RATHER_IMPORTANT, 8);
 				BufferedReadableCharacterStream stream = new BufferedReadableCharacterStream(bio, StandardCharsets.UTF_8, 256, 32);

net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/DynamicLibrariesManager.java

@@ -1,29 +1,29 @@
-package net.lecousin.framework.application.libraries;
-
-import java.io.File;
-import java.util.List;
-
-import net.lecousin.framework.application.Application;
-import net.lecousin.framework.application.ApplicationClassLoader;
-import net.lecousin.framework.concurrent.synch.ISynchronizationPoint;
-import net.lecousin.framework.io.IO;
-
-/** Allows to load libraries and get information about loaded ones. */
-public interface LibrariesManager {
-
-	/** This method is automatically called on application startup so this libraries manager
-	 * can initialize and load libraries as needed for the given application.
-	 */
-	<T extends ClassLoader & ApplicationClassLoader> T start(Application app);
-	
-	/** Return a synchronization point which is blocked until this libraries manager has been initialized
-	 * and has loaded all required libraries. */
-	ISynchronizationPoint<Exception> onLibrariesLoaded();
-	
-	/** Open a resource or return null if it does not exist. */
-	IO.Readable getResource(String path, byte priority);
-
-	/** Return the list of libraries loaded. Each File may be a file in case of a JAR, or a directory. */
-	List<File> getLibrariesLocations();
-	
-}
+package net.lecousin.framework.application.libraries;
+
+import java.io.File;
+import java.util.List;
+
+import net.lecousin.framework.application.Application;
+import net.lecousin.framework.application.ApplicationClassLoader;
+import net.lecousin.framework.concurrent.synch.ISynchronizationPoint;
+import net.lecousin.framework.io.IO;
+
+/** Allows to load libraries and get information about loaded ones. */
+public interface LibrariesManager {
+
+	/** This method is automatically called on application startup so this libraries manager
+	 * can initialize and load libraries as needed for the given application.
+	 */
+	ApplicationClassLoader start(Application app);
+	
+	/** Return a synchronization point which is blocked until this libraries manager has been initialized
+	 * and has loaded all required libraries. */
+	ISynchronizationPoint<Exception> onLibrariesLoaded();
+	
+	/** Open a resource or return null if it does not exist. */
+	IO.Readable getResource(String path, byte priority);
+
+	/** Return the list of libraries loaded. Each File may be a file in case of a JAR, or a directory. */
+	List<File> getLibrariesLocations();
+	
+}

net.lecousin.core/src/main/java/net/lecousin/framework/application/libraries/LibrariesManager.java

@@ -53,7 +53,11 @@ public Application getApplication() {
 
 	/** Search a resource. */
 	protected abstract URL loadResourceURL(String name);
-
+	
+	protected abstract Object getResourcePointer(String path);
+	
+	protected abstract IO.Readable openResourcePointer(Object pointer, byte priority) throws IOException;
+	
 	private List<AbstractClassLoader> subLoaders = null;
 
 	/** Add a class loader from a resource contained by this class loader, for example an inner jar file. */
@@ -157,21 +161,26 @@ final Class<?> loadClassInLibrary(String name) throws IOException {
 
 	@Override
 	public final IOProvider.Readable get(String path) {
+		Object pointer = getResourcePointer(path);
+		AbstractClassLoader cl = this;
+		if (pointer == null) {
+			if (subLoaders != null)
+				for (AbstractClassLoader sub : subLoaders) {
+					pointer = sub.getResourcePointer(path);
+					if (pointer != null) {
+						cl = sub;
+						break;
+					}
+				}
+			if (pointer == null)
+				return null;
+		}
+		Object ptr = pointer;
+		AbstractClassLoader owner = cl;
 		return new IOProvider.Readable() {
 			@Override
 			public IO.Readable provideIOReadable(byte priority) throws IOException {
-				try { return loadResourceAsIO(path, priority); }
-				catch (FileNotFoundException e) {
-					if (subLoaders == null) throw e;
-					for (AbstractClassLoader sub : subLoaders) {
-						try {
-							return sub.get(path).provideIOReadable(priority);
-						} catch (FileNotFoundException e2) {
-							// not found
-						}
-					}
-					throw e;
-				}
+				return owner.openResourcePointer(ptr, priority);
 			}
 
 			@Override
@@ -180,6 +189,25 @@ public String getDescription() {
 			}
 		};
 	}
+	
+	/** Open a resource. */
+	public final IO.Readable open(String path, byte priority) throws IOException {
+		Object pointer = getResourcePointer(path);
+		AbstractClassLoader cl = this;
+		if (pointer == null) {
+			if (subLoaders != null)
+				for (AbstractClassLoader sub : subLoaders) {
+					pointer = sub.getResourcePointer(path);
+					if (pointer != null) {
+						cl = sub;
+						break;
+					}
+				}
+			if (pointer == null)
+				throw new FileNotFoundException(path);
+		}
+		return cl.openResourcePointer(pointer, priority);
+	}
 
 	/** Search for a resource. */
 	public final URL getResourceURL(String name) {
@@ -221,4 +249,9 @@ public InputStream getResourceAsStream(String name) {
 		return appClassLoader.getResourceAsStreamFrom(name, this);
 	}
 
+	@Override
+	public IOProvider.Readable getIOProvider(String filename) {
+		return appClassLoader.getIOProviderFrom(filename, this);
+	}
+	
 }