opendev/gerrit
Code Issues Proposed changes

SiteProgram: Normalize site path

Browse Source 
Normalize the site path, i.e. remove redundant elements, from the
path passed via the constructor or command line.

Change-Id: Ied03c8916a5598945fea5740f259fafcd11fa36e
This commit is contained in:
David Pursehouse
2019-04-11 14:18:14 +09:00
parent af904cad5a
commit b09858031f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/com/google/gerrit/pgm/util/SiteProgram.java
View File

@@ -71,7 +71,7 @@ public abstract class SiteProgram extends AbstractProgram {
aliases = {"-d"},
usage = "Local directory containing site data")
private void setSitePath(String path) {
sitePath = Paths.get(path);
sitePath = Paths.get(path).normalize();
}
protected Provider<DataSource> dsProvider;
@@ -80,13 +80,13 @@ public abstract class SiteProgram extends AbstractProgram {
protected SiteProgram() {}
protected SiteProgram(Path sitePath) {
this.sitePath = sitePath;
protected SiteProgram(Path sitePath, Provider<DataSource> dsProvider) {
this.sitePath = sitePath.normalize();
this.dsProvider = dsProvider;
}
protected SiteProgram(Path sitePath, Provider<DataSource> dsProvider) {
this.sitePath = sitePath;
this.dsProvider = dsProvider;
protected SiteProgram(Path sitePath) {
this(sitePath, null);
}
/** @return the site path specified on the command line. */