Clean up ContainerFilter

Author: labkey-adam

LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java

@@ -122,7 +122,7 @@ public DataIteratorBuilder persistRows(DataIteratorBuilder data, DataIteratorCon
 
     protected class UpdateService extends SimpleQueryUpdateService
     {
-        private KeyManager _keyManager = new KeyManager();
+        private final KeyManager _keyManager = new KeyManager();
 
         public UpdateService(SimpleUserSchema.SimpleTable<?> ti)
         {
@@ -307,7 +307,7 @@ public Object call()
 
     private class KeyManager
     {
-        private Set<Object> _encounteredKeys = new HashSet<>();
+        private final Set<Object> _encounteredKeys = new HashSet<>();
 
         public KeyManager()
         {
@@ -337,7 +337,7 @@ public boolean rowExists(Container c, Object key)
 
             Container target = c.getContainerFor(ContainerType.DataType.sharedSchemaOwner);
             SimpleFilter filter = new SimpleFilter(FieldKey.fromString(_pseudoPk), key, CompareType.EQUAL);
-            filter.addClause(ContainerFilter.current(target).createFilterClause(_rootTable.getSchema(), getContainerFieldKey()));
+            filter.addClause(ContainerFilter.current(target, getUserSchema().getUser()).createFilterClause(_rootTable.getSchema(), getContainerFieldKey()));
             TableSelector ts = new TableSelector(_rootTable, Collections.singleton(_pseudoPk), filter, null);
 
             return ts.getRowCount() > 0;

laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java

@@ -982,7 +982,7 @@ public void customizeButtonBar(AbstractTableInfo ti)
                 newIncludes.addAll(Arrays.asList(includes));
             }
 
-            ti.getButtonBarConfig().setScriptIncludes(newIncludes.toArray(new String[newIncludes.size()]));
+            ti.getButtonBarConfig().setScriptIncludes(newIncludes.toArray(new String[0]));
         }
     }
 
@@ -993,7 +993,7 @@ private void customzieSamplesTable(AbstractTableInfo ti)
         {
             Container c = ti.getUserSchema().getContainer();
             c = c.isWorkbook() ? c.getParent() : c;
-            SQLFragment containerSql = ContainerFilter.current(c).getSQLFragment(LaboratorySchema.getInstance().getSchema(), new SQLFragment(ti.getContainerFieldKey().toString()));
+            SQLFragment containerSql = ContainerFilter.current(c, ti.getUserSchema().getUser()).getSQLFragment(LaboratorySchema.getInstance().getSchema(), new SQLFragment(ti.getContainerFieldKey().toString()));
 
             SQLFragment sql = new SQLFragment("(SELECT count(*) as _expr FROM laboratory.samples s WHERE " +
                     " (s.").append(containerSql).append(")" + " AND ").