From 3a4cd557bc1448a83e1f8bcd0c2fe3de1a698ca7 Mon Sep 17 00:00:00 2001 From: Eric Hartmann Date: Sat, 14 Apr 2018 20:13:34 +0200 Subject: [PATCH] Fix quality flaws --- .../db/migration/version/v72/PopulateHashMethodOnUsersTest.java | 1 - .../org/sonar/server/authentication/LocalAuthentication.java | 2 +- .../src/main/java/org/sonar/server/user/UserUpdater.java | 1 - .../java/org/sonarqube/tests/organization/RootUserTest.java | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v72/PopulateHashMethodOnUsersTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v72/PopulateHashMethodOnUsersTest.java index 254e9da4f07..3ce76a5f286 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v72/PopulateHashMethodOnUsersTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v72/PopulateHashMethodOnUsersTest.java @@ -35,7 +35,6 @@ import static org.assertj.core.api.Assertions.assertThat; public class PopulateHashMethodOnUsersTest { - private static final long PAST = 5_000_000_000L; private static final long NOW = 10_000_000_000L; @Rule diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/LocalAuthentication.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/LocalAuthentication.java index c7efae31e9f..73fef18b235 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/authentication/LocalAuthentication.java +++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/LocalAuthentication.java @@ -172,7 +172,7 @@ public class LocalAuthentication { .setSalt(salt); } - private String hash(String salt, String password) { + private static String hash(String salt, String password) { return DigestUtils.sha1Hex("--" + salt + "--" + password + "--"); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java index f1ec17669f4..cdfc0b80716 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java @@ -21,7 +21,6 @@ package org.sonar.server.user; import com.google.common.base.Joiner; import com.google.common.base.Strings; -import java.security.SecureRandom; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java b/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java index 2622d2f1963..ae3fe5a1ae4 100644 --- a/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java +++ b/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java @@ -20,7 +20,6 @@ package org.sonarqube.tests.organization; import com.sonar.orchestrator.Orchestrator; -import java.sql.SQLException; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -- 2.39.5