@@ -86,6 +86,7 @@ import org.sonar.core.test.TestPlanBuilder; | |||
import org.sonar.core.test.TestPlanPerspectiveLoader; | |||
import org.sonar.core.test.TestableBuilder; | |||
import org.sonar.core.test.TestablePerspectiveLoader; | |||
import org.sonar.core.user.DefaultUserFinder; | |||
public class ProjectScanContainer extends ComponentContainer { | |||
private boolean sensorMode; | |||
@@ -205,6 +206,9 @@ public class ProjectScanContainer extends ComponentContainer { | |||
SourcePersister.class, | |||
ResourceKeyMigration.class, | |||
// Users | |||
DefaultUserFinder.class, | |||
// Rules | |||
new RulesProvider(), | |||
new DebtModelProvider(), |
@@ -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 { | |||
/** |
@@ -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); |
@@ -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); |