Spotbugs fix

opendistro-for-elasticsearch · Jul 30, 2020 · d207d65 · d207d65
1 parent 8b5388f
commit d207d65
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/...ava/com/amazon/opendistro/elasticsearch/performanceanalyzer/plugins/PluginController.java b/...ava/com/amazon/opendistro/elasticsearch/performanceanalyzer/plugins/PluginController.java
@@ -36,6 +36,9 @@ public PluginController(PluginControllerConfig pluginConfig, Publisher publisher
     this.pluginControllerConfig = pluginConfig;
     this.publisher = publisher;
     this.plugins = new ArrayList<>();
+  }
+
+  public void initPlugins() {
     loadFrameworkPlugins();
     registerActionListeners();
   }

diff --git a/...on/opendistro/elasticsearch/performanceanalyzer/rca/store/ElasticSearchAnalysisGraph.java b/...on/opendistro/elasticsearch/performanceanalyzer/rca/store/ElasticSearchAnalysisGraph.java
@@ -220,6 +220,7 @@ public void construct() {
     // TODO: Refactor using DI to move out of construct method
     PluginControllerConfig pluginControllerConfig = new PluginControllerConfig();
     PluginController pluginController = new PluginController(pluginControllerConfig, publisher);
+    pluginController.initPlugins();
   }
 
   private void constructShardResourceUsageGraph() {

diff --git a/...com/amazon/opendistro/elasticsearch/performanceanalyzer/plugins/PluginControllerTest.java b/...com/amazon/opendistro/elasticsearch/performanceanalyzer/plugins/PluginControllerTest.java
@@ -40,6 +40,7 @@ public void testInit() {
     Mockito.when(pluginControllerConfig.getFrameworkPlugins()).thenReturn(frameworkPlugins);
     Publisher publisher = Mockito.mock(Publisher.class);
     PluginController pluginController = new PluginController(pluginControllerConfig, publisher);
+    pluginController.initPlugins();
 
     List<Plugin> plugins = pluginController.getPlugins();
     assertEquals(2, plugins.size());
@@ -58,6 +59,7 @@ public void testPrivateConstructorPlugin() {
     Mockito.when(pluginControllerConfig.getFrameworkPlugins()).thenReturn(frameworkPlugins);
     Publisher publisher = Mockito.mock(Publisher.class);
     PluginController pluginController = new PluginController(pluginControllerConfig, publisher);
+    pluginController.initPlugins();
   }
 
   @Test(expected = IllegalStateException.class)
@@ -69,6 +71,7 @@ public void testMultiConstructorPlugin() {
     Mockito.when(pluginControllerConfig.getFrameworkPlugins()).thenReturn(frameworkPlugins);
     Publisher publisher = Mockito.mock(Publisher.class);
     PluginController pluginController = new PluginController(pluginControllerConfig, publisher);
+    pluginController.initPlugins();
   }
 
   @Test(expected = IllegalStateException.class)
@@ -80,6 +83,7 @@ public void testNonDefaultConstructorPlugin() {
     Mockito.when(pluginControllerConfig.getFrameworkPlugins()).thenReturn(frameworkPlugins);
     Publisher publisher = Mockito.mock(Publisher.class);
     PluginController pluginController = new PluginController(pluginControllerConfig, publisher);
+    pluginController.initPlugins();
   }
 
   public static class TestActionListener extends Plugin implements ActionListener {