Move plugin loading to a method

Author: hugithordarson

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

@@ -167,32 +167,7 @@ public static <E extends NGApplication> E runAndReturn( final String[] args, fin
 			application.plugins.add( application );
 
 			for( final NGPlugin plugin : application.plugins ) {
-				addDefaultResourcesourcesForNamespace( application.resourceManager().resourceLoader(), plugin.namespace() );
-				properties.addAndReadSource( new PropertiesSourceResource( plugin.namespace(), "Properties" ) );
-
-				for( final ElementProvider elementProvider : plugin.elements().elementProviders() ) {
-					application.elementManager().registerElementProvider( elementProvider );
-				}
-
-				// Obtain all the routes generated by the given plugin
-				final List<Route> routeList = plugin._createRouteList();
-
-				if( !routeList.isEmpty() ) {
-
-					// CHECKME: We generate a new route table. This is only so we can copy in the plugin's namespace. Should reeeaally happen in the plugin itself...
-					final NGRouteTable pluginRouteTable;
-
-					// If we're in development mode, the create the route table, using the plugin as a "route supplier". This means the route list gets updated, every time the user makes a change.
-					// In production, we just create the route table from a static list in instead, to maintain performance
-					if( isDevelopmentMode ) {
-						pluginRouteTable = new NGRouteTable( plugin.namespace(), plugin::_createRouteList );
-					}
-					else {
-						pluginRouteTable = new NGRouteTable( plugin.namespace(), plugin._createRouteList() );
-					}
-
-					application._routeTables.add( 0, pluginRouteTable );
-				}
+				application.loadPlugin( plugin );
 			}
 
 			logger.info( "===== All properties =====\n" + properties._propertiesMapAsString() );
@@ -284,10 +259,40 @@ private void loadPlugins() {
 				.forEach( plugin -> {
 					logger.info( "Loading plugin {}", plugin.getClass().getName() );
 					plugins.add( plugin );
-					plugin.load( this );
 				} );
 	}
 
+	private void loadPlugin( NGPlugin plugin ) {
+		addDefaultResourcesourcesForNamespace( resourceManager().resourceLoader(), plugin.namespace() );
+		properties().addAndReadSource( new PropertiesSourceResource( plugin.namespace(), "Properties" ) );
+
+		for( final ElementProvider elementProvider : plugin.elements().elementProviders() ) {
+			elementManager().registerElementProvider( elementProvider );
+		}
+
+		// Obtain all the routes generated by the given plugin
+		final List<Route> routeList = plugin._createRouteList();
+
+		if( !routeList.isEmpty() ) {
+
+			// CHECKME: We generate a new route table. This is only so we can copy in the plugin's namespace. Should reeeaally happen in the plugin itself...
+			final NGRouteTable pluginRouteTable;
+
+			// If we're in development mode, the create the route table, using the plugin as a "route supplier". This means the route list gets updated, every time the user makes a change.
+			// In production, we just create the route table from a static list in instead, to maintain performance
+			if( isDevelopmentMode() ) {
+				pluginRouteTable = new NGRouteTable( plugin.namespace(), plugin::_createRouteList );
+			}
+			else {
+				pluginRouteTable = new NGRouteTable( plugin.namespace(), plugin._createRouteList() );
+			}
+
+			_routeTables.add( 0, pluginRouteTable );
+		}
+
+		plugin.load( this );
+	}
+
 	/**
 	 * @return The class to use when constructing a new session. By default we look for a class named "Session" in the same package as the application class
 	 */