SONAR-2603 generate server key at startup

1 files changed, 20 insertions, 24 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/ServerMetadata.java b/sonar-batch/src/main/java/org/sonar/batch/ServerMetadata.java
index b8accd4e6d1..6415c9e01e1 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/ServerMetadata.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/ServerMetadata.java
@@ -31,43 +31,39 @@ import java.util.Date;
 
 public class ServerMetadata extends Server {
 
-  private String id;
-  private String version;
-  private String url;
-  private Date startTime;
+  private Configuration conf;
 
   public ServerMetadata(Configuration conf) {
-    id = conf.getString(CoreProperties.SERVER_ID);
-    version = conf.getString(CoreProperties.SERVER_VERSION);
-    url = getURL(conf);
-    String dateString = conf.getString(CoreProperties.SERVER_STARTTIME);
-    if (dateString!=null) {
-      try {
-        this.startTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").parse(dateString);
-
-      } catch (ParseException e) {
-        LoggerFactory.getLogger(getClass()).error("The property " + CoreProperties.SERVER_STARTTIME + " is badly formatted.", e);
-      }
-    }
-  }
-
-  public static String getURL(Configuration conf) {
-    return StringUtils.removeEnd(conf.getString("sonar.host.url", "http://localhost:9000"), "/");
+    this.conf = conf;
   }
 
   public String getId() {
-    return id;
+    return conf.getString(CoreProperties.SERVER_ID);
   }
 
   public String getVersion() {
-    return version;
+    return conf.getString(CoreProperties.SERVER_VERSION);
   }
 
   public Date getStartedAt() {
-    return startTime;
+    String dateString = conf.getString(CoreProperties.SERVER_STARTTIME);
+    if (dateString != null) {
+      try {
+        return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").parse(dateString);
+
+      } catch (ParseException e) {
+        LoggerFactory.getLogger(getClass()).error("The property " + CoreProperties.SERVER_STARTTIME + " is badly formatted.", e);
+      }
+    }
+    return null;
   }
 
   public String getURL() {
-    return url;
+    return StringUtils.removeEnd(conf.getString("sonar.host.url", "http://localhost:9000"), "/");
+  }
+
+  @Override
+  public String getKey() {
+    return conf.getString(CoreProperties.SERVER_KEY);
   }
 }