+ 26 // level 1
+ 60 // content of DaoModule
+ 3 // content of EsModule
- + 54 // content of CorePropertyDefinitions
+ + 52 // content of CorePropertyDefinitions
+ 1 // StopFlagContainer
);
assertThat(
`sonar.branch` **Deprecated since SQ 6.7** | _The Developer Edition provides fuller-featured branch functionality._ Manage SCM branches. Two branches of the same project are considered to be different projects in SonarQube. As a consequence issues found in a project A in a branch B1 are not linked to issues found for this project A in a branch B2. There is no way to automatically resolve issues from B2 when they are resolved in B1 as again A-B1 & A-B2 are considered separated projects.
`sonar.language` **Deprecated since SQ 4.5** | Set the language of the source code to analyze. Browse the Plugin Library page to get the list of all available languages. If not set, a multi-language analysis will be triggered.
`sonar.profile` **Deprecated since SQ 4.5** | Override the profile to be used. This should be set on a per-langauge basis through the UI instead.
-`sonar.analysis.mode` **Deprecated since SQ 6.6** | This parameter is set to `preview` as part of non-Developer Edition PR decoration.
`sonar.links.scm_dev` **Deprecated since SQ 7.1** | Developer connection. | `<scm><developerConnection>` for Maven projects
<!-- /sonarqube -->
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.server.batch;
-
-public class Messages {
- public static final String NO_PERMISSION = "You're not authorized to execute any SonarQube analysis. Please contact your SonarQube administrator.";
-
- private Messages() {
- // constants
- }
-
-}
package org.sonar.server.batch;
import com.google.common.collect.Maps;
-import java.util.Date;
import java.util.Map;
import java.util.stream.Collectors;
import org.sonar.api.server.ws.Change;
private static final String PARAM_KEY = "key";
private static final String PARAM_PROFILE = "profile";
- private static final String PARAM_ISSUES_MODE = "issues_mode";
private static final String PARAM_BRANCH = "branch";
private static final String PARAM_PULL_REQUEST = "pullRequest";
.setSince("4.5")
.setChangelog(new Change("7.6", String.format("The use of module keys in parameter '%s' is deprecated", PARAM_KEY)))
.setChangelog(new Change("7.6", "Stop returning settings"))
+ .setChangelog(new Change("7.7", "Stop supporting preview mode, removed timestamp and last analysis date"))
.setInternal(true)
.setHandler(this);
.setDescription("Profile name")
.setExampleValue("SonarQube Way");
- action
- .createParam(PARAM_ISSUES_MODE)
- .setDescription("Issues mode or not")
- .setDefaultValue(false)
- .setBooleanPossibleValues();
-
action
.createParam(PARAM_BRANCH)
.setSince("6.6")
ProjectRepositories data = projectDataLoader.load(ProjectDataQuery.create()
.setProjectKey(wsRequest.mandatoryParam(PARAM_KEY))
.setProfileName(wsRequest.param(PARAM_PROFILE))
- .setIssuesMode(wsRequest.mandatoryParamAsBoolean(PARAM_ISSUES_MODE))
.setBranch(wsRequest.param(PARAM_BRANCH))
.setPullRequest(wsRequest.param(PARAM_PULL_REQUEST)));
private static WsProjectResponse buildResponse(ProjectRepositories data) {
WsProjectResponse.Builder response = WsProjectResponse.newBuilder();
- ofNullable(data.lastAnalysisDate()).map(Date::getTime).ifPresent(response::setLastAnalysisDate);
- response.setTimestamp(data.timestamp());
if (data instanceof SingleProjectRepository) {
response.putAllFileDataByPath(buildFileDataByPath((SingleProjectRepository) data));
} else {
package org.sonar.server.batch;
import java.util.Collections;
-import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
+import org.sonar.api.config.Configuration;
import org.sonar.api.server.ServerSide;
import org.sonar.api.web.UserRole;
import org.sonar.db.DbClient;
import org.sonar.server.user.UserSession;
import static com.google.common.collect.Maps.newHashMap;
-import static org.sonar.api.web.UserRole.USER;
+import static org.sonar.process.ProcessProperties.Property.SONARCLOUD_ENABLED;
import static org.sonar.server.ws.WsUtils.checkRequest;
@ServerSide
private final DbClient dbClient;
private final UserSession userSession;
private final ComponentFinder componentFinder;
+ private final boolean isSonarCloud;
- public ProjectDataLoader(DbClient dbClient, UserSession userSession, ComponentFinder componentFinder) {
+ public ProjectDataLoader(DbClient dbClient, UserSession userSession, ComponentFinder componentFinder, Configuration configuration) {
this.dbClient = dbClient;
this.userSession = userSession;
this.componentFinder = componentFinder;
+ this.isSonarCloud = configuration.getBoolean(SONARCLOUD_ENABLED.getKey()).orElse(false);
}
public ProjectRepositories load(ProjectDataQuery query) {
checkRequest(project.isRootProject(), "Key '%s' belongs to a component which is not a Project", projectKey);
boolean hasScanPerm = userSession.hasComponentPermission(UserRole.SCAN, project) ||
userSession.hasPermission(OrganizationPermission.SCAN, project.getOrganizationUuid());
- boolean hasBrowsePerm = userSession.hasComponentPermission(USER, project);
- checkPermission(query.isIssuesMode(), hasScanPerm, hasBrowsePerm);
+ checkPermission(hasScanPerm);
ComponentDto branchOrMainModule = (branch == null && pullRequest == null) ? project
: componentFinder.getByKeyAndOptionalBranchOrPullRequest(session, projectKey, branch, pullRequest);
// MMF-365 we still have to support multi-module projects because it's not possible to transform from logical to
// physical structure for some multi-module projects
- ProjectRepositories data;
if (modulesTree.size() > 1) {
MultiModuleProjectRepository repository = new MultiModuleProjectRepository();
addFileDataPerModule(repository, modulesTree, files);
- data = repository;
+ return repository;
} else {
SingleProjectRepository repository = new SingleProjectRepository();
addFileData(repository, files);
- data = repository;
+ return repository;
}
-
- // FIXME need real value but actually only used to know if there is a previous analysis in local issue tracking mode so any value is
- // ok
- data.setLastAnalysisDate(new Date());
- return data;
}
}
}
}
- private static void checkPermission(boolean preview, boolean hasScanPerm, boolean hasBrowsePerm) {
- if (!hasBrowsePerm && !hasScanPerm) {
- throw new ForbiddenException(Messages.NO_PERMISSION);
- }
- if (!preview && !hasScanPerm) {
- throw new ForbiddenException("You're only authorized to execute a local (preview) SonarQube analysis without pushing the results to the SonarQube server. " +
- "Please contact your SonarQube administrator.");
- }
- if (preview && !hasBrowsePerm) {
- throw new ForbiddenException("You don't have the required permissions to access this project. Please contact your SonarQube administrator.");
+ private void checkPermission(boolean hasScanPerm) {
+ if (!hasScanPerm) {
+ if (isSonarCloud) {
+ throw new ForbiddenException("You're not authorized to push analysis results to SonarCloud. " +
+ "Please contact your SonarCloud organization administrator.");
+ } else {
+ throw new ForbiddenException("You're not authorized to push analysis results to the SonarQube server. " +
+ "Please contact your SonarQube administrator.");
+ }
}
}
private String projectKey;
private String profileName;
- private boolean issuesMode;
private String branch;
private String pullRequest;
// No direct call
}
- public boolean isIssuesMode() {
- return issuesMode;
- }
-
- public ProjectDataQuery setIssuesMode(boolean issuesMode) {
- this.issuesMode = issuesMode;
- return this;
- }
-
@CheckForNull
public String getProfileName() {
return profileName;
import static org.apache.commons.lang.StringUtils.isEmpty;
import static org.sonar.api.PropertyType.PROPERTY_SET;
import static org.sonar.api.web.UserRole.ADMIN;
-import static org.sonar.server.setting.ws.SettingsWsSupport.DOT_LICENSE;
import static org.sonar.server.setting.ws.SettingsWsSupport.DOT_SECURED;
import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001;
Predicate<PropertyDto> isVisible(Optional<ComponentDto> component) {
return propertyDto -> !propertyDto.getKey().endsWith(DOT_SECURED)
- || hasAdminPermission(component)
- || (propertyDto.getKey().contains(DOT_LICENSE) && userSession.isLoggedIn());
+ || hasAdminPermission(component);
}
private boolean hasAdminPermission(Optional<ComponentDto> component) {
propertyDefinitions.getAll().stream()
.filter(definition -> qualifier.map(s -> definition.qualifiers().contains(s)).orElseGet(definition::global))
.filter(definition -> wsRequest.getBranch() == null || SETTING_ON_BRANCHES.contains(definition.key()))
- .filter(definition -> settingsWsSupport.isVisible(definition.key(), definition, component))
+ .filter(definition -> settingsWsSupport.isVisible(definition.key(), component))
.sorted(comparing(PropertyDefinition::category, String::compareToIgnoreCase)
.thenComparingInt(PropertyDefinition::index)
.thenComparing(PropertyDefinition::name, String::compareToIgnoreCase))
import java.util.Optional;
import java.util.stream.Collector;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-import org.sonar.api.config.PropertyDefinition;
import org.sonar.api.server.ServerSide;
import org.sonar.api.server.ws.WebService;
import org.sonar.api.web.UserRole;
import static java.lang.String.format;
import static java.util.Arrays.stream;
-import static org.sonar.api.PropertyType.LICENSE;
import static org.sonar.api.web.UserRole.ADMIN;
import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_BRANCH;
import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_PULL_REQUEST;
private static final Collector<CharSequence, ?, String> COMMA_JOINER = Collectors.joining(",");
public static final String DOT_SECURED = ".secured";
- public static final String DOT_LICENSE = ".license";
- private static final String LICENSE_SUFFIX = DOT_LICENSE + DOT_SECURED;
- private static final String LICENSE_HASH_SUFFIX = ".licenseHash" + DOT_SECURED;
private final DefaultOrganizationProvider defaultOrganizationProvider;
private final UserSession userSession;
});
}
- boolean isVisible(String key, @Nullable PropertyDefinition definition, Optional<ComponentDto> component) {
- return hasPermission(OrganizationPermission.SCAN, UserRole.SCAN, component) || (verifySecuredSetting(key, definition, component) && (verifyLicenseSetting(key, definition)));
+ boolean isVisible(String key, Optional<ComponentDto> component) {
+ return hasPermission(OrganizationPermission.SCAN, UserRole.SCAN, component) || verifySecuredSetting(key, component);
}
static boolean isSecured(String key) {
return key.endsWith(DOT_SECURED);
}
- private boolean verifySecuredSetting(String key, @Nullable PropertyDefinition definition, Optional<ComponentDto> component) {
- return isLicense(key, definition) || (!isSecured(key) || hasPermission(OrganizationPermission.ADMINISTER, ADMIN, component));
- }
-
- private boolean verifyLicenseSetting(String key, @Nullable PropertyDefinition definition) {
- return !isLicense(key, definition) || userSession.isLoggedIn();
- }
-
- private static boolean isLicense(String key, @Nullable PropertyDefinition definition) {
- return key.endsWith(LICENSE_SUFFIX) || key.endsWith(LICENSE_HASH_SUFFIX) || (definition != null && definition.type() == LICENSE);
+ private boolean verifySecuredSetting(String key, Optional<ComponentDto> component) {
+ return (!isSecured(key) || hasPermission(OrganizationPermission.ADMINISTER, ADMIN, component));
}
private boolean hasPermission(OrganizationPermission orgPermission, String projectPermission, Optional<ComponentDto> component) {
"If no value has been set for a setting, then the default value is returned.<br>" +
"The settings from conf/sonar.properties are excluded from results.<br>" +
"Requires 'Browse' or 'Execute Analysis' permission when a component is specified.<br/>" +
- "To access licensed settings, authentication is required<br/>" +
"To access secured settings, one of the following permissions is required: " +
"<ul>" +
"<li>'Execute Analysis'</li>" +
}
component.ifPresent(componentDto -> settings.addAll(loadComponentSettings(dbSession, keys, componentDto).values()));
return settings.stream()
- .filter(s -> settingsWsSupport.isVisible(s.getKey(), s.getDefinition(), component))
+ .filter(s -> settingsWsSupport.isVisible(s.getKey(), component))
.collect(Collectors.toList());
}
propertySets.forEach(map -> {
Map<String, String> set = new HashMap<>();
map.entrySet().stream()
- .filter(entry -> settingsWsSupport.isVisible(entry.getKey(), null, requestedComponent))
+ .filter(entry -> settingsWsSupport.isVisible(entry.getKey(), requestedComponent))
.forEach(entry -> set.put(entry.getKey(), entry.getValue()));
filteredPropertySets.add(set);
});
.setDescription("Show line line hashes for a given file. Require See Source Code permission on file's project<br/>")
.setSince("5.0")
.setInternal(true)
+ .setDeprecatedSince("7.7")
.setResponseExample(Resources.getResource(getClass(), "example-hash.txt"))
.setHandler(this);
assertThat(queryArgumentCaptor.getValue().getProjectKey()).isEqualTo(projectKey);
assertThat(queryArgumentCaptor.getValue().getProfileName()).isEqualTo("Default");
- assertThat(queryArgumentCaptor.getValue().isIssuesMode()).isFalse();
assertThat(queryArgumentCaptor.getValue().getBranch()).isEqualTo("my_branch");
}
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.sonar.api.config.internal.MapSettings;
import org.sonar.api.resources.Qualifiers;
import org.sonar.api.resources.Scopes;
import org.sonar.api.web.UserRole;
-import org.sonar.core.permission.GlobalPermissions;
import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.DbTester;
import static org.sonar.core.permission.GlobalPermissions.SCAN_EXECUTION;
import static org.sonar.db.component.ComponentTesting.newFileDto;
import static org.sonar.db.component.ComponentTesting.newModuleDto;
-import static org.sonar.db.permission.OrganizationPermission.SCAN;
+import static org.sonar.process.ProcessProperties.Property.SONARCLOUD_ENABLED;
public class ProjectDataLoaderTest {
@Rule
private DbSession dbSession = db.getSession();
private int uuidCounter = 0;
private ResourceTypesRule resourceTypes = new ResourceTypesRule().setRootQualifiers(Qualifiers.PROJECT);
- private ProjectDataLoader underTest = new ProjectDataLoader(dbClient, userSession, new ComponentFinder(dbClient, resourceTypes));
+ private MapSettings settings = new MapSettings();
+ private ProjectDataLoader underTest = new ProjectDataLoader(dbClient, userSession, new ComponentFinder(dbClient, resourceTypes), settings.asConfig());
@Test
public void throws_NotFoundException_when_branch_does_not_exist() {
}
@Test
- public void throw_ForbiddenException_if_no_browse_permission_nor_scan_permission() {
+ public void throw_ForbiddenException_if_no_scan_permission_on_sonarqube() {
ComponentDto project = db.components().insertPrivateProject();
userSession.logIn();
expectedException.expect(ForbiddenException.class);
- expectedException.expectMessage("You're not authorized to execute any SonarQube analysis");
+ expectedException.expectMessage("You're not authorized to push analysis results to the SonarQube server. Please contact your SonarQube administrator.");
underTest.load(ProjectDataQuery.create().setProjectKey(project.getKey()));
}
@Test
- public void throw_ForbiddenException_if_browse_permission_but_not_scan_permission() {
- ComponentDto project = db.components().insertPrivateProject();
- userSession.logIn().addProjectPermission(UserRole.USER, project);
-
- expectedException.expect(ForbiddenException.class);
- expectedException.expectMessage("You're only authorized to execute a local (preview) SonarQube analysis without pushing the results to the SonarQube server");
+ public void throw_ForbiddenException_if_no_scan_permission_on_sonarcloud() {
+ // Test the SonarCloud specific message
+ settings.setProperty(SONARCLOUD_ENABLED.getKey(), "true");
+ underTest = new ProjectDataLoader(dbClient, userSession, new ComponentFinder(dbClient, resourceTypes), settings.asConfig());
- underTest.load(ProjectDataQuery.create().setProjectKey(project.getKey()));
- }
-
- @Test
- public void issues_mode_is_allowed_if_user_has_browse_permission() {
ComponentDto project = db.components().insertPrivateProject();
+ // Browse is not enough
userSession.logIn().addProjectPermission(UserRole.USER, project);
- ProjectRepositories repositories = underTest.load(ProjectDataQuery.create().setProjectKey(project.getKey()).setIssuesMode(true));
-
- assertThat(repositories).isNotNull();
- }
-
- @Test
- public void issues_mode_is_forbidden_if_user_doesnt_have_browse_permission() {
- ComponentDto project = db.components().insertPrivateProject();
- userSession.logIn().addProjectPermission(GlobalPermissions.SCAN_EXECUTION, project);
-
expectedException.expect(ForbiddenException.class);
- expectedException.expectMessage("You don't have the required permissions to access this project");
+ expectedException.expectMessage("You're not authorized to push analysis results to SonarCloud. Please contact your SonarCloud organization administrator.");
- underTest.load(ProjectDataQuery.create().setProjectKey(project.getKey()).setIssuesMode(true));
- }
-
- @Test
- public void scan_permission_on_organization_is_enough_even_without_scan_permission_on_project() {
- ComponentDto project = db.components().insertPrivateProject();
- userSession.logIn().addPermission(SCAN, project.getOrganizationUuid());
- userSession.logIn().addProjectPermission(UserRole.USER, project);
-
- ProjectRepositories repositories = underTest.load(ProjectDataQuery.create().setProjectKey(project.getKey()).setIssuesMode(true));
-
- assertThat(repositories).isNotNull();
+ underTest.load(ProjectDataQuery.create().setProjectKey(project.getKey()));
}
private static FileSourceDto newFileSourceDto(ComponentDto file) {
}
@Test
- public void does_not_returned_secured_and_license_settings_when_not_authenticated() {
+ public void does_not_returned_secured_settings_when_not_authenticated() {
definitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
propertyDb.insertProperties(
newGlobalPropertyDto().setKey("foo").setValue("one"),
- newGlobalPropertyDto().setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"));
+ newGlobalPropertyDto().setKey("secret.secured").setValue("password"));
executeAndVerify(null, null, "does_not_returned_secured_and_license_settings_when_not_authenticated.json");
}
@Test
- public void does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated() {
- definitions.addComponent(PropertyDefinition
- .builder("foo")
- .type(PropertyType.PROPERTY_SET)
- .fields(asList(
- PropertyFieldDefinition.build("key").name("Key").build(),
- PropertyFieldDefinition.build("plugin.license.secured").name("License").type(LICENSE).build(),
- PropertyFieldDefinition.build("secret.secured").name("Secured").build()))
- .build());
- propertyDb.insertPropertySet("foo", null,
- ImmutableMap.of("key", "key1", "plugin.license.secured", "ABCD", "secret.secured", "123456"));
-
- executeAndVerify(null, null, "does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json");
- }
-
- @Test
- public void return_license_with_hash_settings_when_authenticated_but_not_admin() {
- logInAsProjectUser();
- definitions.addComponents(asList(
- PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("commercial.plugin").type(LICENSE).build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
- propertyDb.insertProperties(
- newGlobalPropertyDto().setKey("foo").setValue("one"),
- newGlobalPropertyDto().setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("commercial.plugin").setValue("ABCD"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"),
- newGlobalPropertyDto().setKey("plugin.licenseHash.secured").setValue("987654321"));
-
- executeAndVerify(null, null, "return_license_with_hash_settings_when_authenticated_but_not_admin.json");
- }
-
- @Test
- public void return_secured_and_license_settings_when_system_admin() {
+ public void return_secured_settings_when_system_admin() {
logInAsSystemAdministrator();
definitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
propertyDb.insertProperties(
newGlobalPropertyDto().setKey("foo").setValue("one"),
- newGlobalPropertyDto().setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"),
- newGlobalPropertyDto().setKey("plugin.licenseHash.secured").setValue("987654321"));
+ newGlobalPropertyDto().setKey("secret.secured").setValue("password"));
executeAndVerify(null, null, "return_secured_and_license_settings_when_system_admin.json");
}
}
@Test
- public void return_secured_and_license_settings_in_property_set_when_system_admin() {
+ public void return_secured_settings_in_property_set_when_system_admin() {
logInAsSystemAdministrator();
definitions.addComponent(PropertyDefinition
.builder("foo")
.type(PropertyType.PROPERTY_SET)
.fields(asList(
PropertyFieldDefinition.build("key").name("Key").build(),
- PropertyFieldDefinition.build("plugin.license.secured").name("License").type(LICENSE).build(),
PropertyFieldDefinition.build("secret.secured").name("Secured").build()))
.build());
propertyDb.insertPropertySet("foo", null,
- ImmutableMap.of("key", "key1", "plugin.license.secured", "ABCD", "secret.secured", "123456"));
+ ImmutableMap.of("key", "key1", "secret.secured", "123456"));
executeAndVerify(null, null, "return_secured_and_license_settings_in_property_set_when_system_admin.json");
}
public void does_not_returned_secured_and_license_settings_when_not_authenticated() {
propertyDefinitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("plugin.license.secured").type(PropertyType.LICENSE).build(),
- PropertyDefinition.builder("commercial.plugin").type(PropertyType.LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
ListDefinitionsWsResponse result = executeRequest();
assertThat(result.getDefinitionsList()).extracting(Definition::getKey).containsOnly("foo");
}
- @Test
- public void return_license_settings_when_authenticated_but_not_admin() {
- logInAsProjectUser();
- propertyDefinitions.addComponents(asList(
- PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("plugin.license.secured").type(PropertyType.LICENSE).build(),
- PropertyDefinition.builder("commercial.plugin").type(PropertyType.LICENSE).build()));
-
- ListDefinitionsWsResponse result = executeRequest();
-
- assertThat(result.getDefinitionsList()).extracting(Definition::getKey).containsOnly("foo", "plugin.license.secured", "commercial.plugin");
- }
-
@Test
public void return_secured_settings_when_not_authenticated_but_with_scan_permission() {
userSession.anonymous().addPermission(SCAN, db.getDefaultOrganization());
propertyDefinitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("plugin.license.secured").type(PropertyType.LICENSE).build(),
- PropertyDefinition.builder("commercial.plugin").type(PropertyType.LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
ListDefinitionsWsResponse result = executeRequest();
- assertThat(result.getDefinitionsList()).extracting(Definition::getKey).containsOnly("foo", "secret.secured", "plugin.license.secured", "commercial.plugin");
+ assertThat(result.getDefinitionsList()).extracting(Definition::getKey).containsOnly("foo", "secret.secured");
}
@Test
- public void return_secured_and_license_settings_when_system_admin() {
+ public void return_secured_settings_when_system_admin() {
logInAsAdmin(db.getDefaultOrganization());
propertyDefinitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("plugin.license.secured").type(PropertyType.LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
ListDefinitionsWsResponse result = executeRequest();
- assertThat(result.getDefinitionsList()).extracting(Definition::getKey).containsOnly("foo", "secret.secured", "plugin.license.secured");
+ assertThat(result.getDefinitionsList()).extracting(Definition::getKey).containsOnly("foo", "secret.secured");
}
@Test
- public void return_secured_and_license_settings_when_project_admin() {
+ public void return_secured_settings_when_project_admin() {
logInAsProjectAdmin();
propertyDefinitions.addComponents(asList(
PropertyDefinition.builder("foo").onQualifiers(PROJECT).build(),
- PropertyDefinition.builder("secret.secured").onQualifiers(PROJECT).build(),
- PropertyDefinition.builder("plugin.license.secured").onQualifiers(PROJECT).type(PropertyType.LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").onQualifiers(PROJECT).build()));
ListDefinitionsWsResponse result = executeRequest(project.getDbKey());
- assertThat(result.getDefinitionsList()).extracting(Definition::getKey).containsOnly("foo", "secret.secured", "plugin.license.secured");
+ assertThat(result.getDefinitionsList()).extracting(Definition::getKey).containsOnly("foo", "secret.secured");
}
@Test
import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.groups.Tuple.tuple;
-import static org.sonar.api.PropertyType.LICENSE;
import static org.sonar.api.resources.Qualifiers.MODULE;
import static org.sonar.api.resources.Qualifiers.PROJECT;
import static org.sonar.api.web.UserRole.ADMIN;
}
@Test
- public void do_not_return_secured_and_license_settings_when_not_authenticated() {
+ public void do_not_return_secured_settings_when_not_authenticated() {
definitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("commercial.plugin").type(LICENSE).build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
propertyDb.insertProperties(
newGlobalPropertyDto().setKey("foo").setValue("one"),
- newGlobalPropertyDto().setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("commercial.plugin").setValue("ABCD"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"));
+ newGlobalPropertyDto().setKey("secret.secured").setValue("password"));
ValuesWsResponse result = executeRequestForGlobalProperties();
}
@Test
- public void do_not_return_secured_and_license_settings_in_property_set_when_not_authenticated() {
+ public void do_not_return_secured_settings_in_property_set_when_not_authenticated() {
definitions.addComponent(PropertyDefinition
.builder("foo")
.type(PropertyType.PROPERTY_SET)
.fields(asList(
PropertyFieldDefinition.build("key").name("Key").build(),
- PropertyFieldDefinition.build("plugin.license.secured").name("License").type(LICENSE).build(),
PropertyFieldDefinition.build("secret.secured").name("Secured").build()))
.build());
- propertyDb.insertPropertySet("foo", null, ImmutableMap.of("key", "key1", "plugin.license.secured", "ABCD", "secret.secured", "123456"));
+ propertyDb.insertPropertySet("foo", null, ImmutableMap.of("key", "key1", "secret.secured", "123456"));
ValuesWsResponse result = executeRequestForGlobalProperties();
assertFieldValues(result.getSettings(0), ImmutableMap.of("key", "key1"));
}
- @Test
- public void return_license_settings_when_authenticated_but_not_admin() {
- logIn();
- definitions.addComponents(asList(
- PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("commercial.plugin").type(LICENSE).build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
- propertyDb.insertProperties(
- newGlobalPropertyDto().setKey("foo").setValue("one"),
- newGlobalPropertyDto().setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("commercial.plugin").setValue("ABCD"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"));
-
- ValuesWsResponse result = executeRequestForGlobalProperties();
-
- assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "commercial.plugin", "plugin.license.secured");
- }
-
@Test
public void return_global_secured_settings_when_not_authenticated_but_with_scan_permission() {
userSession.anonymous().addPermission(SCAN, db.getDefaultOrganization());
definitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("commercial.plugin").type(LICENSE).build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
propertyDb.insertProperties(
newGlobalPropertyDto().setKey("foo").setValue("one"),
- newGlobalPropertyDto().setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("commercial.plugin").setValue("ABCD"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"));
+ newGlobalPropertyDto().setKey("secret.secured").setValue("password"));
ValuesWsResponse result = executeRequestForGlobalProperties();
- assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured", "commercial.plugin", "plugin.license.secured");
+ assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured");
}
@Test
definitions.addComponents(asList(
PropertyDefinition.builder("foo").onQualifiers(PROJECT).build(),
PropertyDefinition.builder("global.secret.secured").build(),
- PropertyDefinition.builder("secret.secured").onQualifiers(PROJECT).build(),
- PropertyDefinition.builder("commercial.plugin").type(LICENSE).build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").onQualifiers(PROJECT).build()));
propertyDb.insertProperties(
newComponentPropertyDto(project).setKey("foo").setValue("one"),
newGlobalPropertyDto().setKey("global.secret.secured").setValue("very secret"),
- newComponentPropertyDto(project).setKey("secret.secured").setValue("password"),
- newComponentPropertyDto(project).setKey("commercial.plugin").setValue("ABCD"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"));
+ newComponentPropertyDto(project).setKey("secret.secured").setValue("password"));
ValuesWsResponse result = executeRequestForProjectProperties();
- assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "global.secret.secured", "secret.secured", "commercial.plugin",
- "plugin.license.secured");
+ assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "global.secret.secured", "secret.secured");
}
@Test
}
@Test
- public void return_secured_and_license_settings_when_system_admin() {
+ public void return_secured_settings_when_system_admin() {
logInAsAdmin();
definitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
propertyDb.insertProperties(
newGlobalPropertyDto().setKey("foo").setValue("one"),
- newGlobalPropertyDto().setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"));
+ newGlobalPropertyDto().setKey("secret.secured").setValue("password"));
ValuesWsResponse result = executeRequestForGlobalProperties();
- assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured", "plugin.license.secured");
+ assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured");
}
@Test
- public void return_secured_and_license_settings_when_project_admin() {
+ public void return_secured_settings_when_project_admin() {
logInAsProjectAdmin();
definitions.addComponents(asList(
PropertyDefinition.builder("foo").onQualifiers(PROJECT).build(),
PropertyDefinition.builder("global.secret.secured").build(),
- PropertyDefinition.builder("secret.secured").onQualifiers(PROJECT).build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").onQualifiers(PROJECT).build()));
propertyDb.insertProperties(
newComponentPropertyDto(project).setKey("foo").setValue("one"),
newGlobalPropertyDto().setKey("global.secret.secured").setValue("very secret"),
- newComponentPropertyDto(project).setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"));
+ newComponentPropertyDto(project).setKey("secret.secured").setValue("password"));
ValuesWsResponse result = executeRequestForProjectProperties();
- assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "global.secret.secured", "secret.secured", "plugin.license.secured");
+ assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "global.secret.secured", "secret.secured");
}
@Test
- public void return_secured_and_license_settings_even_if_not_defined_when_project_admin() {
+ public void return_secured_settings_even_if_not_defined_when_project_admin() {
logInAsProjectAdmin();
propertyDb.insertProperties(newComponentPropertyDto(project).setKey("not-defined.secured").setValue("123"));
}
@Test
- public void return_secured_and_license_settings_in_property_set_when_system_admin() {
+ public void return_secured_settings_in_property_set_when_system_admin() {
logInAsAdmin();
definitions.addComponent(PropertyDefinition
.builder("foo")
.type(PropertyType.PROPERTY_SET)
.fields(asList(
PropertyFieldDefinition.build("key").name("Key").build(),
- PropertyFieldDefinition.build("plugin.license.secured").name("License").type(LICENSE).build(),
PropertyFieldDefinition.build("secret.secured").name("Secured").build()))
.build());
- propertyDb.insertPropertySet("foo", null, ImmutableMap.of("key", "key1", "plugin.license.secured", "ABCD", "secret.secured", "123456"));
+ propertyDb.insertPropertySet("foo", null, ImmutableMap.of("key", "key1", "secret.secured", "123456"));
ValuesWsResponse result = executeRequestForGlobalProperties();
- assertFieldValues(result.getSettings(0), ImmutableMap.of("key", "key1", "plugin.license.secured", "ABCD", "secret.secured", "123456"));
+ assertFieldValues(result.getSettings(0), ImmutableMap.of("key", "key1", "secret.secured", "123456"));
}
@Test
logInAsAdmin();
definitions.addComponents(asList(
PropertyDefinition.builder("foo").build(),
- PropertyDefinition.builder("secret.secured").build(),
- PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").build()));
propertyDb.insertProperties(
newGlobalPropertyDto().setKey("foo").setValue("one"),
- newGlobalPropertyDto().setKey("secret.secured").setValue("password"),
- newGlobalPropertyDto().setKey("plugin.license.secured").setValue("ABCD"));
+ newGlobalPropertyDto().setKey("secret.secured").setValue("password"));
ValuesWsResponse result = executeRequestForGlobalProperties();
- assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured", "plugin.license.secured");
+ assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured");
}
@Test
logInAsProjectAdmin();
definitions.addComponents(asList(
PropertyDefinition.builder("foo").onQualifiers(PROJECT).build(),
- PropertyDefinition.builder("secret.secured").onQualifiers(PROJECT).build(),
- PropertyDefinition.builder("plugin.license.secured").onQualifiers(PROJECT).type(LICENSE).build()));
+ PropertyDefinition.builder("secret.secured").onQualifiers(PROJECT).build()));
propertyDb.insertProperties(
newComponentPropertyDto(project).setKey("foo").setValue("one"),
- newComponentPropertyDto(project).setKey("secret.secured").setValue("password"),
- newComponentPropertyDto(project).setKey("plugin.license.secured").setValue("ABCD"));
+ newComponentPropertyDto(project).setKey("secret.secured").setValue("password"));
ValuesWsResponse result = executeRequestForProjectProperties();
- assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured", "plugin.license.secured");
+ assertThat(result.getSettingsList()).extracting(Settings.Setting::getKey).containsOnly("foo", "secret.secured");
}
@Test
public void return_additional_settings_specific_for_scanner_when_no_keys() {
logInAsAdmin();
- definitions.addComponent(PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build());
+ definitions.addComponent(PropertyDefinition.builder("secret.secured").build());
propertyDb.insertProperties(
newGlobalPropertyDto().setKey("sonar.core.id").setValue("ID"),
newGlobalPropertyDto().setKey("sonar.core.startTime").setValue("2017-01-01"));
"key": "foo.1.key",
"value": "key1"
},
- {
- "key": "foo.1.plugin.license.secured",
- "value": "ABCD"
- },
{
"key": "foo.1.secret.secured",
"value": "123456"
"key": "secret.secured",
"value": "password"
},
- {
- "key": "plugin.licenseHash.secured",
- "value": "987654321"
- },
{
"key": "foo",
"value": "one"
- },
- {
- "key": "plugin.license.secured",
- "value": "ABCD"
}
]
.category(CoreProperties.CATEGORY_GENERAL)
.build(),
- PropertyDefinition.builder(CoreProperties.PREVIEW_INCLUDE_PLUGINS)
- .name("Plugins accepted for Preview mode")
- .description("DEPRECATED - List of plugin keys. Those plugins will be used during preview analyses.")
- .category(CoreProperties.CATEGORY_GENERAL)
- .multiValues(true)
- .defaultValue(CoreProperties.PREVIEW_INCLUDE_PLUGINS_DEFAULT_VALUE)
- .build(),
- PropertyDefinition.builder(CoreProperties.PREVIEW_EXCLUDE_PLUGINS)
- .name("Plugins excluded for Preview mode")
- .description("DEPRECATED - List of plugin keys. Those plugins will not be used during preview analyses.")
- .category(CoreProperties.CATEGORY_GENERAL)
- .multiValues(true)
- .defaultValue(CoreProperties.PREVIEW_EXCLUDE_PLUGINS_DEFAULT_VALUE)
- .build(),
PropertyDefinition.builder("sonar.authenticator.downcase")
.name("Downcase login")
.description("Downcase login during user authentication, typically for Active Directory")
@Test
public void all() {
List<PropertyDefinition> defs = CorePropertyDefinitions.all();
- assertThat(defs).hasSize(54);
+ assertThat(defs).hasSize(52);
}
@Test
// TODO remove?
String PROFILING_LOG_PROPERTY = "sonar.showProfiling";
- /**
- * @since 4.0
- * @deprecated in 5.1 no more used
- */
- @Deprecated
- String PREVIEW_READ_TIMEOUT_SEC = "sonar.preview.readTimeout";
-
/**
* @since 4.0
* @deprecated replaced in 5.2 by the permission 'provisioning'
@Deprecated
String CORE_PREVENT_AUTOMATIC_PROJECT_CREATION = "sonar.preventAutoProjectCreation";
- /**
- * @since 4.0
- */
- String ANALYSIS_MODE = "sonar.analysis.mode";
-
- /**
- * @since 4.0
- * @deprecated since 5.2 the default mode is publish
- */
- @Deprecated
- String ANALYSIS_MODE_ANALYSIS = "analysis";
-
- /**
- * @since 4.0
- * @deprecated since 7.3 preview mode deprecated since 6.6
- */
- @Deprecated
- String ANALYSIS_MODE_PREVIEW = "preview";
-
- /**
- * @since 5.2
- * @deprecated since 7.3 issues mode deprecated since 6.6
- */
- @Deprecated
- String ANALYSIS_MODE_ISSUES = "issues";
-
- /**
- * @since 5.2
- */
- String ANALYSIS_MODE_PUBLISH = "publish";
-
- /**
- * @since 4.0
- */
- String PREVIEW_INCLUDE_PLUGINS = "sonar.preview.includePlugins";
- String PREVIEW_INCLUDE_PLUGINS_DEFAULT_VALUE = "";
-
- /**
- * @since 4.0
- */
- String PREVIEW_EXCLUDE_PLUGINS = "sonar.preview.excludePlugins";
-
- String PREVIEW_EXCLUDE_PLUGINS_DEFAULT_VALUE = "devcockpit,pdfreport,governance,ldap,authaad,authgithub,authbitbucket,googleanalytics";
-
/**
* @since 4.0
*/
/**
* Status regarding previous analysis
+ * @deprecated since 7.7 preview mode was dropped
*/
+ @Deprecated
enum Status {
SAME, CHANGED, ADDED
}
String contents() throws IOException;
/**
- * Status regarding previous analysis
+ * @deprecated since 7.7 preview/issue mode was removed
*/
+ @Deprecated
Status status();
/**
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import javax.annotation.Nullable;
import org.sonar.api.batch.fs.FilePredicate;
import org.sonar.api.batch.fs.FilePredicates;
import org.sonar.api.batch.fs.FileSystem;
private Path workDir;
private Charset encoding;
protected final FilePredicates predicates;
- private Function<FilePredicate, Predicate<InputFile>> defaultPredicateFactory;
/**
* Only for testing
return this;
}
- public DefaultFileSystem setDefaultPredicate(@Nullable Function<FilePredicate, Predicate<InputFile>> defaultPredicateFactory) {
- this.defaultPredicateFactory = defaultPredicateFactory;
- return this;
- }
-
@Override
public File workDir() {
return workDir.toFile();
}
- /**
- * Bypass default predicate to get all files/dirs indexed.
- * Default predicate is used when some files/dirs should not be processed by sensors.
- */
public Iterable<InputFile> inputFiles() {
- return OptimizedFilePredicateAdapter.create(predicates.all()).get(cache);
+ return inputFiles(predicates.all());
}
@Override
public Iterable<InputFile> inputFiles(FilePredicate predicate) {
- Iterable<InputFile> iterable = OptimizedFilePredicateAdapter.create(predicate).get(cache);
- if (defaultPredicateFactory != null) {
- return StreamSupport.stream(iterable.spliterator(), false)
- .filter(defaultPredicateFactory.apply(predicate)).collect(Collectors.toList());
- }
- return iterable;
+ return OptimizedFilePredicateAdapter.create(predicate).get(cache);
}
@Override
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.api.batch.sensor.internal;
-
-import org.sonar.api.batch.AnalysisMode;
-
-public class MockAnalysisMode implements AnalysisMode {
- private boolean previewOrIssue = false;
-
- @Override
- public boolean isPreview() {
- return previewOrIssue;
- }
-
- public void setPreviewOrIssue(boolean value) {
- this.previewOrIssue = value;
- }
-
- @Override
- public boolean isIssues() {
- return this.previewOrIssue;
- }
-
- @Override
- public boolean isPublish() {
- return !previewOrIssue;
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.api.issue;
-
-import org.sonar.api.scanner.ScannerSide;
-
-/**
- * Used by batch components to get all project issues.
- *
- * @since 4.0
- * @deprecated since 7.3 preview mode is deprecated since 6.6
- */
-@ScannerSide
-@Deprecated
-public interface ProjectIssues {
-
- /**
- * All the unresolved issues of the project, including the issues reported by end-users.
- */
- Iterable<Issue> issues();
-
- /**
- * All the issues of this project that have been marked as resolved during this scan
- */
- Iterable<Issue> resolvedIssues();
-}
import java.io.File;
import java.nio.charset.Charset;
-import java.util.Iterator;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
assertThat(fs.languages()).containsOnly("java", "php");
}
- @Test
- public void filesWithDefaultPredicate() {
- DefaultInputFile file1 = new TestInputFileBuilder("foo", "src/Foo.php").setLanguage("php").build();
- fs.add(file1);
- fs.add(new TestInputFileBuilder("foo", "src/Bar.java").setLanguage("java").build());
- fs.add(new TestInputFileBuilder("foo", "src/Baz.java").setLanguage("java").build());
-
- fs.setDefaultPredicate(p -> f -> f.relativePath().endsWith("Foo.php"));
- Iterator<File> iterator = fs.files(fs.predicates().all()).iterator();
- assertThat(iterator.hasNext()).isTrue();
- assertThat(iterator.next()).isEqualTo(file1.file());
- assertThat(iterator.hasNext()).isFalse();
- }
-
@Test
public void input_file_returns_null_if_file_not_found() {
assertThat(fs.inputFile(fs.predicates().hasRelativePath("src/Bar.java"))).isNull();
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.api.batch.sensor.internal;
-
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class MockAnalysisModeTest {
-
- @Test
- public void sanityCheck() {
- MockAnalysisMode mode = new MockAnalysisMode();
- assertThat(mode.isIssues()).isFalse();
- assertThat(mode.isPreview()).isFalse();
- assertThat(mode.isPublish()).isTrue();
- mode.setPreviewOrIssue(true);
- assertThat(mode.isIssues()).isTrue();
- assertThat(mode.isPreview()).isTrue();
- assertThat(mode.isPublish()).isFalse();
- }
-
-}
*/
package org.sonar.scanner.analysis;
-import java.util.Map;
import javax.annotation.concurrent.Immutable;
import org.sonar.api.batch.AnalysisMode;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
-import org.sonar.scanner.bootstrap.GlobalAnalysisMode;
-import org.sonar.scanner.bootstrap.ProcessedScannerProperties;
@Immutable
public class DefaultAnalysisMode implements AnalysisMode {
- private static final Logger LOG = Loggers.get(DefaultAnalysisMode.class);
- private static final String KEY_SCAN_ALL = "sonar.scanAllFiles";
-
- private final Map<String, String> analysisProps;
- private final GlobalAnalysisMode analysisMode;
-
- private boolean scanAllFiles;
-
- public DefaultAnalysisMode(ProcessedScannerProperties props, GlobalAnalysisMode analysisMode) {
- this.analysisMode = analysisMode;
- this.analysisProps = props.properties();
- load();
- printFlags();
- }
-
- public boolean scanAllFiles() {
- return scanAllFiles;
- }
-
- private void printFlags() {
- if (!scanAllFiles) {
- LOG.info("Scanning only changed files");
- }
- }
-
- private void load() {
- String scanAllStr = analysisProps.get(KEY_SCAN_ALL);
- scanAllFiles = !analysisMode.isIssues() || "true".equals(scanAllStr);
- }
@Override
public boolean isPreview() {
- return analysisMode.isPreview();
+ return false;
}
@Override
public boolean isIssues() {
- return analysisMode.isIssues();
+ return false;
}
@Override
public boolean isPublish() {
- return analysisMode.isPublish();
+ return true;
}
}
import java.util.List;
import org.sonar.core.component.DefaultResourceTypes;
import org.sonar.core.config.CorePropertyDefinitions;
-import org.sonar.core.issue.tracking.Tracker;
import org.sonar.scanner.cpd.JavaCpdBlockIndexerSensor;
import org.sonar.scanner.externalissue.ExternalIssuesImportSensor;
import org.sonar.scanner.genericcoverage.GenericCoverageSensor;
import org.sonar.scanner.genericcoverage.GenericTestExecutionSensor;
-import org.sonar.scanner.issue.tracking.ServerIssueFromWs;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.scan.report.JSONReport;
import org.sonar.scanner.source.ZeroCoverageSensor;
public class BatchComponents {
// only static stuff
}
- public static Collection<Object> all(GlobalAnalysisMode analysisMode) {
+ public static Collection<Object> all() {
List<Object> components = Lists.newArrayList(
DefaultResourceTypes.get());
components.addAll(CorePropertyDefinitions.all());
- if (!analysisMode.isIssues()) {
- components.add(ZeroCoverageSensor.class);
- components.add(JavaCpdBlockIndexerSensor.class);
+ components.add(ZeroCoverageSensor.class);
+ components.add(JavaCpdBlockIndexerSensor.class);
- // Generic coverage
- components.add(GenericCoverageSensor.class);
- components.addAll(GenericCoverageSensor.properties());
- components.add(GenericTestExecutionSensor.class);
- components.addAll(GenericTestExecutionSensor.properties());
+ // Generic coverage
+ components.add(GenericCoverageSensor.class);
+ components.addAll(GenericCoverageSensor.properties());
+ components.add(GenericTestExecutionSensor.class);
+ components.addAll(GenericTestExecutionSensor.properties());
- // External issues
- components.add(ExternalIssuesImportSensor.class);
- components.add(ExternalIssuesImportSensor.properties());
+ // External issues
+ components.add(ExternalIssuesImportSensor.class);
+ components.add(ExternalIssuesImportSensor.properties());
- } else {
- // Issues tracking
- components.add(new Tracker<TrackedIssue, ServerIssueFromWs>());
- components.add(JSONReport.class);
- }
return components;
}
}
private final SonarRuntime sonarRuntime;
private final PluginRepository pluginRepository;
- private final GlobalAnalysisMode analysisMode;
private final Configuration bootConfiguration;
- public ExtensionInstaller(SonarRuntime sonarRuntime, PluginRepository pluginRepository, GlobalAnalysisMode analysisMode,
- Configuration bootConfiguration) {
+ public ExtensionInstaller(SonarRuntime sonarRuntime, PluginRepository pluginRepository, Configuration bootConfiguration) {
this.sonarRuntime = sonarRuntime;
this.pluginRepository = pluginRepository;
- this.analysisMode = analysisMode;
this.bootConfiguration = bootConfiguration;
}
public ExtensionInstaller install(ComponentContainer container, ExtensionMatcher matcher) {
// core components
- for (Object o : BatchComponents.all(analysisMode)) {
+ for (Object o : BatchComponents.all()) {
doInstall(container, matcher, null, o);
}
*/
package org.sonar.scanner.bootstrap;
-import java.util.Arrays;
import javax.annotation.concurrent.Immutable;
-import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.sonar.api.CoreProperties;
@Immutable
public class GlobalAnalysisMode {
public static final String MEDIUM_TEST_ENABLED = "sonar.mediumTest.enabled";
private static final Logger LOG = LoggerFactory.getLogger(GlobalAnalysisMode.class);
- private static final String[] VALID_MODES = {CoreProperties.ANALYSIS_MODE_PREVIEW, CoreProperties.ANALYSIS_MODE_PUBLISH, CoreProperties.ANALYSIS_MODE_ISSUES};
- protected boolean preview;
- protected boolean issues;
protected boolean mediumTestMode;
public GlobalAnalysisMode(RawScannerProperties props) {
- String mode = props.property(CoreProperties.ANALYSIS_MODE);
- validate(mode);
- issues = CoreProperties.ANALYSIS_MODE_ISSUES.equals(mode) || CoreProperties.ANALYSIS_MODE_PREVIEW.equals(mode);
mediumTestMode = "true".equals(props.property(MEDIUM_TEST_ENABLED));
- if (preview) {
- LOG.info("Preview mode");
- LOG.warn("The use of the preview mode (sonar.analysis.mode=preview) is deprecated. This mode will be dropped in the future.");
- } else if (issues) {
- LOG.info("Issues mode");
- LOG.warn("The use of the issues mode (sonar.analysis.mode=issues) is deprecated. This mode will be dropped in the future.");
- }
if (mediumTestMode) {
LOG.info("Medium test mode");
}
}
- public boolean isPreview() {
- return preview;
- }
-
- public boolean isIssues() {
- return issues;
- }
-
- public boolean isPublish() {
- return !preview && !issues;
- }
-
public boolean isMediumTest() {
return mediumTestMode;
}
-
- protected static void validate(String mode) {
- if (StringUtils.isEmpty(mode)) {
- return;
- }
-
- if (!Arrays.asList(VALID_MODES).contains(mode)) {
- throw new IllegalStateException("Invalid analysis mode: " + mode + ".");
- }
-
- }
}
PluginLoader.class,
PluginClassloaderFactory.class,
ScannerPluginJarExploder.class,
- ScannerPluginPredicate.class,
ExtensionInstaller.class,
new SonarQubeVersion(apiVersion),
} else if (!taskKey.equals(CoreProperties.SCAN_TASK)) {
throw MessageException.of("Tasks support was removed in SonarQube 7.6.");
}
+ String analysisMode = StringUtils.defaultIfEmpty(scannerProperties.get("sonar.analysis.mode"), "publish");
+ if (!analysisMode.equals("publish")) {
+ throw MessageException.of("The preview mode, along with the 'sonar.analysis.mode' parameter, is no more supported. You should stop using this parameter.");
+ }
+
new ProjectScanContainer(this).execute();
LOG.info("Analysis total time: {}", formatTime(System.currentTimeMillis() - startTime));
private static final String PLUGINS_WS_URL = "api/plugins/installed";
private final PluginFiles pluginFiles;
- private final ScannerPluginPredicate pluginPredicate;
private final ScannerWsClient wsClient;
- public ScannerPluginInstaller(PluginFiles pluginFiles, ScannerPluginPredicate pluginPredicate, ScannerWsClient wsClient) {
+ public ScannerPluginInstaller(PluginFiles pluginFiles, ScannerWsClient wsClient) {
this.pluginFiles = pluginFiles;
- this.pluginPredicate = pluginPredicate;
this.wsClient = wsClient;
}
private Loaded loadPlugins(Map<String, ScannerPlugin> result) {
for (InstalledPlugin plugin : listInstalledPlugins()) {
- if (pluginPredicate.apply(plugin.key)) {
- Optional<File> jarFile = pluginFiles.get(plugin);
- if (!jarFile.isPresent()) {
- return new Loaded(false, plugin.key);
- }
-
- PluginInfo info = PluginInfo.create(jarFile.get());
- result.put(info.getKey(), new ScannerPlugin(plugin.key, plugin.updatedAt, info));
+ Optional<File> jarFile = pluginFiles.get(plugin);
+ if (!jarFile.isPresent()) {
+ return new Loaded(false, plugin.key);
}
+
+ PluginInfo info = PluginInfo.create(jarFile.get());
+ result.put(info.getKey(), new ScannerPlugin(plugin.key, plugin.updatedAt, info));
}
return new Loaded(true, null);
}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.bootstrap;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
-import com.google.common.base.Splitter;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-import javax.annotation.Nonnull;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.config.Configuration;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
-
-/**
- * Filters the plugins to be enabled during analysis
- */
-public class ScannerPluginPredicate implements Predicate<String> {
-
- private static final Logger LOG = Loggers.get(ScannerPluginPredicate.class);
-
- private static final String BUILDBREAKER_PLUGIN_KEY = "buildbreaker";
- private static final Joiner COMMA_JOINER = Joiner.on(", ");
-
- private final Set<String> whites = new HashSet<>();
- private final Set<String> blacks = new HashSet<>();
- private final GlobalAnalysisMode mode;
-
- public ScannerPluginPredicate(Configuration settings, GlobalAnalysisMode mode) {
- this.mode = mode;
- if (mode.isPreview() || mode.isIssues()) {
- // These default values are not supported by Settings because the class CorePlugin
- // is not loaded yet.
- whites.addAll(propertyValues(settings,
- CoreProperties.PREVIEW_INCLUDE_PLUGINS, CoreProperties.PREVIEW_INCLUDE_PLUGINS_DEFAULT_VALUE));
- blacks.addAll(propertyValues(settings,
- CoreProperties.PREVIEW_EXCLUDE_PLUGINS, CoreProperties.PREVIEW_EXCLUDE_PLUGINS_DEFAULT_VALUE));
- }
- if (!whites.isEmpty()) {
- LOG.info("Include plugins: " + COMMA_JOINER.join(whites));
- }
- if (!blacks.isEmpty()) {
- LOG.info("Exclude plugins: " + COMMA_JOINER.join(blacks));
- }
- }
-
- @Override
- public boolean apply(@Nonnull String pluginKey) {
- if (BUILDBREAKER_PLUGIN_KEY.equals(pluginKey) && mode.isPreview()) {
- LOG.info("Build Breaker plugin is no more supported in preview mode");
- return false;
- }
-
- if (whites.isEmpty()) {
- return blacks.isEmpty() || !blacks.contains(pluginKey);
- }
- return whites.contains(pluginKey);
- }
-
- Set<String> getWhites() {
- return whites;
- }
-
- Set<String> getBlacks() {
- return blacks;
- }
-
- private static List<String> propertyValues(Configuration settings, String key, String defaultValue) {
- String s = settings.get(key).orElse(defaultValue);
- return StreamSupport.stream(Splitter.on(",").trimResults().omitEmptyStrings().split(s).spliterator(), false)
- .collect(Collectors.toList());
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue;
-
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-import javax.annotation.Nullable;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.ProjectIssues;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-
-/**
- * Expose list of issues for the current project
- * @since 4.0
- */
-public class DefaultProjectIssues implements ProjectIssues {
- private static final Predicate<TrackedIssue> RESOLVED = new ResolvedPredicate(true);
- private static final Predicate<TrackedIssue> NOT_RESOLVED = new ResolvedPredicate(false);
- private final IssueCache cache;
-
- public DefaultProjectIssues(IssueCache cache) {
- this.cache = cache;
- }
-
- @Override
- public Iterable<Issue> issues() {
- return StreamSupport.stream(cache.all().spliterator(), false)
- .filter(NOT_RESOLVED)
- .map(TrackedIssueAdapter::new)
- .collect(Collectors.toList());
- }
-
- @Override
- public Iterable<Issue> resolvedIssues() {
- return StreamSupport.stream(cache.all().spliterator(), false)
- .filter(RESOLVED)
- .map(TrackedIssueAdapter::new)
- .collect(Collectors.toList());
- }
-
- private static class ResolvedPredicate implements Predicate<TrackedIssue> {
- private final boolean resolved;
-
- private ResolvedPredicate(boolean resolved) {
- this.resolved = resolved;
- }
-
- @Override
- public boolean test(@Nullable TrackedIssue issue) {
- if (issue != null) {
- return resolved ? (issue.resolution() != null) : (issue.resolution() == null);
- }
- return false;
- }
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue;
-
-import java.util.Collection;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.storage.Storage;
-import org.sonar.scanner.storage.Storages;
-
-/**
- * Shared issues among all project modules
- */
-public class IssueCache {
-
- // component key -> issue key -> issue
- private final Storage<TrackedIssue> cache;
-
- public IssueCache(Storages caches) {
- cache = caches.createCache("issues");
- }
-
- public Iterable<TrackedIssue> byComponent(String componentKey) {
- return cache.values(componentKey);
- }
-
- public Iterable<TrackedIssue> all() {
- return cache.values();
- }
-
- public Collection<Object> componentKeys() {
- return cache.keySet();
- }
-
- public IssueCache put(TrackedIssue issue) {
- cache.put(issue.componentKey(), issue.key(), issue);
- return this;
- }
-
- public void clear(String componentKey) {
- cache.clear(componentKey);
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue;
-
-import com.google.common.base.Preconditions;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import javax.annotation.Nullable;
-import org.apache.commons.lang.StringUtils;
-import org.sonar.api.batch.fs.InputComponent;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.core.util.Uuids;
-import org.sonar.scanner.issue.tracking.SourceHashHolder;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
-import org.sonar.scanner.protocol.output.ScannerReport;
-import org.sonar.scanner.protocol.output.ScannerReport.TextRange;
-
-public class IssueTransformer {
- private IssueTransformer() {
- // static only
- }
-
- public static TrackedIssue toTrackedIssue(ServerIssue serverIssue, String componentKey) {
- TrackedIssue issue = new TrackedIssue();
- issue.setKey(serverIssue.getKey());
- issue.setStatus(serverIssue.getStatus());
- issue.setResolution(serverIssue.hasResolution() ? serverIssue.getResolution() : null);
- issue.setMessage(serverIssue.hasMsg() ? serverIssue.getMsg() : null);
- issue.setStartLine(serverIssue.hasLine() ? serverIssue.getLine() : null);
- issue.setEndLine(serverIssue.hasLine() ? serverIssue.getLine() : null);
- issue.setSeverity(serverIssue.getSeverity().name());
- issue.setAssignee(serverIssue.hasAssigneeLogin() ? serverIssue.getAssigneeLogin() : null);
- // key in serverIssue might have branch, so don't use it
- issue.setComponentKey(componentKey);
- issue.setCreationDate(new Date(serverIssue.getCreationDate()));
- issue.setRuleKey(RuleKey.of(serverIssue.getRuleRepository(), serverIssue.getRuleKey()));
- issue.setNew(false);
- return issue;
- }
-
- public static void close(TrackedIssue issue) {
- issue.setStatus(Issue.STATUS_CLOSED);
- issue.setStartLine(null);
- issue.setEndLine(null);
- issue.setResolution(Issue.RESOLUTION_FIXED);
- }
-
- public static void resolveRemove(TrackedIssue issue) {
- issue.setStatus(Issue.STATUS_CLOSED);
- issue.setStartLine(null);
- issue.setEndLine(null);
- issue.setResolution(Issue.RESOLUTION_REMOVED);
- }
-
- public static Collection<TrackedIssue> toTrackedIssue(InputComponent component, Collection<ScannerReport.Issue> rawIssues, @Nullable SourceHashHolder hashes) {
- List<TrackedIssue> issues = new ArrayList<>(rawIssues.size());
-
- for (ScannerReport.Issue issue : rawIssues) {
- issues.add(toTrackedIssue(component, issue, hashes));
- }
-
- return issues;
- }
-
- public static TrackedIssue toTrackedIssue(InputComponent component, ScannerReport.Issue rawIssue, @Nullable SourceHashHolder hashes) {
- RuleKey ruleKey = RuleKey.of(rawIssue.getRuleRepository(), rawIssue.getRuleKey());
-
- Preconditions.checkNotNull(component.key(), "Component key must be set");
- Preconditions.checkNotNull(ruleKey, "Rule key must be set");
-
- TrackedIssue issue = new TrackedIssue(hashes != null ? hashes.getHashedSource() : null);
-
- issue.setKey(Uuids.createFast());
- issue.setComponentKey(component.key());
- issue.setRuleKey(ruleKey);
- issue.setGap(rawIssue.getGap() != 0 ? rawIssue.getGap() : null);
- issue.setSeverity(rawIssue.getSeverity().name());
- issue.setMessage(StringUtils.trimToNull(rawIssue.getMsg()));
- issue.setResolution(null);
- issue.setStatus(Issue.STATUS_OPEN);
- issue.setNew(true);
-
- if (rawIssue.hasTextRange()) {
- TextRange r = rawIssue.getTextRange();
-
- issue.setStartLine(r.getStartLine());
- issue.setStartLineOffset(r.getStartOffset());
- issue.setEndLine(r.getEndLine());
- issue.setEndLineOffset(r.getEndOffset());
- }
-
- return issue;
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.IssueComment;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.api.utils.Duration;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-
-public class TrackedIssueAdapter implements Issue {
- private TrackedIssue issue;
-
- public TrackedIssueAdapter(TrackedIssue issue) {
- this.issue = issue;
- }
-
- @Override
- public String key() {
- return issue.key();
- }
-
- @Override
- public String componentKey() {
- return issue.componentKey();
- }
-
- @Override
- public RuleKey ruleKey() {
- return issue.getRuleKey();
- }
-
- @Override
- public String severity() {
- return issue.severity();
- }
-
- @Override
- public String message() {
- return issue.getMessage();
- }
-
- @Override
- public Integer line() {
- return issue.startLine();
- }
-
- @Override
- public Double gap() {
- return issue.gap();
- }
-
- @Override
- public String status() {
- return issue.status();
- }
-
- @Override
- public String resolution() {
- return issue.resolution();
- }
-
- @Override
- public String assignee() {
- return issue.assignee();
- }
-
- @Override
- public boolean isNew() {
- return issue.isNew();
- }
-
- @Override
- public boolean isCopied() {
- return false;
- }
-
- @Override
- public Map<String, String> attributes() {
- return new HashMap<>();
- }
-
- @Override
- public Date creationDate() {
- return issue.getCreationDate();
- }
-
- @Override
- public String language() {
- return null;
- }
-
- @Override
- public Date updateDate() {
- return null;
- }
-
- @Override
- public Date closeDate() {
- return null;
- }
-
- @Override
- public String attribute(String key) {
- return attributes().get(key);
- }
-
- @Override
- public String authorLogin() {
- return null;
- }
-
- @Override
- public List<IssueComment> comments() {
- return new ArrayList<>();
- }
-
- @Override
- public Duration effort() {
- return null;
- }
-
- @Override
- public String projectKey() {
- return null;
- }
-
- @Override
- public String projectUuid() {
- return null;
- }
-
- @Override
- public String componentUuid() {
- return null;
- }
-
- @Override
- public Collection<String> tags() {
- return new ArrayList<>();
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == null || !(o instanceof Issue)) {
- return false;
- }
- Issue that = (Issue) o;
- return !(issue.key() != null ? !issue.key().equals(that.key()) : (that.key() != null));
- }
-
- @Override
- public int hashCode() {
- return issue.key() != null ? issue.key().hashCode() : 0;
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterators;
-import java.io.IOException;
-import java.io.Reader;
-import org.apache.commons.io.IOUtils;
-import org.sonar.api.utils.log.Loggers;
-import org.sonar.api.utils.log.Profiler;
-import org.sonar.scanner.bootstrap.ScannerWsClient;
-import org.sonar.scanner.util.ScannerUtils;
-import org.sonarqube.ws.client.GetRequest;
-
-public class DefaultServerLineHashesLoader implements ServerLineHashesLoader {
- private ScannerWsClient wsClient;
-
- public DefaultServerLineHashesLoader(ScannerWsClient wsClient) {
- this.wsClient = wsClient;
- }
-
- @Override
- public String[] getLineHashes(String fileKey) {
- String hashesFromWs = loadHashesFromWs(fileKey);
- return Iterators.toArray(Splitter.on('\n').split(hashesFromWs).iterator(), String.class);
- }
-
- private String loadHashesFromWs(String fileKey) {
- Profiler profiler = Profiler.createIfDebug(Loggers.get(getClass()))
- .addContext("file", fileKey)
- .startDebug("Load line hashes");
-
- GetRequest getRequest = new GetRequest("/api/sources/hash?key=" + ScannerUtils.encodeForUrl(fileKey));
- Reader reader = wsClient.call(getRequest).contentReader();
- try {
- return IOUtils.toString(reader);
- } catch (IOException e) {
- throw new IllegalStateException(e);
- } finally {
- profiler.stopDebug();
- }
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Multimap;
-import java.util.Collection;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.ObjectUtils;
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.internal.FileMetadata;
-
-/**
- * Wraps a {@link Sequence} to assign hash codes to elements.
- */
-public final class FileHashes {
-
- private final String[] hashes;
- private final Multimap<String, Integer> linesByHash;
-
- private FileHashes(String[] hashes, Multimap<String, Integer> linesByHash) {
- this.hashes = hashes;
- this.linesByHash = linesByHash;
- }
-
- public static FileHashes create(String[] hashes) {
- int size = hashes.length;
- Multimap<String, Integer> linesByHash = LinkedHashMultimap.create();
- for (int i = 0; i < size; i++) {
- // indices in array are shifted one line before
- linesByHash.put(hashes[i], i + 1);
- }
- return new FileHashes(hashes, linesByHash);
- }
-
- public static FileHashes create(InputFile f) {
- final byte[][] hashes = new byte[f.lines()][];
- FileMetadata.computeLineHashesForIssueTracking(f,
- (lineIdx, hash) -> hashes[lineIdx - 1] = hash);
-
- int size = hashes.length;
- Multimap<String, Integer> linesByHash = LinkedHashMultimap.create();
- String[] hexHashes = new String[size];
- for (int i = 0; i < size; i++) {
- String hash = hashes[i] != null ? Hex.encodeHexString(hashes[i]) : "";
- hexHashes[i] = hash;
- // indices in array are shifted one line before
- linesByHash.put(hash, i + 1);
- }
- return new FileHashes(hexHashes, linesByHash);
- }
-
- public int length() {
- return hashes.length;
- }
-
- public Collection<Integer> getLinesForHash(String hash) {
- return linesByHash.get(hash);
- }
-
- public String[] hashes() {
- return hashes;
- }
-
- public String getHash(int line) {
- // indices in array are shifted one line before
- return (String) ObjectUtils.defaultIfNull(hashes[line - 1], "");
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import java.util.Collection;
-import java.util.List;
-import org.sonar.core.issue.tracking.BlockHashSequence;
-import org.sonar.core.issue.tracking.Input;
-import org.sonar.core.issue.tracking.LineHashSequence;
-import org.sonar.core.issue.tracking.Trackable;
-
-public class IssueTrackingInput<T extends Trackable> implements Input<T> {
-
- private final Collection<T> issues;
- private final LineHashSequence lineHashes;
- private final BlockHashSequence blockHashes;
-
- public IssueTrackingInput(Collection<T> issues, List<String> hashes) {
- this.issues = issues;
- this.lineHashes = new LineHashSequence(hashes);
- this.blockHashes = BlockHashSequence.create(lineHashes);
- }
-
- @Override
- public LineHashSequence getLineHashSequence() {
- return lineHashes;
- }
-
- @Override
- public BlockHashSequence getBlockHashSequence() {
- return blockHashes;
- }
-
- @Override
- public Collection<T> getIssues() {
- return issues;
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
-import org.sonar.api.batch.fs.InputComponent;
-import org.sonar.api.batch.fs.internal.DefaultInputComponent;
-import org.sonar.core.util.CloseableIterator;
-import org.sonar.scanner.ProjectInfo;
-import org.sonar.scanner.issue.IssueCache;
-import org.sonar.scanner.issue.IssueTransformer;
-import org.sonar.scanner.protocol.output.ScannerReport;
-import org.sonar.scanner.protocol.output.ScannerReportReader;
-import org.sonar.scanner.report.ReportPublisher;
-import org.sonar.scanner.scan.filesystem.InputComponentStore;
-import org.sonar.scanner.util.ProgressReport;
-
-public class IssueTransition {
- private final IssueCache issueCache;
- private final InputComponentStore inputComponentStore;
- private final ReportPublisher reportPublisher;
- private final Date analysisDate;
- @Nullable
- private final LocalIssueTracking localIssueTracking;
-
- public IssueTransition(InputComponentStore inputComponentCache, ProjectInfo projectInfo, IssueCache issueCache, ReportPublisher reportPublisher,
- @Nullable LocalIssueTracking localIssueTracking) {
- this.inputComponentStore = inputComponentCache;
- this.issueCache = issueCache;
- this.reportPublisher = reportPublisher;
- this.localIssueTracking = localIssueTracking;
- this.analysisDate = projectInfo.getAnalysisDate();
- }
-
- public IssueTransition(InputComponentStore inputComponentCache, ProjectInfo projectInfo, IssueCache issueCache, ReportPublisher reportPublisher) {
- this(inputComponentCache, projectInfo, issueCache, reportPublisher, null);
- }
-
- public void execute() {
- if (localIssueTracking != null) {
- localIssueTracking.init();
- }
-
- ScannerReportReader reader = new ScannerReportReader(reportPublisher.getReportDir().toFile());
- int nbComponents = inputComponentStore.all().size();
-
- if (nbComponents == 0) {
- return;
- }
-
- ProgressReport progressReport = new ProgressReport("issue-tracking-report", TimeUnit.SECONDS.toMillis(10));
- progressReport.start("Performing issue tracking");
- int count = 0;
-
- try {
- for (InputComponent component : inputComponentStore.all()) {
- trackIssues(reader, (DefaultInputComponent) component);
- count++;
- progressReport.message(count + "/" + nbComponents + " components tracked");
- }
- } finally {
- progressReport.stop(count + "/" + nbComponents + " components tracked");
- }
- }
-
- public void trackIssues(ScannerReportReader reader, DefaultInputComponent component) {
- // raw issues = all the issues created by rule engines during this module scan and not excluded by filters
- List<ScannerReport.Issue> rawIssues = new LinkedList<>();
- try (CloseableIterator<ScannerReport.Issue> it = reader.readComponentIssues(component.scannerId())) {
- while (it.hasNext()) {
- rawIssues.add(it.next());
- }
- } catch (Exception e) {
- throw new IllegalStateException("Can't read issues for " + component.key(), e);
- }
-
- List<TrackedIssue> trackedIssues;
- if (localIssueTracking != null) {
- trackedIssues = localIssueTracking.trackIssues(component, rawIssues, analysisDate);
- } else {
- trackedIssues = doTransition(rawIssues, component);
- }
-
- for (TrackedIssue issue : trackedIssues) {
- issueCache.put(issue);
- }
- }
-
- private static List<TrackedIssue> doTransition(List<ScannerReport.Issue> rawIssues, InputComponent component) {
- List<TrackedIssue> issues = new ArrayList<>(rawIssues.size());
-
- for (ScannerReport.Issue issue : rawIssues) {
- issues.add(IssueTransformer.toTrackedIssue(component, issue, null));
- }
-
- return issues;
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-import org.sonar.api.batch.fs.InputComponent;
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.InputFile.Status;
-import org.sonar.api.batch.fs.InputModule;
-import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.api.batch.fs.internal.DefaultInputProject;
-import org.sonar.api.batch.rule.ActiveRule;
-import org.sonar.api.batch.rule.ActiveRules;
-import org.sonar.core.issue.tracking.Input;
-import org.sonar.core.issue.tracking.Tracker;
-import org.sonar.core.issue.tracking.Tracking;
-import org.sonar.scanner.analysis.DefaultAnalysisMode;
-import org.sonar.scanner.issue.IssueTransformer;
-import org.sonar.scanner.protocol.output.ScannerReport;
-import org.sonar.scanner.repository.ProjectRepositories;
-
-public class LocalIssueTracking {
- private final DefaultInputProject project;
- private final Tracker<TrackedIssue, ServerIssueFromWs> tracker;
- private final ServerLineHashesLoader lastLineHashes;
- private final ActiveRules activeRules;
- private final ServerIssueRepository serverIssueRepository;
- private final DefaultAnalysisMode mode;
-
- private boolean hasServerAnalysis;
-
- public LocalIssueTracking(DefaultInputProject project, Tracker<TrackedIssue, ServerIssueFromWs> tracker, ServerLineHashesLoader lastLineHashes,
- ActiveRules activeRules, ServerIssueRepository serverIssueRepository, ProjectRepositories projectRepositories, DefaultAnalysisMode mode) {
- this.project = project;
- this.tracker = tracker;
- this.lastLineHashes = lastLineHashes;
- this.serverIssueRepository = serverIssueRepository;
- this.mode = mode;
- this.activeRules = activeRules;
- this.hasServerAnalysis = projectRepositories.lastAnalysisDate() != null;
- }
-
- public void init() {
- if (hasServerAnalysis) {
- serverIssueRepository.load();
- }
- }
-
- public List<TrackedIssue> trackIssues(InputComponent component, Collection<ScannerReport.Issue> reportIssues, Date analysisDate) {
- List<TrackedIssue> trackedIssues = new LinkedList<>();
- if (hasServerAnalysis) {
- // all the issues that are not closed in db before starting this module scan, including manual issues
- Collection<ServerIssueFromWs> serverIssues = loadServerIssues(component);
-
- if (shouldCopyServerIssues(component)) {
- // raw issues should be empty, we just need to deal with server issues (SONAR-6931)
- copyServerIssues(serverIssues, trackedIssues, component.key());
- } else {
-
- SourceHashHolder sourceHashHolder = loadSourceHashes(component);
- Collection<TrackedIssue> rIssues = IssueTransformer.toTrackedIssue(component, reportIssues, sourceHashHolder);
-
- Input<ServerIssueFromWs> baseIssues = createBaseInput(serverIssues, sourceHashHolder);
- Input<TrackedIssue> rawIssues = createRawInput(rIssues, sourceHashHolder);
-
- Tracking<TrackedIssue, ServerIssueFromWs> track = tracker.trackNonClosed(rawIssues, baseIssues);
-
- addUnmatchedFromServer(track.getUnmatchedBases(), trackedIssues, component.key());
- mergeMatched(track, trackedIssues, rIssues);
- addUnmatchedFromReport(track.getUnmatchedRaws(), trackedIssues, analysisDate);
- }
- }
-
- if (hasServerAnalysis && !component.isFile()) {
- Preconditions.checkState(component instanceof InputModule, "Object without parent is of type: " + component.getClass());
- // issues that relate to deleted components
- addIssuesOnDeletedComponents(trackedIssues, component.key());
- }
-
- return trackedIssues;
- }
-
- private static Input<ServerIssueFromWs> createBaseInput(Collection<ServerIssueFromWs> serverIssues, @Nullable SourceHashHolder sourceHashHolder) {
- List<String> refHashes;
-
- if (sourceHashHolder != null && sourceHashHolder.getHashedReference() != null) {
- refHashes = Arrays.asList(sourceHashHolder.getHashedReference().hashes());
- } else {
- refHashes = new ArrayList<>(0);
- }
-
- return new IssueTrackingInput<>(serverIssues, refHashes);
- }
-
- private static Input<TrackedIssue> createRawInput(Collection<TrackedIssue> rIssues, @Nullable SourceHashHolder sourceHashHolder) {
- List<String> baseHashes;
- if (sourceHashHolder != null && sourceHashHolder.getHashedSource() != null) {
- baseHashes = Arrays.asList(sourceHashHolder.getHashedSource().hashes());
- } else {
- baseHashes = new ArrayList<>(0);
- }
-
- return new IssueTrackingInput<>(rIssues, baseHashes);
- }
-
- private boolean shouldCopyServerIssues(InputComponent component) {
- if (!mode.scanAllFiles() && component.isFile()) {
- InputFile inputFile = (InputFile) component;
- if (inputFile.status() == Status.SAME) {
- return true;
- }
- }
- return false;
- }
-
- private void copyServerIssues(Collection<ServerIssueFromWs> serverIssues, List<TrackedIssue> trackedIssues, String componentKey) {
- for (ServerIssueFromWs serverIssue : serverIssues) {
- org.sonar.scanner.protocol.input.ScannerInput.ServerIssue unmatchedPreviousIssue = serverIssue.getDto();
- TrackedIssue unmatched = IssueTransformer.toTrackedIssue(unmatchedPreviousIssue, componentKey);
-
- ActiveRule activeRule = activeRules.find(unmatched.getRuleKey());
- unmatched.setNew(false);
-
- if (activeRule == null) {
- // rule removed
- IssueTransformer.resolveRemove(unmatched);
- }
-
- trackedIssues.add(unmatched);
- }
- }
-
- @CheckForNull
- private SourceHashHolder loadSourceHashes(InputComponent component) {
- SourceHashHolder sourceHashHolder = null;
- if (component.isFile()) {
- DefaultInputFile file = (DefaultInputFile) component;
- sourceHashHolder = new SourceHashHolder(project, file, lastLineHashes);
- }
- return sourceHashHolder;
- }
-
- private Collection<ServerIssueFromWs> loadServerIssues(InputComponent component) {
- Collection<ServerIssueFromWs> serverIssues = new ArrayList<>();
- for (org.sonar.scanner.protocol.input.ScannerInput.ServerIssue previousIssue : serverIssueRepository.byComponent(component)) {
- serverIssues.add(new ServerIssueFromWs(previousIssue));
- }
- return serverIssues;
- }
-
- @VisibleForTesting
- protected void mergeMatched(Tracking<TrackedIssue, ServerIssueFromWs> result, Collection<TrackedIssue> mergeTo, Collection<TrackedIssue> rawIssues) {
- for (Map.Entry<TrackedIssue, ServerIssueFromWs> e : result.getMatchedRaws().entrySet()) {
- org.sonar.scanner.protocol.input.ScannerInput.ServerIssue dto = e.getValue().getDto();
- TrackedIssue tracked = e.getKey();
-
- // invariant fields
- tracked.setKey(dto.getKey());
-
- // non-persisted fields
- tracked.setNew(false);
-
- // fields to update with old values
- tracked.setResolution(dto.hasResolution() ? dto.getResolution() : null);
- tracked.setStatus(dto.getStatus());
- tracked.setAssignee(dto.hasAssigneeLogin() ? dto.getAssigneeLogin() : null);
- tracked.setCreationDate(new Date(dto.getCreationDate()));
-
- if (dto.getManualSeverity()) {
- // Severity overridden by user
- tracked.setSeverity(dto.getSeverity().name());
- }
- mergeTo.add(tracked);
- }
- }
-
- private void addUnmatchedFromServer(Stream<ServerIssueFromWs> unmatchedIssues, Collection<TrackedIssue> mergeTo, String componentKey) {
- unmatchedIssues.forEach(unmatchedIssue -> {
- org.sonar.scanner.protocol.input.ScannerInput.ServerIssue unmatchedPreviousIssue = unmatchedIssue.getDto();
- TrackedIssue unmatched = IssueTransformer.toTrackedIssue(unmatchedPreviousIssue, componentKey);
- updateUnmatchedIssue(unmatched);
- mergeTo.add(unmatched);
- });
- }
-
- private static void addUnmatchedFromReport(Stream<TrackedIssue> rawIssues, Collection<TrackedIssue> trackedIssues, Date analysisDate) {
- rawIssues.forEach(rawIssue -> {
- rawIssue.setCreationDate(analysisDate);
- trackedIssues.add(rawIssue);
- });
- }
-
- private void addIssuesOnDeletedComponents(Collection<TrackedIssue> issues, String componentKey) {
- for (org.sonar.scanner.protocol.input.ScannerInput.ServerIssue previous : serverIssueRepository.issuesOnMissingComponents()) {
- TrackedIssue dead = IssueTransformer.toTrackedIssue(previous, componentKey);
- updateUnmatchedIssue(dead);
- issues.add(dead);
- }
- }
-
- private void updateUnmatchedIssue(TrackedIssue issue) {
- ActiveRule activeRule = activeRules.find(issue.getRuleKey());
- issue.setNew(false);
-
- boolean isRemovedRule = activeRule == null;
-
- if (isRemovedRule) {
- IssueTransformer.resolveRemove(issue);
- } else {
- IssueTransformer.close(issue);
- }
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-/**
- * Compute hashes of block around each line
- */
-public class RollingFileHashes {
-
- final int[] rollingHashes;
-
- private RollingFileHashes(int[] hashes) {
- this.rollingHashes = hashes;
- }
-
- public static RollingFileHashes create(FileHashes hashes, int halfBlockSize) {
- int size = hashes.length();
- int[] rollingHashes = new int[size];
-
- RollingHashCalculator hashCalulator = new RollingHashCalculator(halfBlockSize * 2 + 1);
- for (int i = 1; i <= Math.min(size, halfBlockSize + 1); i++) {
- hashCalulator.add(hashes.getHash(i).hashCode());
- }
- for (int i = 1; i <= size; i++) {
- rollingHashes[i - 1] = hashCalulator.getHash();
- if (i - halfBlockSize > 0) {
- hashCalulator.remove(hashes.getHash(i - halfBlockSize).hashCode());
- }
- if (i + 1 + halfBlockSize <= size) {
- hashCalulator.add(hashes.getHash(i + 1 + halfBlockSize).hashCode());
- } else {
- hashCalulator.add(0);
- }
- }
-
- return new RollingFileHashes(rollingHashes);
- }
-
- public int getHash(int line) {
- return rollingHashes[line - 1];
- }
-
- private static class RollingHashCalculator {
-
- private static final int PRIME_BASE = 31;
-
- private final int power;
- private int hash;
-
- public RollingHashCalculator(int size) {
- int pow = 1;
- for (int i = 0; i < size - 1; i++) {
- pow = pow * PRIME_BASE;
- }
- this.power = pow;
- }
-
- public void add(int value) {
- hash = hash * PRIME_BASE + value;
- }
-
- public void remove(int value) {
- hash = hash - power * value;
- }
-
- public int getHash() {
- return hash;
- }
-
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import java.util.Date;
-import javax.annotation.CheckForNull;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.api.utils.DateUtils;
-import org.sonar.core.issue.tracking.Trackable;
-
-import static org.apache.commons.lang.StringUtils.trim;
-
-public class ServerIssueFromWs implements Trackable {
-
- private org.sonar.scanner.protocol.input.ScannerInput.ServerIssue dto;
-
- public ServerIssueFromWs(org.sonar.scanner.protocol.input.ScannerInput.ServerIssue dto) {
- this.dto = dto;
- }
-
- public org.sonar.scanner.protocol.input.ScannerInput.ServerIssue getDto() {
- return dto;
- }
-
- public String key() {
- return dto.getKey();
- }
-
- @Override
- public RuleKey getRuleKey() {
- return RuleKey.of(dto.getRuleRepository(), dto.getRuleKey());
- }
-
- @Override
- @CheckForNull
- public String getLineHash() {
- return dto.hasChecksum() ? dto.getChecksum() : null;
- }
-
- @Override
- @CheckForNull
- public Integer getLine() {
- return dto.hasLine() ? dto.getLine() : null;
- }
-
- @Override
- public String getMessage() {
- return dto.hasMsg() ? trim(dto.getMsg()) : "";
- }
-
- @Override
- public String getStatus() {
- return dto.getStatus();
- }
-
- @Override
- public Date getCreationDate() {
- return DateUtils.longToDate(dto.getCreationDate());
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import org.sonar.api.batch.fs.InputComponent;
-import org.sonar.api.batch.fs.internal.AbstractProjectOrModule;
-import org.sonar.api.batch.fs.internal.DefaultInputComponent;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
-import org.sonar.api.utils.log.Profiler;
-import org.sonar.core.component.ComponentKeys;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
-import org.sonar.scanner.repository.ServerIssuesLoader;
-import org.sonar.scanner.scan.filesystem.InputComponentStore;
-import org.sonar.scanner.storage.Storage;
-import org.sonar.scanner.storage.Storages;
-
-public class ServerIssueRepository {
-
- private static final Logger LOG = Loggers.get(ServerIssueRepository.class);
- private static final String LOG_MSG = "Load server issues";
-
- private final Storages caches;
- private Storage<ServerIssue> issuesCache;
- private final ServerIssuesLoader previousIssuesLoader;
- private final InputComponentStore componentStore;
- private final AbstractProjectOrModule project;
-
- public ServerIssueRepository(Storages caches, ServerIssuesLoader previousIssuesLoader, InputComponentStore componentStore, AbstractProjectOrModule project) {
- this.caches = caches;
- this.previousIssuesLoader = previousIssuesLoader;
- this.componentStore = componentStore;
- this.project = project;
- }
-
- public void load() {
- Profiler profiler = Profiler.create(LOG).startInfo(LOG_MSG);
- this.issuesCache = caches.createCache("previousIssues");
- caches.registerValueCoder(ServerIssue.class, new ServerIssueValueCoder());
- previousIssuesLoader.load(project.getKeyWithBranch(), this::store);
- profiler.stopInfo();
- }
-
- public Iterable<ServerIssue> byComponent(InputComponent component) {
- return issuesCache.values(((DefaultInputComponent) component).scannerId());
- }
-
- private void store(ServerIssue issue) {
- String moduleKeyWithBranch = issue.getModuleKey();
- AbstractProjectOrModule moduleOrProject = componentStore.getModule(moduleKeyWithBranch);
- if (moduleOrProject != null) {
- String componentKeyWithoutBranch = ComponentKeys.createEffectiveKey(moduleOrProject.key(), issue.hasPath() ? issue.getPath() : null);
- DefaultInputComponent r = (DefaultInputComponent) componentStore.getByKey(componentKeyWithoutBranch);
- if (r != null) {
- issuesCache.put(r.scannerId(), issue.getKey(), issue);
- return;
- }
- }
- // Deleted resource
- issuesCache.put(0, issue.getKey(), issue);
- }
-
- public Iterable<ServerIssue> issuesOnMissingComponents() {
- return issuesCache.values(0);
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import com.persistit.Value;
-import com.persistit.encoding.CoderContext;
-import com.persistit.encoding.ValueCoder;
-import java.io.IOException;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
-
-public class ServerIssueValueCoder implements ValueCoder {
-
- @Override
- public void put(Value value, Object object, CoderContext context) {
- ServerIssue issue = (ServerIssue) object;
- value.putByteArray(issue.toByteArray());
- }
-
- @Override
- public Object get(Value value, Class<?> clazz, CoderContext context) {
- try {
- return ServerIssue.parseFrom(value.getByteArray());
- } catch (IOException e) {
- throw new IllegalStateException("Unable to read issue from cache", e);
- }
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-public interface ServerLineHashesLoader {
-
- String[] getLineHashes(String fileKey);
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import javax.annotation.CheckForNull;
-import org.sonar.api.batch.fs.InputFile.Status;
-import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.api.batch.fs.internal.DefaultInputProject;
-import org.sonar.core.component.ComponentKeys;
-
-public class SourceHashHolder {
-
- private final DefaultInputProject project;
- private final DefaultInputFile inputFile;
- private final ServerLineHashesLoader lastSnapshots;
-
- private FileHashes hashedReference;
- private FileHashes hashedSource;
-
- public SourceHashHolder(DefaultInputProject project, DefaultInputFile inputFile, ServerLineHashesLoader lastSnapshots) {
- this.project = project;
- this.inputFile = inputFile;
- this.lastSnapshots = lastSnapshots;
- }
-
- private void initHashes() {
- if (hashedSource == null) {
- hashedSource = FileHashes.create(inputFile);
- Status status = inputFile.status();
- if (status == Status.ADDED) {
- hashedReference = null;
- } else if (status == Status.SAME) {
- hashedReference = hashedSource;
- } else {
- // Need key with branch
- String serverSideKey = ComponentKeys.createEffectiveKey(project.getKeyWithBranch(), inputFile);
- String[] lineHashes = lastSnapshots.getLineHashes(serverSideKey);
- hashedReference = lineHashes != null ? FileHashes.create(lineHashes) : null;
- }
- }
- }
-
- @CheckForNull
- public FileHashes getHashedReference() {
- initHashes();
- return hashedReference;
- }
-
- public FileHashes getHashedSource() {
- initHashes();
- return hashedSource;
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import com.google.common.base.Preconditions;
-import java.io.Serializable;
-import java.util.Date;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.core.issue.tracking.Trackable;
-
-public class TrackedIssue implements Trackable, Serializable {
- private static final long serialVersionUID = -1755017079070964287L;
-
- private RuleKey ruleKey;
- private String key;
- private String severity;
- private Integer startLine;
- private Integer startLineOffset;
- private Integer endLine;
- private Integer endLineOffset;
- private Double gap;
- private boolean isNew;
- private Date creationDate;
- private String resolution;
- private String status;
- private String assignee;
- private String componentKey;
- private String message;
-
- private transient FileHashes hashes;
-
- public TrackedIssue() {
- hashes = null;
- }
-
- public TrackedIssue(@Nullable FileHashes hashes) {
- this.hashes = hashes;
- }
-
- @Override
- @CheckForNull
- public String getLineHash() {
- if (getLine() == null || hashes == null) {
- return null;
- }
-
- int line = getLine();
- Preconditions.checkState(line <= hashes.length(), "Invalid line number for issue %s. File has only %s line(s)", this, hashes.length());
-
- return hashes.getHash(line);
- }
-
- @Override
- public String getMessage() {
- return message;
- }
-
- public TrackedIssue setMessage(String message) {
- this.message = message;
- return this;
- }
-
- /**
- * Component key shared by all part of SonarQube (batch, server, WS...).
- * It doesn't include the branch.
- */
- public String componentKey() {
- return componentKey;
- }
-
- /**
- * Component key shared by all part of SonarQube (batch, server, WS...).
- * It doesn't include the branch.
- */
- public TrackedIssue setComponentKey(String componentKey) {
- this.componentKey = componentKey;
- return this;
- }
-
- public String key() {
- return key;
- }
-
- public Integer startLine() {
- return startLine;
- }
-
- @Override
- public Integer getLine() {
- return startLine;
- }
-
- public TrackedIssue setStartLine(Integer startLine) {
- this.startLine = startLine;
- return this;
- }
-
- public Integer startLineOffset() {
- return startLineOffset;
- }
-
- public TrackedIssue setStartLineOffset(Integer startLineOffset) {
- this.startLineOffset = startLineOffset;
- return this;
- }
-
- public Integer endLine() {
- return endLine;
- }
-
- public TrackedIssue setEndLine(Integer endLine) {
- this.endLine = endLine;
- return this;
- }
-
- public Integer endLineOffset() {
- return endLineOffset;
- }
-
- public TrackedIssue setEndLineOffset(Integer endLineOffset) {
- this.endLineOffset = endLineOffset;
- return this;
- }
-
- public TrackedIssue setKey(String key) {
- this.key = key;
- return this;
- }
-
- public String assignee() {
- return assignee;
- }
-
- public TrackedIssue setAssignee(String assignee) {
- this.assignee = assignee;
- return this;
- }
-
- public String resolution() {
- return resolution;
- }
-
- public TrackedIssue setResolution(String resolution) {
- this.resolution = resolution;
- return this;
- }
-
- public String status() {
- return status;
- }
-
- public TrackedIssue setStatus(String status) {
- this.status = status;
- return this;
- }
-
- @Override
- public RuleKey getRuleKey() {
- return ruleKey;
- }
-
- @Override
- public String getStatus() {
- return status;
- }
-
- public String severity() {
- return severity;
- }
-
- public Double gap() {
- return gap;
- }
-
- public Date getCreationDate() {
- return creationDate;
- }
-
- public boolean isNew() {
- return isNew;
- }
-
- public TrackedIssue setNew(boolean isNew) {
- this.isNew = isNew;
- return this;
- }
-
- public Date creationDate() {
- return creationDate;
- }
-
- public TrackedIssue setCreationDate(Date creationDate) {
- this.creationDate = creationDate;
- return this;
- }
-
- public TrackedIssue setRuleKey(RuleKey ruleKey) {
- this.ruleKey = ruleKey;
- return this;
- }
-
- public TrackedIssue setSeverity(String severity) {
- this.severity = severity;
- return this;
- }
-
- public TrackedIssue setGap(Double gap) {
- this.gap = gap;
- return this;
- }
-
- @Override
- public int hashCode() {
- final int PRIME = 31;
- int result = 1;
- result = PRIME * result + ((key == null) ? 0 : key.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- TrackedIssue other = (TrackedIssue) obj;
- if (key == null) {
- if (other.key != null) {
- return false;
- }
- } else if (!key.equals(other.key)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString() {
- return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.scanner.issue.tracking;
-
-import javax.annotation.ParametersAreNonnullByDefault;
import org.sonar.api.batch.sensor.highlighting.TypeOfText;
import org.sonar.api.scanner.fs.InputProject;
import org.sonar.core.util.CloseableIterator;
-import org.sonar.scanner.issue.IssueCache;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
import org.sonar.scanner.protocol.output.ScannerReport;
import org.sonar.scanner.protocol.output.ScannerReport.Component;
import org.sonar.scanner.protocol.output.ScannerReport.Symbol;
private static final Logger LOG = LoggerFactory.getLogger(AnalysisResult.class);
- private List<TrackedIssue> issues = new ArrayList<>();
private Map<String, InputFile> inputFilesByKeys = new HashMap<>();
private InputProject project;
private ScannerReportReader reader;
@Override
public void analysisCompleted(ProjectScanContainer container) {
LOG.info("Store analysis results in memory for later assertions in medium test");
- for (TrackedIssue issue : container.getComponentByType(IssueCache.class).all()) {
- issues.add(issue);
- }
-
ReportPublisher reportPublisher = container.getComponentByType(ReportPublisher.class);
reader = new ScannerReportReader(reportPublisher.getReportDir().toFile());
project = container.getComponentByType(InputProject.class);
}
}
- public List<TrackedIssue> trackedIssues() {
- return issues;
- }
-
public Component getReportComponent(InputComponent inputComponent) {
return getReportReader().readComponent(((DefaultInputComponent) inputComponent).scannerId());
}
*/
package org.sonar.scanner.postjob;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-import javax.annotation.Nullable;
import org.sonar.api.batch.AnalysisMode;
-import org.sonar.api.batch.fs.InputComponent;
import org.sonar.api.batch.postjob.PostJobContext;
import org.sonar.api.batch.postjob.issue.PostJobIssue;
-import org.sonar.api.batch.rule.Severity;
import org.sonar.api.config.Configuration;
import org.sonar.api.config.Settings;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.scanner.issue.IssueCache;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.scan.filesystem.InputComponentStore;
public class DefaultPostJobContext implements PostJobContext {
private final Configuration config;
- private final IssueCache cache;
private final AnalysisMode analysisMode;
- private InputComponentStore inputComponentStore;
private final Settings mutableSettings;
- public DefaultPostJobContext(Configuration config, Settings mutableSettings, IssueCache cache, InputComponentStore inputComponentStore,
- AnalysisMode analysisMode) {
+ public DefaultPostJobContext(Configuration config, Settings mutableSettings, AnalysisMode analysisMode) {
this.config = config;
this.mutableSettings = mutableSettings;
- this.cache = cache;
- this.inputComponentStore = inputComponentStore;
this.analysisMode = analysisMode;
}
@Override
public Iterable<PostJobIssue> issues() {
- if (!analysisMode.isIssues()) {
- throw new UnsupportedOperationException("Issues are only available to PostJobs in 'issues' mode.");
- }
- return StreamSupport.stream(cache.all().spliterator(), false)
- .filter(new ResolvedPredicate(false))
- .map(DefaultIssueWrapper::new)
- .collect(Collectors.toList());
+ throw new UnsupportedOperationException("Preview mode was dropped.");
}
@Override
public Iterable<PostJobIssue> resolvedIssues() {
- if (!analysisMode.isIssues()) {
- throw new UnsupportedOperationException("Resolved issues are only available to PostJobs in 'issues' mode.");
- }
- return StreamSupport.stream(cache.all().spliterator(), false)
- .filter(new ResolvedPredicate(true))
- .map(DefaultIssueWrapper::new)
- .collect(Collectors.toList());
- }
-
- private class DefaultIssueWrapper implements PostJobIssue {
-
- private final TrackedIssue wrapped;
-
- public DefaultIssueWrapper(TrackedIssue wrapped) {
- this.wrapped = wrapped;
- }
-
- @Override
- public String key() {
- return wrapped.key();
- }
-
- @Override
- public RuleKey ruleKey() {
- return wrapped.getRuleKey();
- }
-
- @Override
- public String componentKey() {
- return wrapped.componentKey();
- }
-
- @Override
- public InputComponent inputComponent() {
- return inputComponentStore.getByKey(wrapped.componentKey());
- }
-
- @Override
- public Integer line() {
- return wrapped.startLine();
- }
-
- @Override
- public String message() {
- return wrapped.getMessage();
- }
-
- @Override
- public Severity severity() {
- return Severity.valueOf(wrapped.severity());
- }
-
- @Override
- public boolean isNew() {
- return wrapped.isNew();
- }
- }
-
- private static class ResolvedPredicate implements Predicate<TrackedIssue> {
- private final boolean resolved;
-
- private ResolvedPredicate(boolean resolved) {
- this.resolved = resolved;
- }
-
- @Override
- public boolean test(@Nullable TrackedIssue issue) {
- if (issue != null) {
- return resolved ? issue.resolution() != null : issue.resolution() == null;
- }
- return false;
- }
+ throw new UnsupportedOperationException("Preview mode was dropped.");
}
}
writer = new ScannerReportWriter(reportDir.toFile());
contextPublisher.init(writer);
- if (!analysisMode.isIssues() && !analysisMode.isMediumTest()) {
+ if (!analysisMode.isMediumTest()) {
String publicUrl = server.getPublicRootUrl();
if (HttpUrl.parse(publicUrl) == null) {
throw MessageException.of("Failed to parse public URL set in SonarQube server: " + publicUrl);
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
-import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nullable;
}
@Override
- public ProjectRepositories load(String projectKey, boolean issuesMode, @Nullable String branchBase) {
- GetRequest request = new GetRequest(getUrl(projectKey, issuesMode, branchBase));
+ public ProjectRepositories load(String projectKey, @Nullable String branchBase) {
+ GetRequest request = new GetRequest(getUrl(projectKey, branchBase));
try (WsResponse response = wsClient.call(request)) {
try (InputStream is = response.contentStream()) {
return processStream(is);
}
}
- private static String getUrl(String projectKey, boolean issuesMode, @Nullable String branchBase) {
+ private static String getUrl(String projectKey, @Nullable String branchBase) {
StringBuilder builder = new StringBuilder();
builder.append(BATCH_PROJECT_URL)
.append("?key=").append(ScannerUtils.encodeForUrl(projectKey));
- if (issuesMode) {
- builder.append("&issues_mode=true");
- }
if (branchBase != null) {
builder.append("&branch=").append(branchBase);
}
private static ProjectRepositories processStream(InputStream is) throws IOException {
WsProjectResponse response = WsProjectResponse.parseFrom(is);
if (response.getFileDataByModuleAndPathCount() == 0) {
- return new SingleProjectRepository(constructFileDataMap(response.getFileDataByPathMap()), new Date(response.getLastAnalysisDate()));
+ return new SingleProjectRepository(constructFileDataMap(response.getFileDataByPathMap()));
} else {
final Map<String, SingleProjectRepository> repositoriesPerModule = new HashMap<>();
response.getFileDataByModuleAndPathMap().keySet().forEach(moduleKey -> {
WsProjectResponse.FileDataByPath filePaths = response.getFileDataByModuleAndPathMap().get(moduleKey);
repositoriesPerModule.put(moduleKey, new SingleProjectRepository(
- constructFileDataMap(filePaths.getFileDataByPathMap()), new Date(response.getLastAnalysisDate())));
+ constructFileDataMap(filePaths.getFileDataByPathMap())));
});
- return new MultiModuleProjectRepository(repositoriesPerModule, new Date(response.getLastAnalysisDate()));
+ return new MultiModuleProjectRepository(repositoriesPerModule);
}
}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.repository;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.function.Consumer;
-import org.apache.commons.io.IOUtils;
-import org.sonar.scanner.bootstrap.ScannerWsClient;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
-import org.sonar.scanner.util.ScannerUtils;
-import org.sonarqube.ws.client.GetRequest;
-
-public class DefaultServerIssuesLoader implements ServerIssuesLoader {
-
- private final ScannerWsClient wsClient;
-
- public DefaultServerIssuesLoader(ScannerWsClient wsClient) {
- this.wsClient = wsClient;
- }
-
- @Override
- public void load(String componentKey, Consumer<ServerIssue> consumer) {
- GetRequest getRequest = new GetRequest("/batch/issues.protobuf?key=" + ScannerUtils.encodeForUrl(componentKey));
- InputStream is = wsClient.call(getRequest).contentStream();
- parseIssues(is, consumer);
- }
-
- private static void parseIssues(InputStream is, Consumer<ServerIssue> consumer) {
- try {
- ServerIssue previousIssue = ServerIssue.parseDelimitedFrom(is);
- while (previousIssue != null) {
- consumer.accept(previousIssue);
- previousIssue = ServerIssue.parseDelimitedFrom(is);
- }
- } catch (IOException e) {
- throw new IllegalStateException("Unable to get previous issues", e);
- } finally {
- IOUtils.closeQuietly(is);
- }
- }
-}
package org.sonar.scanner.repository;
import com.google.common.collect.ImmutableMap;
-import java.util.Date;
import java.util.Map;
import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;
@Immutable
private Map<String, SingleProjectRepository> repositoriesPerModule;
- public MultiModuleProjectRepository(Map<String, SingleProjectRepository> repositoriesPerModule, @Nullable Date lastAnalysisDate) {
- super(lastAnalysisDate, true);
+ public MultiModuleProjectRepository(Map<String, SingleProjectRepository> repositoriesPerModule) {
+ super(true);
this.repositoriesPerModule = ImmutableMap.copyOf(repositoriesPerModule);
}
*/
package org.sonar.scanner.repository;
-import java.util.Date;
import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;
import org.sonar.api.batch.fs.internal.DefaultInputFile;
@Immutable
public abstract class ProjectRepositories {
- private final Date lastAnalysisDate;
private final boolean exists;
- public ProjectRepositories(@Nullable Date lastAnalysisDate, boolean exists) {
- this.lastAnalysisDate = lastAnalysisDate;
+ public ProjectRepositories(boolean exists) {
this.exists = exists;
}
}
}
- @CheckForNull
- public Date lastAnalysisDate() {
- return lastAnalysisDate;
- }
}
import javax.annotation.Nullable;
public interface ProjectRepositoriesLoader {
- ProjectRepositories load(String projectKeyWithBranch, boolean issuesMode, @Nullable String branchBase);
+ ProjectRepositories load(String projectKeyWithBranch, @Nullable String branchBase);
}
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.api.utils.log.Profiler;
-import org.sonar.scanner.bootstrap.GlobalAnalysisMode;
import org.sonar.scanner.bootstrap.ProcessedScannerProperties;
import org.sonar.scanner.scan.branch.BranchConfiguration;
private static final String LOG_MSG = "Load project repositories";
private ProjectRepositories project = null;
- public ProjectRepositories provide(ProjectRepositoriesLoader loader, ProcessedScannerProperties scannerProperties, GlobalAnalysisMode mode, BranchConfiguration branchConfig) {
+ public ProjectRepositories provide(ProjectRepositoriesLoader loader, ProcessedScannerProperties scannerProperties, BranchConfiguration branchConfig) {
if (project == null) {
- boolean isIssuesMode = mode.isIssues();
Profiler profiler = Profiler.create(LOG).startInfo(LOG_MSG);
- project = loader.load(scannerProperties.getKeyWithBranch(), isIssuesMode, branchConfig.longLivingSonarReferenceBranch());
- checkProject(isIssuesMode);
+ project = loader.load(scannerProperties.getKeyWithBranch(), branchConfig.longLivingSonarReferenceBranch());
profiler.stopInfo();
}
return project;
}
-
- private void checkProject(boolean isIssueMode) {
- if (isIssueMode) {
- if (!project.exists()) {
- LOG.warn("Project doesn't exist on the server. All issues will be marked as 'new'.");
- } else if (project.lastAnalysisDate() == null) {
- LOG.warn("No analysis has been found on the server for this project. All issues will be marked as 'new'.");
- }
- }
- }
}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.repository;
-
-import java.util.function.Consumer;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
-
-public interface ServerIssuesLoader {
-
- void load(String componentKey, Consumer<ServerIssue> consumer);
-
-}
package org.sonar.scanner.repository;
import com.google.common.collect.ImmutableMap;
-import java.util.Date;
import java.util.Map;
import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;
@Immutable
private final ImmutableMap<String, FileData> fileDataByPath;
public SingleProjectRepository() {
- super(null, false);
+ super(false);
this.fileDataByPath = ImmutableMap.<String, FileData>builder().build();
}
- public SingleProjectRepository(Map<String, FileData> fileDataByPath,
- @Nullable Date lastAnalysisDate) {
- super(lastAnalysisDate, true);
+ public SingleProjectRepository(Map<String, FileData> fileDataByPath) {
+ super(true);
this.fileDataByPath = ImmutableMap.copyOf(fileDataByPath);
}
import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
import org.sonar.scanner.deprecated.test.TestPlanBuilder;
import org.sonar.scanner.deprecated.test.TestableBuilder;
-import org.sonar.scanner.issue.DefaultProjectIssues;
-import org.sonar.scanner.issue.IssueCache;
import org.sonar.scanner.issue.IssueFilters;
import org.sonar.scanner.issue.IssuePublisher;
import org.sonar.scanner.issue.ignore.EnforceIssuesFilter;
import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
import org.sonar.scanner.issue.ignore.pattern.IssueInclusionPatternInitializer;
import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsLoader;
-import org.sonar.scanner.issue.tracking.DefaultServerLineHashesLoader;
-import org.sonar.scanner.issue.tracking.IssueTransition;
-import org.sonar.scanner.issue.tracking.LocalIssueTracking;
-import org.sonar.scanner.issue.tracking.ServerIssueRepository;
-import org.sonar.scanner.issue.tracking.ServerLineHashesLoader;
import org.sonar.scanner.mediumtest.AnalysisObservers;
import org.sonar.scanner.notifications.DefaultAnalysisWarnings;
import org.sonar.scanner.postjob.DefaultPostJobContext;
import org.sonar.scanner.repository.ContextPropertiesCache;
import org.sonar.scanner.repository.DefaultProjectRepositoriesLoader;
import org.sonar.scanner.repository.DefaultQualityProfileLoader;
-import org.sonar.scanner.repository.DefaultServerIssuesLoader;
-import org.sonar.scanner.repository.ProjectRepositories;
import org.sonar.scanner.repository.ProjectRepositoriesLoader;
import org.sonar.scanner.repository.ProjectRepositoriesProvider;
import org.sonar.scanner.repository.QualityProfileLoader;
import org.sonar.scanner.repository.QualityProfilesProvider;
-import org.sonar.scanner.repository.ServerIssuesLoader;
import org.sonar.scanner.repository.language.DefaultLanguagesRepository;
import org.sonar.scanner.repository.settings.DefaultProjectSettingsLoader;
import org.sonar.scanner.repository.settings.ProjectSettingsLoader;
import org.sonar.scanner.scan.filesystem.StatusDetection;
import org.sonar.scanner.scan.measure.DefaultMetricFinder;
import org.sonar.scanner.scan.measure.MeasureCache;
-import org.sonar.scanner.scan.report.JSONReport;
import org.sonar.scanner.scm.ScmChangedFilesProvider;
import org.sonar.scanner.scm.ScmConfiguration;
import org.sonar.scanner.scm.ScmPublisher;
ProjectLock lock = getComponentByType(ProjectLock.class);
lock.tryLock();
getComponentByType(WorkDirectoriesInitializer.class).execute();
-
- if (!isIssuesMode()) {
- addReportPublishSteps();
- } else if (isTherePreviousAnalysis()) {
- addIssueTrackingComponents();
- }
-
}
private void addScannerComponents() {
QProfileVerifier.class,
// issues
- IssueCache.class,
- DefaultProjectIssues.class,
- IssueTransition.class,
NoSonarFilter.class,
IssueFilters.class,
IssuePublisher.class,
MetadataPublisher.class,
ActiveRulesPublisher.class,
AnalysisWarningsPublisher.class,
+ ComponentsPublisher.class,
+ MeasuresPublisher.class,
+ CoveragePublisher.class,
+ SourcePublisher.class,
+ ChangedLinesPublisher.class,
// Cpd
CpdExecutor.class,
addIfMissing(DefaultProjectRepositoriesLoader.class, ProjectRepositoriesLoader.class);
}
- private void addReportPublishSteps() {
- add(
- ComponentsPublisher.class,
- MeasuresPublisher.class,
- CoveragePublisher.class,
- SourcePublisher.class,
- ChangedLinesPublisher.class);
- }
-
- private void addIssueTrackingComponents() {
- add(
- LocalIssueTracking.class,
- ServerIssueRepository.class);
- addIfMissing(DefaultServerIssuesLoader.class, ServerIssuesLoader.class);
- addIfMissing(DefaultServerLineHashesLoader.class, ServerLineHashesLoader.class);
- }
-
- private boolean isTherePreviousAnalysis() {
- return getComponentByType(ProjectRepositories.class).lastAnalysisDate() != null;
- }
-
- private boolean isIssuesMode() {
- return getComponentByType(GlobalAnalysisMode.class).isIssues();
- }
-
private void addScannerExtensions() {
getComponentByType(CoreExtensionsInstaller.class)
.install(this, noExtensionFilter(), extension -> getScannerProjectExtensionsFilter().accept(extension));
getComponentByType(ScmPublisher.class).publish();
- if (analysisMode.isIssues()) {
- getComponentByType(IssueTransition.class).execute();
- getComponentByType(JSONReport.class).execute();
- LOG.info("ANALYSIS SUCCESSFUL");
- } else {
- getComponentByType(CpdExecutor.class).execute();
- getComponentByType(ReportPublisher.class).execute();
- }
+ getComponentByType(CpdExecutor.class).execute();
+ getComponentByType(ReportPublisher.class).execute();
getComponentByType(PostJobsExecutor.class).execute();
import com.google.common.annotations.VisibleForTesting;
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
import org.sonar.api.batch.fs.internal.DefaultInputModule;
-import org.sonar.scanner.analysis.DefaultAnalysisMode;
public class DefaultModuleFileSystem extends DefaultFileSystem {
- public DefaultModuleFileSystem(ModuleInputComponentStore moduleInputFileCache, DefaultInputModule module, DefaultAnalysisMode mode,
- StatusDetection statusDetection) {
+ public DefaultModuleFileSystem(ModuleInputComponentStore moduleInputFileCache, DefaultInputModule module) {
super(module.getBaseDir(), moduleInputFileCache);
- setFields(module, mode, statusDetection);
+ initFields(module);
}
@VisibleForTesting
- public DefaultModuleFileSystem(DefaultInputModule module, DefaultAnalysisMode mode, StatusDetection statusDetection) {
+ public DefaultModuleFileSystem(DefaultInputModule module) {
super(module.getBaseDir());
- setFields(module, mode, statusDetection);
+ initFields(module);
}
- private void setFields(DefaultInputModule module, DefaultAnalysisMode mode, StatusDetection statusDetection) {
+ private void initFields(DefaultInputModule module) {
setWorkDir(module.getWorkDir());
setEncoding(module.getEncoding());
-
- // filter the files sensors have access to
- if (!mode.scanAllFiles()) {
- setDefaultPredicate(p -> new SameInputFilePredicate(p, statusDetection, module.definition().getKeyWithBranch()));
- }
}
}
import com.google.common.annotations.VisibleForTesting;
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
import org.sonar.api.batch.fs.internal.DefaultInputProject;
-import org.sonar.scanner.analysis.DefaultAnalysisMode;
public class DefaultProjectFileSystem extends DefaultFileSystem {
- public DefaultProjectFileSystem(InputComponentStore inputComponentStore, DefaultInputProject project, DefaultAnalysisMode mode,
- StatusDetection statusDetection) {
+ public DefaultProjectFileSystem(InputComponentStore inputComponentStore, DefaultInputProject project) {
super(project.getBaseDir(), inputComponentStore);
- setFields(project, mode, statusDetection);
+ setFields(project);
}
@VisibleForTesting
- public DefaultProjectFileSystem(DefaultInputProject project, DefaultAnalysisMode mode, StatusDetection statusDetection) {
+ public DefaultProjectFileSystem(DefaultInputProject project) {
super(project.getBaseDir());
- setFields(project, mode, statusDetection);
+ setFields(project);
}
- private void setFields(DefaultInputProject project, DefaultAnalysisMode mode, StatusDetection statusDetection) {
+ private void setFields(DefaultInputProject project) {
setWorkDir(project.getWorkDir());
setEncoding(project.getEncoding());
-
- // filter the files sensors have access to
- if (!mode.scanAllFiles()) {
- setDefaultPredicate(p -> new SameInputFilePredicate(p, statusDetection, project.definition().getKeyWithBranch()));
- }
}
}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.scan.filesystem;
-
-import java.util.function.Predicate;
-import org.sonar.api.batch.fs.FilePredicate;
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.InputFile.Status;
-import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.api.batch.fs.internal.OperatorPredicate;
-import org.sonar.api.batch.fs.internal.StatusPredicate;
-
-public class SameInputFilePredicate implements Predicate<InputFile> {
- private final StatusDetection statusDetection;
- private final String moduleKeyWithBranch;
- private final FilePredicate currentPredicate;
-
- public SameInputFilePredicate(FilePredicate currentPredicate, StatusDetection statusDetection, String moduleKeyWithBranch) {
- this.currentPredicate = currentPredicate;
- this.statusDetection = statusDetection;
- this.moduleKeyWithBranch = moduleKeyWithBranch;
- }
-
- @Override
- public boolean test(InputFile inputFile) {
- if (hasExplicitFilterOnStatus(currentPredicate)) {
- // If user explicitly requested a given status, don't change the result
- return true;
- }
-
- // TODO: the inputFile could try to calculate the status itself without generating metadata
- Status status = statusDetection.getStatusWithoutMetadata(moduleKeyWithBranch, (DefaultInputFile) inputFile);
- if (status != null) {
- return status != Status.SAME;
- }
-
- // this will trigger computation of metadata
- return inputFile.status() != Status.SAME;
- }
-
- static boolean hasExplicitFilterOnStatus(FilePredicate predicate) {
- if (predicate instanceof StatusPredicate) {
- return true;
- }
- if (predicate instanceof OperatorPredicate) {
- return ((OperatorPredicate) predicate).operands().stream().anyMatch(SameInputFilePredicate::hasExplicitFilterOnStatus);
- }
- return false;
- }
-
-}
*/
package org.sonar.scanner.scan.filesystem;
-import javax.annotation.CheckForNull;
import javax.annotation.concurrent.Immutable;
import org.apache.commons.lang.StringUtils;
import org.sonar.api.batch.fs.InputFile;
return checkChanged(CHANGED, inputFile);
}
- /**
- * If possible, get the status of the provided file without initializing metadata of the file.
- *
- * @return null if it was not possible to get the status without calculating metadata
- */
- @CheckForNull
- public InputFile.Status getStatusWithoutMetadata(String moduleKeyWithBranch, DefaultInputFile inputFile) {
- FileData fileDataPerPath = projectRepositories.fileData(moduleKeyWithBranch, inputFile);
- if (fileDataPerPath == null) {
- return checkChanged(ADDED, inputFile);
- }
- String previousHash = fileDataPerPath.hash();
- if (StringUtils.isEmpty(previousHash)) {
- return checkChanged(ADDED, inputFile);
- }
- return null;
- }
-
private InputFile.Status checkChanged(InputFile.Status status, DefaultInputFile inputFile) {
if (!scmChangedFiles.verifyChanged(inputFile.path())) {
return SAME;
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.scan.report;
-
-import com.google.common.annotations.VisibleForTesting;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.sonar.api.Properties;
-import org.sonar.api.Property;
-import org.sonar.api.PropertyType;
-import org.sonar.api.batch.fs.FileSystem;
-import org.sonar.api.batch.fs.InputComponent;
-import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.api.batch.fs.internal.DefaultInputProject;
-import org.sonar.api.batch.rule.Rule;
-import org.sonar.api.batch.rule.Rules;
-import org.sonar.api.config.Configuration;
-import org.sonar.api.platform.Server;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.api.scanner.ScannerSide;
-import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.core.component.ComponentKeys;
-import org.sonar.scanner.issue.IssueCache;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.scan.filesystem.InputComponentStore;
-
-@Properties({
- @Property(
- key = JSONReport.SONAR_REPORT_EXPORT_PATH,
- name = "Report Results Export File",
- type = PropertyType.STRING,
- global = false, project = false)})
-@ScannerSide
-public class JSONReport {
-
- static final String SONAR_REPORT_EXPORT_PATH = "sonar.report.export.path";
- private static final Logger LOG = LoggerFactory.getLogger(JSONReport.class);
- private final Configuration settings;
- private final FileSystem fileSystem;
- private final Server server;
- private final Rules rules;
- private final IssueCache issueCache;
- private final InputComponentStore componentStore;
- private final DefaultInputProject project;
-
- public JSONReport(Configuration settings, FileSystem fileSystem, Server server, Rules rules, IssueCache issueCache,
- DefaultInputProject project, InputComponentStore componentStore) {
- this.settings = settings;
- this.fileSystem = fileSystem;
- this.server = server;
- this.rules = rules;
- this.issueCache = issueCache;
- this.project = project;
- this.componentStore = componentStore;
- }
-
- public void execute() {
- settings.get(SONAR_REPORT_EXPORT_PATH).ifPresent(this::exportResults);
- }
-
- private void exportResults(String exportPath) {
- File exportFile = new File(fileSystem.workDir(), exportPath);
-
- LOG.info("Export issues to {}", exportFile.getAbsolutePath());
- try (FileOutputStream fos = new FileOutputStream(exportFile)) {
- writeJson(new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8)));
- } catch (IOException e) {
- throw new IllegalStateException("Unable to write report results in file " + exportFile.getAbsolutePath(), e);
- }
- }
-
- @VisibleForTesting
- void writeJson(Writer writer) {
- try (JsonWriter json = JsonWriter.of(writer)) {
- json.beginObject();
- json.prop("version", server.getVersion());
-
- Set<RuleKey> ruleKeys = new LinkedHashSet<>();
- Set<String> userLogins = new LinkedHashSet<>();
- writeJsonIssues(json, ruleKeys, userLogins);
- writeJsonComponents(json);
- writeJsonRules(json, ruleKeys);
- writeUsers(json, userLogins);
- json.endObject();
- }
- }
-
- private void writeJsonIssues(JsonWriter json, Set<RuleKey> ruleKeys, Set<String> logins) {
- json.name("issues").beginArray();
- for (TrackedIssue issue : getIssues()) {
- if (issue.resolution() == null) {
- InputComponent component = componentStore.getByKey(issue.componentKey());
- String componentKeyWithBranch = project.getKeyWithBranch();
- if (component.isFile()) {
- componentKeyWithBranch = ComponentKeys.createEffectiveKey(componentKeyWithBranch, (DefaultInputFile) component);
- }
- json
- .beginObject()
- .prop("key", issue.key())
- .prop("component", componentKeyWithBranch)
- .prop("line", issue.startLine())
- .prop("startLine", issue.startLine())
- .prop("startOffset", issue.startLineOffset())
- .prop("endLine", issue.endLine())
- .prop("endOffset", issue.endLineOffset())
- .prop("message", issue.getMessage())
- .prop("severity", issue.severity())
- .prop("rule", issue.getRuleKey().toString())
- .prop("status", issue.status())
- .prop("resolution", issue.resolution())
- .prop("isNew", issue.isNew())
- .prop("assignee", issue.assignee())
- .prop("effortToFix", issue.gap())
- .propDateTime("creationDate", issue.creationDate());
- if (!StringUtils.isEmpty(issue.assignee())) {
- logins.add(issue.assignee());
- }
- json.endObject();
- ruleKeys.add(issue.getRuleKey());
- }
- }
- json.endArray();
- }
-
- private void writeJsonComponents(JsonWriter json) {
- json.name("components").beginArray();
- // Dump modules
- writeJsonProject(json);
- for (DefaultInputFile inputFile : componentStore.allFilesToPublish()) {
- String projectKey = project.getKeyWithBranch();
- String key = ComponentKeys.createEffectiveKey(projectKey, inputFile);
- json
- .beginObject()
- .prop("key", key)
- .prop("path", inputFile.relativePath())
- .prop("status", inputFile.status().name())
- .endObject();
- }
- json.endArray();
- }
-
- private void writeJsonProject(JsonWriter json) {
- json
- .beginObject()
- .prop("key", project.definition().getKeyWithBranch())
- .endObject();
- }
-
- private void writeJsonRules(JsonWriter json, Set<RuleKey> ruleKeys) {
- json.name("rules").beginArray();
- for (RuleKey ruleKey : ruleKeys) {
- json
- .beginObject()
- .prop("key", ruleKey.toString())
- .prop("rule", ruleKey.rule())
- .prop("repository", ruleKey.repository())
- .prop("name", getRuleName(ruleKey))
- .endObject();
- }
- json.endArray();
- }
-
- private static void writeUsers(JsonWriter json, Collection<String> userLogins) {
- json.name("users").beginArray();
-
- // for compatiblity with programs that parse the json report. We no longer get the name for logins.
- for (String user : userLogins) {
- json
- .beginObject()
- .prop("login", user)
- .prop("name", user)
- .endObject();
- }
- json.endArray();
- }
-
- private String getRuleName(RuleKey ruleKey) {
- Rule rule = rules.find(ruleKey);
- return rule != null ? rule.name() : null;
- }
-
- @VisibleForTesting
- Iterable<TrackedIssue> getIssues() {
- return issueCache.all();
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.scanner.scan.report;
-
-import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.concurrent.ThreadSafe;
import org.sonar.api.SonarRuntime;
-import org.sonar.api.batch.AnalysisMode;
import org.sonar.api.batch.fs.FileSystem;
import org.sonar.api.batch.fs.InputModule;
import org.sonar.api.batch.fs.internal.DefaultInputProject;
private final InputModule module;
public ModuleSensorContext(DefaultInputProject project, InputModule module, Configuration config, Settings mutableSettings, FileSystem fs, ActiveRules activeRules,
- AnalysisMode analysisMode, SensorStorage sensorStorage, SonarRuntime sonarRuntime) {
- super(project, config, mutableSettings, fs, activeRules, analysisMode, sensorStorage, sonarRuntime);
+ SensorStorage sensorStorage, SonarRuntime sonarRuntime) {
+ super(project, config, mutableSettings, fs, activeRules, sensorStorage, sonarRuntime);
this.module = module;
}
import java.io.Serializable;
import javax.annotation.concurrent.ThreadSafe;
import org.sonar.api.SonarRuntime;
-import org.sonar.api.batch.AnalysisMode;
import org.sonar.api.batch.fs.FileSystem;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.batch.fs.InputModule;
import org.sonar.api.config.Settings;
import org.sonar.api.scanner.fs.InputProject;
import org.sonar.api.utils.Version;
-import org.sonar.scanner.sensor.noop.NoOpNewAdHocRule;
import org.sonar.scanner.sensor.noop.NoOpNewAnalysisError;
-import org.sonar.scanner.sensor.noop.NoOpNewCpdTokens;
-import org.sonar.scanner.sensor.noop.NoOpNewExternalIssue;
-import org.sonar.scanner.sensor.noop.NoOpNewHighlighting;
-import org.sonar.scanner.sensor.noop.NoOpNewSignificantCode;
-import org.sonar.scanner.sensor.noop.NoOpNewSymbolTable;
@ThreadSafe
public class ProjectSensorContext implements SensorContext {
- static final NoOpNewHighlighting NO_OP_NEW_HIGHLIGHTING = new NoOpNewHighlighting();
- static final NoOpNewSymbolTable NO_OP_NEW_SYMBOL_TABLE = new NoOpNewSymbolTable();
- static final NoOpNewCpdTokens NO_OP_NEW_CPD_TOKENS = new NoOpNewCpdTokens();
static final NoOpNewAnalysisError NO_OP_NEW_ANALYSIS_ERROR = new NoOpNewAnalysisError();
- static final NoOpNewExternalIssue NO_OP_NEW_EXTERNAL_ISSUE = new NoOpNewExternalIssue();
- static final NoOpNewAdHocRule NO_OP_NEW_AD_HOC_RULE = new NoOpNewAdHocRule();
- static final NoOpNewSignificantCode NO_OP_NEW_SIGNIFICANT_CODE = new NoOpNewSignificantCode();
private final Settings mutableSettings;
private final FileSystem fs;
private final ActiveRules activeRules;
private final SensorStorage sensorStorage;
- private final AnalysisMode analysisMode;
private final DefaultInputProject project;
private final SonarRuntime sonarRuntime;
private final Configuration config;
public ProjectSensorContext(DefaultInputProject project, Configuration config, Settings mutableSettings, FileSystem fs, ActiveRules activeRules,
- AnalysisMode analysisMode, SensorStorage sensorStorage, SonarRuntime sonarRuntime) {
+ SensorStorage sensorStorage, SonarRuntime sonarRuntime) {
this.project = project;
this.config = config;
this.mutableSettings = mutableSettings;
this.fs = fs;
this.activeRules = activeRules;
- this.analysisMode = analysisMode;
this.sensorStorage = sensorStorage;
this.sonarRuntime = sonarRuntime;
}
@Override
public NewExternalIssue newExternalIssue() {
- if (analysisMode.isIssues()) {
- return NO_OP_NEW_EXTERNAL_ISSUE;
- }
return new DefaultExternalIssue(project, sensorStorage);
}
@Override
public NewAdHocRule newAdHocRule() {
- if (analysisMode.isIssues()) {
- return NO_OP_NEW_AD_HOC_RULE;
- }
return new DefaultAdHocRule(sensorStorage);
}
@Override
public NewHighlighting newHighlighting() {
- if (analysisMode.isIssues()) {
- return NO_OP_NEW_HIGHLIGHTING;
- }
return new DefaultHighlighting(sensorStorage);
}
@Override
public NewSymbolTable newSymbolTable() {
- if (analysisMode.isIssues()) {
- return NO_OP_NEW_SYMBOL_TABLE;
- }
return new DefaultSymbolTable(sensorStorage);
}
@Override
public NewCpdTokens newCpdTokens() {
- if (analysisMode.isIssues()) {
- return NO_OP_NEW_CPD_TOKENS;
- }
return new DefaultCpdTokens(sensorStorage);
}
@Override
public NewSignificantCode newSignificantCode() {
- if (analysisMode.isIssues()) {
- return NO_OP_NEW_SIGNIFICANT_CODE;
- }
return new DefaultSignificantCode(sensorStorage);
}
}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.sensor.noop;
-
-import org.sonar.api.batch.rule.Severity;
-import org.sonar.api.batch.sensor.rule.NewAdHocRule;
-import org.sonar.api.rules.RuleType;
-
-public class NoOpNewAdHocRule implements NewAdHocRule {
-
- @Override
- public NoOpNewAdHocRule engineId(String engineId) {
- // no op
- return this;
- }
-
- @Override
- public NoOpNewAdHocRule ruleId(String ruleId) {
- // no op
- return this;
- }
-
- @Override
- public NewAdHocRule name(String name) {
- // no op
- return this;
- }
-
- @Override
- public NewAdHocRule description(String description) {
- // no op
- return this;
- }
-
- @Override
- public NoOpNewAdHocRule type(RuleType type) {
- // no op
- return this;
- }
-
- @Override
- public NoOpNewAdHocRule severity(Severity severity) {
- // no op
- return this;
- }
-
- @Override
- public void save() {
- // no op
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.sensor.noop;
-
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.TextRange;
-import org.sonar.api.batch.sensor.cpd.NewCpdTokens;
-
-public class NoOpNewCpdTokens implements NewCpdTokens {
- @Override
- public void save() {
- // Do nothing
- }
-
- @Override
- public NoOpNewCpdTokens onFile(InputFile inputFile) {
- // Do nothing
- return this;
- }
-
- @Override
- public NewCpdTokens addToken(TextRange range, String image) {
- // Do nothing
- return this;
- }
-
- @Override
- public NewCpdTokens addToken(int startLine, int startLineOffset, int endLine, int endLineOffset, String image) {
- // Do nothing
- return this;
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.sensor.noop;
-
-import org.sonar.api.batch.rule.Severity;
-import org.sonar.api.batch.sensor.issue.NewExternalIssue;
-import org.sonar.api.batch.sensor.issue.NewIssueLocation;
-import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.api.rules.RuleType;
-
-public class NoOpNewExternalIssue implements NewExternalIssue {
-
- @Override
- public NewExternalIssue forRule(RuleKey ruleKey) {
- // no op
- return this;
- }
-
- @Override
- public NewExternalIssue engineId(String engineId) {
- // no op
- return this;
- }
-
- @Override
- public NewExternalIssue ruleId(String ruleId) {
- // no op
- return this;
- }
-
- @Override
- public NewExternalIssue type(RuleType type) {
- // no op
- return this;
- }
-
- @Override
- public NewExternalIssue remediationEffortMinutes(Long effort) {
- // no op
- return this;
- }
-
- @Override
- public NewExternalIssue severity(Severity severity) {
- // no op
- return this;
- }
-
- @Override
- public NewExternalIssue at(NewIssueLocation primaryLocation) {
- // no op
- return this;
- }
-
- @Override
- public NewExternalIssue addLocation(NewIssueLocation secondaryLocation) {
- // no op
- return this;
- }
-
- @Override
- public NewExternalIssue addFlow(Iterable<NewIssueLocation> flowLocations) {
- // no op
- return this;
- }
-
- @Override
- public NewIssueLocation newLocation() {
- // no op
- return new DefaultIssueLocation();
- }
-
- @Override
- public void save() {
- // no op
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.sensor.noop;
-
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.TextRange;
-import org.sonar.api.batch.sensor.highlighting.NewHighlighting;
-import org.sonar.api.batch.sensor.highlighting.TypeOfText;
-
-public class NoOpNewHighlighting implements NewHighlighting {
- @Override
- public void save() {
- // Do nothing
- }
-
- @Override
- public NoOpNewHighlighting onFile(InputFile inputFile) {
- // Do nothing
- return this;
- }
-
- @Override
- public NoOpNewHighlighting highlight(int startOffset, int endOffset, TypeOfText typeOfText) {
- // Do nothing
- return this;
- }
-
- @Override
- public NoOpNewHighlighting highlight(int startLine, int startLineOffset, int endLine, int endLineOffset, TypeOfText typeOfText) {
- // Do nothing
- return this;
- }
-
- @Override
- public NoOpNewHighlighting highlight(TextRange range, TypeOfText typeOfText) {
- // Do nothing
- return this;
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.sensor.noop;
-
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.TextRange;
-import org.sonar.api.batch.sensor.code.NewSignificantCode;
-
-public class NoOpNewSignificantCode implements NewSignificantCode {
-
- @Override
- public NewSignificantCode onFile(InputFile file) {
- // no op
- return this;
- }
-
- @Override
- public NewSignificantCode addRange(TextRange range) {
- // no op
- return this;
- }
-
- @Override
- public void save() {
- // no op
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.sensor.noop;
-
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.TextRange;
-import org.sonar.api.batch.sensor.symbol.NewSymbol;
-import org.sonar.api.batch.sensor.symbol.NewSymbolTable;
-
-public class NoOpNewSymbolTable implements NewSymbolTable, NewSymbol {
- @Override
- public void save() {
- // Do nothing
- }
-
- @Override
- public NoOpNewSymbolTable onFile(InputFile inputFile) {
- // Do nothing
- return this;
- }
-
- @Override
- public NewSymbol newSymbol(int startOffset, int endOffset) {
- // Do nothing
- return this;
- }
-
- @Override
- public NewSymbol newSymbol(int startLine, int startLineOffset, int endLine, int endLineOffset) {
- // Do nothing
- return this;
- }
-
- @Override
- public NewSymbol newSymbol(TextRange range) {
- // Do nothing
- return this;
- }
-
- @Override
- public NewSymbol newReference(int startLine, int startLineOffset, int endLine, int endLineOffset) {
- // Do nothing
- return this;
- }
-
- @Override
- public NewSymbol newReference(int startOffset, int endOffset) {
- // Do nothing
- return this;
- }
-
- @Override
- public NewSymbol newReference(TextRange range) {
- // Do nothing
- return this;
- }
-
-}
*/
package org.sonar.scanner.analysis;
-import java.util.Collections;
-import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.sonar.scanner.bootstrap.GlobalAnalysisMode;
-import org.sonar.scanner.bootstrap.RawScannerProperties;
-import org.sonar.scanner.bootstrap.ProcessedScannerProperties;
-import org.sonar.scanner.scan.EmptyExternalProjectKeyAndOrganization;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
public class DefaultAnalysisModeTest {
- private GlobalAnalysisMode globalMode;
-
- @Before
- public void setUp() {
- globalMode = mock(GlobalAnalysisMode.class);
- }
-
- @Rule
- public ExpectedException thrown = ExpectedException.none();
@Test
- public void scan_all_even_on_short_lived_branch() {
- ProcessedScannerProperties analysisProps = new ProcessedScannerProperties(
- new RawScannerProperties(Collections.singletonMap("sonar.scanAllFiles", "true")), new EmptyExternalProjectKeyAndOrganization());
- DefaultAnalysisMode mode = createmode(analysisProps);
-
- assertThat(mode.scanAllFiles()).isTrue();
- }
-
- @Test
- public void reuse_global_mode() {
- when(globalMode.isIssues()).thenReturn(true);
- when(globalMode.isPublish()).thenReturn(true);
- when(globalMode.isPreview()).thenReturn(true);
- DefaultAnalysisMode mode = createmode(new ProcessedScannerProperties(
- new RawScannerProperties(Collections.emptyMap()), new EmptyExternalProjectKeyAndOrganization()));
-
- assertThat(mode.isIssues()).isTrue();
+ public void test() {
+ DefaultAnalysisMode mode = new DefaultAnalysisMode();
assertThat(mode.isPublish()).isTrue();
- assertThat(mode.isPreview()).isTrue();
- }
-
- @Test
- public void scan_all_if_publish() {
- when(globalMode.isIssues()).thenReturn(false);
- DefaultAnalysisMode mode = createmode(new ProcessedScannerProperties(
- new RawScannerProperties(Collections.emptyMap()), new EmptyExternalProjectKeyAndOrganization()));
-
- assertThat(mode.scanAllFiles()).isTrue();
- }
-
- @Test
- public void scan_all_if_property_set() {
- ProcessedScannerProperties analysisProps = new ProcessedScannerProperties(
- new RawScannerProperties(Collections.singletonMap("sonar.scanAllFiles", "true")), new EmptyExternalProjectKeyAndOrganization());
- DefaultAnalysisMode mode = createmode(analysisProps);
-
- assertThat(mode.scanAllFiles()).isTrue();
- }
-
- @Test
- public void dont_scan_all_if_issues_mode() {
- when(globalMode.isIssues()).thenReturn(true);
- DefaultAnalysisMode mode = createmode(new ProcessedScannerProperties(
- new RawScannerProperties(Collections.emptyMap()), new EmptyExternalProjectKeyAndOrganization()));
-
- assertThat(mode.scanAllFiles()).isFalse();
- }
-
- private DefaultAnalysisMode createmode(ProcessedScannerProperties analysisProps) {
- return new DefaultAnalysisMode(analysisProps, globalMode);
+ assertThat(mode.isIssues()).isFalse();
+ assertThat(mode.isPreview()).isFalse();
}
}
public class ExtensionInstallerTest {
private MapSettings settings = new MapSettings();
- private GlobalAnalysisMode mode = mock(GlobalAnalysisMode.class);
private ScannerPluginRepository pluginRepository = mock(ScannerPluginRepository.class);
private static Plugin newPluginInstance(final Object... extensions) {
when(pluginRepository.getPluginInstance("foo")).thenReturn(newPluginInstance(Foo.class, Bar.class));
ComponentContainer container = new ComponentContainer();
- ExtensionInstaller installer = new ExtensionInstaller(mock(SonarRuntime.class), pluginRepository, mode, settings.asConfig());
+ ExtensionInstaller installer = new ExtensionInstaller(mock(SonarRuntime.class), pluginRepository, settings.asConfig());
installer.install(container, new FooMatcher());
assertThat(container.getComponentByType(Foo.class)).isNotNull();
when(pluginRepository.getPluginInfos()).thenReturn(Arrays.asList(new PluginInfo("foo")));
when(pluginRepository.getPluginInstance("foo")).thenReturn(newPluginInstance(new FooProvider(), new BarProvider()));
ComponentContainer container = new ComponentContainer();
- ExtensionInstaller installer = new ExtensionInstaller(mock(SonarRuntime.class), pluginRepository, mode, settings.asConfig());
+ ExtensionInstaller installer = new ExtensionInstaller(mock(SonarRuntime.class), pluginRepository, settings.asConfig());
installer.install(container, new FooMatcher());
when(pluginRepository.getPluginInfos()).thenReturn(Arrays.asList(new PluginInfo("foo")));
when(pluginRepository.getPluginInstance("foo")).thenReturn(newPluginInstance(new FooBarProvider()));
ComponentContainer container = new ComponentContainer();
- ExtensionInstaller installer = new ExtensionInstaller(mock(SonarRuntime.class), pluginRepository, mode, settings.asConfig());
+ ExtensionInstaller installer = new ExtensionInstaller(mock(SonarRuntime.class), pluginRepository, settings.asConfig());
installer.install(container, new TrueMatcher());
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.bootstrap;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.sonar.api.CoreProperties;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class GlobalAnalysisModeTest {
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
- @Test
- public void invalidate_mode() {
- thrown.expect(IllegalStateException.class);
- thrown.expectMessage("Invalid analysis mode: invalid.");
-
- createMode(CoreProperties.ANALYSIS_MODE, "invalid");
- }
-
- @Test
- public void testOtherProperty() {
- GlobalAnalysisMode mode = createMode(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_PUBLISH);
- assertThat(mode.isPreview()).isFalse();
- assertThat(mode.isIssues()).isFalse();
- assertThat(mode.isPublish()).isTrue();
- }
-
- @Test
- public void testIssuesMode() {
- GlobalAnalysisMode mode = createMode(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_ISSUES);
- assertThat(mode.isPreview()).isFalse();
- assertThat(mode.isIssues()).isTrue();
- assertThat(mode.isPublish()).isFalse();
- }
-
- @Test
- public void preview_mode_fallback_issues() {
- GlobalAnalysisMode mode = createMode(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_PREVIEW);
-
- assertThat(mode.isIssues()).isTrue();
- assertThat(mode.isPreview()).isFalse();
- }
-
- @Test
- public void testDefault() {
- GlobalAnalysisMode mode = createMode(null, null);
- assertThat(mode.isPreview()).isFalse();
- assertThat(mode.isIssues()).isFalse();
- assertThat(mode.isPublish()).isTrue();
- }
-
- @Test(expected = IllegalStateException.class)
- public void testInvalidMode() {
- createMode(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_ANALYSIS);
- }
-
- private GlobalAnalysisMode createMode(String key, String value) {
- Map<String, String> map = new HashMap<>();
- if (key != null) {
- map.put(key, value);
- }
- RawScannerProperties props = new RawScannerProperties(map);
- return new GlobalAnalysisMode(props);
- }
-}
import org.sonar.scanner.WsTestUtil;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
public class ScannerPluginInstallerTest {
@Rule
public ExpectedException expectedException = ExpectedException.none();
- private ScannerPluginPredicate pluginPredicate = mock(ScannerPluginPredicate.class);
private PluginFiles pluginFiles = mock(PluginFiles.class);
private ScannerWsClient wsClient = mock(ScannerWsClient.class);
- private ScannerPluginInstaller underTest = new ScannerPluginInstaller(pluginFiles, pluginPredicate, wsClient);
+ private ScannerPluginInstaller underTest = new ScannerPluginInstaller(pluginFiles, wsClient);
@Test
public void download_installed_plugins() throws IOException {
WsTestUtil.mockReader(wsClient, "api/plugins/installed", new InputStreamReader(getClass().getResourceAsStream("ScannerPluginInstallerTest/installed-plugins-ws.json")));
enqueueDownload("scmgit", "abc");
enqueueDownload("java", "def");
- when(pluginPredicate.apply(any())).thenReturn(true);
Map<String, ScannerPlugin> result = underTest.installRemotes();
assertThat(javaPlugin.getUpdatedAt()).isEqualTo(200L);
}
- @Test
- public void filter_blacklisted_plugins() throws IOException {
- WsTestUtil.mockReader(wsClient, "api/plugins/installed", new InputStreamReader(getClass().getResourceAsStream("ScannerPluginInstallerTest/installed-plugins-ws.json")));
- enqueueDownload("scmgit", "abc");
- enqueueDownload("java", "def");
- when(pluginPredicate.apply("scmgit")).thenReturn(true);
- when(pluginPredicate.apply("java")).thenReturn(false);
-
- Map<String, ScannerPlugin> result = underTest.installRemotes();
-
- assertThat(result.keySet()).containsExactlyInAnyOrder("scmgit");
- verify(pluginFiles, times(1)).get(any());
- }
-
@Test
public void fail_if_json_of_installed_plugins_is_not_valid() {
WsTestUtil.mockReader(wsClient, "api/plugins/installed", new StringReader("not json"));
enqueueNotFoundDownload("scmgit", "abc");
enqueueDownload("java", "def");
enqueueDownload("cobol", "ghi");
- when(pluginPredicate.apply(any())).thenReturn(true);
Map<String, ScannerPlugin> result = underTest.installRemotes();
enqueueDownload("scmgit", "abc");
enqueueDownload("cobol", "ghi");
enqueueNotFoundDownload("java", "def");
- when(pluginPredicate.apply(any())).thenReturn(true);
expectedException.expect(IllegalStateException.class);
expectedException.expectMessage("Fail to download plugin [java]. Not found.");
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.bootstrap;
-
-import org.junit.Test;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.config.internal.MapSettings;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class ScannerPluginPredicateTest {
-
- private MapSettings settings = new MapSettings();
- private GlobalAnalysisMode mode = mock(GlobalAnalysisMode.class);
-
- @Test
- public void accept_if_no_inclusions_nor_exclusions() {
- ScannerPluginPredicate predicate = new ScannerPluginPredicate(settings.asConfig(), mode);
- assertThat(predicate.getWhites()).isEmpty();
- assertThat(predicate.getBlacks()).isEmpty();
- assertThat(predicate.apply("pmd")).isTrue();
- assertThat(predicate.apply("buildbreaker")).isTrue();
- }
-
- @Test
- public void exclude_buildbreaker_in_preview_mode() {
- when(mode.isPreview()).thenReturn(true);
- ScannerPluginPredicate predicate = new ScannerPluginPredicate(settings.asConfig(), mode);
- assertThat(predicate.apply("buildbreaker")).isFalse();
- }
-
- @Test
- public void inclusions_take_precedence_over_exclusions() {
- when(mode.isPreview()).thenReturn(true);
- settings
- .setProperty(CoreProperties.PREVIEW_INCLUDE_PLUGINS, "checkstyle,pmd,findbugs")
- .setProperty(CoreProperties.PREVIEW_EXCLUDE_PLUGINS, "cobertura,pmd");
- ScannerPluginPredicate predicate = new ScannerPluginPredicate(settings.asConfig(), mode);
- assertThat(predicate.apply("pmd")).isTrue();
- }
-
- @Test
- public void verify_both_inclusions_and_exclusions() {
- when(mode.isPreview()).thenReturn(true);
- settings
- .setProperty(CoreProperties.PREVIEW_INCLUDE_PLUGINS, "checkstyle,pmd,findbugs")
- .setProperty(CoreProperties.PREVIEW_EXCLUDE_PLUGINS, "cobertura");
- ScannerPluginPredicate predicate = new ScannerPluginPredicate(settings.asConfig(), mode);
- assertThat(predicate.apply("checkstyle")).isTrue();
- assertThat(predicate.apply("pmd")).isTrue();
- assertThat(predicate.apply("cobertura")).isFalse();
- }
-
- @Test
- public void verify_both_inclusions_and_exclusions_issues() {
- when(mode.isIssues()).thenReturn(true);
- settings
- .setProperty(CoreProperties.PREVIEW_INCLUDE_PLUGINS, "checkstyle,pmd,findbugs")
- .setProperty(CoreProperties.PREVIEW_EXCLUDE_PLUGINS, "cobertura");
- ScannerPluginPredicate predicate = new ScannerPluginPredicate(settings.asConfig(), mode);
- assertThat(predicate.apply("checkstyle")).isTrue();
- assertThat(predicate.apply("pmd")).isTrue();
- assertThat(predicate.apply("cobertura")).isFalse();
- }
-
- @Test
- public void test_exclusions_without_any_inclusions() {
- when(mode.isPreview()).thenReturn(true);
- settings.setProperty(CoreProperties.PREVIEW_EXCLUDE_PLUGINS, "checkstyle,pmd,findbugs");
- ScannerPluginPredicate predicate = new ScannerPluginPredicate(settings.asConfig(), mode);
- assertThat(predicate.apply("checkstyle")).isFalse();
- assertThat(predicate.apply("pmd")).isFalse();
- assertThat(predicate.apply("cobertura")).isTrue();
- }
-
- @Test
- public void trim_inclusions_and_exclusions() {
- settings
- .setProperty(CoreProperties.PREVIEW_INCLUDE_PLUGINS, "checkstyle, pmd, findbugs")
- .setProperty(CoreProperties.PREVIEW_EXCLUDE_PLUGINS, "cobertura, pmd");
- ScannerPluginPredicate predicate = new ScannerPluginPredicate(settings.asConfig(), mode);
- assertThat(predicate.apply("pmd")).isTrue();
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue;
-
-import com.google.common.collect.Lists;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.api.rule.Severity;
-import org.sonar.core.issue.DefaultIssue;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class DefaultProjectIssuesTest {
-
- static final RuleKey SQUID_RULE_KEY = RuleKey.of("squid", "AvoidCycle");
-
- IssueCache cache = mock(IssueCache.class);
- DefaultProjectIssues projectIssues = new DefaultProjectIssues(cache);
-
- @Test
- public void should_get_all_issues() {
- DefaultIssue issueOnModule = new DefaultIssue().setKey("1").setRuleKey(SQUID_RULE_KEY).setComponentKey("org.apache:struts-core");
- DefaultIssue issueInModule = new DefaultIssue().setKey("2").setRuleKey(SQUID_RULE_KEY).setComponentKey("org.apache:struts-core:Action");
- DefaultIssue resolvedIssueInModule = new DefaultIssue().setKey("3").setRuleKey(SQUID_RULE_KEY).setComponentKey("org.apache:struts-core:Action")
- .setResolution(Issue.RESOLUTION_FIXED);
-
- DefaultIssue issueOnRoot = new DefaultIssue().setKey("4").setRuleKey(SQUID_RULE_KEY).setSeverity(Severity.CRITICAL).setComponentKey("org.apache:struts");
- DefaultIssue issueInRoot = new DefaultIssue().setKey("5").setRuleKey(SQUID_RULE_KEY).setSeverity(Severity.CRITICAL).setComponentKey("org.apache:struts:FileInRoot");
- when(cache.all()).thenReturn(Arrays.<TrackedIssue>asList(
- toTrackedIssue(issueOnRoot), toTrackedIssue(issueInRoot),
- toTrackedIssue(issueOnModule), toTrackedIssue(issueInModule), toTrackedIssue(resolvedIssueInModule)
- ));
-
- // unresolved issues
- List<Issue> issues = Lists.newArrayList(projectIssues.issues());
- assertThat(issues).containsOnly(issueOnRoot, issueInRoot, issueInModule, issueOnModule);
-
- List<Issue> resolvedIssues = Lists.newArrayList(projectIssues.resolvedIssues());
- assertThat(resolvedIssues).containsOnly(resolvedIssueInModule);
- }
-
- private TrackedIssue toTrackedIssue(DefaultIssue issue) {
- TrackedIssue trackedIssue = new TrackedIssue();
-
- trackedIssue.setKey(issue.key());
- trackedIssue.setRuleKey(issue.ruleKey());
- trackedIssue.setComponentKey(issue.componentKey());
- trackedIssue.setSeverity(issue.severity());
- trackedIssue.setResolution(issue.resolution());
-
- return trackedIssue;
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableList;
-import java.util.Collection;
-import java.util.List;
-import javax.annotation.Nullable;
-import org.junit.Test;
-import org.sonar.api.rule.Severity;
-import org.sonar.scanner.index.AbstractCachesTest;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class IssueCacheTest extends AbstractCachesTest {
-
- @Test
- public void should_add_new_issue() {
- IssueCache cache = new IssueCache(caches);
- TrackedIssue issue1 = createIssue("111", "org.struts.Action", null);
- TrackedIssue issue2 = createIssue("222", "org.struts.Action", null);
- TrackedIssue issue3 = createIssue("333", "org.struts.Filter", null);
- issue3.setAssignee("foo");
- cache.put(issue1).put(issue2).put(issue3);
-
- assertThat(issueKeys(cache.byComponent("org.struts.Action"))).containsOnly("111", "222");
- assertThat(issueKeys(cache.byComponent("org.struts.Filter"))).containsOnly("333");
- assertThat(cache.byComponent("org.struts.Filter").iterator().next().assignee()).isEqualTo("foo");
- }
-
- @Test
- public void should_update_existing_issue() {
- IssueCache cache = new IssueCache(caches);
- TrackedIssue issue = createIssue("111", "org.struts.Action", Severity.BLOCKER);
- cache.put(issue);
-
- issue.setSeverity(Severity.MINOR);
- cache.put(issue);
-
- List<TrackedIssue> issues = ImmutableList.copyOf(cache.byComponent("org.struts.Action"));
- assertThat(issues).hasSize(1);
- TrackedIssue reloaded = issues.iterator().next();
- assertThat(reloaded.key()).isEqualTo("111");
- assertThat(reloaded.severity()).isEqualTo(Severity.MINOR);
- }
-
- @Test
- public void should_get_all_issues() {
- IssueCache cache = new IssueCache(caches);
- TrackedIssue issue1 = createIssue("111", "org.struts.Action", Severity.BLOCKER);
- TrackedIssue issue2 = createIssue("222", "org.struts.Filter", Severity.INFO);
- cache.put(issue1).put(issue2);
-
- List<TrackedIssue> issues = ImmutableList.copyOf(cache.all());
- assertThat(issues).containsOnly(issue1, issue2);
- }
-
- private Collection<String> issueKeys(Iterable<TrackedIssue> issues) {
- return Collections2.transform(ImmutableList.copyOf(issues), new Function<TrackedIssue, String>() {
- @Override
- public String apply(@Nullable TrackedIssue issue) {
- return issue.key();
- }
- });
- }
-
- private TrackedIssue createIssue(String key, String componentKey, String severity) {
- TrackedIssue issue = new TrackedIssue();
- issue.setKey(key);
- issue.setComponentKey(componentKey);
- issue.setSeverity(severity);
-
- return issue;
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue;
-
-import java.util.Date;
-import org.junit.Test;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TrackedIssueAdapterTest {
-
- @Test
- public void improve_coverage() {
- Date creationDate = new Date();
- TrackedIssue trackedIssue = new TrackedIssue()
- .setKey("XYZ123")
- .setComponentKey("foo")
- .setRuleKey(RuleKey.of("repo", "rule"))
- .setSeverity("MAJOR")
- .setMessage("msg")
- .setStartLine(1)
- .setGap(2.0)
- .setStatus("RESOLVED")
- .setResolution("FIXED")
- .setAssignee("tata")
- .setNew(true)
- .setCreationDate(creationDate);
- Issue issue = new TrackedIssueAdapter(trackedIssue);
- assertThat(issue.key()).isEqualTo("XYZ123");
- assertThat(issue.componentKey()).isEqualTo("foo");
- assertThat(issue.ruleKey()).isEqualTo(RuleKey.of("repo", "rule"));
- assertThat(issue.severity()).isEqualTo("MAJOR");
- assertThat(issue.message()).isEqualTo("msg");
- assertThat(issue.line()).isEqualTo(1);
- assertThat(issue.gap()).isEqualTo(2.0);
- assertThat(issue.status()).isEqualTo("RESOLVED");
- assertThat(issue.resolution()).isEqualTo("FIXED");
- assertThat(issue.assignee()).isEqualTo("tata");
- assertThat(issue.isNew()).isTrue();
- assertThat(issue.attribute("foo")).isNull();
- assertThat(issue.creationDate()).isEqualTo(creationDate);
- assertThat(issue.language()).isNull();
- assertThat(issue.updateDate()).isNull();
- assertThat(issue.closeDate()).isNull();
- assertThat(issue.authorLogin()).isNull();
- assertThat(issue.comments()).isEmpty();
- assertThat(issue.effort()).isNull();
- assertThat(issue.projectKey()).isNull();
- assertThat(issue.projectUuid()).isNull();
- assertThat(issue.componentUuid()).isNull();
- assertThat(issue.tags()).isEmpty();
-
- assertThat(issue).isNotEqualTo(null);
- assertThat(issue).isNotEqualTo("Foo");
- assertThat(issue).isEqualTo(new TrackedIssueAdapter(trackedIssue));
- assertThat(issue.hashCode()).isEqualTo(trackedIssue.key().hashCode());
- assertThat(issue).isNotEqualTo(new TrackedIssueAdapter(new TrackedIssue()
- .setKey("another")));
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import java.io.StringReader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.sonar.api.utils.HttpDownloader;
-import org.sonar.scanner.WsTestUtil;
-import org.sonar.scanner.bootstrap.ScannerWsClient;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-public class DefaultServerLineHashesLoaderTest {
- private ScannerWsClient wsClient;
-
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
- @Before
- public void before() {
- wsClient = mock(ScannerWsClient.class);
- }
-
- @Test
- public void should_download_source_from_ws_if_preview_mode() {
- WsTestUtil.mockReader(wsClient, new StringReader("ae12\n\n43fb"));
- ServerLineHashesLoader lastSnapshots = new DefaultServerLineHashesLoader(wsClient);
-
- String[] hashes = lastSnapshots.getLineHashes("myproject:org/foo/Bar.c");
- assertThat(hashes).containsOnly("ae12", "", "43fb");
- WsTestUtil.verifyCall(wsClient, "/api/sources/hash?key=myproject%3Aorg%2Ffoo%2FBar.c");
- }
-
- @Test
- public void should_download_source_with_space_from_ws_if_preview_mode() {
- WsTestUtil.mockReader(wsClient, new StringReader("ae12\n\n43fb"));
- ServerLineHashesLoader lastSnapshots = new DefaultServerLineHashesLoader(wsClient);
-
- String[] hashes = lastSnapshots.getLineHashes("myproject:org/foo/Foo Bar.c");
- assertThat(hashes).containsOnly("ae12", "", "43fb");
- WsTestUtil.verifyCall(wsClient, "/api/sources/hash?key=myproject%3Aorg%2Ffoo%2FFoo+Bar.c");
- }
-
- @Test
- public void should_fail_to_download_source_from_ws() throws URISyntaxException {
- WsTestUtil.mockException(wsClient, new HttpDownloader.HttpException(new URI(""), 500));
- ServerLineHashesLoader lastSnapshots = new DefaultServerLineHashesLoader(wsClient);
-
- thrown.expect(HttpDownloader.HttpException.class);
- lastSnapshots.getLineHashes("foo");
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import org.junit.Test;
-
-import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class RollingFileHashesTest {
-
- @Test
- public void test_equals() {
- RollingFileHashes a = RollingFileHashes.create(FileHashes.create(new String[] {md5Hex("line0"), md5Hex("line1"), md5Hex("line2")}), 1);
- RollingFileHashes b = RollingFileHashes.create(FileHashes.create(new String[] {md5Hex("line0"), md5Hex("line1"), md5Hex("line2"), md5Hex("line3")}), 1);
-
- assertThat(a.getHash(1) == b.getHash(1)).isTrue();
- assertThat(a.getHash(2) == b.getHash(2)).isTrue();
- assertThat(a.getHash(3) == b.getHash(3)).isFalse();
-
- RollingFileHashes c = RollingFileHashes.create(FileHashes.create(new String[] {md5Hex("line-1"), md5Hex("line0"), md5Hex("line1"), md5Hex("line2"), md5Hex("line3")}), 1);
- assertThat(a.getHash(1) == c.getHash(2)).isFalse();
- assertThat(a.getHash(2) == c.getHash(3)).isTrue();
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import org.apache.commons.io.FileUtils;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.mockito.Mockito;
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.api.batch.fs.internal.DefaultInputProject;
-
-import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class SourceHashHolderTest {
-
- @Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
- SourceHashHolder sourceHashHolder;
-
- ServerLineHashesLoader lastSnapshots;
- DefaultInputFile file;
-
- private File ioFile;
- private DefaultInputProject project;
-
- @Before
- public void setUp() throws Exception {
- lastSnapshots = mock(ServerLineHashesLoader.class);
- file = mock(DefaultInputFile.class);
- ioFile = temp.newFile();
- when(file.file()).thenReturn(ioFile);
- when(file.path()).thenReturn(ioFile.toPath());
- when(file.inputStream()).thenAnswer(i -> Files.newInputStream(ioFile.toPath()));
- when(file.lines()).thenReturn(1);
- when(file.charset()).thenReturn(StandardCharsets.UTF_8);
-
- project = mock(DefaultInputProject.class);
- sourceHashHolder = new SourceHashHolder(project, file, lastSnapshots);
- }
-
- @Test
- public void should_lazy_load_line_hashes() throws Exception {
- final String source = "source";
- FileUtils.write(ioFile, source + "\n", StandardCharsets.UTF_8);
- when(file.lines()).thenReturn(2);
-
- assertThat(sourceHashHolder.getHashedSource().getHash(1)).isEqualTo(md5Hex(source));
- assertThat(sourceHashHolder.getHashedSource().getHash(2)).isEqualTo("");
-
- assertThat(sourceHashHolder.getHashedSource().getHash(1)).isEqualTo(md5Hex(source));
- }
-
- @Test
- public void should_lazy_load_reference_hashes_when_status_changed() throws Exception {
- final String source = "source";
- FileUtils.write(ioFile, source, StandardCharsets.UTF_8);
- when(project.getKeyWithBranch()).thenReturn("foo");
- when(file.getProjectRelativePath()).thenReturn("src/Foo.java");
- String key = "foo:src/Foo.java";
- when(file.status()).thenReturn(InputFile.Status.CHANGED);
- when(lastSnapshots.getLineHashes(key)).thenReturn(new String[] {md5Hex(source)});
-
- assertThat(sourceHashHolder.getHashedReference().getHash(1)).isEqualTo(md5Hex(source));
- verify(lastSnapshots).getLineHashes(key);
-
- assertThat(sourceHashHolder.getHashedReference().getHash(1)).isEqualTo(md5Hex(source));
- Mockito.verifyNoMoreInteractions(lastSnapshots);
- }
-
- @Test
- public void should_lazy_load_reference_hashes_when_status_changed_on_branch() throws Exception {
- final String source = "source";
- FileUtils.write(ioFile, source, StandardCharsets.UTF_8);
- when(project.getKeyWithBranch()).thenReturn("foo:myBranch");
- when(file.getProjectRelativePath()).thenReturn("src/Foo.java");
- String key = "foo:myBranch:src/Foo.java";
- when(file.status()).thenReturn(InputFile.Status.CHANGED);
- when(lastSnapshots.getLineHashes(key)).thenReturn(new String[] {md5Hex(source)});
-
- assertThat(sourceHashHolder.getHashedReference().getHash(1)).isEqualTo(md5Hex(source));
- verify(lastSnapshots).getLineHashes(key);
-
- assertThat(sourceHashHolder.getHashedReference().getHash(1)).isEqualTo(md5Hex(source));
- Mockito.verifyNoMoreInteractions(lastSnapshots);
- }
-
- @Test
- public void should_not_load_reference_hashes_when_status_same() throws Exception {
- final String source = "source";
- String key = "foo:src/Foo.java";
- FileUtils.write(ioFile, source, StandardCharsets.UTF_8);
- when(file.key()).thenReturn(key);
- when(file.status()).thenReturn(InputFile.Status.SAME);
-
- assertThat(sourceHashHolder.getHashedReference().getHash(1)).isEqualTo(md5Hex(source));
- Mockito.verifyNoMoreInteractions(lastSnapshots);
- }
-
- @Test
- public void no_reference_hashes_when_status_added() throws Exception {
- final String source = "source";
- String key = "foo:src/Foo.java";
- FileUtils.write(ioFile, source, StandardCharsets.UTF_8);
- when(file.key()).thenReturn(key);
- when(file.status()).thenReturn(InputFile.Status.ADDED);
-
- assertThat(sourceHashHolder.getHashedReference()).isNull();
- Mockito.verifyNoMoreInteractions(lastSnapshots);
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.issue.tracking;
-
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TrackedIssueTest {
- @Test
- public void round_trip() {
- TrackedIssue issue = new TrackedIssue();
- issue.setStartLine(15);
-
- assertThat(issue.getLine()).isEqualTo(15);
- assertThat(issue.startLine()).isEqualTo(15);
- }
-
- @Test
- public void hashes() {
- String[] hashArr = new String[] {
- "hash1", "hash2", "hash3"
- };
-
- FileHashes hashes = FileHashes.create(hashArr);
- TrackedIssue issue = new TrackedIssue(hashes);
- issue.setStartLine(1);
- assertThat(issue.getLineHash()).isEqualTo("hash1");
- }
-}
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.function.Consumer;
import java.util.function.Supplier;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
import org.sonar.batch.bootstrapper.EnvironmentInformation;
import org.sonar.batch.bootstrapper.LogOutput;
import org.sonar.scanner.bootstrap.GlobalAnalysisMode;
-import org.sonar.scanner.issue.tracking.ServerLineHashesLoader;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
import org.sonar.scanner.repository.FileData;
import org.sonar.scanner.repository.MetricsRepository;
import org.sonar.scanner.repository.MetricsRepositoryLoader;
import org.sonar.scanner.repository.ProjectRepositories;
import org.sonar.scanner.repository.ProjectRepositoriesLoader;
import org.sonar.scanner.repository.QualityProfileLoader;
-import org.sonar.scanner.repository.ServerIssuesLoader;
import org.sonar.scanner.repository.SingleProjectRepository;
import org.sonar.scanner.repository.settings.GlobalSettingsLoader;
import org.sonar.scanner.repository.settings.ProjectSettingsLoader;
private final FakeBranchConfiguration branchConfiguration = new FakeBranchConfiguration();
private final FakeProjectRepositoriesLoader projectRefProvider = new FakeProjectRepositoriesLoader();
private final FakePluginInstaller pluginInstaller = new FakePluginInstaller();
- private final FakeServerIssuesLoader serverIssues = new FakeServerIssuesLoader();
private final FakeGlobalSettingsLoader globalSettingsLoader = new FakeGlobalSettingsLoader();
private final FakeProjectSettingsLoader projectSettingsLoader = new FakeProjectSettingsLoader();
- private final FakeServerLineHashesLoader serverLineHashes = new FakeServerLineHashesLoader();
private final FakeRulesLoader rulesLoader = new FakeRulesLoader();
private final FakeQualityProfileLoader qualityProfiles = new FakeQualityProfileLoader();
private final FakeActiveRulesLoader activeRules = new FakeActiveRulesLoader();
return this;
}
- public ScannerMediumTester setPreviousAnalysisDate(Date previousAnalysis) {
- projectRefProvider.setLastAnalysisDate(previousAnalysis);
- return this;
- }
-
public ScannerMediumTester bootstrapProperties(Map<String, String> props) {
globalProperties.putAll(props);
return this;
return this;
}
- public ScannerMediumTester setLastBuildDate(Date d) {
- projectRefProvider.setLastAnalysisDate(d);
- return this;
- }
-
- public ScannerMediumTester mockServerIssue(ServerIssue issue) {
- serverIssues.getServerIssues().add(issue);
- return this;
- }
-
public ScannerMediumTester addGlobalServerSettings(String key, String value) {
globalSettingsLoader.getGlobalSettings().put(key, value);
return this;
return this;
}
- public ScannerMediumTester mockLineHashes(String fileKey, String[] lineHashes) {
- serverLineHashes.byKey.put(fileKey, lineHashes);
- return this;
- }
-
@Override
protected void before() throws Throwable {
try {
tester.branchConfigurationLoader,
tester.projectRefProvider,
tester.activeRules,
- tester.serverIssues,
tester.globalSettingsLoader,
tester.projectSettingsLoader,
result)
private static class FakeProjectRepositoriesLoader implements ProjectRepositoriesLoader {
private Map<String, FileData> fileDataMap = Maps.newHashMap();
- private Date lastAnalysisDate;
@Override
- public ProjectRepositories load(String projectKey, boolean isIssuesMode, @Nullable String branchBase) {
- return new SingleProjectRepository(fileDataMap, lastAnalysisDate);
+ public ProjectRepositories load(String projectKey, @Nullable String branchBase) {
+ return new SingleProjectRepository(fileDataMap);
}
public FakeProjectRepositoriesLoader addFileData(String path, FileData fileData) {
return this;
}
- public FakeProjectRepositoriesLoader setLastAnalysisDate(Date d) {
- lastAnalysisDate = d;
- return this;
- }
-
}
private static class FakeBranchConfiguration implements BranchConfiguration {
}
}
- private static class FakeServerIssuesLoader implements ServerIssuesLoader {
-
- private List<ServerIssue> serverIssues = new ArrayList<>();
-
- public List<ServerIssue> getServerIssues() {
- return serverIssues;
- }
-
- @Override
- public void load(String componentKey, Consumer<ServerIssue> consumer) {
- for (ServerIssue serverIssue : serverIssues) {
- consumer.accept(serverIssue);
- }
- }
- }
-
private static class FakeGlobalSettingsLoader implements GlobalSettingsLoader {
private Map<String, String> globalSettings = new HashMap<>();
}
}
- private static class FakeServerLineHashesLoader implements ServerLineHashesLoader {
- private Map<String, String[]> byKey = new HashMap<>();
-
- @Override
- public String[] getLineHashes(String fileKey) {
- if (byKey.containsKey(fileKey)) {
- return byKey.get(fileKey);
- } else {
- throw new IllegalStateException("You forgot to mock line hashes for " + fileKey);
- }
- }
- }
}
public ExpectedException exception = ExpectedException.none();
@Rule
- public ScannerMediumTester tester = new ScannerMediumTester()
- .setPreviousAnalysisDate(null);
+ public ScannerMediumTester tester = new ScannerMediumTester();
@Test
public void testNoLanguagePluginsInstalled() throws Exception {
import com.google.common.collect.ImmutableMap;
import java.io.File;
import java.io.IOException;
-import java.util.Date;
import java.util.List;
import org.apache.commons.io.FileUtils;
import org.hamcrest.BaseMatcher;
import org.junit.rules.TemporaryFolder;
import org.sonar.api.batch.bootstrap.ProjectBuilder;
import org.sonar.api.utils.MessageException;
-import org.sonar.scanner.mediumtest.ScannerMediumTester;
import org.sonar.scanner.mediumtest.AnalysisResult;
+import org.sonar.scanner.mediumtest.ScannerMediumTester;
import org.sonar.scanner.protocol.output.ScannerReport.Issue;
import org.sonar.xoo.XooPlugin;
import org.sonar.xoo.rule.XooRulesDefinition;
.registerPlugin("xoo", new XooPluginWithBuilder(projectBuilder))
.addRules(new XooRulesDefinition())
.addDefaultQProfile("xoo", "Sonar Way")
- .setPreviousAnalysisDate(new Date())
.addActiveRule("xoo", "OneIssuePerLine", null, "One issue per line", "MAJOR", "OneIssuePerLine.internal", "xoo");
private class XooPluginWithBuilder extends XooPlugin {
tester.newAnalysis()
.properties(ImmutableMap.<String, String>builder()
- .put("sonar.task", "scan")
.put("sonar.projectBaseDir", baseDir.getAbsolutePath())
.put("sonar.projectKey", "com.foo.project")
- .put("sonar.projectName", "Foo Project")
- .put("sonar.projectVersion", "1.0-SNAPSHOT")
- .put("sonar.projectDescription", "Description of Foo Project")
.put("sonar.sources", ".")
.put("sonar.xoo.enableProjectBuilder", "true")
.build())
AnalysisResult result = tester.newAnalysis()
.properties(ImmutableMap.<String, String>builder()
- .put("sonar.task", "scan")
.put("sonar.projectBaseDir", baseDir.getAbsolutePath())
.put("sonar.projectKey", "com.foo.project")
- .put("sonar.projectName", "Foo Project")
- .put("sonar.projectVersion", "1.0-SNAPSHOT")
- .put("sonar.projectDescription", "Description of Foo Project")
.put("sonar.sources", ".")
.put("sonar.verbose", "true")
.put("sonar.xoo.enableProjectBuilder", "true")
exception.expectMessage("is not a valid branch name");
tester.newAnalysis()
.properties(ImmutableMap.<String, String>builder()
- .put("sonar.task", "scan")
.put("sonar.projectBaseDir", baseDir.getAbsolutePath())
.put("sonar.projectKey", "com.foo.project")
- .put("sonar.projectName", "Foo Project")
.put("sonar.branch", "branch\n")
- .put("sonar.projectVersion", "1.0-SNAPSHOT")
- .put("sonar.projectDescription", "Description of Foo Project")
.put("sonar.sources", ".")
.put("sonar.xoo.enableProjectBuilder", "true")
.build())
AnalysisResult result = tester.newAnalysis()
.properties(ImmutableMap.<String, String>builder()
- .put("sonar.task", "scan")
.put("sonar.projectBaseDir", baseDir.getAbsolutePath())
.put("sonar.projectKey", "com.foo.project")
- .put("sonar.projectName", "Foo Project")
- .put("sonar.projectVersion", "1.0-SNAPSHOT")
- .put("sonar.projectDescription", "Description of Foo Project")
.put("sonar.branch", "my-branch")
.put("sonar.sources", ".")
.put("sonar.xoo.enableProjectBuilder", "true")
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.scanner.mediumtest.issues;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.sonar.api.utils.MessageException;
+import org.sonar.api.utils.log.LogTester;
+import org.sonar.scanner.mediumtest.ScannerMediumTester;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+public class PreviewMediumTest {
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ @Rule
+ public LogTester logTester = new LogTester();
+
+ @Rule
+ public ScannerMediumTester tester = new ScannerMediumTester();
+
+ @Test
+ public void failWhenUsingPreviewMode() throws Exception {
+ try {
+ tester.newAnalysis()
+ .properties(ImmutableMap.<String, String>builder()
+ .put("sonar.analysis.mode", "preview").build())
+ .execute();
+ fail("Expected exception");
+ } catch (Exception e) {
+ assertThat(e).isInstanceOf(MessageException.class).hasMessage("The preview mode, along with the 'sonar.analysis.mode' parameter, is no more supported. You should stop using this parameter.");
+ }
+ }
+
+ @Test
+ public void failWhenUsingIssuesMode() throws Exception {
+ try {
+ tester.newAnalysis()
+ .properties(ImmutableMap.<String, String>builder()
+ .put("sonar.analysis.mode", "issues").build())
+ .execute();
+ fail("Expected exception");
+ } catch (Exception e) {
+ assertThat(e).isInstanceOf(MessageException.class).hasMessage("The preview mode, along with the 'sonar.analysis.mode' parameter, is no more supported. You should stop using this parameter.");
+ }
+ }
+
+}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.mediumtest.issuesmode;
-
-import com.google.common.collect.ImmutableMap;
-import java.io.File;
-import java.util.Date;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.FileFilterUtils;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.utils.log.LogTester;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.mediumtest.ScannerMediumTester;
-import org.sonar.scanner.mediumtest.AnalysisResult;
-import org.sonar.xoo.XooPlugin;
-import org.sonar.xoo.rule.XooRulesDefinition;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class EmptyFileTest {
-
- @Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
- @Rule
- public LogTester logTester = new LogTester();
-
- @Rule
- public ScannerMediumTester tester = new ScannerMediumTester()
- .bootstrapProperties(ImmutableMap.of(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_ISSUES))
- .registerPlugin("xoo", new XooPlugin())
- .addRules(new XooRulesDefinition())
- .addDefaultQProfile("xoo", "Sonar Way")
- .addActiveRule("xoo", "OneIssuePerLine", null, "One issue per line", "MAJOR", "my/internal/key", "xoo")
- .setPreviousAnalysisDate(new Date());
-
- @Test
- public void testIssueTrackingWithIssueOnEmptyFile() throws Exception {
- File projectDir = copyProject("test-resources/mediumtest/xoo/sample-with-empty-file");
-
- AnalysisResult result = tester
- .newAnalysis(new File(projectDir, "sonar-project.properties"))
- .property("sonar.xoo.internalKey", "my/internal/key")
- .execute();
-
- for (TrackedIssue i : result.trackedIssues()) {
- System.out.println(i.startLine() + " " + i.getMessage());
- }
-
- assertThat(result.trackedIssues()).hasSize(11);
- }
-
- private File copyProject(String path) throws Exception {
- File projectDir = temp.newFolder();
- File originalProjectDir = new File(path);
- FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar")));
- return projectDir;
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.mediumtest.issuesmode;
-
-import com.google.common.collect.ImmutableMap;
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.FileFilterUtils;
-import org.apache.commons.lang.StringUtils;
-import org.assertj.core.api.Condition;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.utils.log.LogTester;
-import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.mediumtest.ScannerMediumTester;
-import org.sonar.scanner.mediumtest.AnalysisResult;
-import org.sonar.scanner.protocol.Constants.Severity;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
-import org.sonar.xoo.XooPlugin;
-import org.sonar.xoo.rule.XooRulesDefinition;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class IssueModeAndReportsMediumTest {
-
- @org.junit.Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
- @org.junit.Rule
- public LogTester logTester = new LogTester();
-
- private static SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-
- private static Long date(String date) {
- try {
- return sdf.parse(date).getTime();
- } catch (ParseException e) {
- throw new IllegalStateException(e);
- }
- }
-
- @Rule
- public ScannerMediumTester tester = new ScannerMediumTester()
- .bootstrapProperties(ImmutableMap.of(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_ISSUES))
- .registerPlugin("xoo", new XooPlugin())
- .addDefaultQProfile("xoo", "Sonar Way")
- .addRules(new XooRulesDefinition())
- .addActiveRule("xoo", "OneIssuePerLine", null, "One issue per line", "MAJOR", null, "xoo")
- .addActiveRule("xoo", "OneIssueOnDirPerFile", null, "OneIssueOnDirPerFile", "MAJOR", null, "xoo")
- .addActiveRule("xoo", "OneIssuePerModule", null, "OneIssuePerModule", "MAJOR", null, "xoo")
- .setPreviousAnalysisDate(new Date())
- // Existing issue that is still detected
- .mockServerIssue(ServerIssue.newBuilder().setKey("xyz")
- .setModuleKey("sample")
- .setPath("xources/hello/HelloJava.xoo")
- .setRuleRepository("xoo")
- .setRuleKey("OneIssuePerLine")
- .setLine(1)
- .setSeverity(Severity.MAJOR)
- .setCreationDate(date("14/03/2004"))
- .setChecksum(DigestUtils.md5Hex("packagehello;"))
- .setStatus("OPEN")
- .build())
- // Existing issue that is no more detected (will be closed)
- .mockServerIssue(ServerIssue.newBuilder().setKey("resolved")
- .setModuleKey("sample")
- .setPath("xources/hello/HelloJava.xoo")
- .setRuleRepository("xoo")
- .setRuleKey("OneIssuePerLine")
- .setLine(1)
- .setSeverity(Severity.MAJOR)
- .setCreationDate(date("14/03/2004"))
- .setChecksum(DigestUtils.md5Hex("dontexist"))
- .setStatus("OPEN")
- .build())
- // Existing issue on project that is still detected
- .mockServerIssue(ServerIssue.newBuilder().setKey("resolved-on-project")
- .setModuleKey("sample")
- .setRuleRepository("xoo")
- .setRuleKey("OneIssuePerModule")
- .setSeverity(Severity.CRITICAL)
- .setCreationDate(date("14/03/2004"))
- .setStatus("OPEN")
- .build());
-
- private File copyProject(String path) throws Exception {
- File projectDir = temp.newFolder();
- File originalProjectDir = new File(path);
- FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar")));
- return projectDir;
- }
-
- @Test
- public void testIssueTracking() throws Exception {
- File projectDir = copyProject("test-resources/mediumtest/xoo/sample");
-
- AnalysisResult result = tester
- .newAnalysis(new File(projectDir, "sonar-project.properties"))
- .execute();
-
- int newIssues = 0;
- int openIssues = 0;
- int resolvedIssue = 0;
- for (TrackedIssue issue : result.trackedIssues()) {
- System.out
- .println(issue.getMessage() + " " + issue.key() + " " + issue.getRuleKey() + " " + issue.isNew() + " " + issue.resolution() + " " + issue.componentKey() + " "
- + issue.startLine());
- if (issue.isNew()) {
- newIssues++;
- } else if (issue.resolution() != null) {
- resolvedIssue++;
- } else {
- openIssues++;
- }
- }
- System.out.println("new: " + newIssues + " open: " + openIssues + " resolved " + resolvedIssue);
- assertThat(newIssues).isEqualTo(16);
- assertThat(openIssues).isEqualTo(2);
- assertThat(resolvedIssue).isEqualTo(1);
-
- // progress report
- String logs = StringUtils.join(logTester.logs(LoggerLevel.INFO), "\n");
-
- assertThat(logs).contains("Performing issue tracking");
- assertThat(logs).contains("4/4 components tracked");
-
- // assert that original fields of a matched issue are kept
- assertThat(result.trackedIssues()).haveExactly(1, new Condition<TrackedIssue>() {
- @Override
- public boolean matches(TrackedIssue value) {
- return value.isNew() == false
- && "resolved-on-project".equals(value.key())
- && "OPEN".equals(value.status())
- && new Date(date("14/03/2004")).equals(value.creationDate());
- }
- });
- }
-
- @Test
- public void testPostJob() throws Exception {
- File projectDir = copyProject("test-resources/mediumtest/xoo/sample");
-
- tester
- .newAnalysis(new File(projectDir, "sonar-project.properties"))
- .property("sonar.xoo.enablePostJob", "true")
- .execute();
-
- assertThat(logTester.logs()).contains("Resolved issues: 1", "Open issues: 18");
- }
-
- @Test
- public void noSyntaxHighlightingInIssuesMode() throws IOException {
-
- File baseDir = temp.newFolder();
- File srcDir = new File(baseDir, "src");
- srcDir.mkdir();
-
- File xooFile = new File(srcDir, "sample.xoo");
- File xoohighlightingFile = new File(srcDir, "sample.xoo.highlighting");
- FileUtils.write(xooFile, "Sample xoo\ncontent plop");
- FileUtils.write(xoohighlightingFile, "0:10:s\n11:18:k");
-
- AnalysisResult result = tester.newAnalysis()
- .properties(ImmutableMap.<String, String>builder()
- .put("sonar.projectBaseDir", baseDir.getAbsolutePath())
- .put("sonar.projectKey", "com.foo.project")
- .put("sonar.projectName", "Foo Project")
- .put("sonar.projectVersion", "1.0-SNAPSHOT")
- .put("sonar.projectDescription", "Description of Foo Project")
- .put("sonar.sources", "src")
- .build())
- .execute();
-
- assertThat(result.getReportReader().hasSyntaxHighlighting(1)).isFalse();
- assertThat(result.getReportReader().hasSyntaxHighlighting(2)).isFalse();
- assertThat(result.getReportReader().hasSyntaxHighlighting(3)).isFalse();
- }
-
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.mediumtest.issuesmode;
-
-import com.google.common.collect.ImmutableMap;
-import java.io.File;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.FileFilterUtils;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.utils.log.LogTester;
-import org.sonar.scanner.mediumtest.ScannerMediumTester;
-import org.sonar.scanner.mediumtest.AnalysisResult;
-import org.sonar.xoo.XooPlugin;
-import org.sonar.xoo.rule.XooRulesDefinition;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class NoPreviousAnalysisTest {
- @Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
- @Rule
- public LogTester logTester = new LogTester();
-
- @Rule
- public ScannerMediumTester tester = new ScannerMediumTester()
- .bootstrapProperties(ImmutableMap.of(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_ISSUES))
- .registerPlugin("xoo", new XooPlugin())
- .addRules(new XooRulesDefinition())
- .addDefaultQProfile("xoo", "Sonar Way")
- .addActiveRule("xoo", "OneIssuePerLine", null, "One issue per line", "MAJOR", "my/internal/key", "xoo")
- .setPreviousAnalysisDate(null);
-
- @Test
- public void testIssueTrackingWithIssueOnEmptyFile() throws Exception {
- File projectDir = copyProject("test-resources/mediumtest/xoo/sample");
-
- AnalysisResult result = tester
- .newAnalysis(new File(projectDir, "sonar-project.properties"))
- .execute();
-
- assertThat(result.trackedIssues()).hasSize(14);
-
- }
-
- private File copyProject(String path) throws Exception {
- File projectDir = temp.newFolder();
- File originalProjectDir = new File(path);
- FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar")));
- return projectDir;
- }
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.mediumtest.issuesmode;
-
-import com.google.common.collect.ImmutableMap;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.FileFilterUtils;
-import org.assertj.core.api.Condition;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.batch.fs.internal.FileMetadata;
-import org.sonar.api.utils.log.LogTester;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.mediumtest.AnalysisResult;
-import org.sonar.scanner.mediumtest.ScannerMediumTester;
-import org.sonar.scanner.mediumtest.ScannerMediumTester.AnalysisBuilder;
-import org.sonar.scanner.protocol.Constants.Severity;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
-import org.sonar.scanner.repository.FileData;
-import org.sonar.xoo.XooPlugin;
-import org.sonar.xoo.rule.XooRulesDefinition;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@RunWith(Parameterized.class)
-public class ScanOnlyChangedTest {
- private static SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-
- /*
- * Run with branch too to reproduce SONAR-9141 and SONAR-9160
- */
- @Parameters(name = "branch enabled:{0} projectKey: {1}")
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] {
- {false, "sample"}, {true, "sample:branch"}, {false, "sample:project"}
- });
- }
-
- @Parameter(0)
- public boolean branch;
-
- @Parameter(1)
- public String projectKey;
-
- @Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
- @Rule
- public LogTester logTester = new LogTester();
-
- @Rule
- public ScannerMediumTester tester = new ScannerMediumTester()
- .bootstrapProperties(ImmutableMap.of(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_ISSUES))
- .registerPlugin("xoo", new XooPlugin())
- .addDefaultQProfile("xoo", "Sonar Way")
- .addRules(new XooRulesDefinition())
- .addActiveRule("xoo", "OneIssuePerLine", null, "One issue per line", "MAJOR", null, "xoo")
- .addActiveRule("xoo", "OneIssueOnDirPerFile", null, "OneIssueOnDirPerFile", "MAJOR", null, "xoo")
- .addActiveRule("xoo", "OneIssuePerModule", null, "OneIssuePerModule", "MAJOR", null, "xoo");
-
- @Before
- public void prepare() throws IOException {
- String filePath = "xources/hello/HelloJava.xoo";
- Path path = Paths.get("test-resources/mediumtest/xoo/sample/" + filePath);
- String md5sum = new FileMetadata()
- .readMetadata(Files.newInputStream(path), StandardCharsets.UTF_8, filePath)
- .hash();
-
- tester
- // this will cause the file to have status==SAME
- .addFileData(filePath, new FileData(md5sum, null))
- .setPreviousAnalysisDate(new Date())
- // Existing issue that is copied
- .mockServerIssue(ServerIssue.newBuilder().setKey("xyz")
- .setModuleKey(projectKey)
- .setMsg("One issue per Line copied")
- .setPath("xources/hello/HelloJava.xoo")
- .setRuleRepository("xoo")
- .setRuleKey("OneIssuePerLine")
- .setLine(1)
- .setSeverity(Severity.MAJOR)
- .setCreationDate(date("14/03/2004"))
- .setChecksum(DigestUtils.md5Hex("packagehello;"))
- .setStatus("OPEN")
- .build())
- // Existing issue on project that is still detected
- .mockServerIssue(ServerIssue.newBuilder().setKey("resolved-on-project")
- .setModuleKey(projectKey)
- .setRuleRepository("xoo")
- .setRuleKey("OneIssuePerModule")
- .setSeverity(Severity.CRITICAL)
- .setCreationDate(date("14/03/2004"))
- .setStatus("OPEN")
- .build());
- }
-
- private File copyProject(String path) throws Exception {
- File projectDir = temp.newFolder();
- File originalProjectDir = new File(path);
- FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar")));
- return projectDir;
- }
-
- @Test
- public void testScanOnlyChangedFiles() throws Exception {
- File projectDir = copyProject("test-resources/mediumtest/xoo/sample");
-
- AnalysisBuilder analysisBuilder = tester
- .newAnalysis(new File(projectDir, "sonar-project.properties"))
- .property("sonar.report.export.path", "report.json");
- if (branch) {
- analysisBuilder.property("sonar.branch", "branch");
- } else {
- analysisBuilder.property("sonar.projectKey", projectKey);
- }
-
- AnalysisResult result = analysisBuilder.execute();
- /*
- * We have:
- * 6 new issues per line (open) in helloscala.xoo
- * 2 new issues per file in helloscala.xoo / ClassOneTest.xoo
- * 1 server issue (open, not new) copied from server in HelloJava.xoo (this file is unchanged)
- * 1 manual issue (open, not new) in HelloJava.xoo
- * 1 existing issue on the project (open, not new)
- */
- assertNumberIssues(result, 8, 2, 0);
-
- // should only have server issues (HelloJava.xoo should not have been analyzed)
- assertNumberIssuesOnFile(result, "HelloJava.xoo", 1);
- }
-
- @Test
- public void testScanAll() throws Exception {
- File projectDir = copyProject("test-resources/mediumtest/xoo/sample");
-
- AnalysisBuilder analysisBuilder = tester
- .newAnalysis(new File(projectDir, "sonar-project.properties"))
- .property("sonar.scanAllFiles", "true");
- if (branch) {
- analysisBuilder.property("sonar.branch", "branch");
- } else {
- analysisBuilder.property("sonar.projectKey", projectKey);
- }
-
- AnalysisResult result = analysisBuilder.execute();
-
- assertNumberIssues(result, 16, 2, 0);
-
- /*
- * 8 new per line
- */
- assertNumberIssuesOnFile(result, "HelloJava.xoo", 8);
- }
-
- private static void assertNumberIssuesOnFile(AnalysisResult result, final String fileNameEndsWith, int issues) {
- assertThat(result.trackedIssues()).haveExactly(issues, new Condition<TrackedIssue>() {
- @Override
- public boolean matches(TrackedIssue value) {
- return value.componentKey().endsWith(fileNameEndsWith);
- }
- });
- }
-
- private static void assertNumberIssues(AnalysisResult result, int expectedNew, int expectedOpen, int expectedResolved) {
- int newIssues = 0;
- int openIssues = 0;
- int resolvedIssue = 0;
- for (TrackedIssue issue : result.trackedIssues()) {
- System.out
- .println(issue.getMessage() + " " + issue.key() + " " + issue.getRuleKey() + " " + issue.isNew() + " " + issue.resolution() + " " + issue.componentKey() + " "
- + issue.startLine());
- if (issue.isNew()) {
- newIssues++;
- } else if (issue.resolution() != null) {
- resolvedIssue++;
- } else {
- openIssues++;
- }
- }
-
- System.out.println("new: " + newIssues + " open: " + openIssues + " resolved " + resolvedIssue);
- assertThat(newIssues).isEqualTo(expectedNew);
- assertThat(openIssues).isEqualTo(expectedOpen);
- assertThat(resolvedIssue).isEqualTo(expectedResolved);
- }
-
- private static Long date(String date) {
- try {
- return sdf.parse(date).getTime();
- } catch (ParseException e) {
- throw new IllegalStateException(e);
- }
- }
-}
package org.sonar.scanner.postjob;
import java.io.IOException;
-import java.util.Arrays;
import org.junit.Before;
import org.junit.Test;
import org.sonar.api.batch.AnalysisMode;
-import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
-import org.sonar.api.batch.postjob.issue.PostJobIssue;
-import org.sonar.api.batch.rule.Severity;
import org.sonar.api.config.internal.MapSettings;
-import org.sonar.scanner.issue.IssueCache;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.scan.branch.BranchConfiguration;
-import org.sonar.scanner.scan.filesystem.InputComponentStore;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
public class DefaultPostJobContextTest {
- private IssueCache issueCache;
- private InputComponentStore componentStore;
private DefaultPostJobContext context;
private MapSettings settings;
private AnalysisMode analysisMode;
@Before
public void setUp() throws IOException {
- issueCache = mock(IssueCache.class);
- componentStore = new InputComponentStore(mock(BranchConfiguration.class));
settings = new MapSettings();
analysisMode = mock(AnalysisMode.class);
- context = new DefaultPostJobContext(settings.asConfig(), settings, issueCache, componentStore, analysisMode);
+ context = new DefaultPostJobContext(settings.asConfig(), settings, analysisMode);
}
@Test
- public void testIssues() throws IOException {
- when(analysisMode.isIssues()).thenReturn(true);
-
+ public void testSettings() {
assertThat(context.settings()).isSameAs(settings);
+ }
- TrackedIssue defaultIssue = new TrackedIssue();
- defaultIssue.setComponentKey("foo:src/Foo.php");
- defaultIssue.setGap(2.0);
- defaultIssue.setNew(true);
- defaultIssue.setKey("xyz");
- defaultIssue.setStartLine(1);
- defaultIssue.setMessage("msg");
- defaultIssue.setSeverity("BLOCKER");
- when(issueCache.all()).thenReturn(Arrays.asList(defaultIssue));
-
- PostJobIssue issue = context.issues().iterator().next();
- assertThat(issue.componentKey()).isEqualTo("foo:src/Foo.php");
- assertThat(issue.isNew()).isTrue();
- assertThat(issue.key()).isEqualTo("xyz");
- assertThat(issue.line()).isEqualTo(1);
- assertThat(issue.message()).isEqualTo("msg");
- assertThat(issue.severity()).isEqualTo(Severity.BLOCKER);
- assertThat(issue.inputComponent()).isNull();
-
- String moduleKey = "foo";
- componentStore.put(moduleKey, new TestInputFileBuilder(moduleKey, "src/Foo.php").build());
- assertThat(issue.inputComponent()).isNotNull();
+ @Test(expected=UnsupportedOperationException.class)
+ public void testIssues() {
+ context.issues();
+ }
+ @Test(expected=UnsupportedOperationException.class)
+ public void testResolvedIssues() {
+ context.resolvedIssues();
}
}
@Test
public void continueOnError() {
when(wsClient.call(any(WsRequest.class))).thenThrow(IllegalStateException.class);
- ProjectRepositories proj = loader.load(PROJECT_KEY, false, null);
+ ProjectRepositories proj = loader.load(PROJECT_KEY, null);
assertThat(proj.exists()).isEqualTo(false);
}
InputStream is = mock(InputStream.class);
when(is.read()).thenThrow(IOException.class);
WsTestUtil.mockStream(wsClient, "/batch/project.protobuf?key=foo%3F", is);
- loader.load(PROJECT_KEY, false, null);
+ loader.load(PROJECT_KEY, null);
}
@Test(expected = IllegalStateException.class)
HttpException http = new HttpException("url", 403, null);
IllegalStateException e = new IllegalStateException("http error", http);
WsTestUtil.mockException(wsClient, e);
- loader.load(PROJECT_KEY, false, null);
+ loader.load(PROJECT_KEY, null);
}
@Test
HttpException http = new HttpException("uri", 403, null);
MessageException e = MessageException.of("http error", http);
WsTestUtil.mockException(wsClient, e);
- loader.load(PROJECT_KEY, false, null);
- }
-
- @Test
- public void passIssuesModeParameter() {
- loader.load(PROJECT_KEY, false, null);
- WsTestUtil.verifyCall(wsClient, "/batch/project.protobuf?key=foo%3F");
-
- loader.load(PROJECT_KEY, true, null);
- WsTestUtil.verifyCall(wsClient, "/batch/project.protobuf?key=foo%3F&issues_mode=true");
+ loader.load(PROJECT_KEY, null);
}
@Test
public void deserializeResponse() throws IOException {
- loader.load(PROJECT_KEY, false, null);
+ loader.load(PROJECT_KEY, null);
}
@Test
public void passAndEncodeProjectKeyParameter() {
- loader.load(PROJECT_KEY, false, null);
+ loader.load(PROJECT_KEY, null);
WsTestUtil.verifyCall(wsClient, "/batch/project.protobuf?key=foo%3F");
}
@Test
public void readRealResponse() throws IOException {
InputStream is = getTestResource("project.protobuf");
- WsTestUtil.mockStream(wsClient, "/batch/project.protobuf?key=org.sonarsource.github%3Asonar-github-plugin&issues_mode=true", is);
+ WsTestUtil.mockStream(wsClient, "/batch/project.protobuf?key=org.sonarsource.github%3Asonar-github-plugin", is);
DefaultInputFile file = mock(DefaultInputFile.class);
when(file.getModuleRelativePath()).thenReturn("src/test/java/org/sonar/plugins/github/PullRequestIssuePostJobTest.java");
- ProjectRepositories proj = loader.load("org.sonarsource.github:sonar-github-plugin", true, null);
+ ProjectRepositories proj = loader.load("org.sonarsource.github:sonar-github-plugin", null);
FileData fd = proj.fileData("org.sonarsource.github:sonar-github-plugin", file);
assertThat(fd.revision()).isEqualTo("27bf2c54633d05c5df402bbe09471fe43bd9e2e5");
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.repository;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import org.junit.Before;
-import org.junit.Test;
-import org.sonar.scanner.WsTestUtil;
-import org.sonar.scanner.bootstrap.ScannerWsClient;
-import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class DefaultServerIssuesLoaderTest {
- private DefaultServerIssuesLoader loader;
- private ScannerWsClient wsClient;
-
- @Before
- public void prepare() {
- wsClient = mock(ScannerWsClient.class);
- loader = new DefaultServerIssuesLoader(wsClient);
- }
-
- @Test
- public void loadFromWs() throws Exception {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
- ServerIssue.newBuilder().setKey("ab1").build()
- .writeDelimitedTo(bos);
- ServerIssue.newBuilder().setKey("ab2").build()
- .writeDelimitedTo(bos);
-
- InputStream is = new ByteArrayInputStream(bos.toByteArray());
- WsTestUtil.mockStream(wsClient, "/batch/issues.protobuf?key=foo", is);
-
- final List<ServerIssue> result = new ArrayList<>();
- loader.load("foo", issue -> {
- result.add(issue);
- });
-
- assertThat(result).extracting("key").containsExactly("ab1", "ab2");
- }
-
- @Test(expected = IllegalStateException.class)
- public void testError() throws IOException {
- InputStream is = mock(InputStream.class);
- when(is.read()).thenThrow(IOException.class);
- WsTestUtil.mockStream(wsClient, "/batch/issues.protobuf?key=foo", is);
- loader.load("foo", mock(Consumer.class));
- }
-}
*/
package org.sonar.scanner.repository;
-import java.util.Date;
import java.util.Map;
import org.assertj.core.util.Maps;
import org.junit.Before;
@Before
public void setUp() {
- Date lastAnalysisDate = new Date();
- SingleProjectRepository repository1 = new SingleProjectRepository(Maps.newHashMap("/Abc.java", new FileData("123", "456")), lastAnalysisDate);
- SingleProjectRepository repository2 = new SingleProjectRepository(Maps.newHashMap("/Def.java", new FileData("567", "321")), lastAnalysisDate);
+ SingleProjectRepository repository1 = new SingleProjectRepository(Maps.newHashMap("/Abc.java", new FileData("123", "456")));
+ SingleProjectRepository repository2 = new SingleProjectRepository(Maps.newHashMap("/Def.java", new FileData("567", "321")));
Map<String, SingleProjectRepository> moduleRepositories = Maps.newHashMap("module1", repository1);
moduleRepositories.put("module2", repository2);
- repository = new MultiModuleProjectRepository(moduleRepositories, lastAnalysisDate);
+ repository = new MultiModuleProjectRepository(moduleRepositories);
}
@Test
package org.sonar.scanner.repository;
import com.google.common.collect.Maps;
-import java.util.Date;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.sonar.scanner.bootstrap.GlobalAnalysisMode;
import org.sonar.scanner.bootstrap.ProcessedScannerProperties;
import org.sonar.scanner.scan.branch.BranchConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@Mock
private ProcessedScannerProperties props;
@Mock
- private GlobalAnalysisMode mode;
- @Mock
private BranchConfiguration branchConfiguration;
@Before
Map<String, FileData> fileMap = Maps.newHashMap();
- project = new SingleProjectRepository(fileMap, new Date());
+ project = new SingleProjectRepository(fileMap);
provider = new ProjectRepositoriesProvider();
when(props.getKeyWithBranch()).thenReturn("key");
@Test
public void testValidation() {
- when(mode.isIssues()).thenReturn(true);
- when(loader.load(eq("key"), eq(true), any())).thenReturn(project);
+ when(loader.load(eq("key"), any())).thenReturn(project);
- provider.provide(loader, props, mode, branchConfiguration);
+ provider.provide(loader, props, branchConfiguration);
}
@Test
public void testAssociated() {
- when(mode.isIssues()).thenReturn(false);
- when(loader.load(eq("key"), eq(false), any())).thenReturn(project);
+ when(loader.load(eq("key"), any())).thenReturn(project);
- ProjectRepositories repo = provider.provide(loader, props, mode, branchConfiguration);
+ ProjectRepositories repo = provider.provide(loader, props, branchConfiguration);
assertThat(repo.exists()).isEqualTo(true);
- assertThat(repo.lastAnalysisDate()).isNotNull();
- verify(mode, times(1)).isIssues();
verify(props).getKeyWithBranch();
- verify(loader).load(eq("key"), eq(false), eq(null));
- verifyNoMoreInteractions(loader, props, mode);
+ verify(loader).load(eq("key"), eq(null));
+ verifyNoMoreInteractions(loader, props);
}
}
@Before
public void setUp() {
Date lastAnalysisDate = new Date();
- repository = new SingleProjectRepository(Maps.newHashMap("/Abc.java", new FileData("123", "456")), lastAnalysisDate);
+ repository = new SingleProjectRepository(Maps.newHashMap("/Abc.java", new FileData("123", "456")));
}
@Test
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.scan.filesystem;
-
-import java.io.IOException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.sonar.api.batch.fs.FilePredicates;
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.internal.DefaultFilePredicates;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class SameInputFilePredicateTest {
-
- @Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
- FilePredicates predicates;
-
- @Before
- public void before() throws IOException {
- predicates = new DefaultFilePredicates(temp.newFolder().toPath());
- }
-
- @Test
- public void testHasExplicitFilterOnStatus() {
- assertThat(SameInputFilePredicate.hasExplicitFilterOnStatus(predicates.all())).isFalse();
- assertThat(SameInputFilePredicate.hasExplicitFilterOnStatus(predicates.hasStatus(InputFile.Status.ADDED))).isTrue();
- assertThat(SameInputFilePredicate.hasExplicitFilterOnStatus(predicates.hasAnyStatus())).isTrue();
- assertThat(SameInputFilePredicate.hasExplicitFilterOnStatus(predicates.and(predicates.all(), predicates.hasStatus(InputFile.Status.ADDED)))).isTrue();
- }
-}
import org.sonar.scanner.scm.ScmChangedFiles;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
public class StatusDetectionTest {
@Test
public void detect_status() {
- SingleProjectRepository ref = new SingleProjectRepository(createFileDataPerPathMap(), null);
+ SingleProjectRepository ref = new SingleProjectRepository(createFileDataPerPathMap());
ScmChangedFiles changedFiles = new ScmChangedFiles(null);
StatusDetection statusDetection = new StatusDetection(ref, changedFiles);
@Test
public void detect_status_branches_exclude() {
- SingleProjectRepository ref = new SingleProjectRepository(createFileDataPerPathMap(), null);
+ SingleProjectRepository ref = new SingleProjectRepository(createFileDataPerPathMap());
ScmChangedFiles changedFiles = new ScmChangedFiles(Collections.emptyList());
StatusDetection statusDetection = new StatusDetection(ref, changedFiles);
assertThat(statusDetection.status("foo", createFile("src/Other.java"), "QWERT")).isEqualTo(InputFile.Status.SAME);
}
- @Test
- public void detect_status_without_metadata() {
- DefaultInputFile mockedFile = mock(DefaultInputFile.class);
- when(mockedFile.getProjectRelativePath()).thenReturn("module/src/Foo.java");
- when(mockedFile.path()).thenReturn(Paths.get("module", "src", "Foo.java"));
-
- SingleProjectRepository ref = new SingleProjectRepository(createFileDataPerPathMap(), null);
- ScmChangedFiles changedFiles = new ScmChangedFiles(Collections.singletonList(Paths.get("module", "src", "Foo.java")));
- StatusDetection statusDetection = new StatusDetection(ref, changedFiles);
-
- assertThat(statusDetection.getStatusWithoutMetadata("foo", mockedFile)).isEqualTo(InputFile.Status.ADDED);
-
- verify(mockedFile).path();
- verify(mockedFile).getProjectRelativePath();
- verifyNoMoreInteractions(mockedFile);
- }
-
@Test
public void detect_status_branches_confirm() {
- SingleProjectRepository ref = new SingleProjectRepository(createFileDataPerPathMap(), null);
+ SingleProjectRepository ref = new SingleProjectRepository(createFileDataPerPathMap());
ScmChangedFiles changedFiles = new ScmChangedFiles(Collections.singletonList(Paths.get("module", "src", "Foo.java")));
StatusDetection statusDetection = new StatusDetection(ref, changedFiles);
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2019 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.scanner.scan.report;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.TimeZone;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.sonar.api.batch.bootstrap.ProjectDefinition;
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.fs.internal.DefaultFileSystem;
-import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.api.batch.fs.internal.DefaultInputProject;
-import org.sonar.api.batch.fs.internal.InputModuleHierarchy;
-import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
-import org.sonar.api.batch.rule.Rules;
-import org.sonar.api.batch.rule.internal.RulesBuilder;
-import org.sonar.api.config.internal.MapSettings;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.platform.Server;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.scanner.issue.IssueCache;
-import org.sonar.scanner.issue.tracking.TrackedIssue;
-import org.sonar.scanner.scan.branch.BranchConfiguration;
-import org.sonar.scanner.scan.filesystem.InputComponentStore;
-
-import static net.javacrumbs.jsonunit.assertj.JsonAssert.assertThatJson;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-public class JSONReportTest {
-
- private SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
-
- @Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
- private JSONReport jsonReport;
- private DefaultFileSystem fs;
- private Server server = mock(Server.class);
- private Rules rules = mock(Rules.class);
- private MapSettings settings = new MapSettings();
- private IssueCache issueCache = mock(IssueCache.class);
- private InputModuleHierarchy moduleHierarchy;
-
- @Before
- public void before() throws Exception {
- moduleHierarchy = mock(InputModuleHierarchy.class);
- File projectBaseDir = temp.newFolder();
- fs = new DefaultFileSystem(projectBaseDir.toPath());
- SIMPLE_DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT+02:00"));
- when(server.getVersion()).thenReturn("3.6");
-
- ProjectDefinition def = ProjectDefinition.create().setBaseDir(projectBaseDir).setWorkDir(temp.newFolder()).setKey("struts");
- DefaultInputProject project = new DefaultInputProject(def, 1);
- InputComponentStore inputComponentStore = new InputComponentStore(mock(BranchConfiguration.class));
-
- DefaultInputFile inputFile = new TestInputFileBuilder("struts", "src/main/java/org/apache/struts/Action.java")
- .setModuleBaseDir(projectBaseDir.toPath()).build();
- inputFile.setStatus(InputFile.Status.CHANGED);
- inputFile.setPublished(true);
- inputComponentStore.put("struts", inputFile);
-
- RulesBuilder builder = new RulesBuilder();
- builder.add(RuleKey.of("squid", "AvoidCycles")).setName("Avoid Cycles");
- rules = builder.build();
- jsonReport = new JSONReport(settings.asConfig(), fs, server, rules, issueCache, project, inputComponentStore);
- }
-
- @Test
- public void should_write_json() throws Exception {
- TrackedIssue issue = new TrackedIssue();
- issue.setKey("200");
- issue.setComponentKey("struts:src/main/java/org/apache/struts/Action.java");
- issue.setRuleKey(RuleKey.of("squid", "AvoidCycles"));
- issue.setMessage("There are 2 cycles");
- issue.setSeverity("MINOR");
- issue.setStatus(Issue.STATUS_OPEN);
- issue.setResolution(null);
- issue.setStartLine(1);
- issue.setEndLine(2);
- issue.setStartLineOffset(3);
- issue.setEndLineOffset(4);
- issue.setGap(3.14);
- issue.setAssignee("simon");
- issue.setCreationDate(SIMPLE_DATE_FORMAT.parse("2013-04-24"));
- issue.setNew(false);
- when(issueCache.all()).thenReturn(Collections.singleton(issue));
-
- StringWriter writer = new StringWriter();
- jsonReport.writeJson(writer);
-
- assertThatJson(writer.toString()).isEqualTo(IOUtils.toString(this.getClass().getResource(this.getClass().getSimpleName() + "/report.json")));
- }
-
- @Test
- public void should_exclude_resolved_issues() throws Exception {
- RuleKey ruleKey = RuleKey.of("squid", "AvoidCycles");
- TrackedIssue issue = new TrackedIssue();
- issue.setKey("200");
- issue.setComponentKey("struts:src/main/java/org/apache/struts/Action.java");
- issue.setRuleKey(ruleKey);
- issue.setStatus(Issue.STATUS_CLOSED);
- issue.setResolution(Issue.RESOLUTION_FIXED);
- issue.setCreationDate(SIMPLE_DATE_FORMAT.parse("2013-04-24"));
- issue.setNew(false);
- when(issueCache.all()).thenReturn(Collections.singleton(issue));
-
- StringWriter writer = new StringWriter();
- jsonReport.writeJson(writer);
-
- assertThatJson(writer.toString()).isEqualTo(IOUtils.toString(this.getClass().getResource(this.getClass().getSimpleName() + "/report-without-resolved-issues.json")));
- }
-
- @Test
- public void should_not_export_by_default() throws IOException {
- File workDir = temp.newFolder("sonar");
- fs.setWorkDir(workDir.toPath());
-
- jsonReport.execute();
-
- verifyZeroInteractions(issueCache);
- }
-
- @Test
- public void should_export_issues_to_file() throws IOException {
- File workDir = temp.newFolder("sonar");
- fs.setWorkDir(workDir.toPath());
-
- when(issueCache.all()).thenReturn(Collections.<TrackedIssue>emptyList());
-
- settings.setProperty("sonar.report.export.path", "output.json");
-
- jsonReport.execute();
-
- assertThat(new File(workDir, "output.json")).exists();
- }
-
-}
import org.junit.rules.TemporaryFolder;
import org.sonar.api.SonarQubeSide;
import org.sonar.api.SonarRuntime;
-import org.sonar.api.batch.AnalysisMode;
-import org.sonar.api.batch.bootstrap.ProjectDefinition;
import org.sonar.api.batch.fs.InputModule;
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
-import org.sonar.api.batch.fs.internal.DefaultInputModule;
import org.sonar.api.batch.fs.internal.DefaultInputProject;
-import org.sonar.api.batch.fs.internal.InputModuleHierarchy;
import org.sonar.api.batch.measure.MetricFinder;
import org.sonar.api.batch.rule.ActiveRules;
import org.sonar.api.batch.rule.internal.ActiveRulesBuilder;
import org.sonar.api.internal.SonarRuntimeImpl;
import org.sonar.api.measures.CoreMetrics;
import org.sonar.api.utils.Version;
-import org.sonar.scanner.scan.DefaultInputModuleHierarchy;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
private ModuleSensorContext adaptor;
private MapSettings settings;
private SensorStorage sensorStorage;
- private AnalysisMode analysisMode;
private SonarRuntime runtime;
- private InputModuleHierarchy hierarchy;
@Before
public void prepare() throws Exception {
when(metricFinder.<String>findByKey(CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION);
settings = new MapSettings();
sensorStorage = mock(SensorStorage.class);
- analysisMode = mock(AnalysisMode.class);
runtime = SonarRuntimeImpl.forSonarQube(Version.parse("5.5"), SonarQubeSide.SCANNER);
- hierarchy = new DefaultInputModuleHierarchy(new DefaultInputModule(ProjectDefinition.create()
- .setWorkDir(temp.newFolder())
- .setBaseDir(temp.newFolder()).setKey("foo")));
- adaptor = new ModuleSensorContext(mock(DefaultInputProject.class), mock(InputModule.class), settings.asConfig(), settings, fs, activeRules, analysisMode, sensorStorage, runtime);
+ adaptor = new ModuleSensorContext(mock(DefaultInputProject.class), mock(InputModule.class), settings.asConfig(), settings, fs, activeRules, sensorStorage, runtime);
}
@Test
assertThat(adaptor.newSignificantCode()).isNotNull();
}
- @Test
- public void shouldSkipSignificantCodeOnPreviewMode() {
- when(analysisMode.isIssues()).thenReturn(true);
- assertThat(adaptor.newSignificantCode()).isEqualTo(ModuleSensorContext.NO_OP_NEW_SIGNIFICANT_CODE);
-
- }
-
- @Test
- public void shouldSkipSeveralObjectsInPreviewMode() {
- when(analysisMode.isIssues()).thenReturn(true);
- when(analysisMode.isPreview()).thenReturn(true);
- assertThat(adaptor.newCpdTokens()).isEqualTo(ModuleSensorContext.NO_OP_NEW_CPD_TOKENS);
- assertThat(adaptor.newSymbolTable()).isEqualTo(ModuleSensorContext.NO_OP_NEW_SYMBOL_TABLE);
- assertThat(adaptor.newExternalIssue()).isEqualTo(ModuleSensorContext.NO_OP_NEW_EXTERNAL_ISSUE);
- assertThat(adaptor.newAdHocRule()).isEqualTo(ModuleSensorContext.NO_OP_NEW_AD_HOC_RULE);
- assertThat(adaptor.newHighlighting()).isEqualTo(ModuleSensorContext.NO_OP_NEW_HIGHLIGHTING);
- }
-
- @Test
- public void shouldSkipDupsOnIssuesMode() {
- when(analysisMode.isIssues()).thenReturn(true);
- assertThat(adaptor.newCpdTokens()).isEqualTo(ModuleSensorContext.NO_OP_NEW_CPD_TOKENS);
- }
}
+++ /dev/null
-{
- "version": "3.6",
- "issues": [],
- "components": [
- {"key": "struts"},
- {
- "key": "struts:src/main/java/org/apache/struts/Action.java",
- "path": "src/main/java/org/apache/struts/Action.java",
- "status": "CHANGED"
- }
- ],
- "rules": [],
- "users": []
-}
+++ /dev/null
-{
- "version": "3.6",
- "issues": [
- {
- "key": "200",
- "component": "struts:src/main/java/org/apache/struts/Action.java",
- "line": 1,
- "startLine": 1,
- "startOffset": 3,
- "endLine": 2,
- "endOffset": 4,
- "message": "There are 2 cycles",
- "severity": "MINOR",
- "rule": "squid:AvoidCycles",
- "status": "OPEN",
- "isNew": false,
- "assignee": "simon",
- "effortToFix": 3.14,
- "creationDate": "${json-unit.ignore}"
- }
- ],
- "components": [
- {
- "key": "struts"
- },
- {
- "key": "struts:src/main/java/org/apache/struts/Action.java",
- "path": "src/main/java/org/apache/struts/Action.java",
- "status": "CHANGED"
- }
- ],
- "rules": [
- {
- "key": "squid:AvoidCycles",
- "rule": "AvoidCycles",
- "repository": "squid",
- "name": "Avoid Cycles"
- }
- ],
- "users": [
- {
- "login": "simon",
- "name": "simon"
- }
- ]
-}
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;
}
*/
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 {
}
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;
}
// WS batch/project
message WsProjectResponse {
- optional int64 timestamp = 1;
map<string, FileDataByPath> fileDataByModuleAndPath = 3;
- optional int64 lastAnalysisDate = 4;
map<string, FileData> fileDataByPath = 5;
message FileDataByPath {
projects / sonarqube.git / commitdiff