@@ -19,7 +19,7 @@ | |||
*/ | |||
package org.sonar.core.component; | |||
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.resources.ResourceType; |
@@ -31,14 +31,12 @@ import java.util.Map; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.io.IOUtils; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.ScannerSide; | |||
/** | |||
* Configure Logback | |||
* | |||
* @since 2.12 | |||
*/ | |||
@ScannerSide | |||
public class Logback { | |||
private Logback() { |
@@ -41,7 +41,6 @@ import javax.annotation.CheckForNull; | |||
import javax.annotation.Nullable; | |||
import org.apache.commons.io.IOUtils; | |||
import org.picocontainer.Startable; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.i18n.I18n; | |||
import org.sonar.api.utils.SonarException; | |||
import org.sonar.api.utils.System2; | |||
@@ -52,7 +51,6 @@ import org.sonar.core.platform.PluginRepository; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
@ScannerSide | |||
public class DefaultI18n implements I18n, Startable { | |||
private static final Logger LOG = Loggers.get(DefaultI18n.class); |
@@ -22,17 +22,15 @@ package org.sonar.core.i18n; | |||
import java.util.Locale; | |||
import javax.annotation.CheckForNull; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.ce.ComputeEngineSide; | |||
import org.sonar.api.i18n.RuleI18n; | |||
import org.sonar.api.rules.Rule; | |||
import org.sonar.api.ce.ComputeEngineSide; | |||
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 class RuleI18nManager implements RuleI18n { |
@@ -22,13 +22,11 @@ package org.sonar.core.issue.tracking; | |||
import java.util.Collection; | |||
import java.util.List; | |||
import java.util.stream.Stream; | |||
import org.sonar.api.batch.InstantiationStrategy; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
import org.sonar.api.issue.Issue; | |||
import static org.sonar.core.util.stream.MoreCollectors.toList; | |||
@InstantiationStrategy(InstantiationStrategy.PER_BATCH) | |||
@ScannerSide | |||
public class Tracker<RAW extends Trackable, BASE extends Trackable> extends AbstractTracker<RAW, BASE> { | |||
@@ -26,7 +26,7 @@ import java.util.Objects; | |||
import java.util.Set; | |||
import java.util.stream.Stream; | |||
import javax.annotation.concurrent.Immutable; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
import org.sonar.api.ce.ComputeEngineSide; | |||
import org.sonar.api.measures.Metric; | |||
import org.sonar.api.measures.Metrics; |
@@ -36,7 +36,7 @@ import org.picocontainer.MutablePicoContainer; | |||
import org.picocontainer.PicoContainer; | |||
import org.picocontainer.behaviors.OptInCaching; | |||
import org.picocontainer.monitors.NullComponentMonitor; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
import org.sonar.api.ce.ComputeEngineSide; | |||
import org.sonar.api.config.PropertyDefinitions; | |||
import org.sonar.api.server.ServerSide; |
@@ -25,7 +25,7 @@ import java.net.URL; | |||
import java.util.Collection; | |||
import java.util.HashMap; | |||
import java.util.Map; | |||
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.classloader.ClassloaderBuilder; |
@@ -21,7 +21,7 @@ package org.sonar.core.platform; | |||
import java.util.Collection; | |||
import org.sonar.api.Plugin; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
import org.sonar.api.ce.ComputeEngineSide; | |||
import org.sonar.api.server.ServerSide; | |||
@@ -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: |
@@ -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; |
@@ -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; |
@@ -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> |
@@ -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 { |
@@ -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; |
@@ -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. |
@@ -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 |
@@ -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); |
@@ -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; |
@@ -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 { | |||
@@ -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; |
@@ -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. |
@@ -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> |
@@ -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; |
@@ -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; |
@@ -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; |
@@ -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 { |
@@ -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 { |
@@ -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 | |||
*/ |
@@ -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 { |
@@ -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; | |||
/** |
@@ -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> { |
@@ -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; | |||
@@ -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 |
@@ -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; | |||
@@ -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 |
@@ -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; |
@@ -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; | |||
@@ -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; |
@@ -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. |
@@ -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 { |
@@ -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 |
@@ -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; | |||
@@ -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; | |||
@@ -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; | |||
@@ -19,14 +19,11 @@ | |||
*/ | |||
package org.sonar.batch.bootstrapper; | |||
import org.sonar.api.batch.ScannerSide; | |||
/** | |||
* Describes execution environment. | |||
* | |||
* @since 2.6 | |||
*/ | |||
@ScannerSide | |||
public class EnvironmentInformation { | |||
private String key; |
@@ -27,7 +27,7 @@ import java.util.Map; | |||
import java.util.Map.Entry; | |||
import org.sonar.api.batch.fs.InputFile; | |||
import org.sonar.api.batch.measure.MetricFinder; | |||
import org.sonar.api.batch.sensor.SensorContext; | |||
import org.sonar.api.batch.sensor.internal.SensorStorage; | |||
import org.sonar.api.batch.sensor.measure.internal.DefaultMeasure; | |||
import org.sonar.api.measures.CoreMetrics; | |||
import org.sonar.api.measures.FileLinesContext; | |||
@@ -38,7 +38,6 @@ import org.sonar.scanner.scan.measure.MeasureCache; | |||
import static java.util.stream.Collectors.toMap; | |||
public class DefaultFileLinesContext implements FileLinesContext { | |||
private final SensorContext context; | |||
private final InputFile inputFile; | |||
private final MetricFinder metricFinder; | |||
private final MeasureCache measureCache; | |||
@@ -47,9 +46,10 @@ public class DefaultFileLinesContext implements FileLinesContext { | |||
* metric key -> line -> value | |||
*/ | |||
private final Map<String, Map<Integer, Object>> map = new HashMap<>(); | |||
private final SensorStorage sensorStorage; | |||
public DefaultFileLinesContext(SensorContext context, InputFile inputFile, MetricFinder metricFinder, MeasureCache measureCache) { | |||
this.context = context; | |||
public DefaultFileLinesContext(SensorStorage sensorStorage, InputFile inputFile, MetricFinder metricFinder, MeasureCache measureCache) { | |||
this.sensorStorage = sensorStorage; | |||
this.inputFile = inputFile; | |||
this.metricFinder = metricFinder; | |||
this.measureCache = measureCache; | |||
@@ -103,7 +103,7 @@ public class DefaultFileLinesContext implements FileLinesContext { | |||
Map<Integer, Object> lines = entry.getValue(); | |||
if (shouldSave(lines)) { | |||
String data = KeyValueFormat.format(optimizeStorage(metricKey, lines)); | |||
context.newMeasure() | |||
new DefaultMeasure<String>(sensorStorage) | |||
.on(inputFile) | |||
.forMetric(metricFinder.findByKey(metricKey)) | |||
.withValue(data) |
@@ -22,7 +22,7 @@ package org.sonar.scanner; | |||
import javax.annotation.concurrent.Immutable; | |||
import org.sonar.api.batch.fs.InputFile; | |||
import org.sonar.api.batch.measure.MetricFinder; | |||
import org.sonar.api.batch.sensor.SensorContext; | |||
import org.sonar.api.batch.sensor.internal.SensorStorage; | |||
import org.sonar.api.measures.FileLinesContext; | |||
import org.sonar.api.measures.FileLinesContextFactory; | |||
import org.sonar.scanner.scan.measure.MeasureCache; | |||
@@ -30,19 +30,19 @@ import org.sonar.scanner.scan.measure.MeasureCache; | |||
@Immutable | |||
public class DefaultFileLinesContextFactory implements FileLinesContextFactory { | |||
private final SensorContext sensorContext; | |||
private final SensorStorage sensorStorage; | |||
private final MetricFinder metricFinder; | |||
private final MeasureCache measureCache; | |||
public DefaultFileLinesContextFactory(SensorContext sensorContext, MetricFinder metricFinder, MeasureCache measureCache) { | |||
this.sensorContext = sensorContext; | |||
public DefaultFileLinesContextFactory(SensorStorage sensorStorage, MetricFinder metricFinder, MeasureCache measureCache) { | |||
this.sensorStorage = sensorStorage; | |||
this.metricFinder = metricFinder; | |||
this.measureCache = measureCache; | |||
} | |||
@Override | |||
public FileLinesContext createFor(InputFile inputFile) { | |||
return new DefaultFileLinesContext(sensorContext, inputFile, metricFinder, measureCache); | |||
return new DefaultFileLinesContext(sensorStorage, inputFile, metricFinder, measureCache); | |||
} | |||
} |
@@ -19,12 +19,6 @@ | |||
*/ | |||
package org.sonar.scanner.bootstrap; | |||
import org.sonar.api.batch.ScannerSide; | |||
/** | |||
* @since 3.6 | |||
*/ | |||
@ScannerSide | |||
public interface ExtensionMatcher { | |||
boolean accept(Object extension); | |||
} |
@@ -22,14 +22,12 @@ package org.sonar.scanner.bootstrap; | |||
import com.google.common.collect.Lists; | |||
import java.util.List; | |||
import org.sonar.api.ExtensionProvider; | |||
import org.sonar.api.batch.InstantiationStrategy; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
import org.sonar.api.measures.CoreMetrics; | |||
import org.sonar.api.measures.Metric; | |||
import org.sonar.api.measures.Metrics; | |||
@ScannerSide | |||
@InstantiationStrategy(InstantiationStrategy.PER_BATCH) | |||
public class MetricProvider extends ExtensionProvider { | |||
private Metrics[] factories; |
@@ -21,9 +21,7 @@ package org.sonar.scanner.bootstrap; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.sonar.api.batch.ScannerSide; | |||
@ScannerSide | |||
public interface PluginInstaller { | |||
/** |
@@ -23,7 +23,6 @@ import java.io.File; | |||
import java.io.FileOutputStream; | |||
import java.io.IOException; | |||
import org.apache.commons.io.FileUtils; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.utils.ZipUtils; | |||
import org.sonar.core.platform.ExplodedPlugin; | |||
import org.sonar.core.platform.PluginInfo; | |||
@@ -31,7 +30,6 @@ import org.sonar.core.platform.PluginJarExploder; | |||
import static org.sonar.core.util.FileUtils.deleteQuietly; | |||
@ScannerSide | |||
public class ScannerPluginJarExploder extends PluginJarExploder { | |||
private final PluginFiles pluginFiles; |
@@ -29,7 +29,6 @@ import java.util.stream.Collectors; | |||
import java.util.stream.StreamSupport; | |||
import javax.annotation.Nonnull; | |||
import org.sonar.api.CoreProperties; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.config.Configuration; | |||
import org.sonar.api.utils.log.Logger; | |||
import org.sonar.api.utils.log.Loggers; | |||
@@ -37,7 +36,6 @@ import org.sonar.api.utils.log.Loggers; | |||
/** | |||
* Filters the plugins to be enabled during analysis | |||
*/ | |||
@ScannerSide | |||
public class ScannerPluginPredicate implements Predicate<String> { | |||
private static final Logger LOG = Loggers.get(ScannerPluginPredicate.class); |
@@ -21,7 +21,6 @@ package org.sonar.scanner.bootstrap; | |||
import org.picocontainer.injectors.ProviderAdapter; | |||
import org.sonar.api.CoreProperties; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.batch.bootstrapper.EnvironmentInformation; | |||
import org.sonarqube.ws.client.HttpConnector; | |||
@@ -31,7 +30,6 @@ import static java.lang.Integer.parseInt; | |||
import static java.lang.String.valueOf; | |||
import static org.apache.commons.lang.StringUtils.defaultIfBlank; | |||
@ScannerSide | |||
public class ScannerWsClientProvider extends ProviderAdapter { | |||
static final int CONNECT_TIMEOUT_MS = 5_000; |
@@ -20,11 +20,9 @@ | |||
package org.sonar.scanner.deprecated.perspectives; | |||
import javax.annotation.CheckForNull; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.batch.fs.InputComponent; | |||
import org.sonar.api.component.Perspective; | |||
@ScannerSide | |||
public abstract class PerspectiveBuilder<T extends Perspective> { | |||
private final Class<T> perspectiveClass; |
@@ -20,7 +20,7 @@ | |||
package org.sonar.scanner.extension; | |||
import org.sonar.api.SonarRuntime; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
import org.sonar.core.extension.CoreExtensionRepository; | |||
import org.sonar.core.extension.CoreExtensionsInstaller; | |||
@@ -20,7 +20,6 @@ | |||
package org.sonar.scanner.issue; | |||
import java.util.Collection; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.scanner.issue.tracking.TrackedIssue; | |||
import org.sonar.scanner.storage.Storage; | |||
import org.sonar.scanner.storage.Storages; | |||
@@ -28,7 +27,6 @@ import org.sonar.scanner.storage.Storages; | |||
/** | |||
* Shared issues among all project modules | |||
*/ | |||
@ScannerSide | |||
public class IssueCache { | |||
// component key -> issue key -> issue |
@@ -24,12 +24,10 @@ import java.util.ArrayList; | |||
import java.util.List; | |||
import java.util.Set; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.config.Configuration; | |||
import static com.google.common.base.MoreObjects.firstNonNull; | |||
@ScannerSide | |||
public abstract class AbstractPatternInitializer { | |||
private Configuration settings; | |||
private List<IssuePattern> multicriteriaPatterns; |
@@ -25,7 +25,6 @@ import java.util.LinkedList; | |||
import java.util.List; | |||
import java.util.concurrent.TimeUnit; | |||
import javax.annotation.Nullable; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.batch.fs.InputComponent; | |||
import org.sonar.api.batch.fs.internal.DefaultInputComponent; | |||
import org.sonar.core.util.CloseableIterator; | |||
@@ -38,7 +37,6 @@ import org.sonar.scanner.report.ReportPublisher; | |||
import org.sonar.scanner.scan.filesystem.InputComponentStore; | |||
import org.sonar.scanner.util.ProgressReport; | |||
@ScannerSide | |||
public class IssueTransition { | |||
private final IssueCache issueCache; | |||
private final InputComponentStore inputComponentStore; |
@@ -19,8 +19,6 @@ | |||
*/ | |||
package org.sonar.scanner.issue.tracking; | |||
import org.sonar.api.batch.InstantiationStrategy; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.batch.fs.InputComponent; | |||
import org.sonar.api.batch.fs.internal.AbstractProjectOrModule; | |||
import org.sonar.api.batch.fs.internal.DefaultInputComponent; | |||
@@ -34,8 +32,6 @@ import org.sonar.scanner.scan.filesystem.InputComponentStore; | |||
import org.sonar.scanner.storage.Storage; | |||
import org.sonar.scanner.storage.Storages; | |||
@InstantiationStrategy(InstantiationStrategy.PER_BATCH) | |||
@ScannerSide | |||
public class ServerIssueRepository { | |||
private static final Logger LOG = Loggers.get(ServerIssueRepository.class); |
@@ -19,9 +19,6 @@ | |||
*/ | |||
package org.sonar.scanner.issue.tracking; | |||
import org.sonar.api.batch.ScannerSide; | |||
@ScannerSide | |||
public interface ServerLineHashesLoader { | |||
String[] getLineHashes(String fileKey); |
@@ -20,7 +20,7 @@ | |||
package org.sonar.scanner.mediumtest; | |||
import org.sonar.api.ExtensionPoint; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
import org.sonar.scanner.scan.ProjectScanContainer; | |||
@ScannerSide |
@@ -24,7 +24,6 @@ import java.util.Date; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.sonar.api.CoreProperties; | |||
import org.sonar.api.SonarRuntime; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.config.Configuration; | |||
import org.sonar.api.platform.Server; | |||
import org.sonar.api.utils.DateUtils; | |||
@@ -32,7 +31,6 @@ import org.sonar.scanner.bootstrap.ScannerWsClient; | |||
import static org.apache.commons.lang.StringUtils.trimToEmpty; | |||
@ScannerSide | |||
public class DefaultServer extends Server { | |||
private final Configuration settings; |
@@ -21,11 +21,9 @@ package org.sonar.scanner.postjob; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.batch.postjob.internal.DefaultPostJobDescriptor; | |||
import org.sonar.api.config.Configuration; | |||
@ScannerSide | |||
public class PostJobOptimizer { | |||
private static final Logger LOG = LoggerFactory.getLogger(PostJobOptimizer.class); |
@@ -32,7 +32,6 @@ import java.util.TreeSet; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.sonar.api.CoreProperties; | |||
import org.sonar.api.batch.AnalysisMode; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.batch.fs.internal.AbstractProjectOrModule; | |||
import org.sonar.api.batch.fs.internal.DefaultInputModule; | |||
import org.sonar.api.batch.fs.internal.InputModuleHierarchy; | |||
@@ -48,7 +47,6 @@ import org.sonar.scanner.scan.filesystem.InputComponentStore; | |||
import static java.util.stream.Collectors.toList; | |||
@ScannerSide | |||
public class AnalysisContextReportPublisher { | |||
private static final String KEY_VALUE_FORMAT = " - %s=%s"; |
@@ -36,7 +36,6 @@ import javax.annotation.Nullable; | |||
import okhttp3.HttpUrl; | |||
import org.apache.commons.io.FileUtils; | |||
import org.picocontainer.Startable; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.batch.fs.internal.InputModuleHierarchy; | |||
import org.sonar.api.platform.Server; | |||
import org.sonar.api.utils.MessageException; | |||
@@ -63,7 +62,6 @@ import static org.sonar.scanner.scan.branch.BranchType.LONG; | |||
import static org.sonar.scanner.scan.branch.BranchType.PULL_REQUEST; | |||
import static org.sonar.scanner.scan.branch.BranchType.SHORT; | |||
@ScannerSide | |||
public class ReportPublisher implements Startable { | |||
private static final Logger LOG = Loggers.get(ReportPublisher.class); |
@@ -19,14 +19,11 @@ | |||
*/ | |||
package org.sonar.scanner.repository; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
import java.util.HashMap; | |||
import java.util.Map; | |||
import org.sonar.api.batch.ScannerSide; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
@ScannerSide | |||
public class ContextPropertiesCache { | |||
private final Map<String, String> props = new HashMap<>(); |
@@ -20,17 +20,13 @@ | |||
package org.sonar.scanner.repository.language; | |||
import java.util.Collection; | |||
import javax.annotation.CheckForNull; | |||
import javax.annotation.concurrent.Immutable; | |||
import org.sonar.api.batch.ScannerSide; | |||
/** | |||
* Languages repository | |||
* @since 4.4 | |||
*/ | |||
@ScannerSide | |||
@Immutable | |||
public interface LanguagesRepository { | |||
@@ -23,9 +23,7 @@ import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.fs.internal.DefaultInputModule; | |||
import org.sonar.api.scan.filesystem.FileExclusions; | |||
import org.sonar.core.extension.CoreExtensionsInstaller; | |||
import org.sonar.core.platform.ComponentContainer; | |||
import org.sonar.scanner.DefaultFileLinesContextFactory; | |||
import org.sonar.scanner.bootstrap.ExtensionInstaller; | |||
import org.sonar.scanner.bootstrap.SensorExtensionDictionnary; | |||
import org.sonar.scanner.deprecated.perspectives.ScannerPerspectives; | |||
@@ -33,11 +31,9 @@ import org.sonar.scanner.phases.SensorsExecutor; | |||
import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem; | |||
import org.sonar.scanner.scan.filesystem.ModuleInputComponentStore; | |||
import org.sonar.scanner.sensor.DefaultSensorContext; | |||
import org.sonar.scanner.sensor.DefaultSensorStorage; | |||
import org.sonar.scanner.sensor.SensorOptimizer; | |||
import static org.sonar.api.batch.InstantiationStrategy.PER_PROJECT; | |||
import static org.sonar.core.extension.CoreExtensionsInstaller.noExtensionFilter; | |||
import static org.sonar.scanner.bootstrap.ExtensionUtils.isDeprecatedScannerSide; | |||
import static org.sonar.scanner.bootstrap.ExtensionUtils.isInstantiationStrategy; | |||
@@ -73,19 +69,14 @@ public class ModuleScanContainer extends ComponentContainer { | |||
SensorOptimizer.class, | |||
DefaultSensorStorage.class, | |||
DefaultSensorContext.class, | |||
SensorExtensionDictionnary.class, | |||
// Perspectives | |||
ScannerPerspectives.class, | |||
DefaultFileLinesContextFactory.class); | |||
ScannerPerspectives.class); | |||
} | |||
private void addExtensions() { | |||
CoreExtensionsInstaller coreExtensionsInstaller = getComponentByType(CoreExtensionsInstaller.class); | |||
coreExtensionsInstaller.install(this, noExtensionFilter(), t -> isInstantiationStrategy(t, PER_PROJECT)); | |||
ExtensionInstaller pluginInstaller = getComponentByType(ExtensionInstaller.class); | |||
pluginInstaller.install(this, e -> isDeprecatedScannerSide(e) && isInstantiationStrategy(e, PER_PROJECT)); | |||
} |
@@ -36,6 +36,7 @@ import org.sonar.core.config.ScannerProperties; | |||
import org.sonar.core.extension.CoreExtensionsInstaller; | |||
import org.sonar.core.metric.ScannerMetrics; | |||
import org.sonar.core.platform.ComponentContainer; | |||
import org.sonar.scanner.DefaultFileLinesContextFactory; | |||
import org.sonar.scanner.ProjectAnalysisInfo; | |||
import org.sonar.scanner.analysis.AnalysisTempFolderProvider; | |||
import org.sonar.scanner.analysis.DefaultAnalysisMode; | |||
@@ -121,6 +122,7 @@ import org.sonar.scanner.scan.report.JSONReport; | |||
import org.sonar.scanner.scm.ScmChangedFilesProvider; | |||
import org.sonar.scanner.scm.ScmConfiguration; | |||
import org.sonar.scanner.scm.ScmPublisher; | |||
import org.sonar.scanner.sensor.DefaultSensorStorage; | |||
import org.sonar.scanner.storage.Storages; | |||
import static org.sonar.api.batch.InstantiationStrategy.PER_BATCH; | |||
@@ -207,7 +209,6 @@ public class ProjectScanContainer extends ComponentContainer { | |||
IssueFilters.class, | |||
IssuePublisher.class, | |||
// metrics | |||
DefaultMetricFinder.class, | |||
@@ -268,6 +269,10 @@ public class ProjectScanContainer extends ComponentContainer { | |||
ScmConfiguration.class, | |||
ScmPublisher.class, | |||
// Sensors | |||
DefaultSensorStorage.class, | |||
DefaultFileLinesContextFactory.class, | |||
// Filesystem | |||
DefaultProjectFileSystem.class, | |||
@@ -22,7 +22,6 @@ package org.sonar.scanner.scan; | |||
import java.nio.file.Path; | |||
import java.nio.file.Paths; | |||
import java.util.Optional; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.batch.fs.internal.DefaultInputProject; | |||
import org.sonar.api.config.Configuration; | |||
import org.sonar.api.utils.MessageException; | |||
@@ -33,7 +32,6 @@ import static org.sonar.core.config.ScannerProperties.ORGANIZATION; | |||
/** | |||
* Properties that can be passed to the scanners and are not exposed in SonarQube. | |||
*/ | |||
@ScannerSide | |||
public class ScanProperties { | |||
public static final String METADATA_FILE_PATH_KEY = "sonar.scanner.metadataFilePath"; | |||
public static final String KEEP_REPORT_PROP_KEY = "sonar.scanner.keepReport"; |
@@ -21,11 +21,9 @@ package org.sonar.scanner.scan.branch; | |||
import java.util.Map; | |||
import java.util.function.Supplier; | |||
import org.sonar.api.batch.InstantiationStrategy; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
@ScannerSide | |||
@InstantiationStrategy(InstantiationStrategy.PER_BATCH) | |||
public interface BranchConfigurationLoader { | |||
BranchConfiguration load(Map<String, String> localSettings, Supplier<Map<String, String>> remoteSettingsSupplier, ProjectBranches branches, ProjectPullRequests pullRequests); | |||
} |
@@ -21,11 +21,9 @@ package org.sonar.scanner.scan.branch; | |||
import java.util.List; | |||
import javax.annotation.Nullable; | |||
import org.sonar.api.batch.InstantiationStrategy; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
@ScannerSide | |||
@InstantiationStrategy(InstantiationStrategy.PER_BATCH) | |||
public interface BranchParamsValidator { | |||
void validate(List<String> validationMessages, @Nullable String deprecatedBranchName); | |||
} |
@@ -19,11 +19,9 @@ | |||
*/ | |||
package org.sonar.scanner.scan.branch; | |||
import org.sonar.api.batch.InstantiationStrategy; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
@ScannerSide | |||
@InstantiationStrategy(InstantiationStrategy.PER_BATCH) | |||
public interface ProjectBranchesLoader { | |||
/** |
@@ -19,11 +19,9 @@ | |||
*/ | |||
package org.sonar.scanner.scan.branch; | |||
import org.sonar.api.batch.InstantiationStrategy; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.scanner.ScannerSide; | |||
@ScannerSide | |||
@InstantiationStrategy(InstantiationStrategy.PER_BATCH) | |||
public interface ProjectPullRequestsLoader { | |||
/** |
@@ -21,7 +21,6 @@ package org.sonar.scanner.scan.measure; | |||
import com.google.common.base.Preconditions; | |||
import javax.annotation.CheckForNull; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.batch.measure.MetricFinder; | |||
import org.sonar.api.batch.sensor.measure.internal.DefaultMeasure; | |||
import org.sonar.scanner.storage.Storage; | |||
@@ -31,7 +30,6 @@ import org.sonar.scanner.storage.Storages; | |||
/** | |||
* Cache of all measures. This cache is shared amongst all project modules. | |||
*/ | |||
@ScannerSide | |||
public class MeasureCache { | |||
private final Storage<DefaultMeasure<?>> cache; |
@@ -31,9 +31,7 @@ import java.util.HashMap; | |||
import java.util.Map; | |||
import java.util.Map.Entry; | |||
import org.picocontainer.Startable; | |||
import org.sonar.api.batch.ScannerSide; | |||
@ScannerSide | |||
public class Storages implements Startable { | |||
private final Map<String, Exchange> cacheMap = new HashMap<>(); | |||
private Persistit persistit; |
@@ -26,7 +26,6 @@ import java.io.File; | |||
import java.util.Properties; | |||
import org.picocontainer.Startable; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.ScannerSide; | |||
import org.sonar.api.utils.TempFolder; | |||
import static org.sonar.core.util.FileUtils.deleteQuietly; | |||
@@ -36,7 +35,6 @@ import static org.sonar.core.util.FileUtils.deleteQuietly; | |||
* | |||
* @since 3.6 | |||
*/ | |||
@ScannerSide | |||
public class StoragesManager implements Startable { | |||
private File tempDir; | |||
private Persistit persistit; |
@@ -27,7 +27,7 @@ import java.lang.annotation.Target; | |||
import java.util.stream.Stream; | |||
import org.junit.Test; | |||
import org.sonar.api.SonarRuntime; | |||
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.core.extension.CoreExtension; |