Skip to content

Clean up ContainerFilter #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Mar 3, 2025
Merged

Clean up ContainerFilter #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down