diff options
Diffstat (limited to 'sonar-plugin-api')
36 files changed, 39 insertions, 66 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java b/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java index 6a8bbab1479..8c73b6e4396 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java @@ -122,10 +122,10 @@ public interface Plugin { /** * Add an extension as : * <ul> - * <li>a Class that is annotated with {@link org.sonar.api.batch.ScannerSide}, {@link org.sonar.api.server.ServerSide} + * <li>a Class that is annotated with {@link org.sonar.api.scanner.ScannerSide}, {@link org.sonar.api.server.ServerSide} * or {@link org.sonar.api.ce.ComputeEngineSide}. The extension will be instantiated once. Its dependencies are * injected through constructor parameters.</li> - * <li>an instance that is annotated with {@link org.sonar.api.batch.ScannerSide}, {@link org.sonar.api.server.ServerSide} + * <li>an instance that is annotated with {@link org.sonar.api.scanner.ScannerSide}, {@link org.sonar.api.server.ServerSide} * or {@link org.sonar.api.ce.ComputeEngineSide}.</li> * </ul> * Only a single component can be registered for a class. It's not allowed for example to register: diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/SonarQubeVersion.java b/sonar-plugin-api/src/main/java/org/sonar/api/SonarQubeVersion.java index b5750ed18c6..191fe27b5df 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/SonarQubeVersion.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/SonarQubeVersion.java @@ -20,7 +20,7 @@ package org.sonar.api; import javax.annotation.concurrent.Immutable; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.ce.ComputeEngineSide; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/SonarRuntime.java b/sonar-plugin-api/src/main/java/org/sonar/api/SonarRuntime.java index e741df75e20..0eecfb6977e 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/SonarRuntime.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/SonarRuntime.java @@ -21,7 +21,7 @@ package org.sonar.api; import javax.annotation.concurrent.Immutable; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.ce.ComputeEngineSide; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/Startable.java b/sonar-plugin-api/src/main/java/org/sonar/api/Startable.java index 798217bdfae..34718964aa1 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/Startable.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/Startable.java @@ -20,7 +20,7 @@ package org.sonar.api; /** - * An interface which is implemented by classes annotated with {@link org.sonar.api.batch.ScannerSide ScannerSide}, + * An interface which is implemented by classes annotated with {@link org.sonar.api.scanner.ScannerSide ScannerSide}, * {@link org.sonar.api.server.ServerSide ServerSide} and/or {@link org.sonar.api.ce.ComputeEngineSide ComputeEngineSide} * (referred to below as "component") that can be started and stopped. * <p> diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBuilder.java index 67a1ec6f77b..ae2db71c34c 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBuilder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBuilder.java @@ -20,8 +20,7 @@ package org.sonar.api.batch.bootstrap; import org.sonar.api.ExtensionPoint; -import org.sonar.api.batch.InstantiationStrategy; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; /** * This extension point allows to change project structure at runtime. It is executed once during task startup. @@ -37,7 +36,6 @@ import org.sonar.api.batch.ScannerSide; * @since 2.9 */ @ScannerSide -@InstantiationStrategy(InstantiationStrategy.PER_BATCH) @ExtensionPoint @Deprecated public abstract class ProjectBuilder { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectReactor.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectReactor.java index 4f7393cb073..1883e060151 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectReactor.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectReactor.java @@ -19,7 +19,7 @@ */ package org.sonar.api.batch.bootstrap; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import java.util.ArrayList; import java.util.List; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java index 433c87c57bb..f83ac3c2b87 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java @@ -23,7 +23,7 @@ import java.io.File; import java.nio.charset.Charset; import java.util.SortedSet; import javax.annotation.CheckForNull; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; /** * The {@link FileSystem} manages all the source files to be analyzed. diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/MetricFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/MetricFinder.java index b8955cda127..ca416e46727 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/MetricFinder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/MetricFinder.java @@ -25,7 +25,7 @@ import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.concurrent.ThreadSafe; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; /** * @since 4.5 diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRules.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRules.java index 9d61ff97bbd..38f45787458 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRules.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRules.java @@ -19,7 +19,7 @@ */ package org.sonar.api.batch.rule; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.rule.RuleKey; import javax.annotation.CheckForNull; @@ -28,7 +28,7 @@ import javax.annotation.concurrent.Immutable; import java.util.Collection; /** - * The rules that are activated on the current module. Quality profiles are + * The rules that are activated on the current project. Quality profiles are * merged, so rules can relate to different repositories and languages. * <br> * Use {@link org.sonar.api.batch.rule.internal.ActiveRulesBuilder} to instantiate @@ -43,7 +43,7 @@ public interface ActiveRules { /** * Find a {@link ActiveRule} by the associated rule key. <code>null</code> * is returned if the rule does not exist or if the rule is not activated - * on any Quality profile associated with the module. + * on any Quality profile associated with the project. */ @CheckForNull ActiveRule find(RuleKey ruleKey); @@ -66,7 +66,7 @@ public interface ActiveRules { /** * Find a {@link ActiveRule} by the associated internal key. <code>null</code> * is returned if the rule does not exist or if the rule is not activated - * on any Quality profile associated with the module. + * on any Quality profile associated with the project. */ @CheckForNull ActiveRule findByInternalKey(String repository, String internalKey); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/Rules.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/Rules.java index 8537942b462..54c53c1b12a 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/Rules.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/Rules.java @@ -19,7 +19,7 @@ */ package org.sonar.api.batch.rule; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.rule.RuleKey; import javax.annotation.CheckForNull; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/ScmProvider.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/ScmProvider.java index 1c227c9d796..1ee042001d5 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/ScmProvider.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/ScmProvider.java @@ -26,14 +26,12 @@ import java.util.Set; import javax.annotation.CheckForNull; import org.sonar.api.CoreProperties; import org.sonar.api.ExtensionPoint; -import org.sonar.api.batch.InstantiationStrategy; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; /** * @since 5.0 */ @ScannerSide -@InstantiationStrategy(InstantiationStrategy.PER_BATCH) @ExtensionPoint public abstract class ScmProvider { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorStorage.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorStorage.java index 3dae10cc39e..f3d1210a2d3 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorStorage.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorStorage.java @@ -19,7 +19,7 @@ */ package org.sonar.api.batch.sensor.internal; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.batch.sensor.code.internal.DefaultSignificantCode; import org.sonar.api.batch.sensor.coverage.internal.DefaultCoverage; import org.sonar.api.batch.sensor.cpd.internal.DefaultCpdTokens; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/ce/ComputeEngineSide.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/ComputeEngineSide.java index a0d6f430733..98088c843e6 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/ce/ComputeEngineSide.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/ComputeEngineSide.java @@ -24,7 +24,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; /** * Same as {@link ScannerSide} but for components for the Compute Engine Server. diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/Configuration.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/Configuration.java index d10856b51cf..2a1ee512bc0 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/config/Configuration.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/Configuration.java @@ -20,7 +20,7 @@ package org.sonar.api.config; import java.util.Optional; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.config.internal.MapSettings; import org.sonar.api.server.ServerSide; @@ -29,7 +29,7 @@ import org.sonarsource.api.sonarlint.SonarLintSide; /** * Component to get effective configuration. Values of properties depend on the runtime environment: * <ul> - * <li>immutable project or module configuration in scanner.</li> + * <li>immutable project configuration in scanner.</li> * <li>global configuration in web server. It does not allow to get the settings overridden on projects.</li> * <li>project configuration in Compute Engine.</li> * </ul> diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java index 0c1f582c588..611c28431ab 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java @@ -34,7 +34,7 @@ import org.apache.commons.lang.math.NumberUtils; import org.sonar.api.ExtensionPoint; import org.sonar.api.Property; import org.sonar.api.PropertyType; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.resources.Qualifiers; import org.sonar.api.server.ServerSide; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java index d835e6e8789..e805460f5cf 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java @@ -30,7 +30,7 @@ import org.apache.commons.lang.StringUtils; import org.sonar.api.CoreProperties; import org.sonar.api.Properties; import org.sonar.api.Property; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.AnnotationUtils; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java index f6ee51f3108..10f6cc90af6 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/Settings.java @@ -31,7 +31,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.DateUtils; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java index 616e6d73b55..859c69e8a32 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/I18n.java @@ -22,7 +22,6 @@ package org.sonar.api.i18n; import java.util.Date; import java.util.Locale; import javax.annotation.Nullable; -import org.sonar.api.batch.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; @@ -31,7 +30,6 @@ import org.sonar.api.server.ServerSide; * * @since 2.10 */ -@ScannerSide @ServerSide @ComputeEngineSide public interface I18n { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java index 8ace5945ab1..c3a9d565659 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java @@ -21,9 +21,8 @@ package org.sonar.api.i18n; import java.util.Locale; import javax.annotation.CheckForNull; -import org.sonar.api.batch.ScannerSide; -import org.sonar.api.rules.Rule; import org.sonar.api.ce.ComputeEngineSide; +import org.sonar.api.rules.Rule; import org.sonar.api.server.ServerSide; /** @@ -33,7 +32,6 @@ import org.sonar.api.server.ServerSide; * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885 */ @Deprecated -@ScannerSide @ServerSide @ComputeEngineSide public interface RuleI18n { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java index daa61abac6b..681c0c56f96 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java @@ -25,7 +25,6 @@ import java.util.Date; import java.util.List; import java.util.Map; import javax.annotation.CheckForNull; -import org.sonar.api.batch.ScannerSide; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.Duration; @@ -172,9 +171,6 @@ public interface Issue extends Serializable { /** * Non-null list of comments, ordered by chronological order. - * <br> - * IMPORTANT: existing comments are not loaded when this method is called when analyzing project - * (from {@link ScannerSide}). * * @deprecated since 7.2, comments are not more available */ diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/ProjectIssues.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/ProjectIssues.java index 4e2dd334ae0..4d97e5a378e 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/ProjectIssues.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/ProjectIssues.java @@ -19,10 +19,7 @@ */ package org.sonar.api.issue; -import org.sonar.api.batch.ScannerSide; -import org.sonar.api.batch.InstantiationStrategy; - -import static org.sonar.api.batch.InstantiationStrategy.PER_BATCH; +import org.sonar.api.scanner.ScannerSide; /** * Used by batch components to get all project issues. @@ -30,7 +27,6 @@ import static org.sonar.api.batch.InstantiationStrategy.PER_BATCH; * @since 4.0 * @deprecated since 7.3 preview mode is deprecated since 6.6 */ -@InstantiationStrategy(PER_BATCH) @ScannerSide @Deprecated public interface ProjectIssues { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java index 3606b088ee5..99c71381c8e 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java @@ -19,7 +19,7 @@ */ package org.sonar.api.measures; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.batch.fs.InputFile; /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java index a6dcd3d7e3b..f7e199ff592 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java @@ -27,9 +27,8 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.sonar.api.batch.InstantiationStrategy; -import org.sonar.api.batch.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.server.ServerSide; import static com.google.common.base.MoreObjects.firstNonNull; @@ -38,10 +37,8 @@ import static org.apache.commons.lang.StringUtils.isNotBlank; /** * Used to define a metric in a plugin. Should be used with {@link Metrics} extension point. - * Should no more be used on scanner side. Use {@link org.sonar.api.batch.measure.Metric} instead. */ @ScannerSide -@InstantiationStrategy(InstantiationStrategy.PER_BATCH) @ServerSide @ComputeEngineSide public class Metric<G extends Serializable> implements Serializable, org.sonar.api.batch.measure.Metric<G> { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java index c147fc23786..513df7c4f05 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MetricFinder.java @@ -22,7 +22,7 @@ package org.sonar.api.measures; import java.util.Collection; import java.util.List; import javax.annotation.CheckForNull; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java index 9bdfb4cc560..8c79afd0f60 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java @@ -21,9 +21,8 @@ package org.sonar.api.measures; import java.util.List; import org.sonar.api.ExtensionPoint; -import org.sonar.api.batch.InstantiationStrategy; -import org.sonar.api.batch.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.server.ServerSide; /** @@ -31,7 +30,6 @@ import org.sonar.api.server.ServerSide; * @since 1.10 */ @ScannerSide -@InstantiationStrategy(InstantiationStrategy.PER_BATCH) @ServerSide @ComputeEngineSide @ExtensionPoint diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java index 36d4b9f47a6..c9d37454cb4 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java @@ -21,7 +21,7 @@ package org.sonar.api.platform; import java.io.File; import java.util.Date; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java index 0fbcabc17d3..a5b7cb24136 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java @@ -20,21 +20,17 @@ package org.sonar.api.resources; import org.sonar.api.ExtensionPoint; -import org.sonar.api.batch.ScannerSide; -import org.sonar.api.batch.InstantiationStrategy; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; import org.sonarsource.api.sonarlint.SonarLintSide; /** * The extension point to define a new language - * <br> - * Instantiation strategy changed to PER_BATCH in version 4.2. * * @since 1.10 */ @ScannerSide -@InstantiationStrategy(InstantiationStrategy.PER_BATCH) @ServerSide @SonarLintSide @ComputeEngineSide diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java index a5447371fb4..2bf0aab9a7d 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java @@ -26,7 +26,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.apache.commons.lang.ArrayUtils; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.log.Logger; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java index ce815d5b7cf..c747bab32b3 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java index 923aa96db82..2f55099ba5c 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java @@ -28,7 +28,7 @@ import java.util.Optional; import javax.annotation.CheckForNull; import javax.annotation.concurrent.Immutable; import org.apache.commons.io.FilenameUtils; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.utils.PathUtils; import static java.util.stream.Collectors.joining; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ServerSide.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ServerSide.java index 056855baeb7..604769decb0 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ServerSide.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ServerSide.java @@ -24,7 +24,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; /** * Same as {@link ScannerSide} but for server-side components. diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Durations.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Durations.java index 91de65ec2c8..88c057937a4 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Durations.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Durations.java @@ -20,14 +20,12 @@ package org.sonar.api.utils; import java.util.Locale; -import org.sonar.api.batch.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; /** * @since 4.3 */ -@ScannerSide @ServerSide @ComputeEngineSide public class Durations { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java index 8ff9dedf4af..6c702e2a924 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/HttpDownloader.java @@ -19,7 +19,7 @@ */ package org.sonar.api.utils; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.server.ServerSide; import java.io.File; @@ -28,7 +28,7 @@ import java.net.URI; /** * This component is available in IoC container, so it should be injected through - * a constructor parameter. It is available in both batch and server. + * a constructor parameter. It is available in both scanner and server. */ @ScannerSide @ServerSide diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java index 5dc8bc9377b..2f2ee31eef1 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java @@ -27,7 +27,7 @@ import java.util.Properties; import java.util.TimeZone; import javax.annotation.CheckForNull; import org.apache.commons.lang.SystemUtils; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFolder.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFolder.java index 85d1c04a6fa..b77c68a78e0 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFolder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFolder.java @@ -21,7 +21,7 @@ package org.sonar.api.utils; import java.io.File; import javax.annotation.Nullable; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/UriReader.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/UriReader.java index a890082946b..920ec7543ac 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/UriReader.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/UriReader.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.stream.Stream; -import org.sonar.api.batch.ScannerSide; +import org.sonar.api.scanner.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; |