diff options
16 files changed, 40 insertions, 17 deletions
diff --git a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/connectors/HttpClient4Connector.java b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/connectors/HttpClient4Connector.java index 8fa546978d9..8d3c5e8a1d8 100644 --- a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/connectors/HttpClient4Connector.java +++ b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/connectors/HttpClient4Connector.java @@ -203,6 +203,7 @@ public class HttpClient4Connector extends Connector { static final String ATTRIBUTE = "preemptive-auth"; + @Override public void process( final HttpRequest request, final HttpContext context) throws HttpException { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/Metric.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/Metric.java index e5e4f98953b..95e3828abb9 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/Metric.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/measure/Metric.java @@ -24,7 +24,7 @@ import com.google.common.annotations.Beta; import java.io.Serializable; /** - * Metric definition. + * Experimental - do not use * @since 4.4 */ @Beta 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 4f91ea5aae4..79967526386 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 @@ -19,6 +19,7 @@ */ package org.sonar.api.batch.measure; +import com.google.common.annotations.Beta; import org.sonar.api.BatchComponent; import javax.annotation.CheckForNull; @@ -27,8 +28,10 @@ import java.util.Collection; import java.util.List; /** + * Experimental - do not use * @since 4.5 */ +@Beta public interface MetricFinder extends BatchComponent { @CheckForNull diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorContext.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorContext.java index 7465126c3e1..0e877c8bfc7 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorContext.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorContext.java @@ -41,6 +41,7 @@ import java.io.Serializable; import java.util.List; /** + * Experimental - do not use * @since 4.4 */ @Beta diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationBuilder.java index aa27ff41b28..691fff2dc45 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationBuilder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationBuilder.java @@ -19,11 +19,14 @@ */ package org.sonar.api.batch.sensor.duplication; +import com.google.common.annotations.Beta; import org.sonar.api.batch.fs.InputFile; import java.util.List; /** + * Experimental, do not use. + * <p/> * This builder is used to declare duplications on files of the project. * Usage: * <code><pre> @@ -38,6 +41,7 @@ import java.util.List; * </pre></code> * @since 4.5 */ +@Beta public interface DuplicationBuilder { /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationGroup.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationGroup.java index 5d3d833a906..82f866deea5 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationGroup.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationGroup.java @@ -19,6 +19,7 @@ */ package org.sonar.api.batch.sensor.duplication; +import com.google.common.annotations.Beta; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -29,12 +30,15 @@ import java.util.ArrayList; import java.util.List; /** + * Experimental, do not use. + * <p/> * A {@link DuplicationGroup} is a list of duplicated {@link Block}s. One block * is considered as the original code and all others are duplicates. * Use {@link SensorContext#duplicationBuilder(org.sonar.api.batch.fs.InputFile)} and * {@link SensorContext#saveDuplications(org.sonar.api.batch.fs.InputFile, List)}. * @since 4.5 */ +@Beta public class DuplicationGroup { public static class Block { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationTokenBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationTokenBuilder.java index 6dfd437c552..d43c5d216fd 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationTokenBuilder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/DuplicationTokenBuilder.java @@ -20,7 +20,11 @@ package org.sonar.api.batch.sensor.duplication; +import com.google.common.annotations.Beta; + /** + * Experimental, do not use. + * <p/> * This builder is used to define token on files. Tokens are later used to compute duplication. * Tokens should be declared in sequential order. * Example: @@ -35,6 +39,7 @@ package org.sonar.api.batch.sensor.duplication; * </pre></code> * @since 4.5 */ +@Beta public interface DuplicationTokenBuilder { /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/HighlightingBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/HighlightingBuilder.java index d969ba49a03..aef7d5393a7 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/HighlightingBuilder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/HighlightingBuilder.java @@ -19,10 +19,15 @@ */ package org.sonar.api.batch.sensor.highlighting; +import com.google.common.annotations.Beta; + /** + * Experimental, do not use. + * <p/> * This builder is used to define syntax highlighting (aka code coloration) on files. * @since 4.5 */ +@Beta public interface HighlightingBuilder { /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/TypeOfText.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/TypeOfText.java index ae427944052..16064019c91 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/TypeOfText.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/TypeOfText.java @@ -19,11 +19,15 @@ */ package org.sonar.api.batch.sensor.highlighting; +import com.google.common.annotations.Beta; + /** - * Possible types for highlighting code. - * See sonar-colorizer.css + * Experimental, do not use. + * <p/> + * Possible types for highlighting code. See sonar-colorizer.css * @since 4.5 */ +@Beta public enum TypeOfText { ANNOTATION("a"), CONSTANT("c"), diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/symbol/Symbol.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/symbol/Symbol.java index 9e1e3e8259e..72f0bf92980 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/symbol/Symbol.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/symbol/Symbol.java @@ -20,10 +20,13 @@ package org.sonar.api.batch.sensor.symbol; +import com.google.common.annotations.Beta; + /** - * Represent a symbol in a source file. + * Represent a symbol in a source file. Experimental, do not use * @since 4.5 */ +@Beta public interface Symbol { int getDeclarationStartOffset(); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/symbol/SymbolTableBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/symbol/SymbolTableBuilder.java index 3be82175d42..e9ebd8c72fc 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/symbol/SymbolTableBuilder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/symbol/SymbolTableBuilder.java @@ -19,11 +19,16 @@ */ package org.sonar.api.batch.sensor.symbol; +import com.google.common.annotations.Beta; + /** + * Experimental, do not use. + * <p/> * Use this builder to create symbol references. For now only references * in the same file are supported. * @since 4.5 */ +@Beta public interface SymbolTableBuilder { /** 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 5d9aefd6013..c6f68aaedce 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 @@ -29,9 +29,7 @@ import java.util.List; /** * @since 2.5 - * @deprecated since 4.5 use {@link org.sonar.api.batch.measure.MetricFinder} on batch side */ -@Deprecated public interface MetricFinder extends TaskComponent, ServerComponent { @CheckForNull diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/source/Highlightable.java b/sonar-plugin-api/src/main/java/org/sonar/api/source/Highlightable.java index 6d5bd6bd14d..0ab229be03c 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/source/Highlightable.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/source/Highlightable.java @@ -19,14 +19,11 @@ */ package org.sonar.api.source; -import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.component.Perspective; /** * @since 3.6 - * @deprecated since 4.5 use {@link SensorContext#highlightingBuilder(org.sonar.api.batch.fs.InputFile)} */ -@Deprecated public interface Highlightable extends Perspective { interface HighlightingBuilder { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/source/Symbol.java b/sonar-plugin-api/src/main/java/org/sonar/api/source/Symbol.java index 31702ecb065..9aa8ae26900 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/source/Symbol.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/source/Symbol.java @@ -20,10 +20,6 @@ package org.sonar.api.source; -/** - * @deprecated since 4.5 replaced by {@link org.sonar.api.batch.sensor.symbol.Symbol} - */ -@Deprecated public interface Symbol extends org.sonar.api.batch.sensor.symbol.Symbol { @Override diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/source/Symbolizable.java b/sonar-plugin-api/src/main/java/org/sonar/api/source/Symbolizable.java index 0b7f765cfe7..3a49ada34df 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/source/Symbolizable.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/source/Symbolizable.java @@ -19,16 +19,13 @@ */ package org.sonar.api.source; -import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.component.Perspective; import java.util.List; /** * @since 3.6 - * @deprecated since 4.5 use {@link SensorContext#symbolTableBuilder(org.sonar.api.batch.fs.InputFile)} */ -@Deprecated public interface Symbolizable extends Perspective { interface SymbolTableBuilder { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java index 9786e2fb6f5..19b43b0bc40 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java @@ -37,7 +37,7 @@ public @interface NavigationSection { String RESOURCE = "resource"; /** - * @deprecated since 4.5, as it costs too much to maintain and update. + * @deprecated in 4.5, as it costs too much to maintain and update. * @see <a href="https://jira.codehaus.org/browse/SONAR-5321">SONAR-5321</a> */ @Deprecated |