[WIP] Introduce StringSetting constructor that accepts 2 arguments

Author: andsel

logstash-core/lib/logstash/environment.rb

@@ -35,7 +35,7 @@ module Environment
 
   [
            Setting::Boolean.new("allow_superuser", false),
-            Setting::String.new("node.name", Socket.gethostname),
+            Setting::StringSetting.new("node.name", Socket.gethostname),
     Setting::NullableString.new("path.config", nil, false),
  Setting::WritableDirectory.new("path.data", ::File.join(LogStash::Environment::LOGSTASH_HOME, "data")),
     Setting::NullableString.new("config.string", nil, false),
@@ -52,7 +52,7 @@ module Environment
            Setting::Boolean.new("config.support_escapes", false),
             Setting::StringSetting.new("config.field_reference.escape_style", "none", true, %w(none percent ampersand)),
            Setting::Boolean.new("metric.collect", true),
-            Setting::String.new("pipeline.id", "main"),
+            Setting::StringSetting.new("pipeline.id", "main"),
            Setting::Boolean.new("pipeline.system", false),
    Setting::PositiveInteger.new("pipeline.workers", LogStash::Config::CpuCoreStrategy.maximum),
    Setting::PositiveInteger.new("pipeline.batch.size", 125),
@@ -73,9 +73,9 @@ module Environment
             Setting::StringSetting.new("log.format", "plain", true, ["json", "plain"]),
            Setting::Boolean.new("log.format.json.fix_duplicate_message_fields", true),
            Setting::Boolean.new("api.enabled", true),
-            Setting::String.new("api.http.host", "127.0.0.1"),
+            Setting::StringSetting.new("api.http.host", "127.0.0.1"),
          Setting::PortRange.new("api.http.port", 9600..9700),
-            Setting::String.new("api.environment", "production"),
+            Setting::StringSetting.new("api.environment", "production"),
             Setting::StringSetting.new("api.auth.type", "none", true, %w(none basic)),
             Setting::String.new("api.auth.basic.username", nil, false).nullable,
           Setting::Password.new("api.auth.basic.password", nil, false).nullable,
@@ -107,7 +107,7 @@ module Environment
          Setting::TimeValue.new("slowlog.threshold.info", "-1"),
          Setting::TimeValue.new("slowlog.threshold.debug", "-1"),
          Setting::TimeValue.new("slowlog.threshold.trace", "-1"),
-            Setting::String.new("keystore.classname", "org.logstash.secret.store.backend.JavaKeyStore"),
+            Setting::StringSetting.new("keystore.classname", "org.logstash.secret.store.backend.JavaKeyStore"),
             Setting::String.new("keystore.file", ::File.join(::File.join(LogStash::Environment::LOGSTASH_HOME, "config"), "logstash.keystore"), false), # will be populated on
     Setting::NullableString.new("monitoring.cluster_uuid"),
             Setting::StringSetting.new("pipeline.buffer.type", "direct", true, ["direct", "heap"])

logstash-core/src/main/java/org/logstash/settings/SettingWithDeprecatedAlias.java

@@ -99,7 +99,7 @@ public void format(List<String> output) {
     @Override
     public void validateValue() {
         if (deprecatedAlias.isSet() && getCanonicalSetting().isSet()) {
-            throw new IllegalStateException(String.format("Both `%s` and its deprecated alias `%s` have been set.\n" +
+            throw new IllegalStateException(String.format("Both `%s` and its deprecated alias `%s` have been set. " +
                     "Please only set `%s`", getCanonicalSetting().getName(), deprecatedAlias.getName(), getCanonicalSetting().getName()));
         }
         super.validateValue();

logstash-core/src/main/java/org/logstash/settings/StringSetting.java

@@ -17,6 +17,10 @@ public StringSetting(String name, String defaultValue, boolean strict, List<Stri
         }
     }
 
+    public StringSetting(String name, String defaultValue) {
+        this(name, defaultValue, true, Collections.emptyList());
+    }
+
     @Override
     public void validate(String input) throws IllegalArgumentException {
         staticValidate(input, possibleStrings, this.getName());