Mirrors/sonarqube
1
0
Fork 0
mirror of https://github.com/SonarSource/sonarqube.git synced 2024-08-11 14:10:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/branch-5.0'

Browse Source 
Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java
	server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java
	server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java
	sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java
	sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java
	sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java
This commit is contained in:
Julien Lancelot 2015-02-09 13:10:08 +01:00
commit f32ae830af
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java
View File

@ -67,7 +67,7 @@ public class ProjectRepositoryLoader implements ServerComponent {
private final Languages languages;
public ProjectRepositoryLoader(DbClient dbClient, QProfileFactory qProfileFactory, QProfileLoader qProfileLoader, RuleService ruleService,
Languages languages) {
Languages languages) {
this.dbClient = dbClient;
this.qProfileFactory = qProfileFactory;
this.qProfileLoader = qProfileLoader;
@ -156,7 +156,7 @@ public class ProjectRepositoryLoader implements ServerComponent {
}
private void addSettingsToChildrenModules(ProjectRepositories ref, String moduleKey, Map<String, String> parentProperties, TreeModuleSettings treeModuleSettings,
boolean hasScanPerm, DbSession session) {
boolean hasScanPerm, DbSession session) {
Map<String, String> currentParentProperties = newHashMap();
currentParentProperties.putAll(parentProperties);
currentParentProperties.putAll(getPropertiesMap(treeModuleSettings.findModuleSettings(moduleKey), hasScanPerm));
@ -309,7 +309,7 @@ public class ProjectRepositoryLoader implements ServerComponent {
private Multimap<String, ComponentDto> moduleChildrenByModuleUuid;
private TreeModuleSettings(Map<String, String> moduleUuidsByKey, Map<String, Long> moduleIdsByKey, List<ComponentDto> moduleChildren,
List<PropertyDto> moduleChildrenSettings, ComponentDto module) {
List<PropertyDto> moduleChildrenSettings, ComponentDto module) {
this.moduleIdsByKey = moduleIdsByKey;
this.moduleUuidsByKey = moduleUuidsByKey;
propertiesByModuleId = ArrayListMultimap.create();

34
server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java
View File

@ -104,7 +104,7 @@ public class ProjectRepositoryLoaderMediumTest {
assertThat(projectSettings).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john"
));
));
}
@Test
@ -127,7 +127,7 @@ public class ProjectRepositoryLoaderMediumTest {
Map<String, String> projectSettings = ref.settings(project.key());
assertThat(projectSettings).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR"
));
));
}
@Test
@ -158,12 +158,12 @@ public class ProjectRepositoryLoaderMediumTest {
assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john"
));
));
assertThat(ref.settings(module.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR-SERVER",
"sonar.jira.login.secured", "john",
"sonar.coverage.exclusions", "**/*.java"
));
));
}
@Test
@ -190,11 +190,11 @@ public class ProjectRepositoryLoaderMediumTest {
assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john"
));
));
assertThat(ref.settings(module.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john"
));
));
}
@Test
@ -232,17 +232,17 @@ public class ProjectRepositoryLoaderMediumTest {
assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john"
));
));
assertThat(ref.settings(module.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR-SERVER",
"sonar.jira.login.secured", "john",
"sonar.coverage.exclusions", "**/*.java"
));
));
assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR-SERVER-DAO",
"sonar.jira.login.secured", "john",
"sonar.coverage.exclusions", "**/*.java"
));
));
}
@Test
@ -277,16 +277,16 @@ public class ProjectRepositoryLoaderMediumTest {
assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john"
));
));
assertThat(ref.settings(module1.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR-SERVER",
"sonar.jira.login.secured", "john",
"sonar.coverage.exclusions", "**/*.java"
));
));
assertThat(ref.settings(module2.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR-APPLICATION",
"sonar.jira.login.secured", "john"
));
));
}
@Test
@ -307,7 +307,7 @@ public class ProjectRepositoryLoaderMediumTest {
assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of(
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john"
));
));
}
@Test
@ -340,7 +340,7 @@ public class ProjectRepositoryLoaderMediumTest {
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john",
"sonar.coverage.exclusions", "**/*.java"
));
));
}
@Test
@ -374,7 +374,7 @@ public class ProjectRepositoryLoaderMediumTest {
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john",
"sonar.coverage.exclusions", "**/*.java"
));
));
}
@Test
@ -406,7 +406,7 @@ public class ProjectRepositoryLoaderMediumTest {
"sonar.jira.project.key", "SONAR",
"sonar.jira.login.secured", "john",
"sonar.coverage.exclusions", "**/*.java"
));
));
}
@Test
@ -439,7 +439,7 @@ public class ProjectRepositoryLoaderMediumTest {
"sonar.jira.project.key", "SONAR-SERVER",
"sonar.jira.login.secured", "john",
"sonar.coverage.exclusions", "**/*.java"
));
));
}
@Test

2
sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java
View File

@ -31,7 +31,7 @@ public class ActiveRule {
private final Map<String, String> params = new HashMap<String, String>();
public ActiveRule(String repositoryKey, String ruleKey, @Nullable String templateRuleKey, String name, @Nullable String severity,
@Nullable String internalKey, @Nullable String language) {
@Nullable String internalKey, @Nullable String language) {
this.repositoryKey = repositoryKey;
this.ruleKey = ruleKey;
this.templateRuleKey = templateRuleKey;