Renamed SettingNumeric to NumericSetting

Author: andsel

logstash-core/lib/logstash/environment.rb

@@ -49,7 +49,7 @@ module Environment
            Setting::BooleanSetting.new("pipeline.system", false),
    Setting::SettingPositiveInteger.new("pipeline.workers", LogStash::Config::CpuCoreStrategy.maximum),
    Setting::SettingPositiveInteger.new("pipeline.batch.size", 125),
-           Setting::SettingNumeric.new("pipeline.batch.delay", 50), # in milliseconds
+           Setting::NumericSetting.new("pipeline.batch.delay", 50), # in milliseconds
            Setting::BooleanSetting.new("pipeline.unsafe_shutdown", false),
            Setting::BooleanSetting.new("pipeline.reloadable", true),
            Setting::BooleanSetting.new("pipeline.plugin_classloaders", false),
@@ -73,7 +73,7 @@ module Environment
             Setting::StringSetting.new("api.auth.basic.username", nil, false).nullable,
           Setting::Password.new("api.auth.basic.password", nil, false).nullable,
             Setting::StringSetting.new("api.auth.basic.password_policy.mode", "WARN", true, %w[WARN ERROR]),
-           Setting::SettingNumeric.new("api.auth.basic.password_policy.length.minimum", 8),
+           Setting::NumericSetting.new("api.auth.basic.password_policy.length.minimum", 8),
             Setting::StringSetting.new("api.auth.basic.password_policy.include.upper", "REQUIRED", true, %w[REQUIRED OPTIONAL]),
             Setting::StringSetting.new("api.auth.basic.password_policy.include.lower", "REQUIRED", true, %w[REQUIRED OPTIONAL]),
             Setting::StringSetting.new("api.auth.basic.password_policy.include.digit", "REQUIRED", true, %w[REQUIRED OPTIONAL]),
@@ -86,14 +86,14 @@ module Environment
            Setting::BooleanSetting.new("queue.drain", false),
              Setting::Bytes.new("queue.page_capacity", "64mb"),
              Setting::Bytes.new("queue.max_bytes", "1024mb"),
-           Setting::SettingNumeric.new("queue.max_events", 0), # 0 is unlimited
-           Setting::SettingNumeric.new("queue.checkpoint.acks", 1024), # 0 is unlimited
-           Setting::SettingNumeric.new("queue.checkpoint.writes", 1024), # 0 is unlimited
-           Setting::SettingNumeric.new("queue.checkpoint.interval", 1000), # remove it for #17155
+           Setting::NumericSetting.new("queue.max_events", 0), # 0 is unlimited
+           Setting::NumericSetting.new("queue.checkpoint.acks", 1024), # 0 is unlimited
+           Setting::NumericSetting.new("queue.checkpoint.writes", 1024), # 0 is unlimited
+           Setting::NumericSetting.new("queue.checkpoint.interval", 1000), # remove it for #17155
            Setting::BooleanSetting.new("queue.checkpoint.retry", true),
            Setting::BooleanSetting.new("dead_letter_queue.enable", false),
              Setting::Bytes.new("dead_letter_queue.max_bytes", "1024mb"),
-           Setting::SettingNumeric.new("dead_letter_queue.flush_interval", 5000),
+           Setting::NumericSetting.new("dead_letter_queue.flush_interval", 5000),
             Setting::StringSetting.new("dead_letter_queue.storage_policy", "drop_newer", true, ["drop_newer", "drop_older"]),
     Setting::NullableStringSetting.new("dead_letter_queue.retain.age"), # example 5d
          Setting::TimeValue.new("slowlog.threshold.warn", "-1"),

logstash-core/lib/logstash/settings.rb

@@ -413,7 +413,7 @@ def coerce(value)
     ### Specific settings #####
 
     java_import org.logstash.settings.BooleanSetting
