SONAR-5329 - Updated Base Activity bean

diff --git a/sonar-core/src/main/java/org/sonar/core/activity/ActivityLog.java b/sonar-core/src/main/java/org/sonar/core/activity/ActivityLog.java
index 1fc418717437c59cfa912f7a574456a1c5a80390..9b0a7f54a249f750ac331df5465d51a0d4b42111 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/activity/ActivityLog.java
+++ b/sonar-core/src/main/java/org/sonar/core/activity/ActivityLog.java
@@ -30,6 +30,4 @@ public interface ActivityLog {
 
   public String getAction();
 
-  public String getMessage();
-
 }

diff --git a/sonar-core/src/main/java/org/sonar/core/activity/db/ActivityDto.java b/sonar-core/src/main/java/org/sonar/core/activity/db/ActivityDto.java
index fa0006c823d673046cb19094ad63c04be2614a78..11da7e4af19081f2f8e2756399d0ff9aee338da7 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/activity/db/ActivityDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/activity/db/ActivityDto.java
@@ -113,8 +113,8 @@ public final class ActivityDto extends Dto<ActivityKey> {
 
   public static ActivityDto createFor(ActivityLog activityLog) {
     return new ActivityDto()
-      .setMessage(activityLog.getMessage())
       .setAction(activityLog.getAction())
       .setData(KeyValueFormat.format(activityLog.getDetails()));
+
   }
 }

diff --git a/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityNormalizer.java b/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityNormalizer.java
index 3f50acac4facc4f843485db17fb4653c2d4a8281..3e43c4adf3783a87352b28f64a5e002c638b063b 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityNormalizer.java
@@ -50,6 +50,7 @@ public class ActivityNormalizer extends BaseNormalizer<ActivityDto, ActivityKey>
   public static final class LogFields extends Indexable {
 
     public final static IndexField TYPE = addSortable(IndexField.Type.STRING, "type");
+    public final static IndexField ACTION = addSortable(IndexField.Type.STRING, "action");
     public final static IndexField CREATED_AT = addSortable(IndexField.Type.DATE, "createdAt");
     public final static IndexField UPDATED_AT = addSortable(IndexField.Type.DATE, BaseNormalizer.UPDATED_AT_FIELD);
     public final static IndexField AUTHOR = addSearchable(IndexField.Type.STRING, "author");
@@ -94,6 +95,7 @@ public class ActivityNormalizer extends BaseNormalizer<ActivityDto, ActivityKey>
 
     Map<String, Object> logDoc = new HashMap<String, Object>();
     logDoc.put(LogFields.TYPE.field(), dto.getType());
+    logDoc.put(LogFields.ACTION.field(), dto.getAction());
     logDoc.put(LogFields.AUTHOR.field(), dto.getAuthor());
     logDoc.put(LogFields.MESSAGE.field(), dto.getMessage());
     logDoc.put(LogFields.CREATED_AT.field(), dto.getCreatedAt());

diff --git a/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java b/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java
index f52e3836adf4bd4858a99ba80706ce420cd66fb3..23b30c7b424337c3c95cfe1e3377405438113a01 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java
+++ b/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java
@@ -37,6 +37,7 @@ public class ActivityMapping extends BaseMapping {
   public ActivityMapping(Languages languages, MacroInterpreter macroInterpreter) {
     super();
     addIndexStringField("type", ActivityNormalizer.LogFields.TYPE.field());
+    addIndexStringField("action", ActivityNormalizer.LogFields.ACTION.field());
     addIndexDatetimeField("createdAt", ActivityNormalizer.LogFields.CREATED_AT.field());
     addIndexStringField("userLogin", ActivityNormalizer.LogFields.AUTHOR.field());
     addIndexStringField("message", ActivityNormalizer.LogFields.MESSAGE.field());

diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java
index 1239c2f5cf3236717416d4cea4f03c8311165cac..c4348fca5652c767d23a91d890c0f26908db4b4c 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java
@@ -94,9 +94,7 @@ public class ActiveRuleChange implements ActivityLog {
   @Override
   public Map<String, String> getDetails() {
     HashMap<String, String> details = new HashMap<String, String>();
-    if (getType() != null) {
-      details.put("type", getType().name());
-    }
+
     if (getKey() != null) {
       details.put("key", getKey().toString());
       details.put("ruleKey", getKey().ruleKey().toString());
@@ -132,4 +130,9 @@ public class ActiveRuleChange implements ActivityLog {
       .add("parameters", parameters)
       .toString();
   }
+
+  @Override
+  public String getAction() {
+    return this.type.name();
+  }
 }

diff --git a/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java b/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java
index 960a9b53e5223cffd38f3bea839e499c45302507..237669d09e90e3cc04748b8c78d3dc5da90190a5 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java
@@ -87,6 +87,10 @@ public class ActivityBackendMediumTest {
         return ImmutableMap.of(testKey, testValue);
       }
 
+      @Override
+      public String getAction() {
+        return "myAction";
+      }
     });
     dbSession.commit();
 

diff --git a/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java
index 7e8d9d96af8689863926c7df2f52cf3e3499b93f..664e25315c75bc65ab6c4d6e3d5bc76de9667adf 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java
@@ -198,6 +198,11 @@ public class ActivityServiceMediumTest {
       public Map<String, String> getDetails() {
         return ImmutableMap.of(test_key, test_value);
       }
+
+      @Override
+      public String getAction() {
+        return "myAction";
+      }
     };
   }
 }

diff --git a/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java b/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java
index 21afaf413a318fa9e7fdf324ecdb2131edc0eeef..bda18de33c044b02d6a5fd47f704c35ce6ff95c0 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java
@@ -103,6 +103,11 @@ public class ActivityDaoTest extends AbstractDaoTestCase {
       public Map<String, String> getDetails() {
         return ImmutableMap.of(testKey, testValue);
       }
+
+      @Override
+      public String getAction() {
+        return "myAction";
+      }
     })
       .setAuthor("jUnit")
       .setType(Activity.Type.ACTIVE_RULE);