Avoid leaking static ModuleProperties from LincsModule (#425)

Author: labkey-tchad

lincs/src/org/labkey/lincs/LincsModule.java

@@ -45,11 +45,11 @@
 public class LincsModule extends SpringModule
 {
     public static final String NAME = "LINCS";
-    public static ModuleProperty PSP_JOB_NAME_SUFFIX_PROPERTY;
-    public static ModuleProperty LINCS_ASSAY_TYPE_PROPERTY;
-    public static String PSP_JOB_NAME_SUFFIX = "PSP job name suffix";
+    public static final String PSP_JOB_NAME_SUFFIX = "PSP job name suffix";
+    public final ModuleProperty PSP_JOB_NAME_SUFFIX_PROPERTY;
+    public final ModuleProperty LINCS_ASSAY_TYPE_PROPERTY;
 
-    private static String NO_SUFFIX = "";
+    private static final String NO_SUFFIX = "";
 
     public LincsModule()
     {

lincs/src/org/labkey/lincs/psp/LincsPspTask.java

@@ -3,6 +3,7 @@
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.labkey.api.data.Container;
+import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.pipeline.AbstractTaskFactory;
 import org.labkey.api.pipeline.AbstractTaskFactorySettings;
 import org.labkey.api.pipeline.PipelineJob;
@@ -84,7 +85,8 @@ private void postToPsp(LincsPspJobSupport jobSupport, User user, Logger log) thr
                 pspJob.setPipelineJobId(pipelineJobId);
             }
 
-            String suffix = LincsModule.PSP_JOB_NAME_SUFFIX_PROPERTY.getEffectiveValue(container);
+            String suffix = ModuleLoader.getInstance().getModule(LincsModule.class).PSP_JOB_NAME_SUFFIX_PROPERTY
+                    .getEffectiveValue(container);
 
             pspJob.setPspJobName(LincsPspUtil.getJobName(run, endpoint, suffix, log));
             log.info("PSP job name: " + pspJob.getPspJobName());