@@ -296,7 +296,6 @@ subprojects { | |||
dependency 'commons-codec:commons-codec:1.16.0' | |||
dependency 'commons-dbutils:commons-dbutils:1.8.1' | |||
dependency 'commons-io:commons-io:2.15.1' | |||
dependency 'commons-lang:commons-lang:2.6' | |||
imports { mavenBom 'com.fasterxml.jackson:jackson-bom:2.16.1' } | |||
dependency 'com.eclipsesource.minimal-json:minimal-json:0.9.5' | |||
dependencySet(group: 'com.github.scribejava', version: '8.3.3') { | |||
@@ -374,6 +373,7 @@ subprojects { | |||
dependency 'org.awaitility:awaitility:4.2.0' | |||
dependency 'org.apache.commons:commons-collections4:4.4' | |||
dependency 'org.apache.commons:commons-csv:1.10.0' | |||
dependency 'org.apache.commons:commons-lang3:3.14.0' | |||
dependency 'org.apache.commons:commons-email:1.6.0' | |||
dependency 'com.zaxxer:HikariCP:5.1.0' | |||
dependency('org.apache.httpcomponents:httpclient:4.5.14') { |
@@ -2,7 +2,7 @@ | |||
dependencies { | |||
api 'com.google.guava:guava' | |||
api 'commons-io:commons-io' | |||
api 'commons-lang:commons-lang' | |||
api 'org.apache.commons:commons-lang3' | |||
api 'org.apache.commons:commons-csv' | |||
compileOnlyApi 'com.google.code.findbugs:jsr305' |
@@ -25,14 +25,14 @@ import java.io.IOException; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.fs.InputFile; | |||
import org.sonar.api.batch.sensor.Sensor; | |||
import org.sonar.api.batch.sensor.SensorContext; | |||
import org.sonar.api.batch.sensor.SensorDescriptor; | |||
import org.sonar.api.batch.sensor.coverage.NewCoverage; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.xoo.Xoo; | |||
public abstract class AbstractCoverageSensor implements Sensor { |
@@ -24,7 +24,9 @@ import java.io.IOException; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.fs.InputFile; | |||
import org.sonar.api.batch.sensor.Sensor; | |||
import org.sonar.api.batch.sensor.SensorContext; | |||
@@ -32,8 +34,6 @@ import org.sonar.api.batch.sensor.SensorDescriptor; | |||
import org.sonar.api.measures.FileLinesContext; | |||
import org.sonar.api.measures.FileLinesContextFactory; | |||
import org.sonar.api.utils.KeyValueFormat; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.xoo.Xoo; | |||
/** |
@@ -24,7 +24,9 @@ import java.io.IOException; | |||
import java.io.Serializable; | |||
import java.util.List; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.fs.InputComponent; | |||
import org.sonar.api.batch.fs.InputDir; | |||
import org.sonar.api.batch.fs.InputFile; | |||
@@ -33,8 +35,6 @@ import org.sonar.api.batch.sensor.Sensor; | |||
import org.sonar.api.batch.sensor.SensorContext; | |||
import org.sonar.api.batch.sensor.SensorDescriptor; | |||
import org.sonar.api.batch.sensor.measure.NewMeasure; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.xoo.Xoo; | |||
import org.sonar.xoo.Xoo2; | |||
@@ -23,7 +23,7 @@ import java.io.IOException; | |||
import java.nio.file.Files; | |||
import java.nio.file.Path; | |||
import java.util.List; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.api.batch.fs.InputFile; | |||
import org.sonar.api.batch.sensor.Sensor; | |||
import org.sonar.api.batch.sensor.SensorContext; |
@@ -25,7 +25,7 @@ import java.io.IOException; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.api.batch.fs.InputFile; | |||
import org.sonar.api.batch.sensor.Sensor; | |||
import org.sonar.api.batch.sensor.SensorContext; |
@@ -23,7 +23,7 @@ import java.io.File; | |||
import java.io.IOException; | |||
import java.util.List; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.api.batch.fs.InputFile; | |||
import org.sonar.api.batch.sensor.Sensor; | |||
import org.sonar.api.batch.sensor.SensorContext; |
@@ -23,14 +23,13 @@ import java.io.IOException; | |||
import java.nio.file.Files; | |||
import java.nio.file.Path; | |||
import java.util.List; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.fs.InputFile; | |||
import org.sonar.api.batch.sensor.Sensor; | |||
import org.sonar.api.batch.sensor.SensorContext; | |||
import org.sonar.api.batch.sensor.SensorDescriptor; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.xoo.Xoo; | |||
public class AnalysisErrorSensor implements Sensor { |
@@ -34,7 +34,7 @@ import org.sonar.api.batch.scm.BlameLine; | |||
import org.sonar.api.utils.DateUtils; | |||
import static com.google.common.base.Preconditions.checkState; | |||
import static org.apache.commons.lang.StringUtils.trimToNull; | |||
import static org.apache.commons.lang3.StringUtils.trimToNull; | |||
public class XooBlameCommand extends BlameCommand { | |||
@@ -34,7 +34,7 @@ import java.util.List; | |||
import java.util.Map; | |||
import java.util.Set; | |||
import javax.annotation.CheckForNull; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.batch.scm.BlameCommand; |
@@ -34,7 +34,7 @@ import okhttp3.OkHttpClient; | |||
import okhttp3.Request; | |||
import okhttp3.RequestBody; | |||
import okhttp3.ResponseBody; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.auth.github.security.AccessToken; |
@@ -35,11 +35,11 @@ import okhttp3.RequestBody; | |||
import okhttp3.Response; | |||
import okhttp3.ResponseBody; | |||
import org.apache.commons.codec.binary.Base64; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.sonar.alm.client.TimeoutConfiguration; | |||
import org.sonar.api.server.ServerSide; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.alm.client.TimeoutConfiguration; | |||
import org.sonar.api.server.ServerSide; | |||
import org.sonarqube.ws.client.OkHttpClientBuilder; | |||
import static java.util.stream.Collectors.joining; |
@@ -39,23 +39,23 @@ import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.alm.client.ApplicationHttpClient; | |||
import org.sonar.alm.client.ApplicationHttpClient.GetResponse; | |||
import org.sonar.alm.client.github.security.AppToken; | |||
import org.sonar.alm.client.github.security.GithubAppSecurity; | |||
import org.sonar.alm.client.gitlab.GsonApp; | |||
import org.sonar.api.internal.apachecommons.lang.StringUtils; | |||
import org.sonar.auth.github.AppInstallationToken; | |||
import org.sonar.auth.github.GitHubSettings; | |||
import org.sonar.auth.github.GithubAppConfiguration; | |||
import org.sonar.auth.github.GithubAppInstallation; | |||
import org.sonar.auth.github.GithubBinding; | |||
import org.sonar.auth.github.GithubBinding.GsonGithubRepository; | |||
import org.sonar.auth.github.GithubBinding.GsonInstallations; | |||
import org.sonar.auth.github.GithubBinding.GsonRepositorySearch; | |||
import org.sonar.auth.github.GsonRepositoryCollaborator; | |||
import org.sonar.auth.github.GsonRepositoryTeam; | |||
import org.sonar.auth.github.GithubAppConfiguration; | |||
import org.sonar.auth.github.GithubAppInstallation; | |||
import org.sonar.auth.github.client.GithubApplicationClient; | |||
import org.sonar.auth.github.security.AccessToken; | |||
import org.sonar.alm.client.github.security.AppToken; | |||
import org.sonar.alm.client.github.security.GithubAppSecurity; | |||
import org.sonar.auth.github.security.UserAccessToken; | |||
import org.sonar.alm.client.gitlab.GsonApp; | |||
import org.sonar.api.internal.apachecommons.lang.StringUtils; | |||
import org.sonar.auth.github.GitHubSettings; | |||
import org.sonar.auth.github.client.GithubApplicationClient; | |||
import org.sonar.server.exceptions.ServerException; | |||
import org.sonarqube.ws.client.HttpException; | |||
@@ -234,7 +234,7 @@ public class GithubApplicationClientImpl implements GithubApplicationClient { | |||
Long.toString(gsonInstallation.getId()), | |||
gsonInstallation.getAccount().getLogin(), | |||
gsonInstallation.getPermissions(), | |||
org.apache.commons.lang.StringUtils.isNotEmpty(gsonInstallation.getSuspendedAt())); | |||
org.apache.commons.lang3.StringUtils.isNotEmpty(gsonInstallation.getSuspendedAt())); | |||
} | |||
private static boolean isOrganizationWhiteListed(Set<String> allowedOrganizations, String organizationName) { |
@@ -20,14 +20,14 @@ | |||
package org.sonar.alm.client.github; | |||
import java.util.Optional; | |||
import org.sonar.auth.github.GithubAppConfiguration; | |||
import org.sonar.api.config.internal.Encryption; | |||
import org.sonar.api.config.internal.Settings; | |||
import org.sonar.api.server.ServerSide; | |||
import org.sonar.auth.github.GithubAppConfiguration; | |||
import org.sonar.auth.github.client.GithubApplicationClient; | |||
import org.sonar.db.alm.setting.AlmSettingDto; | |||
import static org.apache.commons.lang.StringUtils.isBlank; | |||
import static org.apache.commons.lang3.StringUtils.isBlank; | |||
@ServerSide | |||
public class GithubGlobalSettingsValidator { |
@@ -21,7 +21,7 @@ package org.sonar.alm.client.github; | |||
import java.util.Optional; | |||
import static org.apache.commons.lang.StringUtils.substringBetween; | |||
import static org.apache.commons.lang3.StringUtils.substringBetween; | |||
public final class SonarQubeIssueKeyFormatter { |
@@ -35,19 +35,19 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.slf4j.event.Level; | |||
import org.sonar.alm.client.ApplicationHttpClient.GetResponse; | |||
import org.sonar.alm.client.ApplicationHttpClient.Response; | |||
import org.sonar.alm.client.ConstantTimeoutConfiguration; | |||
import org.sonar.alm.client.DevopsPlatformHeaders; | |||
import org.sonar.alm.client.GenericApplicationHttpClient; | |||
import org.sonar.alm.client.TimeoutConfiguration; | |||
import org.sonar.alm.client.ApplicationHttpClient.GetResponse; | |||
import org.sonar.alm.client.ApplicationHttpClient.Response; | |||
import org.sonar.auth.github.security.AccessToken; | |||
import org.sonar.auth.github.security.UserAccessToken; | |||
import org.sonar.api.testfixtures.log.LogTester; | |||
import org.sonar.api.utils.log.LoggerLevel; | |||
import org.sonar.auth.github.security.AccessToken; | |||
import org.sonar.auth.github.security.UserAccessToken; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.junit.Assert.fail; |
@@ -37,29 +37,29 @@ import org.junit.runner.RunWith; | |||
import org.mockito.ArgumentCaptor; | |||
import org.slf4j.event.Level; | |||
import org.sonar.alm.client.ApplicationHttpClient.RateLimit; | |||
import org.sonar.auth.github.GsonRepositoryCollaborator; | |||
import org.sonar.auth.github.GsonRepositoryTeam; | |||
import org.sonar.auth.github.AppInstallationToken; | |||
import org.sonar.auth.github.GithubAppConfiguration; | |||
import org.sonar.auth.github.GithubAppInstallation; | |||
import org.sonar.auth.github.GithubBinding; | |||
import org.sonar.auth.github.security.AccessToken; | |||
import org.sonar.alm.client.github.security.AppToken; | |||
import org.sonar.alm.client.github.security.GithubAppSecurity; | |||
import org.sonar.auth.github.security.UserAccessToken; | |||
import org.sonar.api.testfixtures.log.LogAndArguments; | |||
import org.sonar.api.testfixtures.log.LogTester; | |||
import org.sonar.api.utils.log.LoggerLevel; | |||
import org.sonar.auth.github.AppInstallationToken; | |||
import org.sonar.auth.github.GitHubSettings; | |||
import org.sonar.auth.github.GithubAppConfiguration; | |||
import org.sonar.auth.github.GithubAppInstallation; | |||
import org.sonar.auth.github.GithubBinding; | |||
import org.sonar.auth.github.GsonRepositoryCollaborator; | |||
import org.sonar.auth.github.GsonRepositoryPermissions; | |||
import org.sonar.auth.github.GsonRepositoryTeam; | |||
import org.sonar.auth.github.client.GithubApplicationClient; | |||
import org.sonar.auth.github.security.AccessToken; | |||
import org.sonar.auth.github.security.UserAccessToken; | |||
import org.sonarqube.ws.client.HttpException; | |||
import static java.net.HttpURLConnection.HTTP_CREATED; | |||
import static java.net.HttpURLConnection.HTTP_FORBIDDEN; | |||
import static java.net.HttpURLConnection.HTTP_NOT_FOUND; | |||
import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatCode; | |||
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; |
@@ -20,7 +20,7 @@ | |||
package org.sonar.alm.client.github; | |||
import java.util.Optional; | |||
import org.apache.commons.lang.RandomStringUtils; | |||
import org.apache.commons.lang3.RandomStringUtils; | |||
import org.junit.Test; | |||
import static java.lang.String.join; |
@@ -30,8 +30,8 @@ import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.sonar.auth.github.GithubAppConfiguration; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
@@ -12,7 +12,7 @@ dependencies { | |||
compileOnlyApi 'com.google.code.findbugs:jsr305' | |||
testImplementation 'commons-lang:commons-lang' | |||
testImplementation 'org.apache.commons:commons-lang3' | |||
testImplementation 'com.squareup.okhttp3:mockwebserver' | |||
testImplementation 'junit:junit' | |||
testImplementation 'org.assertj:assertj-core' |
@@ -34,7 +34,7 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.Mockito.mock; |
@@ -38,7 +38,7 @@ import org.sonar.server.property.InternalProperties; | |||
import static java.lang.String.format; | |||
import static java.lang.String.valueOf; | |||
import static org.apache.commons.lang.StringUtils.isNotBlank; | |||
import static org.apache.commons.lang3.StringUtils.isNotBlank; | |||
import static org.sonar.api.PropertyType.BOOLEAN; | |||
import static org.sonar.api.PropertyType.PASSWORD; | |||
import static org.sonar.api.PropertyType.STRING; |
@@ -25,11 +25,11 @@ import com.tngtech.java.junit.dataprovider.UseDataProvider; | |||
import java.util.Random; | |||
import java.util.stream.Stream; | |||
import javax.annotation.Nullable; | |||
import org.apache.commons.lang.ArrayUtils; | |||
import org.apache.commons.lang3.ArrayUtils; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
@@ -7,7 +7,7 @@ configurations { | |||
dependencies { | |||
// please keep the list ordered | |||
api 'commons-lang:commons-lang' | |||
api 'org.apache.commons:commons-lang3' | |||
compileOnlyApi 'com.google.code.findbugs:jsr305' | |||
compileOnlyApi 'javax.servlet:javax.servlet-api' |
@@ -26,10 +26,10 @@ import javax.naming.directory.SearchResult; | |||
import javax.security.auth.login.Configuration; | |||
import javax.security.auth.login.LoginContext; | |||
import javax.security.auth.login.LoginException; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.sonar.api.server.ServerSide; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.server.ServerSide; | |||
/** | |||
* @author Evgeny Mandrikov |
@@ -34,7 +34,7 @@ import javax.security.auth.Subject; | |||
import javax.security.auth.login.Configuration; | |||
import javax.security.auth.login.LoginContext; | |||
import javax.security.auth.login.LoginException; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
@@ -23,7 +23,7 @@ import java.util.Arrays; | |||
import javax.naming.NamingException; | |||
import javax.naming.directory.Attribute; | |||
import javax.naming.directory.SearchResult; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.api.config.Configuration; | |||
/** |
@@ -21,11 +21,11 @@ package org.sonar.auth.ldap; | |||
import java.util.LinkedHashMap; | |||
import java.util.Map; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.sonar.api.config.Configuration; | |||
import org.sonar.api.server.ServerSide; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.config.Configuration; | |||
import org.sonar.api.server.ServerSide; | |||
/** | |||
* The LdapSettingsManager will parse the settings. |
@@ -19,7 +19,7 @@ | |||
*/ | |||
package org.sonar.auth.ldap; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.api.config.Configuration; | |||
import static org.sonar.auth.ldap.LdapSettingsManager.MANDATORY_LDAP_PROPERTY_ERROR; |
@@ -43,7 +43,7 @@ dependencies { | |||
testImplementation 'com.google.code.findbugs:jsr305' | |||
testImplementation 'com.tngtech.java:junit-dataprovider' | |||
testImplementation 'commons-lang:commons-lang' | |||
testImplementation 'org.apache.commons:commons-lang3' | |||
testImplementation 'junit:junit' | |||
testImplementation 'org.apache.logging.log4j:log4j-api' | |||
testImplementation 'org.apache.logging.log4j:log4j-core' |
@@ -50,7 +50,7 @@ import org.sonar.server.platform.NodeInformation; | |||
import static com.google.common.collect.ImmutableList.of; | |||
import static java.util.Arrays.asList; | |||
import static java.util.Collections.emptyMap; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.assertj.core.api.Assertions.catchThrowable; |
@@ -22,7 +22,7 @@ dependencies { | |||
api 'net.sf.trove4j:core:3.1.0' | |||
api 'commons-codec:commons-codec' | |||
api 'commons-io:commons-io' | |||
api 'commons-lang:commons-lang' | |||
api 'org.apache.commons:commons-lang3' | |||
api 'com.google.code.gson:gson' | |||
api 'com.google.guava:guava' | |||
api 'com.google.code.findbugs:jsr305' |
@@ -44,7 +44,7 @@ import org.sonar.db.component.ProjectData; | |||
import org.sonar.db.protobuf.DbProjectBranches; | |||
import org.sonar.server.project.Project; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.Mockito.mock; |
@@ -36,7 +36,7 @@ import org.sonar.scanner.protocol.output.ScannerReport; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.server.rule.index.RuleIndexer; | |||
import static org.apache.commons.lang.StringUtils.repeat; | |||
import static org.apache.commons.lang3.StringUtils.repeat; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.tuple; | |||
@@ -30,7 +30,7 @@ import org.sonar.core.issue.DefaultIssue; | |||
import org.sonar.core.issue.tracking.Input; | |||
import org.sonar.db.DbClient; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.reset; |
@@ -52,7 +52,7 @@ import org.sonar.db.rule.RuleDto; | |||
import static java.util.Collections.emptyList; | |||
import static java.util.Collections.singleton; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.verifyNoInteractions; |
@@ -48,8 +48,8 @@ import org.sonar.scanner.protocol.output.ScannerReport.Component.FileStatus; | |||
import org.sonar.server.project.Project; | |||
import static java.util.Optional.ofNullable; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.ArgumentMatchers.any; |
@@ -36,9 +36,9 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.slf4j.event.Level; | |||
import org.sonar.api.testfixtures.log.LogTester; | |||
import org.sonar.api.utils.MessageException; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.api.testfixtures.log.LogTester; | |||
import org.sonar.ce.task.log.CeTaskMessages; | |||
import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; | |||
import org.sonar.ce.task.projectanalysis.component.Component; | |||
@@ -58,7 +58,7 @@ import org.sonar.db.newcodeperiod.NewCodePeriodDao; | |||
import org.sonar.db.newcodeperiod.NewCodePeriodType; | |||
import org.sonar.server.project.Project; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.assertj.core.api.Assertions.fail; |
@@ -35,7 +35,7 @@ import org.sonar.db.DbTester; | |||
import org.sonar.db.component.AnalysisPropertyDto; | |||
import org.sonar.scanner.protocol.output.ScannerReport; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.tuple; | |||
import static org.mockito.Mockito.mock; |
@@ -42,7 +42,7 @@ import org.sonar.db.component.SnapshotDto; | |||
import org.sonar.db.component.SnapshotQuery; | |||
import org.sonar.db.component.SnapshotTesting; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; |
@@ -75,8 +75,7 @@ import static java.util.Collections.shuffle; | |||
import static java.util.Collections.singleton; | |||
import static java.util.stream.Collectors.toList; | |||
import static java.util.stream.Stream.concat; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang.math.RandomUtils.nextInt; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.groups.Tuple.tuple; | |||
import static org.mockito.ArgumentCaptor.forClass; | |||
@@ -519,7 +518,7 @@ public class SendIssueNotificationsStepIT extends BaseStepTest { | |||
builder(Type.FILE, 11).setKey(file.getKey()).setName(file.longName()).build()) | |||
.build()); | |||
RuleDto ruleDefinitionDto = newRule(); | |||
RuleType randomTypeExceptHotspot = RuleType.values()[nextInt(RuleType.values().length - 1)]; | |||
RuleType randomTypeExceptHotspot = RuleType.values()[random.nextInt(RuleType.values().length - 1)]; | |||
DefaultIssue issue = prepareIssue(issueCreatedAt, user, project, file, ruleDefinitionDto, randomTypeExceptHotspot); | |||
IssuesChangesNotification issuesChangesNotification = mock(IssuesChangesNotification.class); | |||
when(notificationService.hasProjectSubscribersForTypes(project.uuid(), NOTIF_TYPES)).thenReturn(true); | |||
@@ -564,7 +563,7 @@ public class SendIssueNotificationsStepIT extends BaseStepTest { | |||
builder(Type.FILE, 11).setKey(file.getKey()).setName(file.longName()).build()).build()); | |||
analysisMetadataHolder.setProject(Project.from(project)); | |||
RuleDto ruleDefinitionDto = newRule(); | |||
RuleType randomTypeExceptHotspot = RuleType.values()[nextInt(RuleType.values().length - 1)]; | |||
RuleType randomTypeExceptHotspot = RuleType.values()[random.nextInt(RuleType.values().length - 1)]; | |||
DefaultIssue issue = newIssue(ruleDefinitionDto, branch, file).setType(randomTypeExceptHotspot).toDefaultIssue() | |||
.setNew(false) | |||
.setChanged(true) | |||
@@ -594,7 +593,7 @@ public class SendIssueNotificationsStepIT extends BaseStepTest { | |||
ComponentDto project = newPrivateProjectDto().setKey(PROJECT.getKey()).setLongName(PROJECT.getName()); | |||
ComponentDto file = newFileDto(project).setKey(FILE.getKey()).setLongName(FILE.getName()); | |||
RuleDto ruleDefinitionDto = newRule(); | |||
RuleType randomTypeExceptHotspot = RuleType.values()[nextInt(RuleType.values().length - 1)]; | |||
RuleType randomTypeExceptHotspot = RuleType.values()[random.nextInt(RuleType.values().length - 1)]; | |||
List<DefaultIssue> issues = IntStream.range(0, 2001 + new Random().nextInt(10)) | |||
.mapToObj(i -> newIssue(ruleDefinitionDto, project, file).setKee("uuid_" + i).setType(randomTypeExceptHotspot).toDefaultIssue() | |||
.setNew(false).setChanged(true).setSendNotifications(true).setAssigneeUuid(user.getUuid())) |
@@ -44,8 +44,8 @@ import org.sonar.db.DbTester; | |||
import org.sonar.db.component.ComponentDto; | |||
import org.sonar.db.component.SnapshotDto; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.Mockito.mock; |
@@ -25,7 +25,7 @@ import java.util.Date; | |||
import java.util.List; | |||
import java.util.Map; | |||
import java.util.function.Function; | |||
import org.apache.commons.lang.time.DateUtils; | |||
import org.apache.commons.lang3.time.DateUtils; | |||
import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; |
@@ -26,7 +26,7 @@ import java.util.List; | |||
import java.util.Map; | |||
import java.util.Set; | |||
import java.util.stream.Collectors; | |||
import org.apache.commons.lang.RandomStringUtils; | |||
import org.apache.commons.lang3.RandomStringUtils; | |||
import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; |
@@ -33,7 +33,7 @@ import org.sonar.server.qualityprofile.QualityProfile; | |||
import static com.google.common.base.Preconditions.checkState; | |||
import static java.util.Objects.requireNonNull; | |||
import static org.apache.commons.lang.StringUtils.defaultIfBlank; | |||
import static org.apache.commons.lang3.StringUtils.defaultIfBlank; | |||
public class AnalysisMetadataHolderImpl implements MutableAnalysisMetadataHolder { | |||
private static final String BRANCH_NOT_SET = "Branch has not been set"; |
@@ -30,8 +30,8 @@ import javax.annotation.concurrent.Immutable; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
import static com.google.common.base.Preconditions.checkState; | |||
import static java.util.Objects.requireNonNull; | |||
import static org.apache.commons.lang.StringUtils.abbreviate; | |||
import static org.apache.commons.lang.StringUtils.trimToNull; | |||
import static org.apache.commons.lang3.StringUtils.abbreviate; | |||
import static org.apache.commons.lang3.StringUtils.trimToNull; | |||
import static org.sonar.db.component.ComponentValidator.MAX_COMPONENT_DESCRIPTION_LENGTH; | |||
import static org.sonar.db.component.ComponentValidator.MAX_COMPONENT_NAME_LENGTH; | |||
@@ -30,7 +30,7 @@ import java.util.function.UnaryOperator; | |||
import javax.annotation.CheckForNull; | |||
import javax.annotation.Nullable; | |||
import org.apache.commons.io.FilenameUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.ce.task.projectanalysis.analysis.Branch; | |||
import org.sonar.scanner.protocol.output.ScannerReport; | |||
import org.sonar.scanner.protocol.output.ScannerReport.Component.FileStatus; | |||
@@ -39,8 +39,8 @@ import org.sonar.server.project.Project; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
import static java.lang.String.format; | |||
import static java.util.Objects.requireNonNull; | |||
import static org.apache.commons.lang.StringUtils.removeStart; | |||
import static org.apache.commons.lang.StringUtils.trimToNull; | |||
import static org.apache.commons.lang3.StringUtils.removeStart; | |||
import static org.apache.commons.lang3.StringUtils.trimToNull; | |||
import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.FILE; | |||
public class ComponentTreeBuilder { |
@@ -24,8 +24,8 @@ import javax.annotation.Nullable; | |||
import javax.annotation.concurrent.Immutable; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
import static org.apache.commons.lang.StringUtils.abbreviate; | |||
import static org.apache.commons.lang.StringUtils.trimToNull; | |||
import static org.apache.commons.lang3.StringUtils.abbreviate; | |||
import static org.apache.commons.lang3.StringUtils.trimToNull; | |||
import static org.sonar.db.component.ComponentValidator.MAX_COMPONENT_NAME_LENGTH; | |||
/** |
@@ -19,7 +19,7 @@ | |||
*/ | |||
package org.sonar.ce.task.projectanalysis.component; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.api.resources.Qualifiers; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; |
@@ -27,7 +27,7 @@ import javax.annotation.CheckForNull; | |||
import static com.google.common.base.Preconditions.checkState; | |||
import static java.util.Objects.requireNonNull; | |||
import static org.apache.commons.lang.StringUtils.isNotBlank; | |||
import static org.apache.commons.lang3.StringUtils.isNotBlank; | |||
import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; | |||
/** |
@@ -38,7 +38,7 @@ import org.sonar.db.rule.RuleDto; | |||
import org.sonar.server.rule.index.RuleIndexer; | |||
import static java.util.Objects.requireNonNull; | |||
import static org.apache.commons.lang.StringUtils.substring; | |||
import static org.apache.commons.lang3.StringUtils.substring; | |||
import static org.sonar.api.rule.RuleStatus.READY; | |||
import static org.sonar.db.rule.RuleDto.Scope.ALL; | |||
@@ -36,7 +36,7 @@ import org.sonar.db.protobuf.DbCommons; | |||
import org.sonar.db.protobuf.DbIssues; | |||
import org.sonar.server.issue.TaintChecker; | |||
import static org.apache.commons.lang.StringUtils.defaultIfEmpty; | |||
import static org.apache.commons.lang3.StringUtils.defaultIfEmpty; | |||
/** | |||
* This visitor will update the locations field of issues, by filling hashes for their locations: |
@@ -22,7 +22,7 @@ package org.sonar.ce.task.projectanalysis.issue; | |||
import java.util.Comparator; | |||
import java.util.Date; | |||
import java.util.Optional; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; | |||
@@ -36,7 +36,7 @@ import org.sonar.db.issue.IssueDto; | |||
import org.sonar.db.user.UserIdDto; | |||
import org.sonar.server.issue.IssueFieldsSetter; | |||
import static org.apache.commons.lang.StringUtils.defaultIfEmpty; | |||
import static org.apache.commons.lang3.StringUtils.defaultIfEmpty; | |||
import static org.sonar.core.issue.IssueChangeContext.issueChangeContextByScanBuilder; | |||
/** |
@@ -22,7 +22,7 @@ package org.sonar.ce.task.projectanalysis.issue; | |||
import java.util.Objects; | |||
import java.util.stream.IntStream; | |||
import java.util.stream.Stream; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.core.issue.DefaultIssue; | |||
import org.sonar.db.protobuf.DbCommons; | |||
import org.sonar.db.protobuf.DbIssues; |
@@ -38,8 +38,8 @@ import org.sonar.api.server.rule.internal.ImpactMapper; | |||
import org.sonar.scanner.protocol.Constants; | |||
import org.sonar.scanner.protocol.output.ScannerReport; | |||
import static org.apache.commons.lang.StringUtils.isNotBlank; | |||
import static org.apache.commons.lang.StringUtils.trimToNull; | |||
import static org.apache.commons.lang3.StringUtils.isNotBlank; | |||
import static org.apache.commons.lang3.StringUtils.trimToNull; | |||
@Immutable | |||
public class NewAdHocRule { |
@@ -54,7 +54,7 @@ import org.sonar.scanner.protocol.output.ScannerReport.IssueType; | |||
import org.sonar.server.rule.CommonRuleKeys; | |||
import static java.util.stream.Collectors.toMap; | |||
import static org.apache.commons.lang.StringUtils.isNotEmpty; | |||
import static org.apache.commons.lang3.StringUtils.isNotEmpty; | |||
import static org.sonar.api.issue.Issue.STATUS_OPEN; | |||
import static org.sonar.api.issue.Issue.STATUS_TO_REVIEW; | |||
@@ -27,7 +27,7 @@ import org.sonar.scanner.protocol.output.ScannerReport; | |||
import org.sonar.scanner.protocol.output.ScannerReport.Measure.ValueCase; | |||
import static java.util.Optional.of; | |||
import static org.apache.commons.lang.StringUtils.trimToNull; | |||
import static org.apache.commons.lang3.StringUtils.trimToNull; | |||
public class BatchMeasureToMeasure { | |||
@@ -27,7 +27,7 @@ import org.sonar.scanner.protocol.output.ScannerReport; | |||
import static com.google.common.base.Preconditions.checkState; | |||
import static java.util.Objects.requireNonNull; | |||
import static org.apache.commons.lang.StringUtils.isNotEmpty; | |||
import static org.apache.commons.lang3.StringUtils.isNotEmpty; | |||
/** | |||
* ScmInfo implementation based on the changeset information from the Report |
@@ -23,7 +23,7 @@ import java.util.List; | |||
import javax.annotation.CheckForNull; | |||
import javax.annotation.Nullable; | |||
import org.apache.commons.codec.digest.DigestUtils; | |||
import org.apache.commons.lang.ObjectUtils; | |||
import org.apache.commons.lang3.ObjectUtils; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.ce.task.projectanalysis.component.Component; | |||
import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; |
@@ -21,7 +21,7 @@ package org.sonar.ce.task.projectanalysis.source; | |||
import java.util.List; | |||
import java.util.Optional; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.ce.task.projectanalysis.component.Component; | |||
import org.sonar.core.hash.LineRange; | |||
import org.sonar.core.hash.SourceLineHashesComputer; |
@@ -38,7 +38,7 @@ import org.sonar.db.component.SnapshotDto; | |||
import org.sonar.scanner.protocol.output.ScannerReport; | |||
import static com.google.common.base.MoreObjects.firstNonNull; | |||
import static org.apache.commons.lang.StringUtils.trimToNull; | |||
import static org.apache.commons.lang3.StringUtils.trimToNull; | |||
/** | |||
* Populates the {@link MutableTreeRootHolder} and {@link MutableAnalysisMetadataHolder} from the {@link BatchReportReader} |
@@ -26,7 +26,7 @@ import java.util.Optional; | |||
import java.util.Set; | |||
import java.util.function.Function; | |||
import java.util.stream.Collectors; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.api.resources.Qualifiers; | |||
import org.sonar.api.resources.Scopes; | |||
import org.sonar.api.utils.System2; |
@@ -21,7 +21,7 @@ package org.sonar.ce.task.projectanalysis.step; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.apache.commons.lang.StringEscapeUtils; | |||
import org.apache.commons.lang3.StringEscapeUtils; | |||
import org.sonar.ce.task.projectanalysis.component.Component; | |||
import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; | |||
import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; |
@@ -30,7 +30,7 @@ import java.util.Set; | |||
import java.util.function.Function; | |||
import java.util.stream.Collectors; | |||
import javax.annotation.Nullable; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.sonar.api.measures.CoreMetrics; | |||
import org.sonar.ce.task.projectanalysis.component.Component; | |||
import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; |
@@ -25,7 +25,7 @@ import java.util.Date; | |||
import java.util.Map; | |||
import java.util.Optional; | |||
import javax.annotation.Nullable; | |||
import org.apache.commons.lang.time.DateUtils; | |||
import org.apache.commons.lang3.time.DateUtils; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.measures.CoreMetrics; |
@@ -35,7 +35,7 @@ import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
import static org.sonar.db.DatabaseUtils.getString; | |||
import static org.sonar.db.component.SnapshotDto.STATUS_PROCESSED; | |||
@@ -32,7 +32,7 @@ import org.sonar.db.DbSession; | |||
import org.sonar.db.component.BranchDto; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
public class ExportBranchesStep implements ComputationStep { | |||
@@ -23,8 +23,8 @@ import com.sonarsource.governance.projectdump.protobuf.ProjectDump; | |||
import java.sql.PreparedStatement; | |||
import java.sql.ResultSet; | |||
import java.sql.SQLException; | |||
import org.sonar.api.resources.Qualifiers; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.api.resources.Qualifiers; | |||
import org.sonar.ce.task.projectexport.steps.DumpElement; | |||
import org.sonar.ce.task.projectexport.steps.DumpWriter; | |||
import org.sonar.ce.task.projectexport.steps.ProjectHolder; | |||
@@ -35,7 +35,7 @@ import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
import static org.sonar.db.DatabaseUtils.getString; | |||
public class ExportComponentsStep implements ComputationStep { |
@@ -32,7 +32,7 @@ import org.sonar.db.DbSession; | |||
import org.sonar.db.component.SnapshotDto; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
import static org.sonar.db.DatabaseUtils.getString; | |||
public class ExportEventsStep implements ComputationStep { |
@@ -28,7 +28,7 @@ import org.sonar.db.DbSession; | |||
import org.sonar.db.component.ProjectLinkDto; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
public class ExportLinksStep implements ComputationStep { | |||
@@ -30,7 +30,7 @@ import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
import static org.sonar.db.DatabaseUtils.getDouble; | |||
import static org.sonar.db.DatabaseUtils.getString; | |||
@@ -32,7 +32,7 @@ import org.sonar.db.DbSession; | |||
import org.sonar.db.component.SnapshotDto; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
import static org.sonar.db.DatabaseUtils.getDouble; | |||
import static org.sonar.db.DatabaseUtils.getString; | |||
@@ -29,7 +29,7 @@ import org.sonar.db.DbSession; | |||
import org.sonar.db.metric.MetricDto; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
public class ExportMetricsStep implements ComputationStep { | |||
@@ -21,7 +21,7 @@ package org.sonar.ce.task.projectexport.steps; | |||
import com.sonarsource.governance.projectdump.protobuf.ProjectDump; | |||
import java.util.Collection; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.ce.task.step.ComputationStep; | |||
import org.sonar.core.platform.PluginInfo; |
@@ -29,7 +29,7 @@ import org.sonar.db.DbSession; | |||
import org.sonar.db.property.PropertyDto; | |||
import static java.lang.String.format; | |||
import static org.apache.commons.lang.StringUtils.defaultString; | |||
import static org.apache.commons.lang3.StringUtils.defaultString; | |||
public class ExportSettingsStep implements ComputationStep { | |||
@@ -29,7 +29,7 @@ import java.util.List; | |||
import java.util.Map; | |||
import java.util.Random; | |||
import javax.annotation.Nullable; | |||
import org.apache.commons.lang.RandomStringUtils; | |||
import org.apache.commons.lang3.RandomStringUtils; | |||
import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; |
@@ -25,7 +25,7 @@ import org.junit.Test; | |||
import org.sonar.ce.task.projectanalysis.component.Component.Status; | |||
import static com.google.common.base.Strings.repeat; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.assertj.core.api.Assertions.fail; |
@@ -39,7 +39,7 @@ import org.sonar.scanner.protocol.output.ScannerReport; | |||
import org.sonar.server.project.Project; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.junit.Assert.fail; |
@@ -38,7 +38,7 @@ import org.sonar.duplications.block.ByteArray; | |||
import static com.google.common.base.Strings.padStart; | |||
import static java.util.Arrays.asList; | |||
import static java.util.Collections.singletonList; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.verify; |
@@ -38,7 +38,7 @@ import org.sonar.ce.task.CeTask; | |||
import org.sonar.ce.task.projectanalysis.filemove.ScoreMatrix.ScoreFile; | |||
import org.sonar.server.platform.ServerFileSystem; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; |
@@ -29,7 +29,7 @@ import java.util.Map; | |||
import java.util.Optional; | |||
import java.util.function.BiConsumer; | |||
import java.util.stream.Stream; | |||
import org.apache.commons.lang.ArrayUtils; | |||
import org.apache.commons.lang3.ArrayUtils; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; |
@@ -19,9 +19,10 @@ | |||
*/ | |||
package org.sonar.ce.task.projectanalysis.locations.flow; | |||
import java.security.SecureRandom; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.apache.commons.lang.math.RandomUtils; | |||
import java.util.Random; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.mockito.InjectMocks; | |||
@@ -34,7 +35,7 @@ import org.sonar.db.protobuf.DbIssues; | |||
import static java.util.function.Function.identity; | |||
import static java.util.stream.Collectors.toMap; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
@@ -44,6 +45,9 @@ public class FlowGeneratorTest { | |||
private static final String COMPONENT_NAME = "test_comp"; | |||
private final Random random = new SecureRandom(); | |||
@Mock | |||
private TreeRootHolder treeRootHolder; | |||
@@ -124,10 +128,10 @@ public class FlowGeneratorTest { | |||
private DbIssues.Location createDbLocation(String componentId) { | |||
org.sonar.db.protobuf.DbCommons.TextRange textRange = org.sonar.db.protobuf.DbCommons.TextRange.newBuilder() | |||
.setStartLine(RandomUtils.nextInt()) | |||
.setEndLine(RandomUtils.nextInt()) | |||
.setStartOffset(RandomUtils.nextInt()) | |||
.setEndOffset(RandomUtils.nextInt()) | |||
.setStartLine(random.nextInt(Integer.MAX_VALUE)) | |||
.setEndLine(random.nextInt(Integer.MAX_VALUE)) | |||
.setStartOffset(random.nextInt(Integer.MAX_VALUE)) | |||
.setEndOffset(random.nextInt(Integer.MAX_VALUE)) | |||
.build(); | |||
Component component = mock(Component.class); |
@@ -60,7 +60,7 @@ import org.sonar.server.issue.notification.NewIssuesNotification.DetailsSupplier | |||
import org.sonar.server.issue.notification.NewIssuesNotification.RuleDefinition; | |||
import static java.util.Collections.emptyMap; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.ArgumentMatchers.any; |
@@ -38,7 +38,7 @@ import org.sonar.server.notification.email.EmailNotificationChannel.EmailDeliver | |||
import static java.util.Collections.emptySet; | |||
import static java.util.stream.Collectors.toSet; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.verify; |
@@ -49,7 +49,7 @@ import org.sonar.db.protobuf.DbIssues; | |||
import org.sonar.db.rule.RuleDto; | |||
import org.sonar.server.issue.TaintChecker; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.fail; | |||
import static org.assertj.core.api.Assertions.tuple; |
@@ -34,7 +34,7 @@ import org.sonar.ce.task.projectanalysis.component.Component; | |||
import org.sonar.ce.task.projectanalysis.component.ReportComponent; | |||
import org.sonar.ce.task.projectanalysis.source.linereader.LineReader; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.times; |
@@ -32,7 +32,7 @@ import org.sonar.db.DbSession; | |||
import org.sonar.db.component.ComponentDao; | |||
import static java.util.Collections.emptyList; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.ArgumentMatchers.any; | |||
import static org.mockito.ArgumentMatchers.eq; |
@@ -47,7 +47,7 @@ import org.sonar.server.project.Project; | |||
import org.sonar.server.qualitygate.notification.QGChangeNotification; | |||
import static java.util.Collections.emptyList; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.reset; |
@@ -47,7 +47,7 @@ import org.sonar.server.webhook.WebHooks; | |||
import org.sonar.server.webhook.WebhookPayload; | |||
import org.sonar.server.webhook.WebhookPayloadFactory; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.ArgumentMatchers.any; | |||
import static org.mockito.ArgumentMatchers.eq; |
@@ -34,7 +34,7 @@ import org.sonar.server.qualityprofile.QualityProfile; | |||
import static com.google.common.base.Preconditions.checkNotNull; | |||
import static com.google.common.base.Preconditions.checkState; | |||
import static org.apache.commons.lang.StringUtils.defaultIfBlank; | |||
import static org.apache.commons.lang3.StringUtils.defaultIfBlank; | |||
public class AnalysisMetadataHolderRule extends ExternalResource implements MutableAnalysisMetadataHolder, AfterEachCallback { | |||
@@ -23,8 +23,8 @@ import javax.annotation.Nullable; | |||
import org.sonar.core.component.ComponentKeys; | |||
import org.sonar.db.component.BranchType; | |||
import static org.apache.commons.lang.StringUtils.isEmpty; | |||
import static org.apache.commons.lang.StringUtils.trimToNull; | |||
import static org.apache.commons.lang3.StringUtils.isEmpty; | |||
import static org.apache.commons.lang3.StringUtils.trimToNull; | |||
public class TestBranch implements Branch { | |||
private final String name; |
@@ -36,8 +36,8 @@ import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import static java.util.stream.Collectors.toList; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.assertj.core.api.Assertions.tuple; |
@@ -22,7 +22,7 @@ package org.sonar.ce.task; | |||
import org.junit.Test; | |||
import org.sonar.db.ce.CeActivityDto; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
public class CeTaskCanceledExceptionTest { |
@@ -25,7 +25,7 @@ import com.tngtech.java.junit.dataprovider.UseDataProvider; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
@@ -23,7 +23,7 @@ import java.util.Random; | |||
import org.junit.Test; | |||
import org.sonar.db.ce.CeActivityDto; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.sonar.ce.task.CeTaskInterruptedException.isTaskInterruptedException; | |||
@@ -21,7 +21,7 @@ package org.sonar.ce.task; | |||
import java.io.PrintWriter; | |||
import java.io.StringWriter; | |||
import org.apache.commons.lang.RandomStringUtils; | |||
import org.apache.commons.lang3.RandomStringUtils; | |||
import org.junit.Test; | |||
import org.sonar.db.ce.CeActivityDto; | |||
@@ -22,7 +22,7 @@ package org.sonar.ce.task.log; | |||
import org.junit.Test; | |||
import org.sonar.ce.task.log.CeTaskMessages.Message; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; | |||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
@@ -26,7 +26,7 @@ import java.util.Date; | |||
import java.util.Locale; | |||
import java.util.Properties; | |||
import org.apache.commons.codec.digest.DigestUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; |