From aa5364a765fe4ef24ee1fb49c016fe70dafc3ef2 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 26 Jan 2015 09:28:29 +0100 Subject: SONAR-5927 Restore UserFinder on batch side but deprecate it --- sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java | 3 +++ .../src/main/java/org/sonar/api/security/UserFinder.java | 2 ++ sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'sonar-plugin-api/src') diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java index 89fd99a10b2..5d8e8478745 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleFinder.java @@ -20,6 +20,7 @@ package org.sonar.api.rules; import org.sonar.api.ServerComponent; +import org.sonar.api.batch.rule.ActiveRules; import org.sonar.api.rule.RuleKey; import org.sonar.api.task.TaskComponent; @@ -29,7 +30,9 @@ import java.util.Collection; /** * @since 2.3 + * @deprecated since 5.1 DB access will soon be removed from batch side. Use {@link ActiveRules} instead. */ +@Deprecated public interface RuleFinder extends TaskComponent, ServerComponent { /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/security/UserFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/security/UserFinder.java index 292ff2cc77c..dc6b50293f6 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/security/UserFinder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/security/UserFinder.java @@ -25,7 +25,9 @@ import org.sonar.api.database.model.User; /** * @since 2.10 + * @deprecated since 5.1 DB access will soon be removed from batch side */ +@Deprecated public interface UserFinder extends ServerComponent, BatchComponent { User findById(int id); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java index 84018f8759a..7e869810b2d 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java @@ -19,6 +19,7 @@ */ package org.sonar.api.user; +import org.sonar.api.BatchComponent; import org.sonar.api.ServerComponent; import javax.annotation.CheckForNull; @@ -27,8 +28,10 @@ import java.util.List; /** * @since 3.6 + * @deprecated since 5.1 DB access will soon be removed from batch side */ -public interface UserFinder extends ServerComponent { +@Deprecated +public interface UserFinder extends BatchComponent, ServerComponent { @CheckForNull User findByLogin(String login); -- cgit v1.2.3