purge – specify contract method

diff --git a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java
index cfe0c2646bb8d6c96c02b8ad028e0be9a75d7356..64e876e20b5afa3b1c999535c66e0bdf36e8544b 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java
+++ b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java
@@ -26,13 +26,15 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.ServerComponent;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.TimeUtils;
+import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.purge.*;
-import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner;
 import org.sonar.server.issue.index.IssueIndex;
 import org.sonar.server.properties.ProjectSettingsFactory;
 import org.sonar.server.search.IndexClient;
 
+import javax.annotation.Nullable;
+
 import java.util.Date;
 
 import static org.sonar.core.purge.PurgeConfiguration.newDefaultPurgeConfiguration;
@@ -73,7 +75,7 @@ public class ProjectCleaner implements ServerComponent {
     return this;
   }
 
-  private void deleteIndexedIssuesBefore(String uuid, Date lastDateWithClosedIssues) {
+  private void deleteIndexedIssuesBefore(String uuid, @Nullable Date lastDateWithClosedIssues) {
     if (lastDateWithClosedIssues != null) {
       indexClient.get(IssueIndex.class).deleteClosedIssuesOfProjectBefore(uuid, lastDateWithClosedIssues);
     }

diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java b/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java
index d3fc9c1c4bd78dd554faf627a1d19f0e16c064b0..772d3670c880063236da7cac14485afca9e20eb3 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java
+++ b/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java
@@ -71,6 +71,7 @@ public class PurgeConfiguration {
   }
 
   @VisibleForTesting
+  @CheckForNull
   Date maxLiveDateOfClosedIssues(Date now) {
     if (maxAgeInDaysOfClosedIssues > 0) {
       return DateUtils.addDays(now, -maxAgeInDaysOfClosedIssues);