Fix module memory leaks caused by GoogleDriveModule

Author: labkey-adam

GoogleDrive/src/org/labkey/googledrive/GoogleDriveModule.java

@@ -5,6 +5,7 @@
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.ldk.ExtendedSimpleModule;
 import org.labkey.api.module.Module;
+import org.labkey.api.module.ModuleContext;
 import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.query.DefaultSchema;
 import org.labkey.api.query.QuerySchema;
@@ -17,11 +18,6 @@
 import java.util.Set;
 
 public class GoogleDriveModule extends ExtendedSimpleModule {
-    @Override
-    public boolean hasScripts() {
-        return true;
-    }
-
     @Override
     @NotNull
     protected Collection<WebPartFactory> createWebPartFactories() {
@@ -33,17 +29,23 @@ protected void init() {
         addController(GoogleDriveController.NAME, GoogleDriveController.class);
 
         GoogleDriveService.set(new GoogleDriveServiceImpl());
+    }
 
-        Module thisModule = ModuleLoader.getInstance().getModule(GoogleDriveModule.class);
+    @Override
+    protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
+    {
+        // We moved this from init() to startup() because init() is too early to be referencing active modules, which
+        // indirectly loads and stashes web parts. Some referenced modules might be removed after this module's init()
+        // runs (e.g., if dependencies are missing), which would then lead to memory leaks.
         Container home = ContainerManager.getHomeContainer();
 
         // Ensure that we're enabled in the home module, since we'll use that for our queries.
         if (ModuleLoader.getInstance().shouldInsertData())
         {
             Set<Module> homeModules = new HashSet<>(home.getActiveModules());
-            if (!homeModules.contains(thisModule))
+            if (!homeModules.contains(this))
             {
-                homeModules.add(thisModule);
+                homeModules.add(this);
                 home.setActiveModules(homeModules);
             }
         }
@@ -66,7 +68,7 @@ public void registerSchemas() {
         DefaultSchema.registerProvider(GoogleDriveSchema.NAME, new DefaultSchema.SchemaProvider(this) {
             @Override
             public QuerySchema createSchema(final DefaultSchema schema, Module module) {
-                return (QuerySchema) new GoogleDriveSchema(schema.getUser(), schema.getContainer());
+                return new GoogleDriveSchema(schema.getUser(), schema.getContainer());
             }
         });
     }

WNPRC_r24/src/org/labkey/wnprc_r24/wnprc_r24Module.java

@@ -79,6 +79,7 @@ public void doStartup(ModuleContext moduleContext)
             final DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);
             DefaultSchema.registerProvider(dbSchema.getQuerySchemaName(), new DefaultSchema.SchemaProvider(this)
             {
+                @Override
                 public QuerySchema createSchema(final DefaultSchema schema, Module module)
                 {
                     DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);

WNPRC_u24/src/org/labkey/wnprc_u24/wnprc_u24Module.java

@@ -79,6 +79,7 @@ public void doStartup(ModuleContext moduleContext)
             final DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);
             DefaultSchema.registerProvider(dbSchema.getQuerySchemaName(), new DefaultSchema.SchemaProvider(this)
             {
+                @Override
                 public QuerySchema createSchema(final DefaultSchema schema, Module module)
                 {
                     DbSchema dbSchema = DbSchema.get(schemaName, DbSchemaType.Module);