SONAR-6370 remove concept of core plugin

4 files changed, 21 insertions, 45 deletions

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
index c11a618b0fd..63938311df0 100644
--- 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 class PluginInfo implements Comparable<PluginInfo> {
   @CheckForNull
   private String basePlugin;
 
-  private boolean core = false;
-
   @CheckForNull
   private String implementationBuild;
 
@@ -223,10 +221,6 @@ public class PluginInfo implements Comparable<PluginInfo> {
     return basePlugin;
   }
 
-  public boolean isCore() {
-    return core;
-  }
-
   @CheckForNull
   public String getImplementationBuild() {
     return implementationBuild;
@@ -305,11 +299,6 @@ public class PluginInfo implements Comparable<PluginInfo> {
     return this;
   }
 
-  public PluginInfo setCore(boolean b) {
-    this.core = b;
-    return this;
-  }
-
   public PluginInfo setImplementationBuild(@Nullable String implementationBuild) {
     this.implementationBuild = implementationBuild;
     return this;
diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java b/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
index 559faeb5a1a..f460118d445 100644
--- a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
@@ -19,33 +19,30 @@
  */
 package org.sonar.core.plugins;
 
+import java.io.File;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.core.platform.PluginInfo;
 import org.sonar.home.cache.FileHashes;
 
-import java.io.File;
-
 public class RemotePlugin {
   private String pluginKey;
   private RemotePluginFile file = null;
-  private boolean core;
 
-  public RemotePlugin(String pluginKey, boolean core) {
+  public RemotePlugin(String pluginKey) {
     this.pluginKey = pluginKey;
-    this.core = core;
   }
 
   public static RemotePlugin create(PluginInfo pluginInfo) {
-    RemotePlugin result = new RemotePlugin(pluginInfo.getKey(), pluginInfo.isCore());
+    RemotePlugin result = new RemotePlugin(pluginInfo.getKey());
     result.setFile(pluginInfo.getNonNullJarFile());
     return result;
   }
 
   public static RemotePlugin unmarshal(String row) {
     String[] fields = StringUtils.split(row, ",");
-    RemotePlugin result = new RemotePlugin(fields[0], Boolean.parseBoolean(fields[1]));
-    if (fields.length > 2) {
-      String[] nameAndHash = StringUtils.split(fields[2], "|");
+    RemotePlugin result = new RemotePlugin(fields[0]);
+    if (fields.length >= 2) {
+      String[] nameAndHash = StringUtils.split(fields[1], "|");
       result.setFile(nameAndHash[0], nameAndHash[1]);
     }
     return result;
@@ -53,8 +50,7 @@ public class RemotePlugin {
 
   public String marshal() {
     StringBuilder sb = new StringBuilder();
-    sb.append(pluginKey).append(",");
-    sb.append(String.valueOf(core));
+    sb.append(pluginKey);
     sb.append(",").append(file.getFilename()).append("|").append(file.getHash());
     return sb.toString();
   }
@@ -63,10 +59,6 @@ public class RemotePlugin {
     return pluginKey;
   }
 
-  public boolean isCore() {
-    return core;
-  }
-
   public RemotePlugin setFile(String filename, String hash) {
     file = new RemotePluginFile(filename, hash);
     return this;
diff --git a/sonar-core/src/test/java/org/sonar/core/platform/PluginInfoTest.java b/sonar-core/src/test/java/org/sonar/core/platform/PluginInfoTest.java
index d64a7323ff7..22f5e462afe 100644
--- a/sonar-core/src/test/java/org/sonar/core/platform/PluginInfoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/platform/PluginInfoTest.java
@@ -19,6 +19,11 @@
  */
 package org.sonar.core.platform;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -26,13 +31,6 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.updatecenter.common.PluginManifest;
 import org.sonar.updatecenter.common.Version;
 
-import javax.annotation.Nullable;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
 import static com.google.common.collect.Ordering.natural;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
@@ -60,7 +58,7 @@ public class PluginInfoTest {
   }
 
   @Test
-   public void test_comparison() {
+  public void test_comparison() {
     PluginInfo java1 = new PluginInfo("java").setVersion(Version.create("1.0"));
     PluginInfo java2 = new PluginInfo("java").setVersion(Version.create("2.0"));
     PluginInfo javaNoVersion = new PluginInfo("java");
@@ -142,7 +140,6 @@ public class PluginInfoTest {
     assertThat(pluginInfo.getVersion().getName()).isEqualTo("1.0");
     assertThat(pluginInfo.getJarFile()).isSameAs(jarFile);
     assertThat(pluginInfo.getMainClass()).isEqualTo("org.foo.FooPlugin");
-    assertThat(pluginInfo.isCore()).isFalse();
     assertThat(pluginInfo.getBasePlugin()).isNull();
     assertThat(pluginInfo.getDescription()).isNull();
     assertThat(pluginInfo.getHomepageUrl()).isNull();
@@ -171,10 +168,10 @@ public class PluginInfoTest {
     manifest.setOrganization("SonarSource");
     manifest.setOrganizationUrl("http://sonarsource.com");
     manifest.setIssueTrackerUrl("http://jira.com");
-    manifest.setRequirePlugins(new String[]{"java:2.0", "pmd:1.3"});
+    manifest.setRequirePlugins(new String[] {"java:2.0", "pmd:1.3"});
 
     File jarFile = temp.newFile();
-    PluginInfo pluginInfo = PluginInfo.create(jarFile, manifest).setCore(true);
+    PluginInfo pluginInfo = PluginInfo.create(jarFile, manifest);
 
     assertThat(pluginInfo.getBasePlugin()).isEqualTo("findbugs");
     assertThat(pluginInfo.getDescription()).isEqualTo("the desc");
@@ -186,7 +183,6 @@ public class PluginInfoTest {
     assertThat(pluginInfo.getOrganizationUrl()).isEqualTo("http://sonarsource.com");
     assertThat(pluginInfo.getMinimalSqVersion().getName()).isEqualTo("4.5.1");
     assertThat(pluginInfo.getRequiredPlugins()).extracting("key").containsOnly("java", "pmd");
-    assertThat(pluginInfo.isCore()).isTrue();
   }
 
   @Test
diff --git a/sonar-core/src/test/java/org/sonar/core/plugins/RemotePluginTest.java b/sonar-core/src/test/java/org/sonar/core/plugins/RemotePluginTest.java
index 210813650b4..7649e0e13a1 100644
--- a/sonar-core/src/test/java/org/sonar/core/plugins/RemotePluginTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/plugins/RemotePluginTest.java
@@ -27,9 +27,9 @@ import static org.junit.Assert.assertThat;
 public class RemotePluginTest {
   @Test
   public void shouldEqual() {
-    RemotePlugin clirr1 = new RemotePlugin("clirr", false);
-    RemotePlugin clirr2 = new RemotePlugin("clirr", false);
-    RemotePlugin checkstyle = new RemotePlugin("checkstyle", true);
+    RemotePlugin clirr1 = new RemotePlugin("clirr");
+    RemotePlugin clirr2 = new RemotePlugin("clirr");
+    RemotePlugin checkstyle = new RemotePlugin("checkstyle");
     assertThat(clirr1.equals(clirr2), is(true));
     assertThat(clirr1.equals(clirr1), is(true));
     assertThat(clirr1.equals(checkstyle), is(false));
@@ -37,16 +37,15 @@ public class RemotePluginTest {
 
   @Test
   public void shouldMarshal() {
-    RemotePlugin clirr = new RemotePlugin("clirr", false).setFile("clirr-1.1.jar", "fakemd5");
+    RemotePlugin clirr = new RemotePlugin("clirr").setFile("clirr-1.1.jar", "fakemd5");
     String text = clirr.marshal();
-    assertThat(text, is("clirr,false,clirr-1.1.jar|fakemd5"));
+    assertThat(text, is("clirr,clirr-1.1.jar|fakemd5"));
   }
 
   @Test
   public void shouldUnmarshal() {
-    RemotePlugin clirr = RemotePlugin.unmarshal("clirr,false,clirr-1.1.jar|fakemd5");
+    RemotePlugin clirr = RemotePlugin.unmarshal("clirr,clirr-1.1.jar|fakemd5");
     assertThat(clirr.getKey(), is("clirr"));
-    assertThat(clirr.isCore(), is(false));
     assertThat(clirr.file().getFilename(), is("clirr-1.1.jar"));
     assertThat(clirr.file().getHash(), is("fakemd5"));
   }