SONAR-6370 remove concept of core plugin

SonarSource · Jun 5, 2015 · e91748e · e91748e
1 parent 7329c0c
commit e91748e
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 158 deletions.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java b/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java
@@ -135,10 +135,6 @@ public File getBundledPluginsDir() {
     return new File(getHomeDir(), "lib/bundled-plugins");
   }
 
-  public File getCorePluginsDir() {
-    return new File(getHomeDir(), "lib/core-plugins");
-  }
-
   public File getDeprecatedPluginsDir() {
     return new File(getHomeDir(), "extensions/deprecated");
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/PluginsMonitor.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/PluginsMonitor.java
@@ -20,16 +20,11 @@
 
 package org.sonar.server.platform.monitoring;
 
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
+import java.util.LinkedHashMap;
 import org.sonar.core.platform.PluginInfo;
 import org.sonar.core.platform.PluginRepository;
 import org.sonar.updatecenter.common.Version;
 
-import javax.annotation.Nonnull;
-
-import java.util.LinkedHashMap;
-
 /**
  * Installed plugins (excluding core plugins)
  */
@@ -48,7 +43,7 @@ public String name() {
   @Override
   public LinkedHashMap<String, Object> attributes() {
     LinkedHashMap<String, Object> attributes = new LinkedHashMap<>();
-    for (PluginInfo plugin : plugins()) {
+    for (PluginInfo plugin : repository.getPluginInfos()) {
       LinkedHashMap<String, Object> pluginAttributes = new LinkedHashMap<>();
       pluginAttributes.put("Name", plugin.getName());
       Version version = plugin.getVersion();
@@ -59,13 +54,4 @@ public LinkedHashMap<String, Object> attributes() {
     }
     return attributes;
   }
-
-  private Iterable<PluginInfo> plugins() {
-    return Iterables.filter(repository.getPluginInfos(), new Predicate<PluginInfo>() {
-      @Override
-      public boolean apply(@Nonnull PluginInfo info) {
-        return !info.isCore();
-      }
-    });
-  }
 }
diff --git a/...nar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java b/...nar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java
@@ -48,9 +48,7 @@ public static PluginReferential getInstalledPluginReferential(Collection<PluginI
   private static List<PluginManifest> getPluginManifestList(Collection<PluginInfo> metadata) {
     List<PluginManifest> pluginManifestList = newArrayList();
     for (PluginInfo plugin : metadata) {
-      if (!plugin.isCore()) {
-        pluginManifestList.add(toPluginManifest(plugin));
-      }
+      pluginManifestList.add(toPluginManifest(plugin));
     }
     return pluginManifestList;
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
@@ -25,7 +25,16 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nonnull;
 import org.apache.commons.io.FileUtils;
 import org.picocontainer.Startable;
 import org.sonar.api.Plugin;
@@ -38,17 +47,6 @@
 import org.sonar.core.platform.PluginLoader;
 import org.sonar.core.platform.PluginRepository;
 import org.sonar.server.platform.DefaultServerFileSystem;
-
-import javax.annotation.Nonnull;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.sonar.updatecenter.common.Version;
 
 import static com.google.common.collect.Iterables.transform;
@@ -73,7 +71,7 @@
 public class ServerPluginRepository implements PluginRepository, Startable {
 
   private static final Logger LOG = Loggers.get(ServerPluginRepository.class);
-  private static final String[] JAR_FILE_EXTENSIONS = new String[]{"jar"};
+  private static final String[] JAR_FILE_EXTENSIONS = new String[] {"jar"};
   private static final Set<String> DEFAULT_BLACKLISTED_PLUGINS = ImmutableSet.of("scmactivity", "issuesreport");
   private static final Joiner SLASH_JOINER = Joiner.on(" / ").skipNulls();
 
@@ -105,7 +103,6 @@ public void start() {
     loadPreInstalledPlugins();
     copyBundledPlugins();
     moveDownloadedPlugins();
-    loadCorePlugins();
     unloadIncompatiblePlugins();
     logInstalledPlugins();
     loadInstances();
@@ -208,13 +205,6 @@ private void overrideAndRegisterPlugin(File sourceFile, boolean deleteSource) {
     }
   }
 
-  private void loadCorePlugins() {
-    for (File file : listJarFiles(fs.getCorePluginsDir())) {
-      PluginInfo info = PluginInfo.create(file).setCore(true);
-      registerPluginInfo(info);
-    }
-  }
-
   /**
    * Removes the plugins that are not compatible with current environment.
    */
@@ -294,15 +284,13 @@ public void uninstall(String pluginKey) {
 
     for (String uninstallKey : uninstallKeys) {
       PluginInfo info = pluginInfosByKeys.get(uninstallKey);
-      if (!info.isCore()) {
-        try {
-          LOG.info("Uninstalling plugin {} [{}]", info.getName(), info.getKey());
-          // we don't reuse info.getFile() just to be sure that file is located in from extensions/plugins
-          File masterFile = new File(fs.getInstalledPluginsDir(), info.getNonNullJarFile().getName());
-          moveFileToDirectory(masterFile, uninstalledPluginsDir(), true);
-        } catch (IOException e) {
-          throw new IllegalStateException(format("Fail to uninstall plugin %s [%s]", info.getName(), info.getKey()), e);
-        }
+      try {
+        LOG.info("Uninstalling plugin {} [{}]", info.getName(), info.getKey());
+        // we don't reuse info.getFile() just to be sure that file is located in from extensions/plugins
+        File masterFile = new File(fs.getInstalledPluginsDir(), info.getNonNullJarFile().getName());
+        moveFileToDirectory(masterFile, uninstalledPluginsDir(), true);
+      } catch (IOException e) {
+        throw new IllegalStateException(format("Fail to uninstall plugin %s [%s]", info.getName(), info.getKey()), e);
       }
     }
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java
@@ -34,6 +34,7 @@
 import java.util.Collection;
 import java.util.SortedSet;
 
+import static com.google.common.collect.ImmutableSortedSet.copyOf;
 import static com.google.common.collect.Iterables.filter;
 import static org.sonar.server.plugins.ws.PluginWSCommons.NAME_KEY_PLUGIN_METADATA_COMPARATOR;
 
@@ -76,10 +77,7 @@ public void handle(Request request, Response response) throws Exception {
   }
 
   private SortedSet<PluginInfo> retrieveAndSortPluginMetadata() {
-    return ImmutableSortedSet.copyOf(
-      NAME_KEY_PLUGIN_METADATA_COMPARATOR,
-      filter(pluginRepository.getPluginInfos(), NotCorePluginsPredicate.INSTANCE)
-      );
+    return copyOf(NAME_KEY_PLUGIN_METADATA_COMPARATOR, pluginRepository.getPluginInfos());
   }
 
   private void writeMetadataList(JsonWriter jsonWriter, Collection<PluginInfo> pluginMetadatas) {
@@ -90,13 +88,4 @@ private void writeMetadataList(JsonWriter jsonWriter, Collection<PluginInfo> plu
     }
     jsonWriter.endArray();
   }
-
-  private enum NotCorePluginsPredicate implements Predicate<PluginInfo> {
-    INSTANCE;
-
-    @Override
-    public boolean apply(@Nullable PluginInfo input) {
-      return input != null && !input.isCore();
-    }
-  }
 }
diff --git a/...server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java b/...server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java
@@ -38,12 +38,4 @@ public void should_convert_info_to_plugin_referential() {
     assertThat(pluginReferential.getPlugins().get(0).getKey()).isEqualTo("foo");
   }
 
-  @Test
-  public void should_not_add_core_plugin() {
-    PluginInfo info = new PluginInfo("foo").setCore(true);
-
-    PluginReferential pluginReferential = PluginReferentialMetadataConverter.getInstalledPluginReferential(newArrayList(info));
-    assertThat(pluginReferential).isNotNull();
-    assertThat(pluginReferential.getPlugins()).hasSize(0);
-  }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
@@ -63,7 +63,6 @@ public class ServerPluginRepositoryTest {
   @Before
   public void setUp() throws IOException {
     when(fs.getBundledPluginsDir()).thenReturn(temp.newFolder());
-    when(fs.getCorePluginsDir()).thenReturn(temp.newFolder());
     when(fs.getDeployedPluginsDir()).thenReturn(temp.newFolder());
     when(fs.getDownloadedPluginsDir()).thenReturn(temp.newFolder());
     when(fs.getHomeDir()).thenReturn(temp.newFolder());
@@ -78,18 +77,17 @@ public void tearDown() {
   }
 
   /**
-   * The first server startup (fresh db) installs bundled plugins and instantiates bundled + core plugins.
+   * The first server startup (fresh db) installs bundled plugins and instantiates bundled plugins.
    */
   @Test
   public void first_startup_installs_bundled_plugins() throws Exception {
     copyTestPluginTo("test-base-plugin", fs.getBundledPluginsDir());
-    copyTestPluginTo("test-core-plugin", fs.getCorePluginsDir());
     when(upgradeStatus.isFreshInstall()).thenReturn(true);
 
     underTest.start();
 
     // both plugins are installed
-    assertThat(underTest.getPluginInfosByKeys()).containsOnlyKeys("core", "testbase");
+    assertThat(underTest.getPluginInfosByKeys()).containsOnlyKeys("testbase");
   }
 
   @Test
@@ -103,20 +101,14 @@ public void bundled_plugins_are_not_installed_if_not_fresh_server() throws Excep
   }
 
   @Test
-  public void standard_startup_loads_core_and_installed_plugins() throws Exception {
+  public void standard_startup_loads_installed_plugins() throws Exception {
     copyTestPluginTo("test-base-plugin", fs.getInstalledPluginsDir());
-    copyTestPluginTo("test-core-plugin", fs.getCorePluginsDir());
 
     underTest.start();
 
-    // both plugins are installed
-    assertThat(underTest.getPluginInfosByKeys()).containsOnlyKeys("core", "testbase");
+    assertThat(underTest.getPluginInfosByKeys()).containsOnlyKeys("testbase");
   }
 
-  /**
-   * That sounds impossible, there are still core plugins for now, but it's still valuable
-   * to test sensibility to null values.
-   */
   @Test
   public void no_plugins_at_all_on_startup() {
     underTest.start();

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.plugins.ws;
 
+import java.io.File;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -29,8 +30,6 @@
 import org.sonar.server.ws.WsTester;
 import org.sonar.updatecenter.common.Version;
 
-import java.io.File;
-
 import static com.google.common.collect.ImmutableList.of;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -77,20 +76,11 @@ public void empty_array_is_returned_when_there_is_not_plugin_installed() throws
     assertJson(response.outputAsString()).setStrictArrayOrder(true).isSimilarTo(JSON_EMPTY_PLUGIN_LIST);
   }
 
-  @Test
-  public void core_plugin_are_not_returned() throws Exception {
-    when(pluginRepository.getPluginInfos()).thenReturn(of(corePlugin("core1", "1.0")));
-
-    underTest.handle(request, response);
-
-    assertJson(response.outputAsString()).setStrictArrayOrder(true).isSimilarTo(JSON_EMPTY_PLUGIN_LIST);
-  }
-
   @Test
   public void empty_fields_are_not_serialized_to_json() throws Exception {
     when(pluginRepository.getPluginInfos()).thenReturn(
       of(
-      new PluginInfo("").setName("").setCore(false)
+      new PluginInfo("").setName("")
       )
       );
 
@@ -105,7 +95,6 @@ public void verify_properties_displayed_in_json_per_plugin() throws Exception {
     when(pluginRepository.getPluginInfos()).thenReturn(of(
       new PluginInfo("plugKey")
         .setName("plugName")
-        .setCore(false)
         .setDescription("desc_it")
         .setVersion(Version.create("1.0"))
         .setLicense("license_hey")
@@ -189,11 +178,7 @@ public void only_one_plugin_can_have_a_specific_name_and_key() throws Exception
     assertThat(response.outputAsString()).containsOnlyOnce("name2");
   }
 
-  private PluginInfo corePlugin(String key, String version) {
-    return new PluginInfo(key).setName(key).setCore(true).setVersion(Version.create(version));
-  }
-
   private PluginInfo plugin(String key, String name) {
-    return new PluginInfo(key).setName(name).setCore(false).setVersion(Version.create("1.0"));
+    return new PluginInfo(key).setName(name).setVersion(Version.create("1.0"));
   }
 }
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
@@ -78,14 +78,6 @@
       <scope>provided</scope>
     </dependencySet>
     <!-- Plugins -->
-    <dependencySet>
-      <outputDirectory>lib/core-plugins</outputDirectory>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-      <includes>
-        <include>org.codehaus.sonar.plugins:*</include>
-      </includes>
-      <scope>provided</scope>
-    </dependencySet>
     <dependencySet>
       <outputDirectory>lib/bundled-plugins</outputDirectory>
       <useTransitiveDependencies>false</useTransitiveDependencies>

diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java
@@ -51,7 +51,7 @@ public class BatchPluginInstallerTest {
   public void listRemotePlugins() {
 
     ServerClient server = mock(ServerClient.class);
-    when(server.request("/deploy/plugins/index.txt")).thenReturn("checkstyle,false\nsqale,false");
+    when(server.request("/deploy/plugins/index.txt")).thenReturn("checkstyle\nsqale");
     BatchPluginInstaller installer = new BatchPluginInstaller(server, fileCache, pluginPredicate);
 
     List<RemotePlugin> remotePlugins = installer.listRemotePlugins();
@@ -66,7 +66,7 @@ public void should_download_plugin() throws Exception {
     ServerClient server = mock(ServerClient.class);
     BatchPluginInstaller installer = new BatchPluginInstaller(server, fileCache, pluginPredicate);
 
-    RemotePlugin remote = new RemotePlugin("checkstyle", true).setFile("checkstyle-plugin.jar", "fakemd5_1");
+    RemotePlugin remote = new RemotePlugin("checkstyle").setFile("checkstyle-plugin.jar", "fakemd5_1");
     File file = installer.download(remote);
 
     assertThat(file).isEqualTo(pluginJar);

diff --git a/sonar-core/src/main/java/org/sonar/core/platform/PluginInfo.java b/sonar-core/src/main/java/org/sonar/core/platform/PluginInfo.java
@@ -133,8 +133,6 @@ public String toString() {
   @CheckForNull
   private String basePlugin;
 
-  private boolean core = false;
-
   @CheckForNull
   private String implementationBuild;
 
@@ -223,10 +221,6 @@ public String getBasePlugin() {
     return basePlugin;
   }
 
-  public boolean isCore() {
-    return core;
-  }
-
   @CheckForNull
   public String getImplementationBuild() {
     return implementationBuild;
@@ -305,11 +299,6 @@ public PluginInfo setBasePlugin(@Nullable String s) {
     return this;
   }
 
-  public PluginInfo setCore(boolean b) {
-    this.core = b;
-    return this;
-  }
-
   public PluginInfo setImplementationBuild(@Nullable String implementationBuild) {
     this.implementationBuild = implementationBuild;
     return this;