Removed aliasing of PortRange (Ruby class) with SettingPortRange (Java class)

Author: andsel

logstash-core/lib/logstash/environment.rb

@@ -71,7 +71,7 @@ def self.as_java_range(r)
            Setting::Boolean.new("log.format.json.fix_duplicate_message_fields", true),
            Setting::Boolean.new("api.enabled", true),
             Setting::SettingString.new("api.http.host", "127.0.0.1"),
-         Setting::PortRange.new("api.http.port", 9600..9700),
+         Setting::SettingPortRange.new("api.http.port", 9600..9700),
             Setting::SettingString.new("api.environment", "production"),
             Setting::SettingString.new("api.auth.type", "none", true, %w(none basic)),
             Setting::SettingString.new("api.auth.basic.username", nil, false).nullable,

logstash-core/lib/logstash/settings.rb

@@ -419,61 +419,9 @@ def coerce(value)
 
     java_import org.logstash.settings.SettingPositiveInteger
 
-    # java_import org.logstash.settings.SettingPort
-    Port = org::logstash::settings::SettingPort
+    java_import org.logstash.settings.SettingPort # seems unused
 
-    # class Port < SettingInteger
-    #   VALID_PORT_RANGE = 1..65535
-    #
-    #   def initialize(name, default = nil, strict = true)
-    #     super(name, default, strict) { |value| valid?(value) }
-    #   end
-    #
-    #   def valid?(port)
-    #     VALID_PORT_RANGE.cover?(port)
-    #   end
-    # end
-
-    # java_import org.logstash.settings.SettingPortRange
-    PortRange = org::logstash::settings::SettingPortRange
-
-    # class PortRange < Coercible
-    #   PORT_SEPARATOR = "-"
-    #   VALID_PORT_RANGE = 1..65535
-    #
-    #   def initialize(name, default = nil, strict = true)
-    #     super(name, ::Range, default, strict = true) { |value| valid?(value) }
-    #   end
-    #
-    #   def valid?(range)
-    #     VALID_PORT_RANGE.first <= range.first && VALID_PORT_RANGE.last >= range.last
-    #   end
-    #
-    #   def coerce(value)
-    #     case value
-    #     when ::Range
-    #       value
-    #     when ::Integer
-    #       value..value
-    #     when ::String
-    #       first, last = value.split(PORT_SEPARATOR)
-    #       last = first if last.nil?
-    #       begin
-    #         (Integer(first))..(Integer(last))
-    #       rescue ArgumentError # Trap and reraise a more human error
-    #         raise ArgumentError.new("Could not coerce #{value} into a port range")
-    #       end
-    #     else
-    #       raise ArgumentError.new("Could not coerce #{value} into a port range")
-    #     end
-    #   end
-    #
-    #   def validate(value)
-    #     unless valid?(value)
-    #       raise ArgumentError.new("Invalid value \"#{name}: #{value}\", valid options are within the range of #{Port::VALID_PORT_RANGE.first}-#{Port::VALID_PORT_RANGE.last}")
-    #     end
-    #   end
-    # end
+    java_import org.logstash.settings.SettingPortRange
 
     class Validator < Setting
       def initialize(name, default = nil, strict = true, validator_class = nil)

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

@@ -18,9 +18,9 @@
 require "logstash/settings"
 require "spec_helper"
 
-describe LogStash::Setting::PortRange do
+describe LogStash::Setting::SettingPortRange do
   context "When the value is an Integer" do
-    subject { LogStash::Setting::PortRange.new("mynewtest", 9000) }
+    subject { LogStash::Setting::SettingPortRange.new("mynewtest", 9000) }
 
     it "coerces the value in a range" do
       expect { subject }.not_to raise_error
@@ -37,14 +37,14 @@
   end
 
   context "When the value is a string" do
-    subject { LogStash::Setting::PortRange.new("mynewtest", "9000-10000") }
+    subject { LogStash::Setting::SettingPortRange.new("mynewtest", "9000-10000") }
 
     it "coerces a string range with the format (9000-10000)" do
       expect { subject }.not_to raise_error
     end
 
     it "refuses when then upper port is out of range" do
-      expect { LogStash::Setting::PortRange.new("mynewtest", "1000-95000") }.to raise_error
+      expect { LogStash::Setting::SettingPortRange.new("mynewtest", "1000-95000") }.to raise_error
     end
 
     it "returns a range" do
@@ -58,31 +58,31 @@
   end
 
   context "when the value is a garbage string" do
-    subject { LogStash::Setting::PortRange.new("mynewtest", "fsdfnsdkjnfjs") }
+    subject { LogStash::Setting::SettingPortRange.new("mynewtest", "fsdfnsdkjnfjs") }
 
     it "raises an argument error" do
       expect { subject }.to raise_error
     end
 
     it "raises an exception on update" do
-      expect { LogStash::Setting::PortRange.new("mynewtest", 10000).set("dsfnsdknfksdnfjksdnfjns") }.to raise_error
+      expect { LogStash::Setting::SettingPortRange.new("mynewtest", 10000).set("dsfnsdknfksdnfjksdnfjns") }.to raise_error
     end
   end
 
   context "when the value is an unknown type" do
-    subject { LogStash::Setting::PortRange.new("mynewtest", 0.1) }
+    subject { LogStash::Setting::SettingPortRange.new("mynewtest", 0.1) }
 
     it "raises an argument error" do
       expect { subject }.to raise_error
     end
 
     it "raises an exception on update" do
-      expect { LogStash::Setting::PortRange.new("mynewtest", 10000).set(0.1) }.to raise_error
+      expect { LogStash::Setting::SettingPortRange.new("mynewtest", 10000).set(0.1) }.to raise_error
     end
   end
 
   context "When value is a range" do
-    subject { LogStash::Setting::PortRange.new("mynewtest", 9000..10000) }
+    subject { LogStash::Setting::SettingPortRange.new("mynewtest", 9000..10000) }
 
     it "accepts a ruby range as the default value" do
       expect { subject }.not_to raise_error
@@ -94,11 +94,11 @@
     end
 
     it "refuses when then upper port is out of range" do
-      expect { LogStash::Setting::PortRange.new("mynewtest", 9000..1000000) }.to raise_error
+      expect { LogStash::Setting::SettingPortRange.new("mynewtest", 9000..1000000) }.to raise_error
     end
 
     it "raise an exception on when port are out of range" do
-      expect { LogStash::Setting::PortRange.new("mynewtest", -1000..1000) }.to raise_error
+      expect { LogStash::Setting::SettingPortRange.new("mynewtest", -1000..1000) }.to raise_error
     end
   end
 end

logstash-core/spec/logstash/settings_spec.rb

@@ -64,7 +64,7 @@
 
   describe "#to_hash" do
     let(:java_deprecated_alias) { LogStash::Setting::Boolean.new("java.actual", true).with_deprecated_alias("java.deprecated") }
-    let(:ruby_deprecated_alias) { LogStash::Setting::PortRange.new("ruby.actual", 9600..9700).with_deprecated_alias("ruby.deprecated") }
+    let(:ruby_deprecated_alias) { LogStash::Setting::SettingPortRange.new("ruby.actual", 9600..9700).with_deprecated_alias("ruby.deprecated") }
     let(:non_deprecated) { LogStash::Setting::Boolean.new("plain_setting", false) }
 
     before :each do