diff options
author | Julien HENRY <julien.henry@sonarsource.com> | 2015-01-23 12:14:00 +0100 |
---|---|---|
committer | Julien HENRY <julien.henry@sonarsource.com> | 2015-01-26 10:19:38 +0100 |
commit | 2ccd693c8ccefb423ab10368ac93fff2eccc1b1f (patch) | |
tree | 184f873261933129c1dd37f382554f54d53cd78f /sonar-batch-protocol | |
parent | 8d2ca3f7e43a01289734ed7a652904adb5c76527 (diff) | |
download | sonarqube-2ccd693c8ccefb423ab10368ac93fff2eccc1b1f.tar.gz sonarqube-2ccd693c8ccefb423ab10368ac93fff2eccc1b1f.zip |
SONAR-6060 Move HTML report into the core
Diffstat (limited to 'sonar-batch-protocol')
-rw-r--r-- | sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalRepositories.java (renamed from sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java) | 10 | ||||
-rw-r--r-- | sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepositories.java (renamed from sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepository.java) | 14 | ||||
-rw-r--r-- | sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java (renamed from sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java) | 6 | ||||
-rw-r--r-- | sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoriesTest.java (renamed from sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoryTest.java) | 6 |
4 files changed, 18 insertions, 18 deletions
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalRepositories.java index e7501e4d1de..4dccd3a286f 100644 --- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java +++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalRepositories.java @@ -30,7 +30,7 @@ import java.util.Map; * Container for all global data going from server to batch. * This is not an API since server and batch always share the same version. */ -public class GlobalReferentials { +public class GlobalRepositories { private long timestamp; private Collection<Metric> metrics = new ArrayList<Metric>(); @@ -40,7 +40,7 @@ public class GlobalReferentials { return globalSettings; } - public GlobalReferentials addGlobalSetting(String key, String value) { + public GlobalRepositories addGlobalSetting(String key, String value) { globalSettings.put(key, value); return this; } @@ -49,7 +49,7 @@ public class GlobalReferentials { return metrics; } - public GlobalReferentials addMetric(Metric metric) { + public GlobalRepositories addMetric(Metric metric) { metrics.add(metric); return this; } @@ -66,8 +66,8 @@ public class GlobalReferentials { return GsonHelper.create().toJson(this); } - public static GlobalReferentials fromJson(String json) { - return GsonHelper.create().fromJson(json, GlobalReferentials.class); + public static GlobalRepositories fromJson(String json) { + return GsonHelper.create().fromJson(json, GlobalRepositories.class); } } diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepository.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepositories.java index f207a34d989..eb3200b6ac3 100644 --- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepository.java +++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepositories.java @@ -30,7 +30,7 @@ import java.util.*; * 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 class ProjectRepository { +public class ProjectRepositories { private long timestamp; private Map<String, QProfile> qprofilesByLanguage = new HashMap<String, QProfile>(); @@ -43,7 +43,7 @@ public class ProjectRepository { return settingsByModule.containsKey(moduleKey) ? settingsByModule.get(moduleKey) : Collections.<String, String>emptyMap(); } - public ProjectRepository addSettings(String moduleKey, Map<String, String> settings) { + public ProjectRepositories addSettings(String moduleKey, Map<String, String> settings) { Map<String, String> existingSettings = settingsByModule.get(moduleKey); if (existingSettings == null) { existingSettings = new HashMap<>(); @@ -57,7 +57,7 @@ public class ProjectRepository { return qprofilesByLanguage.values(); } - public ProjectRepository addQProfile(QProfile qProfile) { + public ProjectRepositories addQProfile(QProfile qProfile) { qprofilesByLanguage.put(qProfile.language(), qProfile); return this; } @@ -66,7 +66,7 @@ public class ProjectRepository { return activeRules; } - public ProjectRepository addActiveRule(ActiveRule activeRule) { + public ProjectRepositories addActiveRule(ActiveRule activeRule) { activeRules.add(activeRule); return this; } @@ -75,7 +75,7 @@ public class ProjectRepository { return fileDataByModuleAndPath.containsKey(moduleKey) ? fileDataByModuleAndPath.get(moduleKey) : Collections.<String, FileData>emptyMap(); } - public ProjectRepository addFileData(String moduleKey, String path, FileData fileData) { + public ProjectRepositories addFileData(String moduleKey, String path, FileData fileData) { Map<String, FileData> existingFileDataByPath = fileDataByModuleAndPath.get(moduleKey); if (existingFileDataByPath == null) { existingFileDataByPath = new HashMap<>(); @@ -111,8 +111,8 @@ public class ProjectRepository { return GsonHelper.create().toJson(this); } - public static ProjectRepository fromJson(String json) { - return GsonHelper.create().fromJson(json, ProjectRepository.class); + public static ProjectRepositories fromJson(String json) { + return GsonHelper.create().fromJson(json, ProjectRepositories.class); } } diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java index cc4593cbbb7..2f4652d3ded 100644 --- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java +++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java @@ -25,11 +25,11 @@ import org.skyscreamer.jsonassert.JSONAssert; import static org.assertj.core.api.Assertions.assertThat; -public class GlobalReferentialsTest { +public class GlobalRepositoriesTest { @Test public void to_json() throws Exception { - GlobalReferentials ref = new GlobalReferentials(); + GlobalRepositories ref = new GlobalRepositories(); ref.addMetric(new Metric(1, "ncloc", "INT", "Description", -1, "NCLOC", true, false, 2.0, 1.0, true)); ref.addGlobalSetting("prop", "value"); ref.setTimestamp(10); @@ -44,7 +44,7 @@ public class GlobalReferentialsTest { @Test public void from_json() throws JSONException { - GlobalReferentials ref = GlobalReferentials + GlobalRepositories ref = GlobalRepositories .fromJson( "{timestamp:1," + "metrics:[{id:1,key:ncloc,valueType:DATA,description:Description,direction:-1,name:NCLOC,qualitative:true,userManaged:false,worstValue:2.0,bestValue:1.0,optimizedBestValue:true}]," diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoryTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoriesTest.java index d60222b455a..e4eb540d291 100644 --- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoryTest.java +++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoriesTest.java @@ -29,11 +29,11 @@ import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -public class ProjectRepositoryTest { +public class ProjectRepositoriesTest { @Test public void testToJson() throws Exception { - ProjectRepository ref = new ProjectRepository(); + ProjectRepositories ref = new ProjectRepositories(); assertThat(ref.settings("foo")).isEmpty(); ref.addQProfile(new QProfile("squid-java", "Java", "java", new SimpleDateFormat("dd/MM/yyyy").parse("14/03/1984"))); @@ -66,7 +66,7 @@ public class ProjectRepositoryTest { @Test public void testFromJson() throws JSONException, ParseException { - ProjectRepository ref = ProjectRepository + ProjectRepositories ref = ProjectRepositories .fromJson("{timestamp:1," + "qprofilesByLanguage:{java:{key:\"squid-java\",name:Java,language:java,rulesUpdatedAt:\"1984-03-14T00:00:00+0100\"}}," + "activeRules:[{repositoryKey:repo,ruleKey:rule,name:Rule,severity:MAJOR,internalKey:rule1,language:java,params:{param1:value1}}]," |