diff options
author | Julien HENRY <julien.henry@sonarsource.com> | 2019-02-21 15:42:14 +0100 |
---|---|---|
committer | SonarTech <sonartech@sonarsource.com> | 2019-02-21 20:21:18 +0100 |
commit | 857c27b744321ddbdd7dbc12e761ee11b83e6288 (patch) | |
tree | 4eae0535df1e1a438c3cb727cc030c8cecaf1274 /sonar-scanner-protocol/src/main/java | |
parent | c193b6d4082eea8bb8a96096456dd4183c2e4569 (diff) | |
download | sonarqube-857c27b744321ddbdd7dbc12e761ee11b83e6288.tar.gz sonarqube-857c27b744321ddbdd7dbc12e761ee11b83e6288.zip |
SONAR-11670 Drop preview mode
Diffstat (limited to 'sonar-scanner-protocol/src/main/java')
3 files changed, 5 insertions, 34 deletions
diff --git a/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/MultiModuleProjectRepository.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/MultiModuleProjectRepository.java index ce174c66be9..b04fbe0c7b7 100644 --- a/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/MultiModuleProjectRepository.java +++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/MultiModuleProjectRepository.java @@ -25,10 +25,10 @@ import java.util.Optional; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -public class MultiModuleProjectRepository extends ProjectRepositories { +public class MultiModuleProjectRepository implements ProjectRepositories { private Map<String, SingleProjectRepository> repositoryPerModule = Maps.newHashMap(); - public ProjectRepositories addFileDataToModule(String moduleKey, @Nullable String path, FileData fileData) { + public MultiModuleProjectRepository addFileDataToModule(String moduleKey, @Nullable String path, FileData fileData) { if (path == null || (fileData.hash() == null && fileData.revision() == null)) { return this; } diff --git a/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/ProjectRepositories.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/ProjectRepositories.java index 3737d98ab77..a8f26553014 100644 --- a/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/ProjectRepositories.java +++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/ProjectRepositories.java @@ -19,34 +19,5 @@ */ package org.sonar.scanner.protocol.input; -import java.util.Date; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - -/** - * Container for all project data going from server to batch. - * This is not an API since server and batch always share the same version. - */ -public abstract class ProjectRepositories { - - private long timestamp; - - private Date lastAnalysisDate; - - public long timestamp() { - return timestamp; - } - - public void setTimestamp(long timestamp) { - this.timestamp = timestamp; - } - - @CheckForNull - public Date lastAnalysisDate() { - return lastAnalysisDate; - } - - public void setLastAnalysisDate(@Nullable Date lastAnalysisDate) { - this.lastAnalysisDate = lastAnalysisDate; - } +public interface ProjectRepositories { } diff --git a/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/SingleProjectRepository.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/SingleProjectRepository.java index aed97ba9dc5..8b158319a45 100644 --- a/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/SingleProjectRepository.java +++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/input/SingleProjectRepository.java @@ -23,10 +23,10 @@ import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; -public class SingleProjectRepository extends ProjectRepositories { +public class SingleProjectRepository implements ProjectRepositories { private Map<String, FileData> fileDataByPath = new HashMap<>(); - public ProjectRepositories addFileData(@Nullable String path, FileData fileData) { + public SingleProjectRepository addFileData(@Nullable String path, FileData fileData) { if (path == null || (fileData.hash() == null && fileData.revision() == null)) { return this; } |