commit 44cd62ec1b2ef0b1d39e7d6048ae68b0091313ea
author Dave Borowitz <dborowitz@google.com> Tue Feb 24 14:18:13 2015 -0800
committer David Pursehouse <david.pursehouse@sonymobile.com> Tue Mar 03 11:19:36 2015 +0900
tree 42c22270a8d2dd4c164b791b2b1d64f2736c8368
parent 6b37799da17b85b265c88fc5c8540797f7986401

SitePaths: Convert mail_dir to Path

Change-Id: I2acb634f6d27b5bb4ddbba1f79db08e893ec3099

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
index f867829..6a066b5 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
@@ -34,7 +34,6 @@
 import com.google.inject.Injector;
 import com.google.inject.TypeLiteral;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -142,8 +141,8 @@
   }
 
   private void extractMailExample(String orig) throws Exception {
-    File ex = new File(site.mail_dir, orig + ".example");
-    extract(ex.toPath(), OutgoingEmail.class, orig);
+    Path ex = site.mail_dir.resolve(orig + ".example");
+    extract(ex, OutgoingEmail.class, orig);
     chmod(0444, ex);
   }
 

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

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java
index 5a4ec02..428a6ee 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java
@@ -37,7 +37,7 @@
   public final Path logs_dir;
   public final Path plugins_dir;
   public final Path data_dir;
-  public final File mail_dir;
+  public final Path mail_dir;
   public final File hooks_dir;
   public final File static_dir;
   public final File themes_dir;
@@ -77,7 +77,7 @@
     plugins_dir = p.resolve("plugins");
     data_dir = p.resolve("data");
     logs_dir = p.resolve("logs");
-    mail_dir = etc_dir.resolve("mail").toFile();
+    mail_dir = etc_dir.resolve("mail");
     hooks_dir = new File(site_path, "hooks");
     static_dir = new File(site_path, "static");
     themes_dir = new File(site_path, "themes");

gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java
index ace1f5b..101aaac 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java
@@ -26,6 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Files;
 import java.util.Properties;
 
 /** Configures Velocity template engine for sending email. */
@@ -49,10 +50,11 @@
     p.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, "true");
     p.setProperty("runtime.log.logsystem.log4j.category", "velocity");
 
-    if (site.mail_dir.isDirectory()) {
+    if (Files.isDirectory(site.mail_dir)) {
       p.setProperty(rl, "file, class");
       p.setProperty("file." + rl + ".class", pkg + ".FileResourceLoader");
-      p.setProperty("file." + rl + ".path", site.mail_dir.getAbsolutePath());
+      p.setProperty("file." + rl + ".path",
+          site.mail_dir.toAbsolutePath().toString());
       p.setProperty("class." + rl + ".class", pkg + ".ClasspathResourceLoader");
     } else {
       p.setProperty(rl, "class");