Convert @SitePath from File to Path
This saves code in some cases, as it allows us to use some of the nicer Java 7 Files static methods. Mostly, though, it opens the door to using an in-memory filesystem in tests. Eventually there are even more fun possibilities, like teaching parts of SitePaths to be read out of somewhere else entirely (like a git repository). Change-Id: Ifa13772a79ded03049bd9f62ade6e25d19e5bb05
This commit is contained in:
parent
0f092fe518
commit
8e481f3c33
@ -43,7 +43,8 @@ import org.apache.sshd.common.KeyPairProvider;
|
|||||||
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
|
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
|
||||||
import org.eclipse.jgit.lib.Config;
|
import org.eclipse.jgit.lib.Config;
|
||||||
|
|
||||||
import java.io.File;
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
class InMemoryTestingDatabaseModule extends LifecycleModule {
|
class InMemoryTestingDatabaseModule extends LifecycleModule {
|
||||||
private final Config cfg;
|
private final Config cfg;
|
||||||
@ -58,9 +59,10 @@ class InMemoryTestingDatabaseModule extends LifecycleModule {
|
|||||||
.annotatedWith(GerritServerConfig.class)
|
.annotatedWith(GerritServerConfig.class)
|
||||||
.toInstance(cfg);
|
.toInstance(cfg);
|
||||||
|
|
||||||
bind(File.class)
|
// TODO(dborowitz): Use jimfs.
|
||||||
|
bind(Path.class)
|
||||||
.annotatedWith(SitePath.class)
|
.annotatedWith(SitePath.class)
|
||||||
.toInstance(new File("UNIT_TEST_GERRIT_SITE"));
|
.toInstance(Paths.get("UNIT_TEST_GERRIT_SITE"));
|
||||||
|
|
||||||
bind(GitRepositoryManager.class)
|
bind(GitRepositoryManager.class)
|
||||||
.toInstance(new InMemoryRepositoryManager());
|
.toInstance(new InMemoryRepositoryManager());
|
||||||
|
@ -16,6 +16,8 @@ package com.google.gerrit.pgm;
|
|||||||
|
|
||||||
import static com.google.gerrit.server.schema.DataSourceProvider.Context.MULTI_USER;
|
import static com.google.gerrit.server.schema.DataSourceProvider.Context.MULTI_USER;
|
||||||
|
|
||||||
|
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||||
|
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
import com.google.common.base.MoreObjects;
|
import com.google.common.base.MoreObjects;
|
||||||
import com.google.gerrit.common.ChangeHookRunner;
|
import com.google.gerrit.common.ChangeHookRunner;
|
||||||
@ -92,10 +94,10 @@ import org.kohsuke.args4j.Option;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.Thread.UncaughtExceptionHandler;
|
import java.lang.Thread.UncaughtExceptionHandler;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -147,7 +149,7 @@ public class Daemon extends SiteProgram {
|
|||||||
private Injector sshInjector;
|
private Injector sshInjector;
|
||||||
private Injector webInjector;
|
private Injector webInjector;
|
||||||
private Injector httpdInjector;
|
private Injector httpdInjector;
|
||||||
private File runFile;
|
private Path runFile;
|
||||||
private boolean test;
|
private boolean test;
|
||||||
private AbstractModule luceneModule;
|
private AbstractModule luceneModule;
|
||||||
|
|
||||||
@ -183,7 +185,7 @@ public class Daemon extends SiteProgram {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (runId != null) {
|
if (runId != null) {
|
||||||
runFile = new File(new File(getSitePath(), "logs"), "gerrit.run");
|
runFile = getSitePath().resolve("logs").resolve("gerrit.run");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (httpd == null) {
|
if (httpd == null) {
|
||||||
@ -207,7 +209,11 @@ public class Daemon extends SiteProgram {
|
|||||||
public void run() {
|
public void run() {
|
||||||
log.info("caught shutdown, cleaning up");
|
log.info("caught shutdown, cleaning up");
|
||||||
if (runId != null) {
|
if (runId != null) {
|
||||||
runFile.delete();
|
try {
|
||||||
|
Files.delete(runFile);
|
||||||
|
} catch (IOException err) {
|
||||||
|
log.warn("failed to delete " + runFile, err);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
manager.stop();
|
manager.stop();
|
||||||
}
|
}
|
||||||
@ -216,15 +222,8 @@ public class Daemon extends SiteProgram {
|
|||||||
log.info("Gerrit Code Review " + myVersion() + " ready");
|
log.info("Gerrit Code Review " + myVersion() + " ready");
|
||||||
if (runId != null) {
|
if (runId != null) {
|
||||||
try {
|
try {
|
||||||
runFile.createNewFile();
|
Files.write(runFile, (runId + "\n").getBytes(UTF_8));
|
||||||
runFile.setReadable(true, false);
|
runFile.toFile().setReadable(true, false);
|
||||||
|
|
||||||
FileOutputStream out = new FileOutputStream(runFile);
|
|
||||||
try {
|
|
||||||
out.write((runId + "\n").getBytes("UTF-8"));
|
|
||||||
} finally {
|
|
||||||
out.close();
|
|
||||||
}
|
|
||||||
} catch (IOException err) {
|
} catch (IOException err) {
|
||||||
log.warn("Cannot write --run-id to " + runFile, err);
|
log.warn("Cannot write --run-id to " + runFile, err);
|
||||||
}
|
}
|
||||||
|
@ -37,8 +37,8 @@ import com.google.inject.util.Providers;
|
|||||||
|
|
||||||
import org.kohsuke.args4j.Option;
|
import org.kohsuke.args4j.Option;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -70,7 +70,7 @@ public class Init extends BaseInit {
|
|||||||
super(new WarDistribution(), null);
|
super(new WarDistribution(), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Init(File sitePath) {
|
public Init(Path sitePath) {
|
||||||
super(sitePath, true, true, new WarDistribution(), null);
|
super(sitePath, true, true, new WarDistribution(), null);
|
||||||
batchMode = true;
|
batchMode = true;
|
||||||
noAutoStart = true;
|
noAutoStart = true;
|
||||||
@ -106,7 +106,7 @@ public class Init extends BaseInit {
|
|||||||
modules.add(new AbstractModule() {
|
modules.add(new AbstractModule() {
|
||||||
@Override
|
@Override
|
||||||
protected void configure() {
|
protected void configure() {
|
||||||
bind(File.class).annotatedWith(SitePath.class).toInstance(getSitePath());
|
bind(Path.class).annotatedWith(SitePath.class).toInstance(getSitePath());
|
||||||
bind(Browser.class);
|
bind(Browser.class);
|
||||||
bind(String.class).annotatedWith(SecureStoreClassName.class)
|
bind(String.class).annotatedWith(SecureStoreClassName.class)
|
||||||
.toProvider(Providers.of(getConfiguredSecureStoreClass()));
|
.toProvider(Providers.of(getConfiguredSecureStoreClass()));
|
||||||
|
@ -59,6 +59,11 @@ import org.slf4j.LoggerFactory;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.FileVisitResult;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.SimpleFileVisitor;
|
||||||
|
import java.nio.file.attribute.BasicFileAttributes;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
@ -86,12 +91,12 @@ public class BaseInit extends SiteProgram {
|
|||||||
this.pluginsToInstall = pluginsToInstall;
|
this.pluginsToInstall = pluginsToInstall;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BaseInit(File sitePath, boolean standalone, boolean initDb,
|
public BaseInit(Path sitePath, boolean standalone, boolean initDb,
|
||||||
PluginsDistribution pluginsDistribution, List<String> pluginsToInstall) {
|
PluginsDistribution pluginsDistribution, List<String> pluginsToInstall) {
|
||||||
this(sitePath, null, standalone, initDb, pluginsDistribution, pluginsToInstall);
|
this(sitePath, null, standalone, initDb, pluginsDistribution, pluginsToInstall);
|
||||||
}
|
}
|
||||||
|
|
||||||
public BaseInit(File sitePath, final Provider<DataSource> dsProvider,
|
public BaseInit(Path sitePath, final Provider<DataSource> dsProvider,
|
||||||
boolean standalone, boolean initDb,
|
boolean standalone, boolean initDb,
|
||||||
PluginsDistribution pluginsDistribution, List<String> pluginsToInstall) {
|
PluginsDistribution pluginsDistribution, List<String> pluginsToInstall) {
|
||||||
super(sitePath, dsProvider);
|
super(sitePath, dsProvider);
|
||||||
@ -132,7 +137,7 @@ public class BaseInit extends SiteProgram {
|
|||||||
throw failure;
|
throw failure;
|
||||||
}
|
}
|
||||||
|
|
||||||
System.err.println("Initialized " + getSitePath().getCanonicalPath());
|
System.err.println("Initialized " + getSitePath().toRealPath().normalize());
|
||||||
afterInit(run);
|
afterInit(run);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -208,7 +213,7 @@ public class BaseInit extends SiteProgram {
|
|||||||
|
|
||||||
private SiteInit createSiteInit() {
|
private SiteInit createSiteInit() {
|
||||||
final ConsoleUI ui = getConsoleUI();
|
final ConsoleUI ui = getConsoleUI();
|
||||||
final File sitePath = getSitePath();
|
final Path sitePath = getSitePath();
|
||||||
final List<Module> m = new ArrayList<>();
|
final List<Module> m = new ArrayList<>();
|
||||||
final SecureStoreInitData secureStoreInitData = discoverSecureStoreClass();
|
final SecureStoreInitData secureStoreInitData = discoverSecureStoreClass();
|
||||||
final String currentSecureStoreClassName = getConfiguredSecureStoreClass();
|
final String currentSecureStoreClassName = getConfiguredSecureStoreClass();
|
||||||
@ -227,7 +232,7 @@ public class BaseInit extends SiteProgram {
|
|||||||
@Override
|
@Override
|
||||||
protected void configure() {
|
protected void configure() {
|
||||||
bind(ConsoleUI.class).toInstance(ui);
|
bind(ConsoleUI.class).toInstance(ui);
|
||||||
bind(File.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
||||||
List<String> plugins =
|
List<String> plugins =
|
||||||
MoreObjects.firstNonNull(
|
MoreObjects.firstNonNull(
|
||||||
getInstallPlugins(), Lists.<String> newArrayList());
|
getInstallPlugins(), Lists.<String> newArrayList());
|
||||||
@ -407,15 +412,41 @@ public class BaseInit extends SiteProgram {
|
|||||||
return sysInjector;
|
return sysInjector;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void recursiveDelete(File path) {
|
private static void recursiveDelete(Path path) {
|
||||||
File[] entries = path.listFiles();
|
final String msg = "warn: Cannot remove ";
|
||||||
if (entries != null) {
|
try {
|
||||||
for (File e : entries) {
|
Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
|
||||||
recursiveDelete(e);
|
@Override
|
||||||
}
|
public FileVisitResult visitFile(Path f, BasicFileAttributes attrs)
|
||||||
}
|
throws IOException {
|
||||||
if (!path.delete() && path.exists()) {
|
try {
|
||||||
System.err.println("warn: Cannot remove " + path);
|
Files.delete(f);
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.err.println(msg + f);
|
||||||
|
}
|
||||||
|
return FileVisitResult.CONTINUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FileVisitResult postVisitDirectory(Path dir, IOException err) {
|
||||||
|
try {
|
||||||
|
// Previously warned if err was not null; if dir is not empty as a
|
||||||
|
// result, will cause an error that will be logged below.
|
||||||
|
Files.delete(dir);
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.err.println(msg + dir);
|
||||||
|
}
|
||||||
|
return FileVisitResult.CONTINUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FileVisitResult visitFileFailed(Path f, IOException e) {
|
||||||
|
System.err.println(msg + f);
|
||||||
|
return FileVisitResult.CONTINUE;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.err.println(msg + path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,7 @@ import org.apache.log4j.PatternLayout;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
public class ErrorLogFile {
|
public class ErrorLogFile {
|
||||||
static final String LOG_NAME = "error_log";
|
static final String LOG_NAME = "error_log";
|
||||||
@ -47,7 +48,7 @@ public class ErrorLogFile {
|
|||||||
root.addAppender(dst);
|
root.addAppender(dst);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LifecycleListener start(final File sitePath)
|
public static LifecycleListener start(final Path sitePath)
|
||||||
throws FileNotFoundException {
|
throws FileNotFoundException {
|
||||||
final File logdir = new SitePaths(sitePath).logs_dir;
|
final File logdir = new SitePaths(sitePath).logs_dir;
|
||||||
if (!logdir.exists() && !logdir.mkdirs()) {
|
if (!logdir.exists() && !logdir.mkdirs()) {
|
||||||
|
@ -26,10 +26,11 @@ import org.apache.log4j.PatternLayout;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
public class GarbageCollectionLogFile {
|
public class GarbageCollectionLogFile {
|
||||||
|
|
||||||
public static LifecycleListener start(File sitePath)
|
public static LifecycleListener start(Path sitePath)
|
||||||
throws FileNotFoundException {
|
throws FileNotFoundException {
|
||||||
File logdir = new SitePaths(sitePath).logs_dir;
|
File logdir = new SitePaths(sitePath).logs_dir;
|
||||||
if (!logdir.exists() && !logdir.mkdirs()) {
|
if (!logdir.exists() && !logdir.mkdirs()) {
|
||||||
|
@ -54,9 +54,11 @@ import org.eclipse.jgit.storage.file.FileBasedConfig;
|
|||||||
import org.eclipse.jgit.util.FS;
|
import org.eclipse.jgit.util.FS;
|
||||||
import org.kohsuke.args4j.Option;
|
import org.kohsuke.args4j.Option;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.annotation.Annotation;
|
import java.lang.annotation.Annotation;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -66,30 +68,30 @@ import javax.sql.DataSource;
|
|||||||
|
|
||||||
public abstract class SiteProgram extends AbstractProgram {
|
public abstract class SiteProgram extends AbstractProgram {
|
||||||
@Option(name = "--site-path", aliases = {"-d"}, usage = "Local directory containing site data")
|
@Option(name = "--site-path", aliases = {"-d"}, usage = "Local directory containing site data")
|
||||||
private File sitePath = new File(".");
|
private void setSitePath(String path) {
|
||||||
|
sitePath = Paths.get(path);
|
||||||
|
}
|
||||||
|
|
||||||
protected Provider<DataSource> dsProvider;
|
protected Provider<DataSource> dsProvider;
|
||||||
|
|
||||||
|
private Path sitePath;
|
||||||
|
|
||||||
protected SiteProgram() {
|
protected SiteProgram() {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected SiteProgram(File sitePath, final Provider<DataSource> dsProvider) {
|
protected SiteProgram(Path sitePath, final Provider<DataSource> dsProvider) {
|
||||||
this.sitePath = sitePath;
|
this.sitePath = sitePath;
|
||||||
this.dsProvider = dsProvider;
|
this.dsProvider = dsProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return the site path specified on the command line. */
|
/** @return the site path specified on the command line. */
|
||||||
protected File getSitePath() {
|
protected Path getSitePath() {
|
||||||
File path = sitePath.getAbsoluteFile();
|
return sitePath;
|
||||||
if (".".equals(path.getName())) {
|
|
||||||
path = path.getParentFile();
|
|
||||||
}
|
|
||||||
return path;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Ensures we are running inside of a valid site, otherwise throws a Die. */
|
/** Ensures we are running inside of a valid site, otherwise throws a Die. */
|
||||||
protected void mustHaveValidSite() throws Die {
|
protected void mustHaveValidSite() throws Die {
|
||||||
if (!new File(new File(getSitePath(), "etc"), "gerrit.config").exists()) {
|
if (!Files.exists(sitePath.resolve("etc").resolve("gerrit.config"))) {
|
||||||
throw die("not a Gerrit site: '" + getSitePath() + "'\n"
|
throw die("not a Gerrit site: '" + getSitePath() + "'\n"
|
||||||
+ "Perhaps you need to run init first?");
|
+ "Perhaps you need to run init first?");
|
||||||
}
|
}
|
||||||
@ -97,13 +99,13 @@ public abstract class SiteProgram extends AbstractProgram {
|
|||||||
|
|
||||||
/** @return provides database connectivity and site path. */
|
/** @return provides database connectivity and site path. */
|
||||||
protected Injector createDbInjector(final DataSourceProvider.Context context) {
|
protected Injector createDbInjector(final DataSourceProvider.Context context) {
|
||||||
final File sitePath = getSitePath();
|
final Path sitePath = getSitePath();
|
||||||
final List<Module> modules = new ArrayList<>();
|
final List<Module> modules = new ArrayList<>();
|
||||||
|
|
||||||
Module sitePathModule = new AbstractModule() {
|
Module sitePathModule = new AbstractModule() {
|
||||||
@Override
|
@Override
|
||||||
protected void configure() {
|
protected void configure() {
|
||||||
bind(File.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
||||||
bind(String.class).annotatedWith(SecureStoreClassName.class)
|
bind(String.class).annotatedWith(SecureStoreClassName.class)
|
||||||
.toProvider(Providers.of(getConfiguredSecureStoreClass()));
|
.toProvider(Providers.of(getConfiguredSecureStoreClass()));
|
||||||
}
|
}
|
||||||
@ -191,7 +193,7 @@ public abstract class SiteProgram extends AbstractProgram {
|
|||||||
Module m = new AbstractModule() {
|
Module m = new AbstractModule() {
|
||||||
@Override
|
@Override
|
||||||
protected void configure() {
|
protected void configure() {
|
||||||
bind(File.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
||||||
bind(SitePaths.class);
|
bind(SitePaths.class);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -222,7 +224,7 @@ public abstract class SiteProgram extends AbstractProgram {
|
|||||||
modules.add(new AbstractModule() {
|
modules.add(new AbstractModule() {
|
||||||
@Override
|
@Override
|
||||||
protected void configure() {
|
protected void configure() {
|
||||||
bind(File.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
modules.add(new GerritServerConfigModule());
|
modules.add(new GerritServerConfigModule());
|
||||||
|
@ -16,11 +16,11 @@ package com.google.gerrit.pgm.init;
|
|||||||
|
|
||||||
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
|
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
public abstract class InitTestCase extends LocalDiskRepositoryTestCase {
|
public abstract class InitTestCase extends LocalDiskRepositoryTestCase {
|
||||||
protected File newSitePath() throws IOException {
|
protected Path newSitePath() throws IOException {
|
||||||
return new File(createWorkRepository().getWorkTree(), "test_site");
|
return createWorkRepository().getWorkTree().toPath().resolve("test_site");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,13 +25,13 @@ import com.google.inject.Provider;
|
|||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
public class LibrariesTest {
|
public class LibrariesTest {
|
||||||
@Test
|
@Test
|
||||||
public void testCreate() throws FileNotFoundException {
|
public void testCreate() throws FileNotFoundException {
|
||||||
final SitePaths site = new SitePaths(new File("."));
|
final SitePaths site = new SitePaths(Paths.get("."));
|
||||||
final ConsoleUI ui = createStrictMock(ConsoleUI.class);
|
final ConsoleUI ui = createStrictMock(ConsoleUI.class);
|
||||||
|
|
||||||
replay(ui);
|
replay(ui);
|
||||||
|
@ -14,6 +14,8 @@
|
|||||||
|
|
||||||
package com.google.gerrit.pgm.init;
|
package com.google.gerrit.pgm.init;
|
||||||
|
|
||||||
|
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||||
|
|
||||||
import static org.easymock.EasyMock.createStrictMock;
|
import static org.easymock.EasyMock.createStrictMock;
|
||||||
import static org.easymock.EasyMock.eq;
|
import static org.easymock.EasyMock.eq;
|
||||||
import static org.easymock.EasyMock.expect;
|
import static org.easymock.EasyMock.expect;
|
||||||
@ -38,9 +40,9 @@ import org.eclipse.jgit.util.IO;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileWriter;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Writer;
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -49,23 +51,18 @@ public class UpgradeFrom2_0_xTest extends InitTestCase {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testUpgrade() throws IOException, ConfigInvalidException {
|
public void testUpgrade() throws IOException, ConfigInvalidException {
|
||||||
final File p = newSitePath();
|
final Path p = newSitePath();
|
||||||
final SitePaths site = new SitePaths(p);
|
final SitePaths site = new SitePaths(p);
|
||||||
assertTrue(site.isNew);
|
assertTrue(site.isNew);
|
||||||
assertTrue(site.site_path.mkdir());
|
assertTrue(site.site_path.mkdir());
|
||||||
assertTrue(site.etc_dir.mkdir());
|
assertTrue(site.etc_dir.mkdir());
|
||||||
|
|
||||||
for (String n : UpgradeFrom2_0_x.etcFiles) {
|
for (String n : UpgradeFrom2_0_x.etcFiles) {
|
||||||
Writer w = new FileWriter(new File(p, n));
|
Files.write(p.resolve(n), ("# " + n + "\n").getBytes(UTF_8));
|
||||||
try {
|
|
||||||
w.write("# " + n + "\n");
|
|
||||||
} finally {
|
|
||||||
w.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
FileBasedConfig old =
|
FileBasedConfig old =
|
||||||
new FileBasedConfig(new File(p, "gerrit.config"), FS.DETECTED);
|
new FileBasedConfig(p.resolve("gerrit.config").toFile(), FS.DETECTED);
|
||||||
|
|
||||||
old.setString("ldap", null, "username", "ldap.user");
|
old.setString("ldap", null, "username", "ldap.user");
|
||||||
old.setString("ldap", null, "password", "ldap.s3kr3t");
|
old.setString("ldap", null, "password", "ldap.s3kr3t");
|
||||||
@ -85,8 +82,11 @@ public class UpgradeFrom2_0_xTest extends InitTestCase {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
expect(ui.yesno(eq(true), eq("Upgrade '%s'"), eq(p.getCanonicalPath())))
|
expect(ui.yesno(
|
||||||
.andReturn(true);
|
eq(true),
|
||||||
|
eq("Upgrade '%s'"),
|
||||||
|
eq(p.toRealPath().normalize().toString())))
|
||||||
|
.andReturn(true);
|
||||||
replay(ui);
|
replay(ui);
|
||||||
|
|
||||||
UpgradeFrom2_0_x u = new UpgradeFrom2_0_x(site, flags, ui, sections);
|
UpgradeFrom2_0_x u = new UpgradeFrom2_0_x(site, flags, ui, sections);
|
||||||
|
@ -24,7 +24,6 @@ import com.google.inject.Inject;
|
|||||||
import org.eclipse.jgit.internal.storage.file.WindowCacheStatAccessor;
|
import org.eclipse.jgit.internal.storage.file.WindowCacheStatAccessor;
|
||||||
import org.kohsuke.args4j.Option;
|
import org.kohsuke.args4j.Option;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.management.ManagementFactory;
|
import java.lang.management.ManagementFactory;
|
||||||
import java.lang.management.OperatingSystemMXBean;
|
import java.lang.management.OperatingSystemMXBean;
|
||||||
@ -33,6 +32,8 @@ import java.lang.management.ThreadInfo;
|
|||||||
import java.lang.management.ThreadMXBean;
|
import java.lang.management.ThreadMXBean;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@ -43,7 +44,7 @@ import java.util.Map;
|
|||||||
public class GetSummary implements RestReadView<ConfigResource> {
|
public class GetSummary implements RestReadView<ConfigResource> {
|
||||||
|
|
||||||
private final WorkQueue workQueue;
|
private final WorkQueue workQueue;
|
||||||
private final File sitePath;
|
private final Path sitePath;
|
||||||
|
|
||||||
@Option(name = "--gc", usage = "perform Java GC before retrieving memory stats")
|
@Option(name = "--gc", usage = "perform Java GC before retrieving memory stats")
|
||||||
private boolean gc;
|
private boolean gc;
|
||||||
@ -62,7 +63,7 @@ public class GetSummary implements RestReadView<ConfigResource> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public GetSummary(WorkQueue workQueue, @SitePath File sitePath) {
|
public GetSummary(WorkQueue workQueue, @SitePath Path sitePath) {
|
||||||
this.workQueue = workQueue;
|
this.workQueue = workQueue;
|
||||||
this.sitePath = sitePath;
|
this.sitePath = sitePath;
|
||||||
}
|
}
|
||||||
@ -186,7 +187,8 @@ public class GetSummary implements RestReadView<ConfigResource> {
|
|||||||
} catch (UnknownHostException e) {
|
} catch (UnknownHostException e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
jvmSummary.currentWorkingDirectory = path(new File(".").getAbsoluteFile().getParentFile());
|
jvmSummary.currentWorkingDirectory =
|
||||||
|
path(Paths.get(".").toAbsolutePath().getParent());
|
||||||
jvmSummary.site = path(sitePath);
|
jvmSummary.site = path(sitePath);
|
||||||
return jvmSummary;
|
return jvmSummary;
|
||||||
}
|
}
|
||||||
@ -210,11 +212,11 @@ public class GetSummary implements RestReadView<ConfigResource> {
|
|||||||
return String.format("%1$6.2f%2$s", value, suffix).trim();
|
return String.format("%1$6.2f%2$s", value, suffix).trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String path(File file) {
|
private static String path(Path path) {
|
||||||
try {
|
try {
|
||||||
return file.getCanonicalPath();
|
return path.toRealPath().normalize().toString();
|
||||||
} catch (IOException err) {
|
} catch (IOException err) {
|
||||||
return file.getAbsolutePath();
|
return path.toAbsolutePath().normalize().toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@ import com.google.inject.Singleton;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
/** Important paths within a {@link SitePath}. */
|
/** Important paths within a {@link SitePath}. */
|
||||||
@Singleton
|
@Singleton
|
||||||
@ -64,8 +65,9 @@ public final class SitePaths {
|
|||||||
public final boolean isNew;
|
public final boolean isNew;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public SitePaths(final @SitePath File sitePath) throws FileNotFoundException {
|
public SitePaths(final @SitePath Path sitePath) throws FileNotFoundException {
|
||||||
site_path = sitePath;
|
// TODO(dborowitz): Convert all of these to Paths.
|
||||||
|
site_path = sitePath.toFile();
|
||||||
|
|
||||||
bin_dir = new File(site_path, "bin");
|
bin_dir = new File(site_path, "bin");
|
||||||
etc_dir = new File(site_path, "etc");
|
etc_dir = new File(site_path, "etc");
|
||||||
|
@ -33,7 +33,7 @@ import com.google.inject.Singleton;
|
|||||||
import org.eclipse.jgit.lib.Config;
|
import org.eclipse.jgit.lib.Config;
|
||||||
import org.eclipse.jgit.lib.PersonIdent;
|
import org.eclipse.jgit.lib.PersonIdent;
|
||||||
|
|
||||||
import java.io.File;
|
import java.nio.file.Path;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copies critical objects from the {@code dbInjector} into a plugin.
|
* Copies critical objects from the {@code dbInjector} into a plugin.
|
||||||
@ -47,11 +47,11 @@ import java.io.File;
|
|||||||
class CopyConfigModule extends AbstractModule {
|
class CopyConfigModule extends AbstractModule {
|
||||||
@Inject
|
@Inject
|
||||||
@SitePath
|
@SitePath
|
||||||
private File sitePath;
|
private Path sitePath;
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@SitePath
|
@SitePath
|
||||||
File getSitePath() {
|
Path getSitePath() {
|
||||||
return sitePath;
|
return sitePath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,14 +32,14 @@ import com.google.inject.Inject;
|
|||||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||||
import org.eclipse.jgit.lib.PersonIdent;
|
import org.eclipse.jgit.lib.PersonIdent;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Path;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
/** Creates the current database schema and populates initial code rows. */
|
/** Creates the current database schema and populates initial code rows. */
|
||||||
public class SchemaCreator {
|
public class SchemaCreator {
|
||||||
private final @SitePath
|
private final @SitePath
|
||||||
File site_path;
|
Path site_path;
|
||||||
|
|
||||||
private final AllProjectsCreator allProjectsCreator;
|
private final AllProjectsCreator allProjectsCreator;
|
||||||
private final AllUsersCreator allUsersCreator;
|
private final AllUsersCreator allUsersCreator;
|
||||||
@ -55,10 +55,10 @@ public class SchemaCreator {
|
|||||||
AllUsersCreator auc,
|
AllUsersCreator auc,
|
||||||
@GerritPersonIdent PersonIdent au,
|
@GerritPersonIdent PersonIdent au,
|
||||||
DataSourceType dst) {
|
DataSourceType dst) {
|
||||||
this(site.site_path, ap, auc, au, dst);
|
this(site.site_path.toPath(), ap, auc, au, dst);
|
||||||
}
|
}
|
||||||
|
|
||||||
public SchemaCreator(@SitePath File site,
|
public SchemaCreator(@SitePath Path site,
|
||||||
AllProjectsCreator ap,
|
AllProjectsCreator ap,
|
||||||
AllUsersCreator auc,
|
AllUsersCreator auc,
|
||||||
@GerritPersonIdent PersonIdent au,
|
@GerritPersonIdent PersonIdent au,
|
||||||
@ -117,9 +117,9 @@ public class SchemaCreator {
|
|||||||
|
|
||||||
final SystemConfig s = SystemConfig.create();
|
final SystemConfig s = SystemConfig.create();
|
||||||
try {
|
try {
|
||||||
s.sitePath = site_path.getCanonicalPath();
|
s.sitePath = site_path.toRealPath().normalize().toString();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
s.sitePath = site_path.getAbsolutePath();
|
s.sitePath = site_path.toAbsolutePath().normalize().toString();
|
||||||
}
|
}
|
||||||
c.systemConfig().insert(Collections.singleton(s));
|
c.systemConfig().insert(Collections.singleton(s));
|
||||||
return s;
|
return s;
|
||||||
|
@ -28,85 +28,86 @@ import org.junit.Test;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
public class SitePathsTest {
|
public class SitePathsTest {
|
||||||
@Test
|
@Test
|
||||||
public void testCreate_NotExisting() throws IOException {
|
public void testCreate_NotExisting() throws IOException {
|
||||||
final File root = random();
|
final Path root = random();
|
||||||
final SitePaths site = new SitePaths(root);
|
final SitePaths site = new SitePaths(root);
|
||||||
assertTrue(site.isNew);
|
assertTrue(site.isNew);
|
||||||
assertEquals(root, site.site_path);
|
assertEquals(root.toFile(), site.site_path);
|
||||||
assertEquals(new File(root, "etc"), site.etc_dir);
|
assertEquals(root.resolve("etc").toFile(), site.etc_dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreate_Empty() throws IOException {
|
public void testCreate_Empty() throws IOException {
|
||||||
final File root = random();
|
final Path root = random();
|
||||||
try {
|
try {
|
||||||
assertTrue(root.mkdir());
|
Files.createDirectory(root);
|
||||||
|
|
||||||
final SitePaths site = new SitePaths(root);
|
final SitePaths site = new SitePaths(root);
|
||||||
assertTrue(site.isNew);
|
assertTrue(site.isNew);
|
||||||
assertEquals(root, site.site_path);
|
assertEquals(root.toFile(), site.site_path);
|
||||||
} finally {
|
} finally {
|
||||||
root.delete();
|
Files.delete(root);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreate_NonEmpty() throws IOException {
|
public void testCreate_NonEmpty() throws IOException {
|
||||||
final File root = random();
|
final Path root = random();
|
||||||
final File txt = new File(root, "test.txt");
|
final Path txt = root.resolve("test.txt");
|
||||||
try {
|
try {
|
||||||
assertTrue(root.mkdir());
|
Files.createDirectory(root);
|
||||||
assertTrue(txt.createNewFile());
|
Files.createFile(txt);
|
||||||
|
|
||||||
final SitePaths site = new SitePaths(root);
|
final SitePaths site = new SitePaths(root);
|
||||||
assertFalse(site.isNew);
|
assertFalse(site.isNew);
|
||||||
assertEquals(root, site.site_path);
|
assertEquals(root.toFile(), site.site_path);
|
||||||
} finally {
|
} finally {
|
||||||
txt.delete();
|
Files.delete(txt);
|
||||||
root.delete();
|
Files.delete(root);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreate_NotDirectory() throws IOException {
|
public void testCreate_NotDirectory() throws IOException {
|
||||||
final File root = random();
|
final Path root = random();
|
||||||
try {
|
try {
|
||||||
assertTrue(root.createNewFile());
|
Files.createFile(root);
|
||||||
try {
|
try {
|
||||||
new SitePaths(root);
|
new SitePaths(root);
|
||||||
fail("Did not throw exception");
|
fail("Did not throw exception");
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
assertEquals("Not a directory: " + root.getPath(), e.getMessage());
|
assertEquals("Not a directory: " + root, e.getMessage());
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
root.delete();
|
Files.delete(root);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testResolve() throws IOException {
|
public void testResolve() throws IOException {
|
||||||
final File root = random();
|
final Path root = random();
|
||||||
final SitePaths site = new SitePaths(root);
|
final SitePaths site = new SitePaths(root);
|
||||||
|
|
||||||
assertNull(site.resolve(null));
|
assertNull(site.resolve(null));
|
||||||
assertNull(site.resolve(""));
|
assertNull(site.resolve(""));
|
||||||
|
|
||||||
assertNotNull(site.resolve("a"));
|
assertNotNull(site.resolve("a"));
|
||||||
assertEquals(new File(root, "a").getCanonicalFile(), site.resolve("a"));
|
assertEquals(root.resolve("a").toAbsolutePath().normalize().toFile(),
|
||||||
|
site.resolve("a"));
|
||||||
|
|
||||||
final String pfx = HostPlatform.isWin32() ? "C:/" : "/";
|
final String pfx = HostPlatform.isWin32() ? "C:/" : "/";
|
||||||
assertNotNull(site.resolve(pfx + "a"));
|
assertNotNull(site.resolve(pfx + "a"));
|
||||||
assertEquals(new File(pfx + "a").getCanonicalFile(), site.resolve(pfx + "a"));
|
assertEquals(new File(pfx + "a").getCanonicalFile(), site.resolve(pfx + "a"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static File random() throws IOException {
|
private static Path random() throws IOException {
|
||||||
File tmp = File.createTempFile("gerrit_test_", "_site");
|
Path tmp = Files.createTempFile("gerrit_test_", "_site");
|
||||||
if (!tmp.delete()) {
|
Files.deleteIfExists(tmp);
|
||||||
throw new IOException("Cannot create " + tmp.getPath());
|
|
||||||
}
|
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,9 +43,10 @@ import org.junit.After;
|
|||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@ -67,7 +68,7 @@ public class SchemaUpdaterTest {
|
|||||||
IOException {
|
IOException {
|
||||||
db.create();
|
db.create();
|
||||||
|
|
||||||
final File site = new File(UUID.randomUUID().toString());
|
final Path site = Paths.get(UUID.randomUUID().toString());
|
||||||
final SitePaths paths = new SitePaths(site);
|
final SitePaths paths = new SitePaths(site);
|
||||||
SchemaUpdater u = Guice.createInjector(new FactoryModule() {
|
SchemaUpdater u = Guice.createInjector(new FactoryModule() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -69,11 +69,12 @@ import com.google.inject.servlet.RequestScoped;
|
|||||||
import org.eclipse.jgit.lib.Config;
|
import org.eclipse.jgit.lib.Config;
|
||||||
import org.eclipse.jgit.lib.PersonIdent;
|
import org.eclipse.jgit.lib.PersonIdent;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.lang.reflect.Constructor;
|
import java.lang.reflect.Constructor;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.net.SocketAddress;
|
import java.net.SocketAddress;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
public class InMemoryModule extends FactoryModule {
|
public class InMemoryModule extends FactoryModule {
|
||||||
public static Config newDefaultConfig() {
|
public static Config newDefaultConfig() {
|
||||||
@ -125,7 +126,8 @@ public class InMemoryModule extends FactoryModule {
|
|||||||
|
|
||||||
bindScope(RequestScoped.class, PerThreadRequestScope.REQUEST);
|
bindScope(RequestScoped.class, PerThreadRequestScope.REQUEST);
|
||||||
|
|
||||||
bind(File.class).annotatedWith(SitePath.class).toInstance(new File("."));
|
// TODO(dborowitz): Use jimfs.
|
||||||
|
bind(Path.class).annotatedWith(SitePath.class).toInstance(Paths.get("."));
|
||||||
bind(Config.class).annotatedWith(GerritServerConfig.class).toInstance(cfg);
|
bind(Config.class).annotatedWith(GerritServerConfig.class).toInstance(cfg);
|
||||||
bind(SocketAddress.class).annotatedWith(RemotePeer.class).toInstance(
|
bind(SocketAddress.class).annotatedWith(RemotePeer.class).toInstance(
|
||||||
new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 1234));
|
new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 1234));
|
||||||
|
@ -20,7 +20,8 @@ import com.google.gerrit.pgm.init.PluginsDistribution;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.io.File;
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
@ -47,21 +48,19 @@ public final class SiteInitializer {
|
|||||||
public void init() {
|
public void init() {
|
||||||
try {
|
try {
|
||||||
if (sitePath != null) {
|
if (sitePath != null) {
|
||||||
File site = new File(sitePath);
|
Path site = Paths.get(sitePath);
|
||||||
LOG.info(String.format("Initializing site at %s",
|
LOG.info("Initializing site at " + site.toRealPath().normalize());
|
||||||
site.getAbsolutePath()));
|
|
||||||
new BaseInit(site, false, true, pluginsDistribution, pluginsToInstall).run();
|
new BaseInit(site, false, true, pluginsDistribution, pluginsToInstall).run();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try (Connection conn = connectToDb()) {
|
try (Connection conn = connectToDb()) {
|
||||||
File site = getSiteFromReviewDb(conn);
|
Path site = getSiteFromReviewDb(conn);
|
||||||
if (site == null && initPath != null) {
|
if (site == null && initPath != null) {
|
||||||
site = new File(initPath);
|
site = Paths.get(initPath);
|
||||||
}
|
}
|
||||||
if (site != null) {
|
if (site != null) {
|
||||||
LOG.info(String.format("Initializing site at %s",
|
LOG.info("Initializing site at " + site.toRealPath().normalize());
|
||||||
site.getAbsolutePath()));
|
|
||||||
new BaseInit(site, new ReviewDbDataSourceProvider(), false, false,
|
new BaseInit(site, new ReviewDbDataSourceProvider(), false, false,
|
||||||
pluginsDistribution, pluginsToInstall).run();
|
pluginsDistribution, pluginsToInstall).run();
|
||||||
}
|
}
|
||||||
@ -76,12 +75,12 @@ public final class SiteInitializer {
|
|||||||
return new ReviewDbDataSourceProvider().get().getConnection();
|
return new ReviewDbDataSourceProvider().get().getConnection();
|
||||||
}
|
}
|
||||||
|
|
||||||
private File getSiteFromReviewDb(Connection conn) {
|
private Path getSiteFromReviewDb(Connection conn) {
|
||||||
try (Statement stmt = conn.createStatement();
|
try (Statement stmt = conn.createStatement();
|
||||||
ResultSet rs = stmt.executeQuery(
|
ResultSet rs = stmt.executeQuery(
|
||||||
"SELECT site_path FROM system_config")) {
|
"SELECT site_path FROM system_config")) {
|
||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
return new File(rs.getString(1));
|
return Paths.get(rs.getString(1));
|
||||||
}
|
}
|
||||||
} catch (SQLException e) {
|
} catch (SQLException e) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -22,12 +22,13 @@ import com.google.gwtorm.server.SchemaFactory;
|
|||||||
import com.google.inject.Inject;
|
import com.google.inject.Inject;
|
||||||
import com.google.inject.Provider;
|
import com.google.inject.Provider;
|
||||||
|
|
||||||
import java.io.File;
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** Provides {@link java.io.File} annotated with {@link SitePath}. */
|
/** Provides {@link Path} annotated with {@link SitePath}. */
|
||||||
class SitePathFromSystemConfigProvider implements Provider<File> {
|
class SitePathFromSystemConfigProvider implements Provider<Path> {
|
||||||
private final File path;
|
private final Path path;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
SitePathFromSystemConfigProvider(SchemaFactory<ReviewDb> schemaFactory)
|
SitePathFromSystemConfigProvider(SchemaFactory<ReviewDb> schemaFactory)
|
||||||
@ -36,18 +37,18 @@ class SitePathFromSystemConfigProvider implements Provider<File> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public File get() {
|
public Path get() {
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static File read(SchemaFactory<ReviewDb> schemaFactory)
|
private static Path read(SchemaFactory<ReviewDb> schemaFactory)
|
||||||
throws OrmException {
|
throws OrmException {
|
||||||
ReviewDb db = schemaFactory.open();
|
ReviewDb db = schemaFactory.open();
|
||||||
try {
|
try {
|
||||||
List<SystemConfig> all = db.systemConfig().all().toList();
|
List<SystemConfig> all = db.systemConfig().all().toList();
|
||||||
switch (all.size()) {
|
switch (all.size()) {
|
||||||
case 1:
|
case 1:
|
||||||
return new File(all.get(0).sitePath);
|
return Paths.get(all.get(0).sitePath);
|
||||||
case 0:
|
case 0:
|
||||||
throw new OrmException("system_config table is empty");
|
throw new OrmException("system_config table is empty");
|
||||||
default:
|
default:
|
||||||
|
@ -78,8 +78,9 @@ import org.eclipse.jgit.lib.Config;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -101,7 +102,7 @@ public class WebAppInitializer extends GuiceServletContextListener
|
|||||||
private static final Logger log =
|
private static final Logger log =
|
||||||
LoggerFactory.getLogger(WebAppInitializer.class);
|
LoggerFactory.getLogger(WebAppInitializer.class);
|
||||||
|
|
||||||
private File sitePath;
|
private Path sitePath;
|
||||||
private Injector dbInjector;
|
private Injector dbInjector;
|
||||||
private Injector cfgInjector;
|
private Injector cfgInjector;
|
||||||
private Injector sysInjector;
|
private Injector sysInjector;
|
||||||
@ -122,7 +123,7 @@ public class WebAppInitializer extends GuiceServletContextListener
|
|||||||
if (manager == null) {
|
if (manager == null) {
|
||||||
final String path = System.getProperty("gerrit.site_path");
|
final String path = System.getProperty("gerrit.site_path");
|
||||||
if (path != null) {
|
if (path != null) {
|
||||||
sitePath = new File(path);
|
sitePath = Paths.get(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (System.getProperty("gerrit.init") != null) {
|
if (System.getProperty("gerrit.init") != null) {
|
||||||
@ -209,7 +210,7 @@ public class WebAppInitializer extends GuiceServletContextListener
|
|||||||
Module sitePathModule = new AbstractModule() {
|
Module sitePathModule = new AbstractModule() {
|
||||||
@Override
|
@Override
|
||||||
protected void configure() {
|
protected void configure() {
|
||||||
bind(File.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
modules.add(sitePathModule);
|
modules.add(sitePathModule);
|
||||||
@ -261,7 +262,7 @@ public class WebAppInitializer extends GuiceServletContextListener
|
|||||||
modules.add(new AbstractModule() {
|
modules.add(new AbstractModule() {
|
||||||
@Override
|
@Override
|
||||||
protected void configure() {
|
protected void configure() {
|
||||||
bind(File.class).annotatedWith(SitePath.class).toProvider(
|
bind(Path.class).annotatedWith(SitePath.class).toProvider(
|
||||||
SitePathFromSystemConfigProvider.class).in(SINGLETON);
|
SitePathFromSystemConfigProvider.class).in(SINGLETON);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user