SONAR-5329 - In case of Null login set Unknown author for log

diff --git a/sonar-server/src/main/java/org/sonar/server/log/LogService.java b/sonar-server/src/main/java/org/sonar/server/log/LogService.java
index e0004ffabf16d9def62d4ed410f0b05411956380..7ff85d339479bf0a51fb25376932afb34da8331b 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/log/LogService.java
+++ b/sonar-server/src/main/java/org/sonar/server/log/LogService.java
@@ -51,8 +51,9 @@ public class LogService {
   }
 
   public <K extends Activity> void write(DbSession session, K activity) {
-
-    dbClient.logDao().insert(session, new LogDto(UserSession.get().login(), activity));
+    dbClient.logDao().insert(session, new LogDto(
+      (UserSession.get().login() != null) ? UserSession.get().login() : "UNKNOWN",
+      activity));
   }
 
   public <K extends Activity> void write(DbSession session, List<K> activities) {

diff --git a/sonar-server/src/main/java/org/sonar/server/log/index/LogNormalizer.java b/sonar-server/src/main/java/org/sonar/server/log/index/LogNormalizer.java
index 0fca7905efdf371021ce9185a4ce0a5a20c0e0f7..9d81d622bd6875d44907bb8dfb28e98d42ac44fc 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/log/index/LogNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/log/index/LogNormalizer.java
@@ -73,6 +73,11 @@ public class LogNormalizer extends BaseNormalizer<LogDto, LogKey> {
     super(IndexDefinition.LOG, db);
   }
 
+  @Override
+  public List<UpdateRequest> normalize(Object object, Object key) {
+    throw new IllegalStateException("Normalizer is not yet implemented");
+  }
+
   @Override
   public List<UpdateRequest> normalize(LogKey logKey) {
     DbSession dbSession = db.openSession(false);

diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java b/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java
index e62bd0fdfffc26b11936b9dec3a234d38fb83149..1b110239c694ef14d52f6aa0a63c258676f7259d 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java
@@ -37,7 +37,7 @@ public abstract class BaseNormalizer<DTO extends Dto<KEY>, KEY extends Serializa
 
   public abstract java.util.List<UpdateRequest> normalize(Object object, Object key);
 
-  public abstract java.util.List<UpdateRequest> normalize(K key);
+  public abstract java.util.List<UpdateRequest> normalize(KEY key);
 
-  public abstract java.util.List<UpdateRequest> normalize(E dto);
+  public abstract java.util.List<UpdateRequest> normalize(DTO dto);
 }