Skip to content

Don't need to check for SearchService; it falls back to a no-op now #928

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-jeckels merged 2 commits into from
Sep 13, 2025
Merged

Don't need to check for SearchService; it falls back to a no-op now #928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
177bf28
Don't need to check for SearchService; it falls back to a noop now
labkey-jeckels Sep 12, 2025
cb94680
More cleanup
labkey-jeckels Sep 13, 2025
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
9 changes: 2 additions & 7 deletions flow/src/org/labkey/flow/FlowModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,7 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
AssayService.get().registerAssayProvider(new FlowAssayProvider());

FolderTypeManager.get().registerFolderType(this, new FlowFolderType(this));
SearchService ss = SearchService.get();
if (null != ss)
ss.addDocumentParser(FCSHeader.documentParser);
SearchService.get().addDocumentParser(FCSHeader.documentParser);
FlowController.registerAdminConsoleLinks();

FileContentService fcs = FileContentService.get();
Expand All @@ -298,10 +296,7 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
if (null != svc)
{
FlowManager mgr = FlowManager.get();
if (null != mgr)
{
svc.registerUsageMetrics(NAME, mgr::getUsageMetrics);
}
svc.registerUsageMetrics(NAME, mgr::getUsageMetrics);
}

FlowSchema.registerContainerListener();
Expand Down
14 changes: 5 additions & 9 deletions ms2/src/org/labkey/ms2/MS2Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,11 @@ protected void startupAfterSpringConfig(ModuleContext moduleContext)
MS2Controller.registerAdminConsoleLinks();

SearchService ss = SearchService.get();

if (null != ss)
{
ss.addDocumentParser(new MzXMLDocumentParser());
ss.addDocumentParser(new MzMLDocumentParser());
ss.addDocumentParser(new DatDocumentParser());
ss.addDocumentParser(new SequestLogDocumentParser());
ss.addDocumentParser(new MGFDocumentParser());
}
ss.addDocumentParser(new MzXMLDocumentParser());
ss.addDocumentParser(new MzMLDocumentParser());
ss.addDocumentParser(new DatDocumentParser());
ss.addDocumentParser(new SequestLogDocumentParser());
ss.addDocumentParser(new MGFDocumentParser());

FileContentService fcs = FileContentService.get();
if (fcs != null)
Expand Down