aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-core/src
diff options
context:
space:
mode:
authorStephane Gamard <stephane.gamard@searchbox.com>2014-06-20 09:51:12 +0200
committerStephane Gamard <stephane.gamard@searchbox.com>2014-06-20 10:01:30 +0200
commitbe7938d5466a777ced1fefde77cb75c97b09637d (patch)
treec85d1b81962314545c2962435d00789860ff306a /sonar-core/src
parent2f49e919ce9455fdb10613334ed23ae0ae076e2e (diff)
downloadsonarqube-be7938d5466a777ced1fefde77cb75c97b09637d.tar.gz
sonarqube-be7938d5466a777ced1fefde77cb75c97b09637d.zip
SONAR-5329 - Added UserName and RuleName into QProfileActivity
Diffstat (limited to 'sonar-core/src')
-rw-r--r--sonar-core/src/main/java/org/sonar/core/activity/Activity.java2
-rw-r--r--sonar-core/src/main/java/org/sonar/core/user/UserDao.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/activity/Activity.java b/sonar-core/src/main/java/org/sonar/core/activity/Activity.java
index caf56919d96..994aebbd339 100644
--- a/sonar-core/src/main/java/org/sonar/core/activity/Activity.java
+++ b/sonar-core/src/main/java/org/sonar/core/activity/Activity.java
@@ -37,7 +37,7 @@ public interface Activity {
Date time();
- String author();
+ String login();
Map<String, String> details();
diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserDao.java b/sonar-core/src/main/java/org/sonar/core/user/UserDao.java
index 9691f7d3b54..d022ee0c135 100644
--- a/sonar-core/src/main/java/org/sonar/core/user/UserDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/user/UserDao.java
@@ -24,16 +24,16 @@ import org.apache.ibatis.session.SqlSession;
import org.sonar.api.BatchComponent;
import org.sonar.api.ServerComponent;
import org.sonar.api.user.UserQuery;
+import org.sonar.core.persistence.DaoComponent;
import org.sonar.core.persistence.MyBatis;
import javax.annotation.CheckForNull;
-
import java.util.List;
/**
* @since 3.2
*/
-public class UserDao implements BatchComponent, ServerComponent {
+public class UserDao implements BatchComponent, ServerComponent, DaoComponent {
private final MyBatis mybatis;