commit 431f973bdec74c9f60b5fd1339bbb52d2b66e152
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> Thu Aug 02 19:50:34 2018 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> Fri Aug 03 05:20:20 2018 -0400
tree a1367d433b0d8cc642dbefd0b31bf2b6c96e5321
parent 3d119f59a517dbea9835a231ebefb9200c16feed

Inline one-time use variables

Change-Id: Ibcf6d9577d95b14986f7ecdca39d264a0e1b2417

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 aae0df3..cf99d55 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
@@ -66,11 +66,9 @@
   private String storePassword;
   private int evictIdleTime;
   private int maxConnections;
-  private String defaultUrl;
 
   @Inject
   EventsLogConfig(PluginConfigFactory cfgFactory, SitePaths site, @PluginName String pluginName) {
-    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);
@@ -79,9 +77,11 @@
     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.resolve("db").normalize();
-    storeUrl = cfg.getString(CONFIG_URL, defaultUrl);
-    localStorePath = Paths.get(cfg.getString(CONFIG_LOCAL_PATH, defaultLocalPath));
+    storeUrl = cfg.getString(CONFIG_URL, "jdbc:h2:" + site.data_dir.resolve("db").normalize());
+    localStorePath =
+        Paths.get(
+            cfg.getString(
+                CONFIG_LOCAL_PATH, site.site_path.resolve("events-db").normalize().toString()));
     urlOptions = Joiner.on(";").join(cfg.getStringList(CONFIG_URL_OPTIONS));
     storeUsername = cfg.getString(CONFIG_USERNAME);
     storePassword = cfg.getString(CONFIG_PASSWORD);