Fix code quality issues and reduce dependency on Guava

4 files changed, 6 insertions, 6 deletions

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java
index f879c237303..5c7e1c5b878 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java
@@ -101,7 +101,7 @@ public class DefaultProjectRepositoriesLoaderTest {
   }
 
   @Test
-  public void deserializeResponse() throws IOException {
+  public void deserializeResponse() {
     loader.load(PROJECT_KEY, null);
   }
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java
index f5d3661dff9..58001d2081a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java
@@ -106,7 +106,7 @@ public class DefaultQualityProfileLoaderTest {
   }
 
   @Test
-  public void load_throws_MessageException_if_organization_is_not_found_after_trying_default() throws IOException {
+  public void load_throws_MessageException_if_organization_is_not_found_after_trying_default() {
     HttpException e = new HttpException("", 404, "{\"errors\":[{\"msg\":\"No organization with key 'myorg'\"}]}");
     WsTestUtil.mockException(wsClient, e);
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ProjectRepositoriesSupplierTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ProjectRepositoriesSupplierTest.java
index 19729bf32d3..45c4783f705 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ProjectRepositoriesSupplierTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ProjectRepositoriesSupplierTest.java
@@ -19,13 +19,13 @@
  */
 package org.sonar.scanner.repository;
 
-import com.google.common.collect.Maps;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.scanner.bootstrap.ProcessedScannerProperties;
 import org.sonar.scanner.scan.branch.BranchConfiguration;
 
+import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -45,7 +45,7 @@ public class ProjectRepositoriesSupplierTest {
   @Before
   public void setUp() {
     underTest = new ProjectRepositoriesSupplier(loader, props, branchConfiguration);
-    Map<String, FileData> fileMap = Maps.newHashMap();
+    Map<String, FileData> fileMap = emptyMap();
     project = new SingleProjectRepository(fileMap);
     when(props.getProjectKey()).thenReturn("key");
   }
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/SingleProjectRepositoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/SingleProjectRepositoryTest.java
index 747e292c044..46b959ea5ce 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/SingleProjectRepositoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/SingleProjectRepositoryTest.java
@@ -20,10 +20,10 @@
 package org.sonar.scanner.repository;
 
 import java.util.Date;
-import org.assertj.core.util.Maps;
 import org.junit.Before;
 import org.junit.Test;
 
+import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 
@@ -34,7 +34,7 @@ public class SingleProjectRepositoryTest {
   @Before
   public void setUp() {
     Date lastAnalysisDate = new Date();
-    repository = new SingleProjectRepository(Maps.newHashMap("/Abc.java", new FileData("123", "456")));
+    repository = new SingleProjectRepository(singletonMap("/Abc.java", new FileData("123", "456")));
   }
 
   @Test