#491 add Pinger plugins to the registry, as plugins are loaded after the registry is created

Author: angryziber

CHANGELOG

@@ -2,7 +2,7 @@ Changes in 3.9.3:
 - Bundle Java 21 with Windows and Mac builds
 - Updated SWT for all platforms, improved loading of correct SWT library on Linux
 - Add support for plugin jars containing their own messages.properties
-- Add support for Pinger plugins
+- Add support for Pinger plugins #491
 - Allow plugins to merge multiple ping results
 - The UDP pinger now uses the same port as traceroute programs
 - FileFeeder: recognition of FQDNs (with trailing dots and numbers in TLDs) in IP list files

src/net/azib/ipscan/config/ComponentRegistry.java

@@ -6,6 +6,8 @@
 package net.azib.ipscan.config;
 
 import net.azib.ipscan.core.PluginLoader;
+import net.azib.ipscan.core.net.Pinger;
+import net.azib.ipscan.core.net.PingerRegistry;
 import net.azib.ipscan.di.Injector;
 import net.azib.ipscan.exporters.*;
 import net.azib.ipscan.fetchers.*;
@@ -35,7 +37,12 @@ public Injector init(boolean withGUI) throws Exception {
 		new ComponentRegistry().register(i);
 		if (withGUI) {
 			new GUIRegistry().register(i);
-			new PluginLoader().getClasses().forEach(i::require);
+			var pingerRegistry = i.require(PingerRegistry.class);
+			new PluginLoader().getClasses().forEach(c -> {
+				var plugin = i.require(c);
+				if (Pinger.class.isAssignableFrom(c))
+					pingerRegistry.register(plugin.getId(), (Class) c);
+			});
 		}
 		return i;
 	}

src/net/azib/ipscan/core/PluginLoader.java

@@ -39,7 +39,7 @@ public List<Class<? extends Plugin>> getClasses() {
 
 		loadPluginsSpecifiedInSystemProperties(container);
 		loadPluginJars(container, getOwnFile());
-		loadPluginJars(container, new File(System.getProperty("user.home"), ".ipscan/placeholder"));
+		loadPluginJars(container, new File(System.getProperty("user.home"), ".ipscan/."));
 
 		return container;
 	}

src/net/azib/ipscan/core/net/PingerRegistry.java

@@ -42,15 +42,16 @@ public PingerRegistry(ScannerConfig scannerConfig, Injector injector) throws Cla
 
 		pingers = new LinkedHashMap<>();
 		if (Platform.WINDOWS)
-			pingers.put("pinger.windows", (Class<Pinger>) Class.forName(getClass().getPackage().getName() + ".WindowsPinger"));
-		pingers.put(UDPPinger.ID, UDPPinger.class);
-		pingers.put(TCPPinger.ID, TCPPinger.class);
-		pingers.put(CombinedUnprivilegedPinger.ID, CombinedUnprivilegedPinger.class);
-		pingers.put(JavaPinger.ID, JavaPinger.class);
-		pingers.put(ARPPinger.ID, ARPPinger.class);
+			register("pinger.windows", (Class<Pinger>) Class.forName(getClass().getPackage().getName() + ".WindowsPinger"));
+		register(JavaPinger.ID, JavaPinger.class);
+		register(UDPPinger.ID, UDPPinger.class);
+		register(TCPPinger.ID, TCPPinger.class);
+		register(CombinedUnprivilegedPinger.ID, CombinedUnprivilegedPinger.class);
+		register(ARPPinger.ID, ARPPinger.class);
+	}
 
-		// Add already registered plugin pingers
-		injector.requireAll(Pinger.class).forEach(p -> pingers.put(p.getId(), p.getClass()));
+	public void register(String id, Class<? extends Pinger> clazz) {
+		pingers.put(id, clazz);
 	}
 
 	public String[] getRegisteredNames() {