SONAR-5389 Rename Analyzer -> Sensor

24 files changed, 161 insertions, 147 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/Sensor.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/Sensor.java
index fc055e6da5c..7a82bc24015 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/Sensor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/Sensor.java
@@ -40,7 +40,9 @@ import org.sonar.api.resources.Project;
  * </p>
  *
  * @since 1.10
+ * @deprecated since 4.5 use {@link org.sonar.api.batch.sensor.Sensor}
  */
+@Deprecated
 public interface Sensor extends BatchExtension, CheckProject {
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SensorContext.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SensorContext.java
index ccdec2dbf2f..2c8332ee0c5 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SensorContext.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SensorContext.java
@@ -38,6 +38,7 @@ import java.util.Set;
 
 /**
  * @since 1.10
+ * @deprecated since 4.5
  */
 public interface SensorContext {
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/internal/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/internal/package-info.java
deleted file mode 100644
index a508e1eacb0..00000000000
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/internal/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.api.batch.analyzer.measure.internal;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/Analyzer.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/Sensor.java
index c551226895c..17a963e54c4 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/Analyzer.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/Sensor.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.api.batch.analyzer;
+package org.sonar.api.batch.sensor;
 
 import com.google.common.annotations.Beta;
 import org.sonar.api.BatchExtension;
@@ -35,16 +35,16 @@ import org.sonar.api.BatchExtension;
  * @since 4.4
  */
 @Beta
-public interface Analyzer extends BatchExtension {
+public interface Sensor extends BatchExtension {
 
   /**
-   * Populate {@link AnalyzerDescriptor} of this analyzer.
+   * Populate {@link SensorDescriptor} of this analyzer.
    */
-  void describe(AnalyzerDescriptor descriptor);
+  void describe(SensorDescriptor descriptor);
 
   /**
    * The actual analyzer code.
    */
-  void analyse(AnalyzerContext context);
+  void analyse(SensorContext context);
 
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/AnalyzerContext.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorContext.java
index 244d0f93001..873fed63243 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/AnalyzerContext.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorContext.java
@@ -17,13 +17,14 @@
  * 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.api.batch.analyzer;
+package org.sonar.api.batch.sensor;
+
+import org.sonar.api.batch.sensor.issue.Issue;
+import org.sonar.api.batch.sensor.issue.IssueBuilder;
+import org.sonar.api.batch.sensor.measure.Measure;
+import org.sonar.api.batch.sensor.measure.MeasureBuilder;
 
 import com.google.common.annotations.Beta;
-import org.sonar.api.batch.analyzer.issue.AnalyzerIssue;
-import org.sonar.api.batch.analyzer.issue.AnalyzerIssueBuilder;
-import org.sonar.api.batch.analyzer.measure.AnalyzerMeasure;
-import org.sonar.api.batch.analyzer.measure.AnalyzerMeasureBuilder;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.Metric;
@@ -38,7 +39,7 @@ import java.io.Serializable;
  * @since 4.4
  */
 @Beta
-public interface AnalyzerContext {
+public interface SensorContext {
 
   /**
    * Get settings of the current project.
@@ -58,50 +59,50 @@ public interface AnalyzerContext {
   // ----------- MEASURES --------------
 
   /**
-   * Builder to create a new {@link AnalyzerMeasure}.
+   * Builder to create a new {@link Measure}.
    */
-  <G extends Serializable> AnalyzerMeasureBuilder<G> measureBuilder();
+  <G extends Serializable> MeasureBuilder<G> measureBuilder();
 
   /**
    * Find a project measure.
    */
   @CheckForNull
-  AnalyzerMeasure getMeasure(String metricKey);
+  Measure getMeasure(String metricKey);
 
   /**
    * Find a project measure.
    */
   @CheckForNull
-  <G extends Serializable> AnalyzerMeasure<G> getMeasure(Metric<G> metric);
+  <G extends Serializable> Measure<G> getMeasure(Metric<G> metric);
 
   /**
    * Find a file measure.
    */
   @CheckForNull
-  AnalyzerMeasure getMeasure(InputFile file, String metricKey);
+  Measure getMeasure(InputFile file, String metricKey);
 
   /**
    * Find a file measure.
    */
   @CheckForNull
-  <G extends Serializable> AnalyzerMeasure<G> getMeasure(InputFile file, Metric<G> metric);
+  <G extends Serializable> Measure<G> getMeasure(InputFile file, Metric<G> metric);
 
   /**
    * Add a measure. Use {@link #measureBuilder()} to create the new measure.
    */
-  void addMeasure(AnalyzerMeasure<?> measure);
+  void addMeasure(Measure<?> measure);
 
   // ----------- ISSUES --------------
 
   /**
-   * Builder to create a new {@link AnalyzerIssue}.
+   * Builder to create a new {@link Issue}.
    */
-  AnalyzerIssueBuilder issueBuilder();
+  IssueBuilder issueBuilder();
 
   /**
    * Add an issue. Use {@link #issueBuilder()} to create the new issue.
    * @return true if the new issue is registered, false if the related rule does not exist or is disabled in the Quality profile.
    */
-  boolean addIssue(AnalyzerIssue issue);
+  boolean addIssue(Issue issue);
 
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/AnalyzerDescriptor.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorDescriptor.java
index 3e38e5da708..b25f00ef2ec 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/AnalyzerDescriptor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorDescriptor.java
@@ -17,54 +17,54 @@
  * 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.api.batch.analyzer;
+package org.sonar.api.batch.sensor;
 
 import com.google.common.annotations.Beta;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.Metric;
 
 /**
- * Describe what an {@link Analyzer} is doing. Information may be used by the platform
+ * Describe what an {@link Sensor} is doing. Information may be used by the platform
  * to log interesting information or perform some optimization.
  * @since 4.4
  */
 @Beta
-public interface AnalyzerDescriptor {
+public interface SensorDescriptor {
 
   /**
-   * Name of the {@link Analyzer}. Will be displayed in logs.
+   * Name of the {@link Sensor}. Will be displayed in logs.
    */
-  AnalyzerDescriptor name(String name);
+  SensorDescriptor name(String name);
 
   /**
-   * List {@link Metric} this {@link Analyzer} depends on. Will be used to execute Analyzers in correct order.
+   * List {@link Metric} this {@link Sensor} depends on. Will be used to execute Analyzers in correct order.
    */
-  AnalyzerDescriptor dependsOn(Metric<?>... metrics);
+  SensorDescriptor dependsOn(Metric<?>... metrics);
 
   /**
-   * List {@link Metric} this {@link Analyzer} provides. Will be used to execute Analyzers in correct order.
+   * List {@link Metric} this {@link Sensor} provides. Will be used to execute Analyzers in correct order.
    */
-  AnalyzerDescriptor provides(Metric<?>... metrics);
+  SensorDescriptor provides(Metric<?>... metrics);
 
   /**
-   * List languages this {@link Analyzer} work on. May be used by the platform to skip execution of the {@link Analyzer} when
+   * List languages this {@link Sensor} work on. May be used by the platform to skip execution of the {@link Sensor} when
    * no file for given languages are present in the project.
    * If no language is provided then it will be executed for all languages.
    */
-  AnalyzerDescriptor workOnLanguages(String... languageKeys);
+  SensorDescriptor workOnLanguages(String... languageKeys);
 
   /**
-   * List {@link InputFile.Type} this {@link Analyzer} work on. May be used by the platform to skip execution of the {@link Analyzer} when
+   * List {@link InputFile.Type} this {@link Sensor} work on. May be used by the platform to skip execution of the {@link Sensor} when
    * no file for given type are present in the project.
    * If not type is provided then it will be executed for all types.
    */
-  AnalyzerDescriptor workOnFileTypes(InputFile.Type... types);
+  SensorDescriptor workOnFileTypes(InputFile.Type... types);
 
   /**
-   * List {@link InputFile.Type} this {@link Analyzer} work on. May be used by the platform to skip execution of the {@link Analyzer} when
+   * List {@link InputFile.Type} this {@link Sensor} work on. May be used by the platform to skip execution of the {@link Sensor} when
    * no file for given type are present in the project.
    * If not type is provided then it will be executed for all types.
    */
-  AnalyzerDescriptor createIssuesForRuleRepositories(String... repositoryKeys);
+  SensorDescriptor createIssuesForRuleRepositories(String... repositoryKeys);
 
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/internal/DefaultAnalyzerDescriptor.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/DefaultSensorDescriptor.java
index 3f793c98a64..a371fc57fb8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/internal/DefaultAnalyzerDescriptor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/DefaultSensorDescriptor.java
@@ -17,16 +17,17 @@
  * 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.api.batch.analyzer.internal;
+package org.sonar.api.batch.sensor.internal;
+
+import org.sonar.api.batch.sensor.SensorDescriptor;
 
-import org.sonar.api.batch.analyzer.AnalyzerDescriptor;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.Metric;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-public class DefaultAnalyzerDescriptor implements AnalyzerDescriptor {
+public class DefaultSensorDescriptor implements SensorDescriptor {
 
   private String name;
   private Metric<?>[] dependsOn = new Metric<?>[0];
@@ -60,37 +61,37 @@ public class DefaultAnalyzerDescriptor implements AnalyzerDescriptor {
   }
 
   @Override
-  public DefaultAnalyzerDescriptor name(String name) {
+  public DefaultSensorDescriptor name(String name) {
     this.name = name;
     return this;
   }
 
   @Override
-  public DefaultAnalyzerDescriptor dependsOn(Metric<?>... metrics) {
+  public DefaultSensorDescriptor dependsOn(Metric<?>... metrics) {
     this.dependsOn = metrics;
     return this;
   }
 
   @Override
-  public DefaultAnalyzerDescriptor provides(Metric<?>... metrics) {
+  public DefaultSensorDescriptor provides(Metric<?>... metrics) {
     this.provides = metrics;
     return this;
   }
 
   @Override
-  public DefaultAnalyzerDescriptor workOnLanguages(String... languageKeys) {
+  public DefaultSensorDescriptor workOnLanguages(String... languageKeys) {
     this.languages = languageKeys;
     return this;
   }
 
   @Override
-  public DefaultAnalyzerDescriptor workOnFileTypes(InputFile.Type... types) {
+  public DefaultSensorDescriptor workOnFileTypes(InputFile.Type... types) {
     this.types = types;
     return this;
   }
 
   @Override
-  public DefaultAnalyzerDescriptor createIssuesForRuleRepositories(String... repositoryKeys) {
+  public DefaultSensorDescriptor createIssuesForRuleRepositories(String... repositoryKeys) {
     this.ruleRepositories = repositoryKeys;
     return this;
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/package-info.java
index a72c5a175f1..9b5158a8767 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/package-info.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.api.batch.analyzer.measure;
+package org.sonar.api.batch.sensor.internal;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/AnalyzerIssue.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/Issue.java
index 9a9ce1bcaee..713b86d6ba3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/AnalyzerIssue.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/Issue.java
@@ -17,22 +17,23 @@
  * 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.api.batch.analyzer.issue;
+package org.sonar.api.batch.sensor.issue;
+
+import org.sonar.api.batch.sensor.Sensor;
 
 import com.google.common.annotations.Beta;
-import org.sonar.api.batch.analyzer.Analyzer;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.rule.RuleKey;
 
 import javax.annotation.Nullable;
 
 /**
- * Issue reported by an {@link Analyzer}
+ * Issue reported by an {@link Sensor}
  *
  * @since 4.4
  */
 @Beta
-public interface AnalyzerIssue {
+public interface Issue {
 
   /**
    * The {@link InputFile} this issue belongs to. Returns null if issue is global to the project.
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/AnalyzerIssueBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/IssueBuilder.java
index 12969a5f574..6b962d6bdcf 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/AnalyzerIssueBuilder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/IssueBuilder.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.api.batch.analyzer.issue;
+package org.sonar.api.batch.sensor.issue;
 
 import com.google.common.annotations.Beta;
 import org.sonar.api.batch.fs.InputFile;
@@ -26,46 +26,46 @@ import org.sonar.api.rule.RuleKey;
 import javax.annotation.Nullable;
 
 /**
- * Builder for {@link AnalyzerIssue}.
+ * Builder for {@link Issue}.
  *
  * @since 4.4
  */
 @Beta
-public interface AnalyzerIssueBuilder {
+public interface IssueBuilder {
 
   /**
    * The {@link RuleKey} of the issue.
    */
-  AnalyzerIssueBuilder ruleKey(RuleKey ruleKey);
+  IssueBuilder ruleKey(RuleKey ruleKey);
 
   /**
    * The {@link InputFile} the issue belongs to. For global issues call {@link #onProject()}.
    */
-  AnalyzerIssueBuilder onFile(InputFile file);
+  IssueBuilder onFile(InputFile file);
 
   /**
    * Tell that the issue is global to the project.
    */
-  AnalyzerIssueBuilder onProject();
+  IssueBuilder onProject();
 
   /**
    * Line of the issue. If no line is specified then issue is supposed to be global to the file.
    */
-  AnalyzerIssueBuilder atLine(int line);
+  IssueBuilder atLine(int line);
 
   /**
    * Effort to fix the issue.
    */
-  AnalyzerIssueBuilder effortToFix(@Nullable Double effortToFix);
+  IssueBuilder effortToFix(@Nullable Double effortToFix);
 
   /**
    * Message of the issue.
    */
-  AnalyzerIssueBuilder message(String message);
+  IssueBuilder message(String message);
 
   /**
    * Build the issue.
    */
-  AnalyzerIssue build();
+  Issue build();
 
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/internal/DefaultAnalyzerIssue.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssue.java
index ba75d12fca7..d20d5c7700e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/internal/DefaultAnalyzerIssue.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssue.java
@@ -17,13 +17,14 @@
  * 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.api.batch.analyzer.issue.internal;
+package org.sonar.api.batch.sensor.issue.internal;
+
+import org.sonar.api.batch.sensor.issue.Issue;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.sonar.api.batch.analyzer.issue.AnalyzerIssue;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.rule.RuleKey;
 
@@ -32,7 +33,7 @@ import javax.annotation.Nullable;
 import java.io.Serializable;
 import java.util.UUID;
 
-public class DefaultAnalyzerIssue implements AnalyzerIssue, Serializable {
+public class DefaultIssue implements Issue, Serializable {
 
   private final String key;
   private final InputFile inputFile;
@@ -41,7 +42,7 @@ public class DefaultAnalyzerIssue implements AnalyzerIssue, Serializable {
   private final Integer line;
   private final Double effortToFix;
 
-  DefaultAnalyzerIssue(DefaultAnalyzerIssueBuilder builder) {
+  DefaultIssue(DefaultIssueBuilder builder) {
     Preconditions.checkNotNull(builder.ruleKey, "ruleKey is mandatory on issue");
     this.inputFile = builder.file;
     this.ruleKey = builder.ruleKey;
@@ -91,7 +92,7 @@ public class DefaultAnalyzerIssue implements AnalyzerIssue, Serializable {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    DefaultAnalyzerIssue that = (DefaultAnalyzerIssue) o;
+    DefaultIssue that = (DefaultIssue) o;
     return !key.equals(that.key);
   }
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/internal/DefaultAnalyzerIssueBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueBuilder.java
index 42a6b970380..8d8249d3058 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/internal/DefaultAnalyzerIssueBuilder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueBuilder.java
@@ -17,17 +17,18 @@
  * 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.api.batch.analyzer.issue.internal;
+package org.sonar.api.batch.sensor.issue.internal;
+
+import org.sonar.api.batch.sensor.issue.Issue;
+import org.sonar.api.batch.sensor.issue.IssueBuilder;
 
 import com.google.common.base.Preconditions;
-import org.sonar.api.batch.analyzer.issue.AnalyzerIssue;
-import org.sonar.api.batch.analyzer.issue.AnalyzerIssueBuilder;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.rule.RuleKey;
 
 import javax.annotation.Nullable;
 
-public class DefaultAnalyzerIssueBuilder implements AnalyzerIssueBuilder {
+public class DefaultIssueBuilder implements IssueBuilder {
 
   String key;
   Boolean onProject = null;
@@ -38,13 +39,13 @@ public class DefaultAnalyzerIssueBuilder implements AnalyzerIssueBuilder {
   Double effortToFix;
 
   @Override
-  public DefaultAnalyzerIssueBuilder ruleKey(RuleKey ruleKey) {
+  public DefaultIssueBuilder ruleKey(RuleKey ruleKey) {
     this.ruleKey = ruleKey;
     return this;
   }
 
   @Override
-  public DefaultAnalyzerIssueBuilder onFile(InputFile file) {
+  public DefaultIssueBuilder onFile(InputFile file) {
     onProject(false);
     Preconditions.checkNotNull(file, "InputFile should be non null");
     this.file = file;
@@ -52,7 +53,7 @@ public class DefaultAnalyzerIssueBuilder implements AnalyzerIssueBuilder {
   }
 
   @Override
-  public DefaultAnalyzerIssueBuilder onProject() {
+  public DefaultIssueBuilder onProject() {
     onProject(true);
     this.file = null;
     return this;
@@ -64,19 +65,19 @@ public class DefaultAnalyzerIssueBuilder implements AnalyzerIssueBuilder {
   }
 
   @Override
-  public DefaultAnalyzerIssueBuilder atLine(int line) {
+  public DefaultIssueBuilder atLine(int line) {
     this.line = line;
     return this;
   }
 
   @Override
-  public DefaultAnalyzerIssueBuilder effortToFix(@Nullable Double effortToFix) {
+  public DefaultIssueBuilder effortToFix(@Nullable Double effortToFix) {
     this.effortToFix = effortToFix;
     return this;
   }
 
   @Override
-  public DefaultAnalyzerIssueBuilder message(String message) {
+  public DefaultIssueBuilder message(String message) {
     this.message = message;
     return this;
   }
@@ -84,14 +85,14 @@ public class DefaultAnalyzerIssueBuilder implements AnalyzerIssueBuilder {
   /**
    * For testing only.
    */
-  public DefaultAnalyzerIssueBuilder withKey(String key) {
+  public DefaultIssueBuilder withKey(String key) {
     this.key = key;
     return this;
   }
 
   @Override
-  public AnalyzerIssue build() {
-    return new DefaultAnalyzerIssue(this);
+  public Issue build() {
+    return new DefaultIssue(this);
   }
 
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/package-info.java
new file mode 100644
index 00000000000..85fd63f9fff
--- /dev/null
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/internal/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@javax.annotation.ParametersAreNonnullByDefault
+package org.sonar.api.batch.sensor.issue.internal;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/package-info.java
index 7ccdcaf5e21..6cc03c47d89 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/package-info.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.api.batch.analyzer.issue;
+package org.sonar.api.batch.sensor.issue;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/AnalyzerMeasure.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/Measure.java
index 4c33ff1e391..ea606d45bd8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/AnalyzerMeasure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/Measure.java
@@ -17,10 +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.api.batch.analyzer.measure;
+package org.sonar.api.batch.sensor.measure;
+
+import org.sonar.api.batch.sensor.Sensor;
 
 import com.google.common.annotations.Beta;
-import org.sonar.api.batch.analyzer.Analyzer;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.Metric;
 
@@ -29,11 +30,11 @@ import javax.annotation.Nullable;
 import java.io.Serializable;
 
 /**
- * A measure computed by an {@link Analyzer}.
+ * A measure computed by an {@link Sensor}.
  * @since 4.4
  */
 @Beta
-public interface AnalyzerMeasure<G extends Serializable> {
+public interface Measure<G extends Serializable> {
 
   /**
    * The {@link InputFile} this measure belongs to. Returns null if measure is global to the project.
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/AnalyzerMeasureBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/MeasureBuilder.java
index b837f85ab85..05b16bee932 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/AnalyzerMeasureBuilder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/MeasureBuilder.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.api.batch.analyzer.measure;
+package org.sonar.api.batch.sensor.measure;
 
 import org.sonar.api.batch.measure.Metric;
 
@@ -27,34 +27,34 @@ import org.sonar.api.batch.fs.InputFile;
 import java.io.Serializable;
 
 /**
- * Builder to create new {@link AnalyzerMeasure}
+ * Builder to create new {@link Measure}
  * @since 4.4
  */
 @Beta
-public interface AnalyzerMeasureBuilder<G extends Serializable> {
+public interface MeasureBuilder<G extends Serializable> {
 
   /**
    * The file the measure belongs to.
    */
-  AnalyzerMeasureBuilder<G> onFile(InputFile file);
+  MeasureBuilder<G> onFile(InputFile file);
 
   /**
    * Tell that the measure is global to the project.
    */
-  AnalyzerMeasureBuilder<G> onProject();
+  MeasureBuilder<G> onProject();
 
   /**
    * The metric this measure belong to.
    */
-  AnalyzerMeasureBuilder<G> forMetric(Metric<G> metric);
+  MeasureBuilder<G> forMetric(Metric<G> metric);
 
   /**
    * Value of the measure.
    */
-  AnalyzerMeasureBuilder<G> withValue(G value);
+  MeasureBuilder<G> withValue(G value);
 
   /**
    * Build the measure.
    */
-  AnalyzerMeasure<G> build();
+  Measure<G> build();
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/internal/DefaultAnalyzerMeasure.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasure.java
index 1e0f6964168..6664a055b8a 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/internal/DefaultAnalyzerMeasure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasure.java
@@ -17,14 +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.api.batch.analyzer.measure.internal;
+package org.sonar.api.batch.sensor.measure.internal;
+
+import org.sonar.api.batch.sensor.measure.Measure;
 
 import com.google.common.base.Preconditions;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.sonar.api.batch.analyzer.measure.AnalyzerMeasure;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.Metric;
 
@@ -32,13 +33,13 @@ import javax.annotation.Nullable;
 
 import java.io.Serializable;
 
-public class DefaultAnalyzerMeasure<G extends Serializable> implements AnalyzerMeasure<G>, Serializable {
+public class DefaultMeasure<G extends Serializable> implements Measure<G>, Serializable {
 
   private final InputFile inputFile;
   private final Metric<G> metric;
   private final G value;
 
-  DefaultAnalyzerMeasure(DefaultAnalyzerMeasureBuilder<G> builder) {
+  DefaultMeasure(DefaultMeasureBuilder<G> builder) {
     Preconditions.checkNotNull(builder.value, "Measure value can't be null");
     Preconditions.checkNotNull(builder.metric, "Measure metric can't be null");
     Preconditions.checkState(builder.metric.valueType().equals(builder.value.getClass()), "Measure value should be of type " + builder.metric.valueType());
@@ -74,7 +75,7 @@ public class DefaultAnalyzerMeasure<G extends Serializable> implements AnalyzerM
     if (obj.getClass() != getClass()) {
       return false;
     }
-    DefaultAnalyzerMeasure rhs = (DefaultAnalyzerMeasure) obj;
+    DefaultMeasure rhs = (DefaultMeasure) obj;
     return new EqualsBuilder()
       .append(inputFile, rhs.inputFile)
       .append(metric, rhs.metric)
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/internal/DefaultAnalyzerMeasureBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureBuilder.java
index 76de69c6ce4..a1ef2e508d9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/measure/internal/DefaultAnalyzerMeasureBuilder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureBuilder.java
@@ -17,16 +17,17 @@
  * 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.api.batch.analyzer.measure.internal;
+package org.sonar.api.batch.sensor.measure.internal;
+
+import org.sonar.api.batch.sensor.measure.MeasureBuilder;
 
 import com.google.common.base.Preconditions;
-import org.sonar.api.batch.analyzer.measure.AnalyzerMeasureBuilder;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.Metric;
 
 import java.io.Serializable;
 
-public class DefaultAnalyzerMeasureBuilder<G extends Serializable> implements AnalyzerMeasureBuilder<G> {
+public class DefaultMeasureBuilder<G extends Serializable> implements MeasureBuilder<G> {
 
   Boolean onProject = null;
   InputFile file;
@@ -34,7 +35,7 @@ public class DefaultAnalyzerMeasureBuilder<G extends Serializable> implements An
   G value;
 
   @Override
-  public DefaultAnalyzerMeasureBuilder<G> onFile(InputFile inputFile) {
+  public DefaultMeasureBuilder<G> onFile(InputFile inputFile) {
     onProject(false);
     Preconditions.checkNotNull(inputFile, "inputFile should be non null");
     this.file = inputFile;
@@ -42,7 +43,7 @@ public class DefaultAnalyzerMeasureBuilder<G extends Serializable> implements An
   }
 
   @Override
-  public DefaultAnalyzerMeasureBuilder<G> onProject() {
+  public DefaultMeasureBuilder<G> onProject() {
     onProject(true);
     this.file = null;
     return this;
@@ -54,7 +55,7 @@ public class DefaultAnalyzerMeasureBuilder<G extends Serializable> implements An
   }
 
   @Override
-  public DefaultAnalyzerMeasureBuilder<G> forMetric(Metric<G> metric) {
+  public DefaultMeasureBuilder<G> forMetric(Metric<G> metric) {
     Preconditions.checkState(metric != null, "Metric already defined");
     Preconditions.checkNotNull(metric, "metric should be non null");
     this.metric = metric;
@@ -62,7 +63,7 @@ public class DefaultAnalyzerMeasureBuilder<G extends Serializable> implements An
   }
 
   @Override
-  public DefaultAnalyzerMeasureBuilder<G> withValue(G value) {
+  public DefaultMeasureBuilder<G> withValue(G value) {
     Preconditions.checkState(this.value == null, "Measure value already defined");
     Preconditions.checkNotNull(value, "Measure value can't be null");
     this.value = value;
@@ -70,7 +71,7 @@ public class DefaultAnalyzerMeasureBuilder<G extends Serializable> implements An
   }
 
   @Override
-  public DefaultAnalyzerMeasure<G> build() {
-    return new DefaultAnalyzerMeasure<G>(this);
+  public DefaultMeasure<G> build() {
+    return new DefaultMeasure<G>(this);
   }
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/internal/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/internal/package-info.java
index 4034ce7fdfa..414484da3ca 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/issue/internal/package-info.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/internal/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.api.batch.analyzer.issue.internal;
+package org.sonar.api.batch.sensor.measure.internal;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/internal/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/package-info.java
index b61bc2267b8..92eba8a28f1 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/internal/package-info.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/measure/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.api.batch.analyzer.internal;
+package org.sonar.api.batch.sensor.measure;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/package-info.java
index 4ae26db9bf1..0b6b56aa15f 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/package-info.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.api.batch.analyzer;
+package org.sonar.api.batch.sensor;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/analyzer/internal/DefaultAnalyzerDescriptorTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/internal/DefaultSensorDescriptorTest.java
index b55bae7bf75..fc91edc8ce1 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/analyzer/internal/DefaultAnalyzerDescriptorTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/internal/DefaultSensorDescriptorTest.java
@@ -17,19 +17,20 @@
  * 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.api.batch.analyzer.internal;
+package org.sonar.api.batch.sensor.internal;
+
+import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor;
 
 import org.junit.Test;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.measures.CoreMetrics;
-
 import static org.fest.assertions.Assertions.assertThat;
 
-public class DefaultAnalyzerDescriptorTest {
+public class DefaultSensorDescriptorTest {
 
   @Test
   public void describe() {
-    DefaultAnalyzerDescriptor descriptor = new DefaultAnalyzerDescriptor();
+    DefaultSensorDescriptor descriptor = new DefaultSensorDescriptor();
     descriptor
       .name("Foo")
       .dependsOn(CoreMetrics.NCLOC)
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/analyzer/issue/internal/DefaultAnalyzerIssueTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java
index 1ec42281afc..25454a8f251 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/analyzer/issue/internal/DefaultAnalyzerIssueTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/issue/internal/DefaultIssueTest.java
@@ -17,25 +17,26 @@
  * 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.api.batch.analyzer.issue.internal;
+package org.sonar.api.batch.sensor.issue.internal;
+
+import org.sonar.api.batch.sensor.issue.Issue;
+import org.sonar.api.batch.sensor.issue.internal.DefaultIssueBuilder;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.api.batch.analyzer.issue.AnalyzerIssue;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.rule.RuleKey;
-
 import static org.fest.assertions.Assertions.assertThat;
 
-public class DefaultAnalyzerIssueTest {
+public class DefaultIssueTest {
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
   @Test
   public void build_file_issue() {
-    AnalyzerIssue issue = new DefaultAnalyzerIssueBuilder()
+    Issue issue = new DefaultIssueBuilder()
       .onFile(new DefaultInputFile("src/Foo.php"))
       .ruleKey(RuleKey.of("repo", "rule"))
       .atLine(1)
@@ -52,7 +53,7 @@ public class DefaultAnalyzerIssueTest {
 
   @Test
   public void build_project_issue() {
-    AnalyzerIssue issue = new DefaultAnalyzerIssueBuilder()
+    Issue issue = new DefaultIssueBuilder()
       .onProject()
       .ruleKey(RuleKey.of("repo", "rule"))
       .atLine(1)
@@ -71,7 +72,7 @@ public class DefaultAnalyzerIssueTest {
   public void not_allowed_to_call_onFile_and_onProject() {
     thrown.expect(IllegalStateException.class);
     thrown.expectMessage("onFile or onProject can be called only once");
-    new DefaultAnalyzerIssueBuilder()
+    new DefaultIssueBuilder()
       .onProject()
       .onFile(new DefaultInputFile("src/Foo.php"))
       .ruleKey(RuleKey.of("repo", "rule"))
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/analyzer/measure/internal/DefaultAnalyzerMeasureTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureTest.java
index 1e27f766ae3..c75a31679b2 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/analyzer/measure/internal/DefaultAnalyzerMeasureTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/measure/internal/DefaultMeasureTest.java
@@ -17,25 +17,26 @@
  * 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.api.batch.analyzer.measure.internal;
+package org.sonar.api.batch.sensor.measure.internal;
+
+import org.sonar.api.batch.sensor.measure.Measure;
+import org.sonar.api.batch.sensor.measure.internal.DefaultMeasureBuilder;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.api.batch.analyzer.measure.AnalyzerMeasure;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.measures.CoreMetrics;
-
 import static org.fest.assertions.Assertions.assertThat;
 
-public class DefaultAnalyzerMeasureTest {
+public class DefaultMeasureTest {
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
   @Test
   public void build_file_measure() {
-    AnalyzerMeasure<Integer> issue = new DefaultAnalyzerMeasureBuilder<Integer>()
+    Measure<Integer> issue = new DefaultMeasureBuilder<Integer>()
       .forMetric(CoreMetrics.LINES)
       .onFile(new DefaultInputFile("src/Foo.php"))
       .withValue(3)
@@ -48,7 +49,7 @@ public class DefaultAnalyzerMeasureTest {
 
   @Test
   public void build_project_measure() {
-    AnalyzerMeasure<Integer> issue = new DefaultAnalyzerMeasureBuilder<Integer>()
+    Measure<Integer> issue = new DefaultMeasureBuilder<Integer>()
       .forMetric(CoreMetrics.LINES)
       .onProject()
       .withValue(3)
@@ -63,7 +64,7 @@ public class DefaultAnalyzerMeasureTest {
   public void not_allowed_to_call_onFile_and_onProject() {
     thrown.expect(IllegalStateException.class);
     thrown.expectMessage("onFile or onProject can be called only once");
-    new DefaultAnalyzerMeasureBuilder<Integer>()
+    new DefaultMeasureBuilder<Integer>()
       .onProject()
       .onFile(new DefaultInputFile("src/Foo.php"))
       .withValue(3)