Refactor plugin management for better maintainability

6 files changed, 13 insertions, 13 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarInstaller.java
index 7f23a2e2b7d..8866cf7fc0f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarInstaller.java
@@ -21,17 +21,17 @@ package org.sonar.batch.bootstrap;
 
 import org.sonar.api.BatchComponent;
 import org.sonar.core.plugins.DefaultPluginMetadata;
-import org.sonar.core.plugins.PluginInstaller;
+import org.sonar.core.plugins.PluginJarInstaller;
 import org.sonar.home.cache.FileCache;
 
 import java.io.File;
 import java.io.IOException;
 
-public class BatchPluginInstaller extends PluginInstaller implements BatchComponent {
+public class BatchPluginJarInstaller extends PluginJarInstaller implements BatchComponent {
 
   private FileCache cache;
 
-  public BatchPluginInstaller(FileCache cache) {
+  public BatchPluginJarInstaller(FileCache cache) {
     this.cache = cache;
   }
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
index 8a93f258916..e0e366282a1 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
@@ -51,10 +51,10 @@ public class BatchPluginRepository implements PluginRepository {
   private Settings settings;
   private PluginClassloaders classLoaders;
   private final AnalysisMode analysisMode;
-  private final BatchPluginInstaller pluginInstaller;
+  private final BatchPluginJarInstaller pluginInstaller;
 
   public BatchPluginRepository(PluginDownloader pluginDownloader, Settings settings, AnalysisMode analysisMode,
-                               BatchPluginInstaller pluginInstaller) {
+                               BatchPluginJarInstaller pluginInstaller) {
     this.pluginDownloader = pluginDownloader;
     this.settings = settings;
     this.analysisMode = analysisMode;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
index 40f027d3cd9..c6bd4a1f93e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java
@@ -72,7 +72,7 @@ public class BootstrapContainer extends ComponentContainer {
       AnalysisMode.class,
       PluginDownloader.class,
       BatchPluginRepository.class,
-      BatchPluginInstaller.class,
+      BatchPluginJarInstaller.class,
       BatchSettings.class,
       ServerClient.class,
       ExtensionInstaller.class,
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginJarInstallerTest.java
index de903420e73..52b80a87d5d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginJarInstallerTest.java
@@ -32,9 +32,9 @@ import java.io.IOException;
 
 import static org.fest.assertions.Assertions.assertThat;
 
-public class BatchPluginInstallerTest {
+public class BatchPluginJarInstallerTest {
 
-  private BatchPluginInstaller extractor;
+  private BatchPluginJarInstaller extractor;
 
   @ClassRule
   public static TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -44,7 +44,7 @@ public class BatchPluginInstallerTest {
   @Before
   public void setUp() throws IOException {
     userHome = temporaryFolder.newFolder();
-    extractor = new BatchPluginInstaller(new FileCacheBuilder().setUserHome(userHome).build());
+    extractor = new BatchPluginJarInstaller(new FileCacheBuilder().setUserHome(userHome).build());
   }
 
   @Test
@@ -68,7 +68,7 @@ public class BatchPluginInstallerTest {
   }
 
   File getFileFromCache(String filename) throws IOException {
-    File src = FileUtils.toFile(BatchPluginInstallerTest.class.getResource("/org/sonar/batch/bootstrap/BatchPluginInstallerTest/" + filename));
+    File src = FileUtils.toFile(BatchPluginJarInstallerTest.class.getResource("/org/sonar/batch/bootstrap/BatchPluginJarInstallerTest/" + filename));
     File destFile = new File(new File(userHome, "" + filename.hashCode()), filename);
     FileUtils.copyFile(src, destFile);
     return destFile;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
index 84f92b7eab6..41a6d0048d5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
@@ -71,7 +71,7 @@ public class BatchPluginRepositoryTest {
     PluginDownloader downloader = mock(PluginDownloader.class);
     when(downloader.downloadPlugin(checkstyle)).thenReturn(fileFromCache("sonar-checkstyle-plugin-2.8.jar"));
 
-    repository = new BatchPluginRepository(downloader, new Settings(), mode, new BatchPluginInstaller(cache));
+    repository = new BatchPluginRepository(downloader, new Settings(), mode, new BatchPluginJarInstaller(cache));
 
     repository.doStart(Arrays.asList(checkstyle));
 
@@ -90,7 +90,7 @@ public class BatchPluginRepositoryTest {
     when(downloader.downloadPlugin(checkstyle)).thenReturn(fileFromCache("sonar-checkstyle-plugin-2.8.jar"));
     when(downloader.downloadPlugin(checkstyleExt)).thenReturn(fileFromCache("sonar-checkstyle-extensions-plugin-0.1-SNAPSHOT.jar"));
 
-    repository = new BatchPluginRepository(downloader, new Settings(), mode, new BatchPluginInstaller(cache));
+    repository = new BatchPluginRepository(downloader, new Settings(), mode, new BatchPluginJarInstaller(cache));
 
     repository.doStart(Arrays.asList(checkstyle, checkstyleExt));
 
@@ -112,7 +112,7 @@ public class BatchPluginRepositoryTest {
 
     Settings settings = new Settings();
     settings.setProperty(CoreProperties.BATCH_EXCLUDE_PLUGINS, "checkstyle");
-    repository = new BatchPluginRepository(downloader, settings, mode, new BatchPluginInstaller(cache));
+    repository = new BatchPluginRepository(downloader, settings, mode, new BatchPluginJarInstaller(cache));
 
     repository.doStart(Arrays.asList(checkstyle, checkstyleExt));
 
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginInstallerTest/sonar-checkstyle-plugin-2.8.jar b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginJarInstallerTest/sonar-checkstyle-plugin-2.8.jar
index f937399bec5..f937399bec5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginInstallerTest/sonar-checkstyle-plugin-2.8.jar
+++ b/sonar-batch/src/test/resources/org/sonar/batch/bootstrap/BatchPluginJarInstallerTest/sonar-checkstyle-plugin-2.8.jar