Clean up ContainerFilter

Author: labkey-adam

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java

@@ -1215,13 +1215,13 @@ public ApiResponse execute(ValidateReadsetImportForm form, BindException errors)
                         //forward reads
                         SimpleFilter filter = new SimpleFilter(FieldKey.fromString("fileid1"), d.getRowId());
                         Container c = getContainer().isWorkbook() ? getContainer().getParent() : getContainer();
-                        filter.addClause(ContainerFilter.current(c).createFilterClause(SequenceAnalysisSchema.getInstance().getSchema(), FieldKey.fromString("container")));
+                        filter.addClause(ContainerFilter.current(this).createFilterClause(SequenceAnalysisSchema.getInstance().getSchema(), FieldKey.fromString("container")));
                         TableSelector ts = new TableSelector(ti, Collections.singleton("readset"), filter, null);
                         Integer[] readsets1 = ts.getArray(Integer.class);
 
                         //reverse reads
                         SimpleFilter filter2 = new SimpleFilter(FieldKey.fromString("fileid2"), d.getRowId());
-                        filter2.addClause(ContainerFilter.current(c).createFilterClause(SequenceAnalysisSchema.getInstance().getSchema(), FieldKey.fromString("container")));
+                        filter2.addClause(ContainerFilter.current(this).createFilterClause(SequenceAnalysisSchema.getInstance().getSchema(), FieldKey.fromString("container")));
                         TableSelector ts2 = new TableSelector(ti, Collections.singleton("readset"), filter2, null);
                         Integer[] readsets2 = ts2.getArray(Integer.class);
 
@@ -1232,7 +1232,7 @@ public ApiResponse execute(ValidateReadsetImportForm form, BindException errors)
                             ids.addAll(Arrays.asList(readsets1));
                             ids.addAll(Arrays.asList(readsets2));
 
-                            if (ids.size() > 0)
+                            if (!ids.isEmpty())
                             {
                                 String msg = "File is already used in existing readsets (" + StringUtils.join(new ArrayList<>(ids), ", ") + "): " + d.getFile().getName();
                                 errorsList.add(msg);

discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java

@@ -123,7 +123,7 @@ private SimpleTable<?> generateAuditSql(String tableName, String eventType, Cont
         DbSchema auditSchema = DbSchema.get("audit", DbSchemaType.Module);
         TableInfo ti = auditSchema.getTable(storageTableName);
 
-        SimpleTable<?> st = new SimpleTable<>(this, ti, ContainerFilter.current(target));
+        SimpleTable<?> st = new SimpleTable<>(this, ti, ContainerFilter.current(this));
         st.setName(tableName);
         st.init();