commit 8c06330d7db685ecd33bedd31a361b1f12fefefe
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> Sat Jul 14 14:55:47 2018 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> Tue Jul 17 05:57:25 2018 -0400
tree 41f4d7ecfb854636ed9e65ed26107c5b8b7044db
parent 141dcb7bdb92a8515c370ee98f4e58ab8f0b502f

Avoid using non portable separator character

Instead of manually concatenating and using non portable separator
characters, use the more portable Path methods to do the same.

Change-Id: Ibd5386952bfafe557cace0dceb8a894778a294e2

src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
index e912faf..55ca83d 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
@@ -67,7 +67,7 @@
 
   @Inject
   EventsLogConfig(PluginConfigFactory cfgFactory, SitePaths site, @PluginName String pluginName) {
-    String defaultLocalPath = site.site_path.toString() + "/events-db/";
+    String defaultLocalPath = site.site_path.resolve("events-db").normalize().toString();
     PluginConfig cfg = cfgFactory.getFromGerritConfig(pluginName, true);
     copyLocal = cfg.getBoolean(CONFIG_COPY_LOCAL, DEFAULT_COPY_LOCAL);
     maxAge = cfg.getInt(CONFIG_MAX_AGE, DEFAULT_MAX_AGE);
@@ -76,7 +76,7 @@
     waitTime = cfg.getInt(CONFIG_WAIT_TIME, DEFAULT_WAIT_TIME);
     connectTime = cfg.getInt(CONFIG_CONN_TIME, DEFAULT_CONN_TIME);
     storeDriver = cfg.getString(CONFIG_DRIVER, DEFAULT_DRIVER);
-    defaultUrl = "jdbc:h2:" + site.data_dir.toString() + "/db";
+    defaultUrl = "jdbc:h2:" + site.data_dir.resolve("db").normalize();
     storeUrl = cfg.getString(CONFIG_URL, defaultUrl);
     localStorePath = Paths.get(cfg.getString(CONFIG_LOCAL_PATH, defaultLocalPath));
     urlOptions = Joiner.on(";").join(cfg.getStringList(CONFIG_URL_OPTIONS));

src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java
index a75335b..a75796a 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java
@@ -52,12 +52,10 @@
   @Singleton
   @LocalEventsDb
   SQLClient provideLocalSqlClient(EventsLogConfig cfg) {
-    String path = cfg.getLocalStorePath().toString();
-    path = path.endsWith("/") ? path : path + "/";
     SQLClient sqlClient =
         new SQLClient(
             cfg.getLocalStoreDriver(),
-            H2_DB_PREFIX + path + SQLTable.TABLE_NAME,
+            H2_DB_PREFIX + cfg.getLocalStorePath().resolve(SQLTable.TABLE_NAME),
             cfg.getUrlOptions());
     sqlClient.setEvictIdleTime(cfg.getEvictIdleTime());
     return sqlClient;