move configuration from ToolInstallation to GlobalConfiguration

src/main/java/jenkins/plugins/logstash/LogstashConfiguration.java

@@ -1,6 +1,9 @@
 package jenkins.plugins.logstash;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -10,6 +13,7 @@
 
 import com.cloudbees.syslog.MessageFormat;
 
+import org.apache.http.client.utils.URIBuilder;
 import hudson.Extension;
 import hudson.init.InitMilestone;
 import hudson.init.Initializer;
@@ -75,6 +79,7 @@ public List<?> getIndexerTypes()
     return LogstashIndexer.all();
   }
 
+  @SuppressWarnings("deprecation")
   @Initializer(after = InitMilestone.JOB_LOADED)
   public void migrateData()
   {
@@ -97,13 +102,21 @@ public void migrateData()
             break;
           case ELASTICSEARCH:
             LOGGER.log(Level.INFO, "Migrating logstash configuration for Elastic Search");
-            ElasticSearch es = new ElasticSearch();
-            es.setHost(descriptor.getHost());
-            es.setPort(descriptor.getPort());
-            es.setKey(descriptor.getKey());
-            es.setUsername(descriptor.getUsername());
-            es.setPassword(descriptor.getPassword());
-            logstashIndexer = es;
+            URI uri;
+            try
+            {
+              uri = (new URIBuilder(descriptor.getHost()))
+                  .setPort(descriptor.getPort())
+                  .setPath("/" + descriptor.getKey()).build();
+              ElasticSearch es = new ElasticSearch(uri.toString());
+              es.setUsername(descriptor.getUsername());
+              es.setPassword(descriptor.getPassword());
+              logstashIndexer = es;
+            }
+            catch (URISyntaxException e)
+            {
+              LOGGER.log(Level.INFO, "Migrating logstash configuration for Elastic Search failed: " + e.toString());
+            }
             break;
           case RABBIT_MQ:
             LOGGER.log(Level.INFO, "Migrating logstash configuration for  RabbitMQ");
@@ -151,8 +164,7 @@ public boolean configure(StaplerRequest staplerRequest, JSONObject json) throws
   {
     // when we bind the stapler request we get a new instance of logstashIndexer
     staplerRequest.bindJSON(this, json);
-
-    if (logstashIndexer != null && !logstashIndexer.equals(activeIndexer))
+    if (!Objects.equals(logstashIndexer, activeIndexer))
     {
       activeIndexer = logstashIndexer;
     }

src/main/java/jenkins/plugins/logstash/LogstashWriter.java

@@ -64,6 +64,9 @@ public class LogstashWriter {
   private boolean connectionBroken;
   private Charset charset;
 
+  /*
+   * TODO: the charset must not be transfered to the dao. The dao is shared between different build.
+   */
   public LogstashWriter(Run<?, ?> run, OutputStream error, TaskListener listener, Charset charset) {
     this.errorStream = error != null ? error : System.err;
     this.build = run;

src/main/java/jenkins/plugins/logstash/configuration/ElasticSearch.java

@@ -1,7 +1,8 @@
 package jenkins.plugins.logstash.configuration;
 
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -16,24 +17,27 @@
 
 public class ElasticSearch extends LogstashIndexer<ElasticSearchDao>
 {
-  protected String key;
-  protected String username;
-  protected Secret password;
+  private String username;
+  private Secret password;
+  private URI uri;
 
   @DataBoundConstructor
-  public ElasticSearch()
+  public ElasticSearch(String uri) throws URISyntaxException
   {
+    this.uri = new URI(uri);
+    validateUri(this.uri);
   }
 
-  public String getKey()
+  public URI getUri()
   {
-    return key;
+    return uri;
   }
 
-  @DataBoundSetter
-  public void setKey(String key)
+  public void setUri(String value) throws URISyntaxException
   {
-    this.key = key;
+    URI uri = new URI(value);
+    validateUri(uri);
+    this.uri = uri;
   }
 
   public String getUsername()
@@ -61,23 +65,23 @@ public void setPassword(String password)
   @Override
   public boolean equals(Object obj)
   {
+    if (obj == null)
+      return false;
     if (this == obj)
       return true;
-    if (!super.equals(obj))
-      return false;
     if (getClass() != obj.getClass())
       return false;
     ElasticSearch other = (ElasticSearch) obj;
     if (!Secret.toString(password).equals(other.getPassword()))
     {
       return false;
     }
-    if (key == null)
+    if (uri == null)
     {
-      if (other.key != null)
+      if (other.uri != null)
         return false;
     }
-    else if (!key.equals(other.key))
+    else if (!uri.equals(other.uri))
     {
       return false;
     }
@@ -98,7 +102,7 @@ public int hashCode()
   {
     final int prime = 31;
     int result = super.hashCode();
-    result = prime * result + ((key == null) ? 0 : key.hashCode());
+    result = prime * result + ((uri == null) ? 0 : uri.hashCode());
     result = prime * result + ((username == null) ? 0 : username.hashCode());
     result = prime * result + Secret.toString(password).hashCode();
     return result;
@@ -107,7 +111,7 @@ public int hashCode()
   @Override
   public ElasticSearchDao createIndexerInstance()
   {
-    return new ElasticSearchDao(host, port, key, username, Secret.toString(password));
+    return new ElasticSearchDao(uri, username, Secret.toString(password));
   }
 
   @Extension
@@ -125,33 +129,48 @@ public int getDefaultPort()
       return 9300;
     }
 
-    @Override
-    public FormValidation doCheckHost(@QueryParameter("value") String value)
+    public FormValidation doCheckUri(@QueryParameter("value") String value)
     {
       if (StringUtils.isBlank(value))
       {
         return FormValidation.warning(Messages.PleaseProvideHost());
       }
       try
       {
-        new URL(value);
+        URI uri = new URI(value);
+        validateUri(uri);
       }
-      catch (MalformedURLException e)
+      catch (URISyntaxException | IllegalArgumentException e)
       {
         return FormValidation.error(e.getMessage());
       }
       return FormValidation.ok();
     }
+  }
 
-    public FormValidation doCheckKey(@QueryParameter("value") String value)
-    {
-      if (StringUtils.isBlank(value))
+  /**
+   * Validates that the given uri has a scheme, a port and a path which is not empty or just "/"
+   *
+   * @param uri
+   * @throws IllegalArgumentException when one of scheme, port or path
+   */
+  public static void validateUri(URI uri) throws IllegalArgumentException
+  {
+      try
       {
-        return FormValidation.error(Messages.ValueIsRequired());
+        uri.toURL();
+      }
+      catch (MalformedURLException e)
+      {
+        throw new IllegalArgumentException(e.getMessage());
       }
 
-      return FormValidation.ok();
+    if(uri.getPort() == -1) {
+      throw new IllegalArgumentException("Please specify a port.");
     }
 
+    if(StringUtils.isBlank(uri.getPath()) || uri.getPath().trim().matches("^\\/+$")) {
+      throw new IllegalArgumentException("Please specify an elastic search key.");
+    }
   }
 }

src/main/java/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer.java

@@ -0,0 +1,83 @@
+package jenkins.plugins.logstash.configuration;
+
+import org.kohsuke.stapler.DataBoundSetter;
+
+import jenkins.plugins.logstash.persistence.AbstractLogstashIndexerDao;
+
+public abstract class HostBasedLogstashIndexer<T extends AbstractLogstashIndexerDao> extends LogstashIndexer<T>
+{
+  private String host;
+  private int port;
+
+  /**
+   * Returns the host for connecting to the indexer.
+   *
+   * @return Host of the indexer
+   */
+  public String getHost()
+  {
+    return host;
+  }
+
+  /**
+   * Sets the host for connecting to the indexer.
+   *
+   * @param host
+   *          host to connect to.
+   */
+  @DataBoundSetter
+  public void setHost(String host)
+  {
+    this.host = host;
+  }
+
+  /**
+   * Returns the port for connecting to the indexer.
+   *
+   * @return Port of the indexer
+   */
+  public int getPort()
+  {
+    return port;
+  }
+
+  /**
+   * Sets the port used for connecting to the indexer
+   *
+   * @param port
+   *          The port of the indexer
+   */
+  @DataBoundSetter
+  public void setPort(int port)
+  {
+    this.port = port;
+  }
+
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((host == null) ? 0 : host.hashCode());
+    result = prime * result + port;
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    HostBasedLogstashIndexer<?> other = (HostBasedLogstashIndexer<?>) obj;
+    if (host == null) {
+      if (other.host != null)
+        return false;
+    } else if (!host.equals(other.host))
+      return false;
+    if (port != other.port)
+      return false;
+    return true;
+  }
+}

src/main/java/jenkins/plugins/logstash/configuration/HostConfiguration.java

@@ -0,0 +1,66 @@
+package jenkins.plugins.logstash.configuration;
+
+import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
+
+public class HostConfiguration
+{
+
+  protected String host;
+  protected int port;
+
+  @DataBoundConstructor
+  public HostConfiguration()
+  {
+  }
+
+  public String getHost()
+  {
+    return host;
+  }
+
+  @DataBoundSetter
+  public void setHost(String host)
+  {
+    this.host = host;
+  }
+
+  public int getPort()
+  {
+    return port;
+  }
+
+  @DataBoundSetter
+  public void setPort(int port)
+  {
+    this.port = port;
+  }
+
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((host == null) ? 0 : host.hashCode());
+    result = prime * result + port;
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    HostConfiguration other = (HostConfiguration) obj;
+    if (host == null) {
+      if (other.host != null)
+        return false;
+    } else if (!host.equals(other.host))
+      return false;
+    if (port != other.port)
+      return false;
+    return true;
+  }
+}