From 177bf28fb0ccaf2404e47c68e10a12ec8a18558d Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 12 Sep 2025 15:58:23 -0700 Subject: [PATCH 1/2] Don't need to check for SearchService; it falls back to a noop now --- flow/src/org/labkey/flow/FlowModule.java | 4 +--- ms2/src/org/labkey/ms2/MS2Module.java | 14 +++++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/flow/src/org/labkey/flow/FlowModule.java b/flow/src/org/labkey/flow/FlowModule.java index cbe2d66b2..33eb6a17f 100644 --- a/flow/src/org/labkey/flow/FlowModule.java +++ b/flow/src/org/labkey/flow/FlowModule.java @@ -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(); diff --git a/ms2/src/org/labkey/ms2/MS2Module.java b/ms2/src/org/labkey/ms2/MS2Module.java index 793ac3790..da4cfd5d1 100644 --- a/ms2/src/org/labkey/ms2/MS2Module.java +++ b/ms2/src/org/labkey/ms2/MS2Module.java @@ -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) From cb946803e583d97284341589215c2958c66ed1f1 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Sat, 13 Sep 2025 11:44:21 -0700 Subject: [PATCH 2/2] More cleanup --- flow/src/org/labkey/flow/FlowModule.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flow/src/org/labkey/flow/FlowModule.java b/flow/src/org/labkey/flow/FlowModule.java index 33eb6a17f..d53cf1bad 100644 --- a/flow/src/org/labkey/flow/FlowModule.java +++ b/flow/src/org/labkey/flow/FlowModule.java @@ -296,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();