-    java_import org.logstash.settings.SettingNumeric
+    java_import org.logstash.settings.NumericSetting
 
     java_import org.logstash.settings.SettingInteger
 

logstash-core/spec/logstash/queue_factory_spec.rb

@@ -26,9 +26,9 @@
       LogStash::Setting::StringSetting.new("queue.type", "memory", true, ["persisted", "memory"]),
       LogStash::Setting::Bytes.new("queue.page_capacity", "8mb"),
       LogStash::Setting::Bytes.new("queue.max_bytes", "64mb"),
-      LogStash::Setting::SettingNumeric.new("queue.max_events", 0),
-      LogStash::Setting::SettingNumeric.new("queue.checkpoint.acks", 1024),
-      LogStash::Setting::SettingNumeric.new("queue.checkpoint.writes", 1024),
+      LogStash::Setting::NumericSetting.new("queue.max_events", 0),
+      LogStash::Setting::NumericSetting.new("queue.checkpoint.acks", 1024),
+      LogStash::Setting::NumericSetting.new("queue.checkpoint.writes", 1024),
       LogStash::Setting::BooleanSetting.new("queue.checkpoint.retry", false),
       LogStash::Setting::StringSetting.new("pipeline.id", pipeline_id),
       LogStash::Setting::SettingPositiveInteger.new("pipeline.batch.size", 125),

logstash-core/spec/logstash/settings/numeric_spec.rb

@@ -19,7 +19,7 @@
 require "logstash/settings"
 
 # Mirrored in java class org.logstash.settings.SettingNumeric
-describe LogStash::Setting::SettingNumeric do
+describe LogStash::Setting::NumericSetting do
   subject { described_class.new("a number", nil, false) }
   describe "#set" do
     context "when giving a string which doesn't represent a string" do

logstash-core/src/main/java/org/logstash/settings/SettingNumeric.java renamed to logstash-core/src/main/java/org/logstash/settings/NumericSetting.java

@@ -18,21 +18,21 @@
  */
 package org.logstash.settings;
 
-public class SettingNumeric extends Coercible<Number> {
+public class NumericSetting extends Coercible<Number> {
 
-    public SettingNumeric(String name, Number defaultValue) {
+    public NumericSetting(String name, Number defaultValue) {
         super(name, defaultValue, true, noValidator());
     }
 
     // constructor used only in tests, but needs to be public to be used in Ruby spec
-    public SettingNumeric(String name, Number defaultValue, boolean strict) {
+    public NumericSetting(String name, Number defaultValue, boolean strict) {
         super(name, defaultValue, strict, noValidator());
     }
 
     @Override
     public Number coerce(Object obj) {
         if (obj == null) {
-            throw new IllegalArgumentException("Failed to coerce value to SettingNumeric. Received null");
+            throw new IllegalArgumentException("Failed to coerce value to NumericSetting. Received null");
         }
         if (obj instanceof Number) {
             return (Number) obj;
@@ -53,6 +53,6 @@ public Number coerce(Object obj) {
     }
 
     private String coercionFailureMessage(Object obj) {
-        return String.format("Failed to coerce value to SettingNumeric. Received %s (%s)", obj, obj.getClass());
+        return String.format("Failed to coerce value to NumericSetting. Received %s (%s)", obj, obj.getClass());
     }
 }

logstash-core/src/test/java/org/logstash/settings/SettingNumericTest.java renamed to logstash-core/src/test/java/org/logstash/settings/NumericSettingTest.java

@@ -24,13 +24,13 @@
 import static org.junit.Assert.*;
 
 // Mirrored from spec/logstash/settings/numeric_spec.rb
-public class SettingNumericTest {
+public class NumericSettingTest {
 
-    private SettingNumeric sut;
+    private NumericSetting sut;
 
     @Before
     public void setUp() {
-        sut = new SettingNumeric("a number", null, false);
+        sut = new NumericSetting("a number", null, false);
     }
 
     @Test(expected = IllegalArgumentException.class)