opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'path'

Browse Source 
* changes:
  SitePaths: Convert static content related paths to Path
  SitePaths: Convert tmp_dir to Path
  Convert @SitePath from File to Path
This commit is contained in:
Dave Borowitz
2015-02-24 16:30:23 +00:00
committed by Gerrit Code Review
parent 3080f02551 ef4e409384
commit cff04c367f
31 changed files with 350 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java
View File

@@ -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());

6
gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java
View File

@@ -21,6 +21,7 @@ import org.eclipse.jgit.util.IO;
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;
import java.util.Arrays; import java.util.Arrays;
public class FileUtil { public class FileUtil {
@@ -42,6 +43,11 @@ public class FileUtil {
} }
} }
public static void chmod(final int mode, final Path path) {
// TODO(dborowitz): Is there a portable way to do this with NIO?
chmod(mode, path.toFile());
}
public static void chmod(final int mode, final File path) { public static void chmod(final int mode, final File path) {
path.setReadable(false, false /* all */); path.setReadable(false, false /* all */);
path.setWritable(false, false /* all */); path.setWritable(false, false /* all */);

48
gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitWebConfig.java
View File

@@ -14,6 +14,9 @@
package com.google.gerrit.httpd; package com.google.gerrit.httpd;
import static java.nio.file.Files.isExecutable;
import static java.nio.file.Files.isRegularFile;
import com.google.gerrit.common.data.GitWebType; import com.google.gerrit.common.data.GitWebType;
import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.config.SitePaths;
@@ -23,16 +26,17 @@ 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.nio.file.Path;
import java.nio.file.Paths;
public class GitWebConfig { public class GitWebConfig {
private static final Logger log = LoggerFactory.getLogger(GitWebConfig.class); private static final Logger log = LoggerFactory.getLogger(GitWebConfig.class);
private final String url; private final String url;
private final File gitweb_cgi; private final Path gitweb_cgi;
private final File gitweb_css; private final Path gitweb_css;
private final File gitweb_js; private final Path gitweb_js;
private final File git_logo_png; private final Path git_logo_png;
private GitWebType type; private GitWebType type;
@Inject @Inject
@@ -117,20 +121,20 @@ public class GitWebConfig {
return; return;
} }
final File pkgCgi = new File("/usr/lib/cgi-bin/gitweb.cgi"); final Path pkgCgi = Paths.get("/usr/lib/cgi-bin/gitweb.cgi");
String[] resourcePaths = {"/usr/share/gitweb/static", "/usr/share/gitweb", String[] resourcePaths = {"/usr/share/gitweb/static", "/usr/share/gitweb",
"/var/www/static", "/var/www"}; "/var/www/static", "/var/www"};
File cgi; Path cgi;
if (cfgCgi != null) { if (cfgCgi != null) {
// Use the CGI script configured by the administrator, failing if it // Use the CGI script configured by the administrator, failing if it
// cannot be used as specified. // cannot be used as specified.
// //
cgi = sitePaths.resolve(cfgCgi); cgi = sitePaths.resolve(cfgCgi).toPath();
if (!cgi.isFile()) { if (!isRegularFile(cgi)) {
throw new IllegalStateException("Cannot find gitweb.cgi: " + cgi); throw new IllegalStateException("Cannot find gitweb.cgi: " + cgi);
} }
if (!cgi.canExecute()) { if (!isExecutable(cgi)) {
throw new IllegalStateException("Cannot execute gitweb.cgi: " + cgi); throw new IllegalStateException("Cannot execute gitweb.cgi: " + cgi);
} }
@@ -138,11 +142,11 @@ public class GitWebConfig {
// Assume the administrator pointed us to the distribution, // Assume the administrator pointed us to the distribution,
// which also has the corresponding CSS and logo file. // which also has the corresponding CSS and logo file.
// //
String absPath = cgi.getParentFile().getAbsolutePath(); String absPath = cgi.getParent().toAbsolutePath().toString();
resourcePaths = new String[] {absPath + "/static", absPath}; resourcePaths = new String[] {absPath + "/static", absPath};
} }
} else if (pkgCgi.isFile() && pkgCgi.canExecute()) { } else if (isRegularFile(pkgCgi) && isExecutable(pkgCgi)) {
// Use the OS packaged CGI. // Use the OS packaged CGI.
// //
log.debug("Assuming gitweb at " + pkgCgi); log.debug("Assuming gitweb at " + pkgCgi);
@@ -154,13 +158,13 @@ public class GitWebConfig {
resourcePaths = new String[] {}; resourcePaths = new String[] {};
} }
File css = null, js = null, logo = null; Path css = null, js = null, logo = null;
for (String path : resourcePaths) { for (String path : resourcePaths) {
File dir = new File(path); Path dir = Paths.get(path);
css = new File(dir, "gitweb.css"); css = dir.resolve("gitweb.css");
js = new File(dir, "gitweb.js"); js = dir.resolve("gitweb.js");
logo = new File(dir, "git-logo.png"); logo = dir.resolve("git-logo.png");
if (css.isFile() && logo.isFile()) { if (isRegularFile(css) && isRegularFile(logo)) {
break; break;
} }
} }
@@ -191,22 +195,22 @@ public class GitWebConfig {
} }
/** @return local path to the CGI executable; null if we shouldn't execute. */ /** @return local path to the CGI executable; null if we shouldn't execute. */
public File getGitwebCGI() { public Path getGitwebCGI() {
return gitweb_cgi; return gitweb_cgi;
} }
/** @return local path of the {@code gitweb.css} matching the CGI. */ /** @return local path of the {@code gitweb.css} matching the CGI. */
public File getGitwebCSS() { public Path getGitwebCSS() {
return gitweb_css; return gitweb_css;
} }
/** @return local path of the {@code gitweb.js} for the CGI. */ /** @return local path of the {@code gitweb.js} for the CGI. */
public File getGitwebJS() { public Path getGitwebJS() {
return gitweb_js; return gitweb_js;
} }
/** @return local path of the {@code git-logo.png} for the CGI. */ /** @return local path of the {@code git-logo.png} for the CGI. */
public File getGitLogoPNG() { public Path getGitLogoPNG() {
return git_logo_png; return git_logo_png;
} }

14
gerrit-httpd/src/main/java/com/google/gerrit/httpd/HtmlDomUtil.java
View File

@@ -23,14 +23,14 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.StringWriter; import java.io.StringWriter;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
@@ -187,8 +187,8 @@ public class HtmlDomUtil {
} }
/** Parse an XHTML file from the local drive and return the instance. */ /** Parse an XHTML file from the local drive and return the instance. */
public static Document parseFile(File path) throws IOException { public static Document parseFile(Path path) throws IOException {
try (InputStream in = new FileInputStream(path)) { try (InputStream in = Files.newInputStream(path)) {
Document doc = newBuilder().parse(in); Document doc = newBuilder().parse(in);
compact(doc); compact(doc);
return doc; return doc;
@@ -200,13 +200,13 @@ public class HtmlDomUtil {
} }
/** Read a UTF-8 text file from the local drive. */ /** Read a UTF-8 text file from the local drive. */
public static String readFile(File parentDir, String name) public static String readFile(Path parentDir, String name)
throws IOException { throws IOException {
if (parentDir == null) { if (parentDir == null) {
return null; return null;
} }
File path = new File(parentDir, name); Path path = parentDir.resolve(name);
try (FileInputStream in = new FileInputStream(path)) { try (InputStream in = Files.newInputStream(path)) {
return new String(ByteStreams.toByteArray(in), ENC); return new String(ByteStreams.toByteArray(in), ENC);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
return null; return null;

17
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java
View File

@@ -14,16 +14,17 @@
package com.google.gerrit.httpd.gitweb; package com.google.gerrit.httpd.gitweb;
import com.google.common.io.ByteStreams;
import com.google.gerrit.httpd.GitWebConfig; import com.google.gerrit.httpd.GitWebConfig;
import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtexpui.server.CacheHeaders;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import org.eclipse.jgit.util.IO;
import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
@@ -38,16 +39,16 @@ class GitLogoServlet extends HttpServlet {
private final byte[] raw; private final byte[] raw;
@Inject @Inject
GitLogoServlet(final GitWebConfig gitWebConfig) throws IOException { GitLogoServlet(GitWebConfig gitWebConfig) throws IOException {
byte[] png; byte[] png;
final File src = gitWebConfig.getGitLogoPNG(); Path src = gitWebConfig.getGitLogoPNG();
if (src != null) { if (src != null) {
try { try (InputStream in = Files.newInputStream(src)) {
png = IO.readFully(src); png = ByteStreams.toByteArray(in);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
png = null; png = null;
} }
modified = src.lastModified(); modified = Files.getLastModifiedTime(src).toMillis();
} else { } else {
modified = -1; modified = -1;
png = null; png = null;

11
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebCssServlet.java
View File

@@ -22,8 +22,9 @@ import com.google.gwtjsonrpc.server.RPCServletUtils;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
@@ -55,14 +56,14 @@ abstract class GitWebCssServlet extends HttpServlet {
private final byte[] raw_css; private final byte[] raw_css;
private final byte[] gz_css; private final byte[] gz_css;
GitWebCssServlet(final File src) GitWebCssServlet(final Path src)
throws IOException { throws IOException {
if (src != null) { if (src != null) {
final File dir = src.getParentFile(); final Path dir = src.getParent();
final String name = src.getName(); final String name = src.getFileName().toString();
final String raw = HtmlDomUtil.readFile(dir, name); final String raw = HtmlDomUtil.readFile(dir, name);
if (raw != null) { if (raw != null) {
modified = src.lastModified(); modified = Files.getLastModifiedTime(src).toMillis();
raw_css = raw.getBytes(ENC); raw_css = raw.getBytes(ENC);
gz_css = HtmlDomUtil.compress(raw_css); gz_css = HtmlDomUtil.compress(raw_css);
} else { } else {

15
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebJavaScriptServlet.java
View File

@@ -14,16 +14,17 @@
package com.google.gerrit.httpd.gitweb; package com.google.gerrit.httpd.gitweb;
import com.google.common.io.ByteStreams;
import com.google.gerrit.httpd.GitWebConfig; import com.google.gerrit.httpd.GitWebConfig;
import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtexpui.server.CacheHeaders;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import org.eclipse.jgit.util.IO;
import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
@@ -40,14 +41,14 @@ class GitWebJavaScriptServlet extends HttpServlet {
@Inject @Inject
GitWebJavaScriptServlet(final GitWebConfig gitWebConfig) throws IOException { GitWebJavaScriptServlet(final GitWebConfig gitWebConfig) throws IOException {
byte[] png; byte[] png;
final File src = gitWebConfig.getGitwebJS(); Path src = gitWebConfig.getGitwebJS();
if (src != null) { if (src != null) {
try { try (InputStream in = Files.newInputStream(src)) {
png = IO.readFully(src); png = ByteStreams.toByteArray(in);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
png = null; png = null;
} }
modified = src.lastModified(); modified = Files.getLastModifiedTime(src).toMillis();
} else { } else {
modified = -1; modified = -1;
png = null; png = null;

66
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java
View File

@@ -29,6 +29,8 @@
package com.google.gerrit.httpd.gitweb; package com.google.gerrit.httpd.gitweb;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.gerrit.common.data.GerritConfig; import com.google.gerrit.common.data.GerritConfig;
import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.httpd.GitWebConfig; import com.google.gerrit.httpd.GitWebConfig;
@@ -54,7 +56,6 @@ import java.io.BufferedInputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.EOFException; import java.io.EOFException;
import java.io.File; import java.io.File;
import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@@ -62,6 +63,8 @@ import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -81,7 +84,7 @@ class GitWebServlet extends HttpServlet {
private final Set<String> deniedActions; private final Set<String> deniedActions;
private final int bufferSize = 8192; private final int bufferSize = 8192;
private final File gitwebCgi; private final Path gitwebCgi;
private final URI gitwebUrl; private final URI gitwebUrl;
private final LocalDiskRepositoryManager repoManager; private final LocalDiskRepositoryManager repoManager;
private final ProjectControl.Factory projectControl; private final ProjectControl.Factory projectControl;
@@ -143,26 +146,28 @@ class GitWebServlet extends HttpServlet {
private void makeSiteConfig(final SitePaths site, private void makeSiteConfig(final SitePaths site,
final GerritConfig gerritConfig) throws IOException { final GerritConfig gerritConfig) throws IOException {
if (!site.tmp_dir.exists()) { if (!Files.exists(site.tmp_dir)) {
site.tmp_dir.mkdirs(); Files.createDirectories(site.tmp_dir);
} }
File myconf = File.createTempFile("gitweb_config", ".perl", site.tmp_dir); Path myconf = Files.createTempFile(site.tmp_dir, "gitweb_config", ".perl");
// To make our configuration file only readable or writable by us; // To make our configuration file only readable or writable by us;
// this reduces the chances of someone tampering with the file. // this reduces the chances of someone tampering with the file.
// //
myconf.setWritable(false, false /* all */); // TODO(dborowitz): Is there a portable way to do this with NIO?
myconf.setReadable(false, false /* all */); File myconfFile = myconf.toFile();
myconf.setExecutable(false, false /* all */); myconfFile.setWritable(false, false /* all */);
myconfFile.setReadable(false, false /* all */);
myconfFile.setExecutable(false, false /* all */);
myconf.setWritable(true, true /* owner only */); myconfFile.setWritable(true, true /* owner only */);
myconf.setReadable(true, true /* owner only */); myconfFile.setReadable(true, true /* owner only */);
_env.set("GIT_DIR", "."); _env.set("GIT_DIR", ".");
_env.set("GITWEB_CONFIG", myconf.getAbsolutePath()); _env.set("GITWEB_CONFIG", myconf.toAbsolutePath().toString());
final PrintWriter p = new PrintWriter(new FileWriter(myconf)); try (PrintWriter p =
try { new PrintWriter(Files.newBufferedWriter(myconf, UTF_8))) {
p.print("# Autogenerated by Gerrit Code Review \n"); p.print("# Autogenerated by Gerrit Code Review \n");
p.print("# DO NOT EDIT\n"); p.print("# DO NOT EDIT\n");
p.print("\n"); p.print("\n");
@@ -170,12 +175,12 @@ class GitWebServlet extends HttpServlet {
// We are mounted at the same level in the context as the main // We are mounted at the same level in the context as the main
// UI, so we can include the same header and footer scheme. // UI, so we can include the same header and footer scheme.
// //
final File hdr = site.site_header; Path hdr = site.site_header;
if (hdr.isFile()) { if (Files.isRegularFile(hdr)) {
p.print("$site_header = " + quoteForPerl(hdr) + ";\n"); p.print("$site_header = " + quoteForPerl(hdr) + ";\n");
} }
final File ftr = site.site_footer; Path ftr = site.site_footer;
if (ftr.isFile()) { if (Files.isRegularFile(ftr)) {
p.print("$site_footer = " + quoteForPerl(ftr) + ";\n"); p.print("$site_footer = " + quoteForPerl(ftr) + ";\n");
} }
@@ -188,8 +193,8 @@ class GitWebServlet extends HttpServlet {
p.print("$logo = 'gitweb-logo.png';\n"); p.print("$logo = 'gitweb-logo.png';\n");
p.print("$javascript = 'gitweb.js';\n"); p.print("$javascript = 'gitweb.js';\n");
p.print("@stylesheets = ('gitweb-default.css');\n"); p.print("@stylesheets = ('gitweb-default.css');\n");
final File css = site.site_css; Path css = site.site_css;
if (css.isFile()) { if (Files.isRegularFile(css)) {
p.print("push @stylesheets, 'gitweb-site.css';\n"); p.print("push @stylesheets, 'gitweb-site.css';\n");
} }
@@ -290,15 +295,15 @@ class GitWebServlet extends HttpServlet {
// If the administrator has created a site-specific gitweb_config, // If the administrator has created a site-specific gitweb_config,
// load that before we perform any final overrides. // load that before we perform any final overrides.
// //
final File sitecfg = site.site_gitweb; Path sitecfg = site.site_gitweb;
if (sitecfg.isFile()) { if (Files.isRegularFile(sitecfg)) {
p.print("$GITWEB_CONFIG = " + quoteForPerl(sitecfg) + ";\n"); p.print("$GITWEB_CONFIG = " + quoteForPerl(sitecfg) + ";\n");
p.print("if (-e $GITWEB_CONFIG) {\n"); p.print("if (-e $GITWEB_CONFIG) {\n");
p.print(" do " + quoteForPerl(sitecfg) + ";\n"); p.print(" do " + quoteForPerl(sitecfg) + ";\n");
p.print("}\n"); p.print("}\n");
} }
final File root = repoManager.getBasePath(); Path root = repoManager.getBasePath().toPath();
p.print("$projectroot = " + quoteForPerl(root) + ";\n"); p.print("$projectroot = " + quoteForPerl(root) + ";\n");
// Permit exporting only the project we were started for. // Permit exporting only the project we were started for.
@@ -322,18 +327,16 @@ class GitWebServlet extends HttpServlet {
// //
p.print("$feature{'forks'}{'override'} = 0;\n"); p.print("$feature{'forks'}{'override'} = 0;\n");
p.print("$feature{'forks'}{'default'} = [0];\n"); p.print("$feature{'forks'}{'default'} = [0];\n");
} finally {
p.close();
} }
myconf.setReadOnly(); myconfFile.setReadOnly();
} }
private String quoteForPerl(File value) { private static String quoteForPerl(Path value) {
return quoteForPerl(value.getAbsolutePath()); return quoteForPerl(value.toAbsolutePath().toString());
} }
private String quoteForPerl(String value) { private static String quoteForPerl(String value) {
if (value == null || value.isEmpty()) { if (value == null || value.isEmpty()) {
return "''"; return "''";
} }
@@ -442,9 +445,10 @@ class GitWebServlet extends HttpServlet {
private void exec(final HttpServletRequest req, private void exec(final HttpServletRequest req,
final HttpServletResponse rsp, final ProjectControl project) throws IOException { final HttpServletResponse rsp, final ProjectControl project) throws IOException {
final Process proc = final Process proc =
Runtime.getRuntime().exec(new String[] {gitwebCgi.getAbsolutePath()}, Runtime.getRuntime().exec(
new String[] {gitwebCgi.toAbsolutePath().toString()},
makeEnv(req, project), makeEnv(req, project),
gitwebCgi.getAbsoluteFile().getParentFile()); gitwebCgi.toAbsolutePath().getParent().toFile());
copyStderrToLog(proc.getErrorStream()); copyStderrToLog(proc.getErrorStream());
if (0 < req.getContentLength()) { if (0 < req.getContentLength()) {
@@ -522,7 +526,7 @@ class GitWebServlet extends HttpServlet {
// //
env.set("REQUEST_METHOD", req.getMethod()); env.set("REQUEST_METHOD", req.getMethod());
env.set("SCRIPT_NAME", req.getContextPath() + req.getServletPath()); env.set("SCRIPT_NAME", req.getContextPath() + req.getServletPath());
env.set("SCRIPT_FILENAME", gitwebCgi.getAbsolutePath()); env.set("SCRIPT_FILENAME", gitwebCgi.toAbsolutePath().toString());
env.set("SERVER_NAME", req.getServerName()); env.set("SERVER_NAME", req.getServerName());
env.set("SERVER_PORT", Integer.toString(req.getServerPort())); env.set("SERVER_PORT", Integer.toString(req.getServerPort()));
env.set("SERVER_PROTOCOL", req.getProtocol()); env.set("SERVER_PROTOCOL", req.getProtocol());

41
gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.httpd.raw; package com.google.gerrit.httpd.raw;
import static java.nio.file.Files.getLastModifiedTime;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.hash.Hasher; import com.google.common.hash.Hasher;
@@ -47,12 +49,13 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.StringWriter; import java.io.StringWriter;
import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -160,16 +163,13 @@ public class HostPageServlet extends HttpServlet {
private Page get() { private Page get() {
Page p = page; Page p = page;
if (refreshHeaderFooter && p.isStale()) {
final Page newPage;
try { try {
newPage = new Page(); if (refreshHeaderFooter && p.isStale()) {
p = new Page();
page = p;
}
} catch (IOException e) { } catch (IOException e) {
log.error("Cannot refresh site header/footer", e); log.error("Cannot refresh site header/footer", e);
return p;
}
p = newPage;
page = p;
} }
return p; return p;
} }
@@ -288,16 +288,16 @@ public class HostPageServlet extends HttpServlet {
} }
private static class FileInfo { private static class FileInfo {
private final File path; private final Path path;
private final long time; private final FileTime time;
FileInfo(final File p) { FileInfo(Path p) throws IOException {
path = p; path = p;
time = path.lastModified(); time = getLastModifiedTime(path);
} }
boolean isStale() { boolean isStale() throws IOException {
return time != path.lastModified(); return !time.equals(getLastModifiedTime(path));
} }
} }
@@ -340,7 +340,7 @@ public class HostPageServlet extends HttpServlet {
debug = new Content(hostDoc); debug = new Content(hostDoc);
} }
boolean isStale() { boolean isStale() throws IOException {
return css.isStale() || header.isStale() || footer.isStale(); return css.isStale() || header.isStale() || footer.isStale();
} }
@@ -364,8 +364,8 @@ public class HostPageServlet extends HttpServlet {
} }
} }
private FileInfo injectCssFile(final Document hostDoc, final String id, private FileInfo injectCssFile(Document hostDoc, String id, Path src)
final File src) throws IOException { throws IOException {
final FileInfo info = new FileInfo(src); final FileInfo info = new FileInfo(src);
final Element banner = HtmlDomUtil.find(hostDoc, id); final Element banner = HtmlDomUtil.find(hostDoc, id);
if (banner == null) { if (banner == null) {
@@ -376,7 +376,8 @@ public class HostPageServlet extends HttpServlet {
banner.removeChild(banner.getFirstChild()); banner.removeChild(banner.getFirstChild());
} }
String css = HtmlDomUtil.readFile(src.getParentFile(), src.getName()); String css =
HtmlDomUtil.readFile(src.getParent(), src.getFileName().toString());
if (css == null) { if (css == null) {
return info; return info;
} }
@@ -385,8 +386,8 @@ public class HostPageServlet extends HttpServlet {
return info; return info;
} }
private FileInfo injectXmlFile(final Document hostDoc, final String id, private FileInfo injectXmlFile(Document hostDoc, String id, Path src)
final File src) throws IOException { throws IOException {
final FileInfo info = new FileInfo(src); final FileInfo info = new FileInfo(src);
final Element banner = HtmlDomUtil.find(hostDoc, id); final Element banner = HtmlDomUtil.find(hostDoc, id);
if (banner == null) { if (banner == null) {

28
gerrit-httpd/src/main/java/com/google/gerrit/httpd/template/SiteHeaderFooter.java
View File

@@ -27,8 +27,10 @@ import org.slf4j.LoggerFactory;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
@Singleton @Singleton
public class SiteHeaderFooter { public class SiteHeaderFooter {
@@ -43,13 +45,13 @@ public class SiteHeaderFooter {
this.refreshHeaderFooter = cfg.getBoolean("site", "refreshHeaderFooter", true); this.refreshHeaderFooter = cfg.getBoolean("site", "refreshHeaderFooter", true);
this.sitePaths = sitePaths; this.sitePaths = sitePaths;
Template t = new Template(sitePaths);
try { try {
Template t = new Template(sitePaths);
t.load(); t.load();
template = t;
} catch (IOException e) { } catch (IOException e) {
log.warn("Cannot load site header or footer", e); log.warn("Cannot load site header or footer", e);
} }
template = t;
} }
public Document parse(Class<?> clazz, String name) throws IOException { public Document parse(Class<?> clazz, String name) throws IOException {
@@ -110,7 +112,7 @@ public class SiteHeaderFooter {
Element header; Element header;
Element footer; Element footer;
Template(SitePaths site) { Template(SitePaths site) throws IOException {
cssFile = new FileInfo(site.site_css); cssFile = new FileInfo(site.site_css);
headerFile = new FileInfo(site.site_header); headerFile = new FileInfo(site.site_header);
footerFile = new FileInfo(site.site_footer); footerFile = new FileInfo(site.site_footer);
@@ -118,13 +120,13 @@ public class SiteHeaderFooter {
void load() throws IOException { void load() throws IOException {
css = HtmlDomUtil.readFile( css = HtmlDomUtil.readFile(
cssFile.path.getParentFile(), cssFile.path.getParent(),
cssFile.path.getName()); cssFile.path.getFileName().toString());
header = readXml(headerFile); header = readXml(headerFile);
footer = readXml(footerFile); footer = readXml(footerFile);
} }
boolean isStale() { boolean isStale() throws IOException {
return cssFile.isStale() || headerFile.isStale() || footerFile.isStale(); return cssFile.isStale() || headerFile.isStale() || footerFile.isStale();
} }
@@ -135,16 +137,16 @@ public class SiteHeaderFooter {
} }
private static class FileInfo { private static class FileInfo {
final File path; final Path path;
final long time; final FileTime time;
FileInfo(File p) { FileInfo(Path p) throws IOException {
path = p; path = p;
time = path.lastModified(); time = Files.getLastModifiedTime(path);
} }
boolean isStale() { boolean isStale() throws IOException {
return time != path.lastModified(); return !time.equals(Files.getLastModifiedTime(path));
} }
} }
} }

27
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
View File

@@ -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);
} }

6
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
View File

@@ -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()));

55
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java
View File

@@ -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();
@@ -228,7 +233,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());
@@ -408,15 +413,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 {
try {
Files.delete(f);
} catch (IOException e) {
System.err.println(msg + f);
} }
return FileVisitResult.CONTINUE;
} }
if (!path.delete() && path.exists()) {
System.err.println("warn: Cannot remove " + path); @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);
} }
} }
} }

17
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java
View File

@@ -34,6 +34,8 @@ import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
/** Utility functions to help initialize a site. */ /** Utility functions to help initialize a site. */
public class InitUtil { public class InitUtil {
@@ -51,9 +53,18 @@ public class InitUtil {
} }
} }
public static void mkdir(final File path) { public static void mkdir(File file) {
if (!path.isDirectory() && !path.mkdir()) { mkdir(file.toPath());
throw die("Cannot make directory " + path); }
public static void mkdir(Path path) {
if (Files.isDirectory(path)) {
return;
}
try {
Files.createDirectory(path);
} catch (IOException e) {
throw die("Cannot make directory " + path, e);
} }
} }

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java
View File

@@ -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()) {

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/GarbageCollectionLogFile.java
View File

@@ -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()) {

30
gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
View File

@@ -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());

6
gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/InitTestCase.java
View File

@@ -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");
} }
} }

4
gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java
View File

@@ -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);

22
gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
View File

@@ -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,7 +82,10 @@ public class UpgradeFrom2_0_xTest extends InitTestCase {
} }
}; };
expect(ui.yesno(eq(true), eq("Upgrade '%s'"), eq(p.getCanonicalPath()))) expect(ui.yesno(
eq(true),
eq("Upgrade '%s'"),
eq(p.toRealPath().normalize().toString())))
.andReturn(true); .andReturn(true);
replay(ui); replay(ui);

16
gerrit-server/src/main/java/com/google/gerrit/server/config/GetSummary.java
View File

@@ -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();
} }
} }

28
gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java
View File

@@ -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
@@ -32,7 +33,7 @@ public final class SitePaths {
public final File bin_dir; public final File bin_dir;
public final File etc_dir; public final File etc_dir;
public final File lib_dir; public final File lib_dir;
public final File tmp_dir; public final Path tmp_dir;
public final File logs_dir; public final File logs_dir;
public final File plugins_dir; public final File plugins_dir;
public final File data_dir; public final File data_dir;
@@ -55,22 +56,24 @@ public final class SitePaths {
public final File ssh_dsa; public final File ssh_dsa;
public final File peer_keys; public final File peer_keys;
public final File site_css; public final Path site_css;
public final File site_header; public final Path site_header;
public final File site_footer; public final Path site_footer;
public final File site_gitweb; public final Path site_gitweb;
/** {@code true} if {@link #site_path} has not been initialized. */ /** {@code true} if {@link #site_path} has not been initialized. */
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();
Path p = sitePath;
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");
lib_dir = new File(site_path, "lib"); lib_dir = new File(site_path, "lib");
tmp_dir = new File(site_path, "tmp"); tmp_dir = p.resolve("tmp");
plugins_dir = new File(site_path, "plugins"); plugins_dir = new File(site_path, "plugins");
data_dir = new File(site_path, "data"); data_dir = new File(site_path, "data");
logs_dir = new File(site_path, "logs"); logs_dir = new File(site_path, "logs");
@@ -93,10 +96,11 @@ public final class SitePaths {
ssh_dsa = new File(etc_dir, "ssh_host_dsa_key"); ssh_dsa = new File(etc_dir, "ssh_host_dsa_key");
peer_keys = new File(etc_dir, "peer_keys"); peer_keys = new File(etc_dir, "peer_keys");
site_css = new File(etc_dir, CSS_FILENAME); Path etcDirPath = etc_dir.toPath();
site_header = new File(etc_dir, HEADER_FILENAME); site_css = etcDirPath.resolve(CSS_FILENAME);
site_footer = new File(etc_dir, FOOTER_FILENAME); site_header = etcDirPath.resolve(HEADER_FILENAME);
site_gitweb = new File(etc_dir, "gitweb_config.perl"); site_footer = etcDirPath.resolve(FOOTER_FILENAME);
site_gitweb = etcDirPath.resolve("gitweb_config.perl");
if (site_path.exists()) { if (site_path.exists()) {
final String[] contents = site_path.list(); final String[] contents = site_path.list();

6
gerrit-server/src/main/java/com/google/gerrit/server/plugins/CopyConfigModule.java
View File

@@ -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;
} }

11
gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java
View File

@@ -31,6 +31,7 @@ import java.io.InputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.nio.file.Files;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -47,7 +48,8 @@ public class JarPluginProvider implements ServerPluginProvider {
@Inject @Inject
JarPluginProvider(SitePaths sitePaths) { JarPluginProvider(SitePaths sitePaths) {
tmpDir = sitePaths.tmp_dir; // TODO(dborowitz): Convert to NIO.
tmpDir = sitePaths.tmp_dir.toFile();
} }
@Override @Override
@@ -111,10 +113,11 @@ public class JarPluginProvider implements ServerPluginProvider {
public static File storeInTemp(String pluginName, InputStream in, public static File storeInTemp(String pluginName, InputStream in,
SitePaths sitePaths) throws IOException { SitePaths sitePaths) throws IOException {
if (!sitePaths.tmp_dir.exists()) { if (!Files.exists(sitePaths.tmp_dir)) {
sitePaths.tmp_dir.mkdirs(); Files.createDirectories(sitePaths.tmp_dir);
} }
return asTemp(in, tempNameFor(pluginName), ".jar", sitePaths.tmp_dir); return asTemp(in, tempNameFor(pluginName), ".jar",
sitePaths.tmp_dir.toFile());
} }
private ServerPlugin loadJarPlugin(String name, File srcJar, private ServerPlugin loadJarPlugin(String name, File srcJar,

12
gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
View File

@@ -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;

51
gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java
View File

@@ -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;
} }
} }

5
gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java
View File

@@ -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

6
gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java
View File

@@ -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));

19
gerrit-war/src/main/java/com/google/gerrit/httpd/SiteInitializer.java
View File

@@ -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;

15
gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java
View File

@@ -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:

11
gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
View File

@@ -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);
} }
}); });