SONAR-6370 move the remaining extensions out of core plugin

plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java

@@ -19,14 +19,13 @@
  */
 package org.sonar.plugins.core;
 
-import com.google.common.collect.ImmutableList;
+import java.util.Collections;
 import java.util.List;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.Properties;
 import org.sonar.api.Property;
 import org.sonar.api.PropertyType;
 import org.sonar.api.SonarPlugin;
-import org.sonar.plugins.core.notifications.alerts.NewAlerts;
 
 @Properties({
   @Property(
@@ -190,17 +189,7 @@ public final class CorePlugin extends SonarPlugin {
   @SuppressWarnings("rawtypes")
   @Override
   public List getExtensions() {
-    ImmutableList.Builder<Object> extensions = ImmutableList.builder();
-
-    extensions.add(
-      DefaultResourceTypes.class,
-      UserManagedMetrics.class,
-
-      // Notify alerts on my favourite projects
-      NewAlerts.class,
-      NewAlerts.newMetadata());
-
-    return extensions.build();
+    return Collections.emptyList();
   }
 
 }

plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/notifications/alerts/NewAlerts.java → server/sonar-server/src/main/java/org/sonar/server/event/NewAlerts.java

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plugins.core.notifications.alerts;
+package org.sonar.server.event;
 
 import com.google.common.collect.Multimap;
 import org.sonar.api.notifications.*;

plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/package-info.java → server/sonar-server/src/main/java/org/sonar/server/event/package-info.java

@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+
 @ParametersAreNonnullByDefault
-package org.sonar.plugins.core.issue;
+package org.sonar.server.event;
 
 import javax.annotation.ParametersAreNonnullByDefault;

plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/UserManagedMetrics.java → server/sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java

@@ -17,15 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plugins.core;
+package org.sonar.server.metric;
 
 import com.google.common.collect.ImmutableList;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metrics;
 
 import java.util.List;
 
-public final class UserManagedMetrics implements Metrics {
+public final class CoreCustomMetrics implements Metrics {
   private static final String DOMAIN = "Management";
 
   @Override

plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/package-info.java → server/sonar-server/src/main/java/org/sonar/server/metric/package-info.java

@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+
 @ParametersAreNonnullByDefault
-package org.sonar.plugins.core.security;
+package org.sonar.server.metric;
 
 import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java

@@ -44,6 +44,7 @@
 import org.sonar.core.qualitygate.db.QualityGateConditionDao;
 import org.sonar.core.qualitygate.db.QualityGateDao;
 import org.sonar.core.resource.DefaultResourcePermissions;
+import org.sonar.core.resource.DefaultResourceTypes;
 import org.sonar.core.timemachine.Periods;
 import org.sonar.core.user.DefaultUserFinder;
 import org.sonar.core.user.HibernateUserFinder;
@@ -122,6 +123,7 @@
 import org.sonar.server.duplication.ws.DuplicationsWs;
 import org.sonar.server.es.IndexCreator;
 import org.sonar.server.es.IndexDefinitions;
+import org.sonar.server.event.NewAlerts;
 import org.sonar.server.issue.ActionService;
 import org.sonar.server.issue.AddTagsAction;
 import org.sonar.server.issue.AssignAction;
@@ -166,6 +168,7 @@
 import org.sonar.server.measure.template.ProjectFilter;
 import org.sonar.server.measure.ws.ManualMeasuresWs;
 import org.sonar.server.measure.ws.TimeMachineWs;
+import org.sonar.server.metric.CoreCustomMetrics;
 import org.sonar.server.metric.ws.MetricsWs;
 import org.sonar.server.notifications.NotificationCenter;
 import org.sonar.server.notifications.NotificationService;
@@ -340,6 +343,7 @@ protected void configureLevel() {
       DistributionAreaChart.class,
       Views.class,
       ResourceTypes.class,
+      DefaultResourceTypes.class,
       SettingsChangeNotifier.class,
       PageDecorations.class,
       DefaultResourcePermissions.class,
@@ -488,6 +492,7 @@ protected void configureLevel() {
       MeasureFilterEngine.class,
       ProjectFilter.class,
       MyFavouritesFilter.class,
+      CoreCustomMetrics.class,
       DefaultMetricFinder.class,
       ServerLifecycleNotifier.class,
       TimeMachineWs.class,
@@ -579,6 +584,7 @@ protected void configureLevel() {
       org.sonar.server.component.ws.AppAction.class,
       org.sonar.server.component.ws.SearchAction.class,
       EventsWs.class,
+      NewAlerts.class,
       ComponentCleanerService.class,
       ProvisionedAction.class,
       GhostsAction.class,

plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/notifications/alerts/NewAlertsTest.java → server/sonar-server/src/test/java/org/sonar/server/event/NewAlertsTest.java

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plugins.core.notifications.alerts;
+package org.sonar.server.event;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;

plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/UserManagedMetricsTest.java → server/sonar-server/src/test/java/org/sonar/server/metric/CoreCustomMetricsTest.java

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plugins.core;
+package org.sonar.server.metric;
 
 import org.junit.Test;
 import org.sonar.api.measures.Metric;
@@ -26,12 +26,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class UserManagedMetricsTest {
+public class CoreCustomMetricsTest {
 
   @Test
   public void checkDefinitions() {
-    UserManagedMetrics userManagedMetrics = new UserManagedMetrics();
-    List<Metric> metrics = userManagedMetrics.getMetrics();
+    CoreCustomMetrics coreCustomMetrics = new CoreCustomMetrics();
+    List<Metric> metrics = coreCustomMetrics.getMetrics();
     assertThat(metrics.size()).isGreaterThan(2);
     for (Metric metric : metrics) {
       assertThat(metric.getUserManaged()).isTrue();

sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java

@@ -75,6 +75,7 @@
 import org.sonar.batch.source.LinesSensor;
 import org.sonar.core.config.CorePropertyDefinitions;
 import org.sonar.core.notification.DefaultNotificationManager;
+import org.sonar.core.resource.DefaultResourceTypes;
 
 public class BatchComponents {
   private BatchComponents() {
@@ -83,6 +84,8 @@ private BatchComponents() {
 
   public static Collection all(DefaultAnalysisMode analysisMode) {
     List components = Lists.newArrayList(
+      DefaultResourceTypes.class,
+
       // Maven
       MavenProjectBootstrapper.class, MavenProjectConverter.class, MavenProjectBuilder.class,
 
@@ -104,8 +107,6 @@ public static Collection all(DefaultAnalysisMode analysisMode) {
       SourceProvider.class,
       RuleNameProvider.class,
 
-      QualityGateVerifier.class,
-
       // language
       LanguageDistributionDecorator.class,
 
@@ -120,6 +121,7 @@ public static Collection all(DefaultAnalysisMode analysisMode) {
 
       // Quality Gate
       GenerateQualityGateEvents.class,
+      QualityGateVerifier.class,
 
       // Issue tracking
       IssueTrackingDecorator.class,

plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java → sonar-core/src/main/java/org/sonar/core/resource/DefaultResourceTypes.java

@@ -17,15 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plugins.core;
+package org.sonar.core.resource;
 
-import org.sonar.api.batch.BatchSide;
 import org.sonar.api.ExtensionProvider;
-import org.sonar.api.server.ServerSide;
+import org.sonar.api.batch.BatchSide;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.ResourceType;
 import org.sonar.api.resources.ResourceTypeTree;
+import org.sonar.api.server.ServerSide;
 
 @BatchSide
 @ServerSide

plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java → sonar-core/src/test/java/org/sonar/core/resource/DefaultResourceTypesTest.java

@@ -17,12 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plugins.core;
-
-import org.sonar.api.resources.ResourceType;
+package org.sonar.core.resource;
 
 import org.junit.Test;
 import org.sonar.api.resources.Qualifiers;
+import org.sonar.api.resources.ResourceType;
 import org.sonar.api.resources.ResourceTypeTree;
 
 import static org.assertj.core.api.Assertions.assertThat;