No need to use the ExpData to look itself up (#909)

Author: labkey-jeckels

flow/src/org/labkey/flow/persist/AttributeSetHelper.java

@@ -153,7 +153,7 @@ public static void doSave(AttributeSet attrs, User user, ExpData data, @Nullable
                 List<List<?>> paramsList = new ArrayList<>();
                 for (Map.Entry<String, String> entry : keywords.entrySet())
                 {
-                    AttributeCache.Entry a = AttributeCache.KEYWORDS.byAttribute(c, entry.getKey());
+                    AttributeCache.Entry<?, ?> a = AttributeCache.KEYWORDS.byAttribute(c, entry.getKey());
                     assert a != null : "parepareForSave should have created an entry";
                     int preferredId = a.getAliasedId() == null ? a.getRowId() : a.getAliasedId();
                     int originalId = a.getRowId();
@@ -174,7 +174,7 @@ public static void doSave(AttributeSet attrs, User user, ExpData data, @Nullable
                 List<List<?>> paramsList = new ArrayList<>();
                 for (Map.Entry<StatisticSpec, Double> entry : statistics.entrySet())
                 {
-                    AttributeCache.Entry a = AttributeCache.STATS.byAttribute(c, entry.getKey());
+                    AttributeCache.Entry<?, ?> a = AttributeCache.STATS.byAttribute(c, entry.getKey());
                     assert a != null : "parepareForSave should have created an entry";
                     int preferredId = a.getAliasedId() == null ? a.getRowId() : a.getAliasedId();
                     int originalId = a.getRowId();
@@ -213,7 +213,7 @@ public static void doSave(AttributeSet attrs, User user, ExpData data, @Nullable
                 List<List<?>> paramsList = new ArrayList<>();
                 for (Map.Entry<GraphSpec, byte[]> entry : graphs.entrySet())
                 {
-                    AttributeCache.Entry a = AttributeCache.GRAPHS.byAttribute(c, entry.getKey());
+                    AttributeCache.Entry<?, ?> a = AttributeCache.GRAPHS.byAttribute(c, entry.getKey());
                     assert a != null : "parepareForSave should have created an entry";
                     int preferredId = a.getAliasedId() == null ? a.getRowId() : a.getAliasedId();
                     int originalId = a.getRowId();

flow/src/org/labkey/flow/persist/FlowManager.java

@@ -1029,9 +1029,9 @@ public void flowObjectModified()
     }
 
 
-    public AttrObject createAttrObject(ExpData data, ObjectType type, URI uri)
+    public AttrObject createAttrObject(@NotNull ExpData data, ObjectType type, URI uri)
     {
-        if (FlowDataHandler.instance.getPriority(ExperimentService.get().getExpData(data.getRowId())) != Handler.Priority.HIGH)
+        if (FlowDataHandler.instance.getPriority(data) != Handler.Priority.HIGH)
         {
             // Need to make sure the right ExperimentDataHandler is associated with this data file, otherwise, you
             // won't be able to delete it because of the foreign key constraint from the flow.object table.