Skip to content

Commit a973502

Browse files
henryjuhenryju
committed
Remove SonarUserHome class
1 parent f0791e2 commit a973502

12 files changed

Lines changed: 28 additions & 67 deletions

‎lib/src/main/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapper.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.sonarsource.scanner.lib.internal.ClassloadRules;
3030
import org.sonarsource.scanner.lib.internal.InternalProperties;
3131
import org.sonarsource.scanner.lib.internal.IsolatedLauncherFactory;
32-
import org.sonarsource.scanner.lib.internal.SonarUserHome;
3332

3433
/**
3534
* Entry point to run a Sonar analysis programmatically.
@@ -79,7 +78,7 @@ public ScannerEngineFacade bootstrap() {
7978
var userHome = Objects.requireNonNull(System.getProperty("user.home"), "The system property 'user.home' is expected to be non null");
8079
sonarUserHome = Paths.get(userHome, ".sonar").toAbsolutePath().toString();
8180
}
82-
var launcherFactory = new IsolatedLauncherFactory(new LoggerAdapter(logOutput), new SonarUserHome(Paths.get(sonarUserHome)));
81+
var launcherFactory = new IsolatedLauncherFactory(new LoggerAdapter(logOutput), Paths.get(sonarUserHome));
8382
var launcher = launcherFactory.createLauncher(properties, rules);
8483
return new ScannerEngineFacade(properties, launcher, logOutput, isSonarCloud);
8584
}

‎lib/src/main/java/org/sonarsource/scanner/lib/internal/IsolatedLauncherFactory.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.io.File;
2323
import java.net.URLClassLoader;
24+
import java.nio.file.Path;
2425
import java.util.List;
2526
import java.util.Map;
2627
import javax.annotation.Nullable;
@@ -33,19 +34,19 @@ public class IsolatedLauncherFactory {
3334
private final TempCleaning tempCleaning;
3435
private final String launcherImplClassName;
3536
private final Logger logger;
36-
private final SonarUserHome sonarUserHome;
37+
private final Path sonarUserHome;
3738

3839
/**
3940
* For unit tests
4041
*/
41-
IsolatedLauncherFactory(String isolatedLauncherClassName, TempCleaning tempCleaning, Logger logger, SonarUserHome sonarUserHome) {
42+
IsolatedLauncherFactory(String isolatedLauncherClassName, TempCleaning tempCleaning, Logger logger, Path sonarUserHome) {
4243
this.tempCleaning = tempCleaning;
4344
this.launcherImplClassName = isolatedLauncherClassName;
4445
this.logger = logger;
4546
this.sonarUserHome = sonarUserHome;
4647
}
4748

48-
public IsolatedLauncherFactory(Logger logger, SonarUserHome sonarUserHome) {
49+
public IsolatedLauncherFactory(Logger logger, Path sonarUserHome) {
4950
this(ISOLATED_LAUNCHER_IMPL, new TempCleaning(logger), logger, sonarUserHome);
5051
}
5152

‎lib/src/main/java/org/sonarsource/scanner/lib/internal/JarDownloaderFactory.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package org.sonarsource.scanner.lib.internal;
2121

22+
import java.nio.file.Path;
2223
import org.sonarsource.scanner.lib.internal.cache.FileCache;
2324
import org.sonarsource.scanner.lib.internal.cache.FileCacheBuilder;
2425
import org.sonarsource.scanner.lib.internal.cache.Logger;
@@ -27,9 +28,9 @@
2728
class JarDownloaderFactory {
2829
private final ServerConnection serverConnection;
2930
private final Logger logger;
30-
private final SonarUserHome sonarUserHome;
31+
private final Path sonarUserHome;
3132

32-
JarDownloaderFactory(ServerConnection conn, Logger logger, SonarUserHome sonarUserHome) {
33+
JarDownloaderFactory(ServerConnection conn, Logger logger, Path sonarUserHome) {
3334
this.serverConnection = conn;
3435
this.logger = logger;
3536
this.sonarUserHome = sonarUserHome;

‎lib/src/main/java/org/sonarsource/scanner/lib/internal/SonarUserHome.java‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎lib/src/main/java/org/sonarsource/scanner/lib/internal/cache/FileCacheBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
*/
2020
package org.sonarsource.scanner.lib.internal.cache;
2121

22-
import org.sonarsource.scanner.lib.internal.SonarUserHome;
22+
import java.nio.file.Path;
2323

2424
public class FileCacheBuilder {
2525
private final Logger logger;
26-
private final SonarUserHome sonarUserHome;
26+
private final Path sonarUserHome;
2727

28-
public FileCacheBuilder(Logger logger, SonarUserHome sonarUserHome) {
28+
public FileCacheBuilder(Logger logger, Path sonarUserHome) {
2929
this.logger = logger;
3030
this.sonarUserHome = sonarUserHome;
3131
}
3232

3333
public FileCache build() {
34-
var cacheDir = sonarUserHome.getPath().resolve("cache");
34+
var cacheDir = sonarUserHome.resolve("cache");
3535
return FileCache.create(cacheDir, logger);
3636
}
3737

‎lib/src/main/java/org/sonarsource/scanner/lib/internal/http/OkHttpClientFactory.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import okhttp3.JavaNetCookieJar;
3737
import okhttp3.OkHttpClient;
3838
import org.sonarsource.scanner.lib.ScannerProperties;
39-
import org.sonarsource.scanner.lib.internal.SonarUserHome;
4039
import org.sonarsource.scanner.lib.internal.http.ssl.CertificateStore;
4140
import org.sonarsource.scanner.lib.internal.http.ssl.SslConfig;
4241

@@ -73,7 +72,7 @@ private OkHttpClientFactory() {
7372
COOKIE_JAR = new JavaNetCookieJar(COOKIE_MANAGER);
7473
}
7574

76-
static OkHttpClient create(Map<String, String> bootstrapProperties, SonarUserHome sonarUserHome) {
75+
static OkHttpClient create(Map<String, String> bootstrapProperties, Path sonarUserHome) {
7776

7877
String oldSocketTimeout = defaultIfBlank(bootstrapProperties.get(READ_TIMEOUT_SEC_PROPERTY), valueOf(DEFAULT_READ_TIMEOUT_SEC));
7978
String socketTimeout = defaultIfBlank(bootstrapProperties.get(SONAR_SCANNER_SOCKET_TIMEOUT), oldSocketTimeout);
@@ -144,10 +143,10 @@ private static int parseIntProperty(String propValue, String propKey) {
144143
}
145144
}
146145

147-
private static SslConfig parseSslConfig(Map<String, String> bootstrapProperties, SonarUserHome sonarUserHome) {
148-
var keyStorePath = defaultIfBlank(bootstrapProperties.get("sonar.scanner.keystorePath"), sonarUserHome.getPath().resolve("ssl/keystore.p12").toString());
146+
private static SslConfig parseSslConfig(Map<String, String> bootstrapProperties, Path sonarUserHome) {
147+
var keyStorePath = defaultIfBlank(bootstrapProperties.get("sonar.scanner.keystorePath"), sonarUserHome.resolve("ssl/keystore.p12").toString());
149148
var keyStorePassword = defaultIfBlank(bootstrapProperties.get("sonar.scanner.keystorePassword"), CertificateStore.DEFAULT_PASSWORD);
150-
var trustStorePath = defaultIfBlank(bootstrapProperties.get("sonar.scanner.truststorePath"), sonarUserHome.getPath().resolve("ssl/truststore.p12").toString());
149+
var trustStorePath = defaultIfBlank(bootstrapProperties.get("sonar.scanner.truststorePath"), sonarUserHome.resolve("ssl/truststore.p12").toString());
151150
var trustStorePassword = defaultIfBlank(bootstrapProperties.get("sonar.scanner.truststorePassword"), CertificateStore.DEFAULT_PASSWORD);
152151
var keyStore = new CertificateStore(Path.of(keyStorePath), keyStorePassword);
153152
var trustStore = new CertificateStore(Path.of(trustStorePath), trustStorePassword);

‎lib/src/main/java/org/sonarsource/scanner/lib/internal/http/ServerConnection.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.sonarsource.scanner.lib.ScannerProperties;
3636
import org.sonarsource.scanner.lib.Utils;
3737
import org.sonarsource.scanner.lib.internal.InternalProperties;
38-
import org.sonarsource.scanner.lib.internal.SonarUserHome;
3938
import org.sonarsource.scanner.lib.internal.cache.Logger;
4039

4140
import static java.lang.String.format;
@@ -50,7 +49,7 @@ public class ServerConnection {
5049
private final String credentials;
5150
private final Logger logger;
5251

53-
ServerConnection(String baseUrl, String userAgent, @Nullable String credentials, Logger logger, Map<String, String> bootstrapProperties, SonarUserHome sonarUserHome) {
52+
ServerConnection(String baseUrl, String userAgent, @Nullable String credentials, Logger logger, Map<String, String> bootstrapProperties, Path sonarUserHome) {
5453
this.credentials = credentials;
5554
this.logger = logger;
5655
this.baseUrlWithoutTrailingSlash = removeTrailingSlash(baseUrl);
@@ -62,7 +61,7 @@ private static String removeTrailingSlash(String url) {
6261
return url.replaceAll("(/)+$", "");
6362
}
6463

65-
public static ServerConnection create(Map<String, String> bootstrapProperties, Logger logger, SonarUserHome sonarUserHome) {
64+
public static ServerConnection create(Map<String, String> bootstrapProperties, Logger logger, Path sonarUserHome) {
6665
String serverUrl = bootstrapProperties.get("sonar.host.url");
6766
String userAgent = format("%s/%s", bootstrapProperties.get(InternalProperties.SCANNER_APP), bootstrapProperties.get(InternalProperties.SCANNER_APP_VERSION));
6867
String token = bootstrapProperties.get(ScannerProperties.SONAR_TOKEN);

‎lib/src/test/java/org/sonarsource/scanner/lib/internal/IsolatedLauncherFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class IsolatedLauncherFactoryTest {
4242
@BeforeEach
4343
public void setUp(@TempDir Path sonarUserHome) {
4444
tempCleaning = mock(TempCleaning.class);
45-
factory = new IsolatedLauncherFactory(FakeIsolatedLauncher.class.getName(), tempCleaning, mock(Logger.class), new SonarUserHome(sonarUserHome));
45+
factory = new IsolatedLauncherFactory(FakeIsolatedLauncher.class.getName(), tempCleaning, mock(Logger.class), sonarUserHome);
4646
props = new Properties();
4747
jarDownloader = mock(JarDownloader.class);
4848
}

‎lib/src/test/java/org/sonarsource/scanner/lib/internal/JarDownloaderFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ class JarDownloaderFactoryTest {
3333
void should_create(@TempDir Path sonarUserHome) {
3434
ServerConnection conn = mock(ServerConnection.class);
3535
Logger logger = mock(Logger.class);
36-
assertThat(new JarDownloaderFactory(conn, logger, new SonarUserHome(sonarUserHome)).create()).isNotNull();
36+
assertThat(new JarDownloaderFactory(conn, logger, sonarUserHome).create()).isNotNull();
3737
}
3838
}

‎lib/src/test/java/org/sonarsource/scanner/lib/internal/cache/FileCacheBuilderTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.nio.file.Path;
2323
import org.junit.jupiter.api.Test;
2424
import org.junit.jupiter.api.io.TempDir;
25-
import org.sonarsource.scanner.lib.internal.SonarUserHome;
2625

2726
import static org.assertj.core.api.Assertions.assertThat;
2827
import static org.mockito.Mockito.mock;
@@ -31,7 +30,7 @@ class FileCacheBuilderTest {
3130

3231
@Test
3332
void create_cache_in_user_home(@TempDir Path sonarUserHome) {
34-
FileCache cache = new FileCacheBuilder(mock(Logger.class), new SonarUserHome(sonarUserHome)).build();
33+
FileCache cache = new FileCacheBuilder(mock(Logger.class), sonarUserHome).build();
3534

3635
assertThat(cache.getDir()).isDirectory().exists();
3736
assertThat(cache.getDir()).hasName("cache");

0 commit comments

Comments
 (0)