Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Commit

Permalink
Inject System.getProperty("user.home") to FileUtils (#102)
Browse files Browse the repository at this point in the history
* Inject "user.home"

* Add @nAmed annotation

* Add changes according to review
  • Loading branch information
val-fed authored May 28, 2018
1 parent 080d40a commit d58cd6f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions common/CommonModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,16 @@
import dagger.Provides;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import javax.inject.Named;
import javax.inject.Singleton;

@Module
public class CommonModule {
public @Provides @Singleton FileSystem provideDefaultFileSystem() {
return FileSystems.getDefault();
}

public @Provides @Singleton @Named("Home folder") String provideUserHome() {
return System.getProperty("user.home");
}
}
10 changes: 5 additions & 5 deletions common/FileUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.inject.Named;
import javax.inject.Singleton;
import javax.inject.Inject;
import javax.inject.Singleton;

/** File utils */
@Singleton
public class FileUtils {
private final String userHome;
private FileSystem fileSystem;

@Inject
FileUtils(FileSystem fileSystem) {
FileUtils(FileSystem fileSystem, @Named("Home folder") String userHome) {
this.fileSystem = fileSystem;
this.userHome = userHome;
}

/** Replace the ~ in e.g ~/path with the home directory. */
// TODO Inject System.getProperty("user.home")
public String expandHomeDirectory(String path) {
if (path.startsWith("~" + fileSystem.getSeparator())) {
path = System.getProperty("user.home") + path.substring(1);
path = userHome + path.substring(1);
}
return path;
}
Expand Down

0 comments on commit d58cd6f

Please sign in to comment.