1 files changed, 9 insertions, 3 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/ce/CeActivityQuery.java b/sonar-db/src/main/java/org/sonar/db/ce/CeActivityQuery.java
index f0e57fdd0a0..98e0269eb6e 100644
--- a/sonar-db/src/main/java/org/sonar/db/ce/CeActivityQuery.java
+++ b/sonar-db/src/main/java/org/sonar/db/ce/CeActivityQuery.java
@@ -19,6 +19,9 @@
  */
 package org.sonar.db.ce;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
+
 public class CeActivityQuery {
 
   private boolean onlyCurrents = false;
@@ -26,11 +29,12 @@ public class CeActivityQuery {
   private CeActivityDto.Status status;
   private String type;
 
+  @CheckForNull
   public String getComponentUuid() {
     return componentUuid;
   }
 
-  public CeActivityQuery setComponentUuid(String componentUuid) {
+  public CeActivityQuery setComponentUuid(@Nullable String componentUuid) {
     this.componentUuid = componentUuid;
     return this;
   }
@@ -44,20 +48,22 @@ public class CeActivityQuery {
     return this;
   }
 
+  @CheckForNull
   public CeActivityDto.Status getStatus() {
     return status;
   }
 
-  public CeActivityQuery setStatus(CeActivityDto.Status status) {
+  public CeActivityQuery setStatus(@Nullable CeActivityDto.Status status) {
     this.status = status;
     return this;
   }
 
+  @CheckForNull
   public String getType() {
     return type;
   }
 
-  public CeActivityQuery setType(String type) {
+  public CeActivityQuery setType(@Nullable String type) {
     this.type = type;
     return this;
   }