Hold GUID instead of Container

Author: labkey-adam

ms2/src/org/labkey/ms2/MS2Run.java

@@ -18,10 +18,12 @@
 
 import org.apache.logging.log4j.Logger;
 import org.labkey.api.data.Container;
+import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.SqlSelector;
 import org.labkey.api.protein.MassType;
 import org.labkey.api.query.FieldKey;
+import org.labkey.api.util.GUID;
 import org.labkey.api.util.MemTracker;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ViewContext;
@@ -41,7 +43,7 @@ public abstract class MS2Run implements Serializable
     protected final static String[] EMPTY_STRING_ARRAY = new String[0];
 
     protected int run;
-    protected Container container;
+    protected GUID containerId;
     protected String description;
     protected String path;
     protected String fileName;
@@ -252,13 +254,13 @@ public void setRun(int run)
 
     public Container getContainer()
     {
-        return container;
+        return ContainerManager.getForId(containerId);
     }
 
 
     public void setContainer(Container container)
     {
-        this.container = container;
+        this.containerId = container.getEntityId();
     }
 
 

ms2/src/org/labkey/ms2/pipeline/mascot/MascotRun.java

@@ -48,8 +48,7 @@ public class MascotRun extends MS2Run
     public void adjustScores(Map<String, String> map)
     {
         // Mascot exported pepXML can exclude "homologyscore"
-        if (null == map.get("homologyscore"))
-            map.put("homologyscore", "-1");
+        map.putIfAbsent("homologyscore", "-1");
         // Issue 30322 - ProteomeDiscoverer pep.xml files use a different name for the score value
         if (null == map.get("ionscore") && map.containsKey("Ions Score"))
             map.put("ionscore", map.get("Ions Score"));

nab/src/org/labkey/nab/NabAssayController.java

@@ -331,8 +331,6 @@ private DilutionAssayRun _getNabAssayRun(ExpRun run, StatsService.CurveFitType f
         return assay;
     }
 
-    private static final String LAST_NAB_RUN_KEY = NabAssayController.class.getName() + "/LastNAbRun";
-
     @RequiresPermission(ReadPermission.class)
     @ContextualRoles(RunDatasetContextualRoles.class)
     public class DetailsAction extends RunDetailsAction<RenderAssayBean>