diff options
3 files changed, 12 insertions, 8 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterContext.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterContext.java index 728ad0e9db3..20aa41cb21a 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterContext.java +++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterContext.java @@ -23,9 +23,11 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.core.resource.SnapshotDto; +import javax.annotation.Nullable; + class MeasureFilterContext { - private Long userId; - private SnapshotDto baseSnapshot; + private Long userId = null; + private SnapshotDto baseSnapshot = null; private String sql; private String data; @@ -33,7 +35,7 @@ class MeasureFilterContext { return userId; } - MeasureFilterContext setUserId(Long userId) { + MeasureFilterContext setUserId(@Nullable Long userId) { this.userId = userId; return this; } @@ -42,7 +44,7 @@ class MeasureFilterContext { return baseSnapshot; } - MeasureFilterContext setBaseSnapshot(SnapshotDto baseSnapshot) { + MeasureFilterContext setBaseSnapshot(@Nullable SnapshotDto baseSnapshot) { this.baseSnapshot = baseSnapshot; return this; } diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterDto.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterDto.java index 7b888e2a8b0..dfb0fc6a5d2 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterDto.java +++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterDto.java @@ -19,6 +19,8 @@ */ package org.sonar.core.measure; +import javax.annotation.Nullable; + import java.util.Date; /** @@ -56,7 +58,7 @@ public class MeasureFilterDto { return userId; } - public MeasureFilterDto setUserId(Long userId) { + public MeasureFilterDto setUserId(@Nullable Long userId) { this.userId = userId; return this; } @@ -65,7 +67,7 @@ public class MeasureFilterDto { return shared; } - public MeasureFilterDto setShared(Boolean shared) { + public MeasureFilterDto setShared(@Nullable Boolean shared) { this.shared = shared; return this; } @@ -74,7 +76,7 @@ public class MeasureFilterDto { return description; } - public MeasureFilterDto setDescription(String description) { + public MeasureFilterDto setDescription(@Nullable String description) { this.description = description; return this; } diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb index e44d640636a..df44897443b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb @@ -692,7 +692,7 @@ module ApplicationHelper # Options : # :id HTML id of the <tfoot> node # :colspan number of columns in the table - # :include_loading_icon adds a hidden loading icon, only if value is true and if the option :id is set as well. The HTML id of the icon + # :include_loading_icon add a hidden loading icon, only if value is true and if the option :id is set as well. The HTML id of the generated icon # is '<id>_loading' def table_pagination(pagination, options={}, &block) html = '<tfoot' |