SONAR-10591 Remove unused code in sonar-home

3 files changed, 7 insertions, 36 deletions

diff --git a/sonar-home/src/main/java/org/sonar/home/cache/DirectoryLock.java b/sonar-home/src/main/java/org/sonar/home/cache/DirectoryLock.java
index e7b88a7f33d..db61bac9bcd 100644
--- a/sonar-home/src/main/java/org/sonar/home/cache/DirectoryLock.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/DirectoryLock.java
@@ -39,20 +39,6 @@ public class DirectoryLock {
     this.lockFilePath = directory.resolve(LOCK_FILE_NAME).toAbsolutePath();
   }
 
-  public String getFileLockName() {
-    return LOCK_FILE_NAME;
-  }
-  
-  public void lock() {
-    try {
-      lockRandomAccessFile = new RandomAccessFile(lockFilePath.toFile(), "rw");
-      lockChannel = lockRandomAccessFile.getChannel();
-      lockFile = lockChannel.lock(0, 1024, false);
-    } catch (IOException e) {
-      throw new IllegalStateException("Failed to create lock in " + lockFilePath.toString(), e);
-    }
-  }
-  
   public boolean tryLock() {
     try {
       lockRandomAccessFile = new RandomAccessFile(lockFilePath.toFile(), "rw");
diff --git a/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java b/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
index 89bb416e048..bc42ed0335c 100644
--- a/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/FileCache.java
@@ -29,7 +29,6 @@ import java.nio.file.Path;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Pack200;
 import java.util.zip.GZIPInputStream;
-import javax.annotation.CheckForNull;
 
 /**
  * This class is responsible for managing Sonar batch file cache. You can put file into cache and
@@ -62,24 +61,15 @@ public class FileCache {
     return cacheDir;
   }
 
-  /**
-   * Look for a file in the cache by its filename and md5 checksum. If the file is not
-   * present then return null.
-   */
-  @CheckForNull
-  public File get(String filename, String hash) {
-    File cachedFile = new File(new File(cacheDir, hash), filename);
-    if (cachedFile.exists()) {
-      return cachedFile;
-    }
-    logger.debug(String.format("No file found in the cache with name %s and hash %s", filename, hash));
-    return null;
-  }
-
   public interface Downloader {
     void download(String filename, File toFile) throws IOException;
   }
 
+  /**
+   * Look for a file in the cache by its filename and md5 checksum. If the file is not
+   * present then try to download it. In case of error or if the file is not found
+   * an exception is thrown. {@code null} is never returned.
+   */
   public File get(String filename, String hash, Downloader downloader) {
     // Does not fail if another process tries to create the directory at the same time.
     File hashDir = hashDir(hash);
diff --git a/sonar-home/src/main/java/org/sonar/home/cache/FileCacheBuilder.java b/sonar-home/src/main/java/org/sonar/home/cache/FileCacheBuilder.java
index 0734a28c9da..0bb78aada30 100644
--- a/sonar-home/src/main/java/org/sonar/home/cache/FileCacheBuilder.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/FileCacheBuilder.java
@@ -31,13 +31,8 @@ public class FileCacheBuilder {
     this.logger = logger;
   }
 
-  public FileCacheBuilder setUserHome(File d) {
-    this.userHome = d;
-    return this;
-  }
-
-  public FileCacheBuilder setUserHome(@Nullable String path) {
-    this.userHome = (path == null) ? null : new File(path);
+  public FileCacheBuilder setUserHome(@Nullable File dir) {
+    this.userHome = dir;
     return this;
   }