Move JBrowseService initialization to PipelineStartup

bbimber · bbimber · commit 23d581eb4a90 · 2023-11-29T18:29:54.000-08:00
diff --git a/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java b/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java
@@ -80,7 +80,6 @@ protected Collection<WebPartFactory> createWebPartFactories()
     protected void init()
     {
         addController(JBrowseController.NAME, JBrowseController.class);
-        JBrowseService.setInstance(JBrowseServiceImpl.get());
         JBrowseService.get().registerFieldCustomizer(new JBrowseLuceneSearch.DefaultJBrowseFieldCustomizer());
         JBrowseService.get().registerGroupsProvider(new JBrowseLuceneSearch.TestJBrowseGroupProvider());
     }
@@ -114,6 +113,7 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext)
 
     public static void registerPipelineSteps()
     {
+        JBrowseService.setInstance(JBrowseServiceImpl.get());
         SequencePipelineService.get().registerPipelineStep(new IndexVariantsStep.Provider());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ protected Collection<WebPartFactory> createWebPartFactories()`
`80`	`80`	`protected void init()`
`81`	`81`	`{`
`82`	`82`	`addController(JBrowseController.NAME, JBrowseController.class);`
`83`		`- JBrowseService.setInstance(JBrowseServiceImpl.get());`
`84`	`83`	`JBrowseService.get().registerFieldCustomizer(new JBrowseLuceneSearch.DefaultJBrowseFieldCustomizer());`
`85`	`84`	`JBrowseService.get().registerGroupsProvider(new JBrowseLuceneSearch.TestJBrowseGroupProvider());`
`86`	`85`	`}`
`@@ -114,6 +113,7 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext)`
`114`	`113`
`115`	`114`	`public static void registerPipelineSteps()`
`116`	`115`	`{`
	`116`	`+ JBrowseService.setInstance(JBrowseServiceImpl.get());`
`117`	`117`	`SequencePipelineService.get().registerPipelineStep(new IndexVariantsStep.Provider());`
`118`	`118`	`}`
`119`	`119`