logstash-core-event-java 5.0.0.alpha6.snapshot5-java → 5.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c3829defeae0811a51be672c8d40d25375b88b
-  data.tar.gz: 8463e3c3aec224ced8ff2ab472d3270e7b0a19bf
+  metadata.gz: 5e91246ebcab4d5729e3b452816a10fe8025a7b0
+  data.tar.gz: 1b01a6229f0c1103d45c3b1ec1ef52f9309c4a47
 SHA512:
-  metadata.gz: 78dde0a65932fb1cd6fde3e38e0ca3a89612c6cc33b868ec5b4a25df5dbb0626e6ba26c945f8b8a47f0e5784001dc4cc5f859bd3b0527dddc30beec7e1a691fe
-  data.tar.gz: c0bc8bc63d98ce24dddcf0c948cbef2857cb8549846b6badbf540a4fe820705fb1c3c0b22d8c358e43c020e0f85b44de10f04407ce46cf26542250c583c0d02c
+  metadata.gz: 8636ce4953e1ca650f13527d6e60021db69675d70c7c359659a43ee7711bbf944c5b5dca2a15fc6e7d58ebaaabd1eb274b90295c414993f5e71b6b7a0409e266
+  data.tar.gz: 393c31cc0c9e2abd277983d1f9a0321475f179131f5e120a55d07e4eb4c7db9c9a948cf3115411cabe7d9c21983fb5fd9fdcdb81f2bc8c189dfe8ed0e268a788

data/lib/logstash-core-event-java/logstash-core-event-java.rb

@@ -25,4 +25,4 @@ end
 require "jruby_event_ext"
 require "jruby_timestamp_ext"
 require "logstash/event"
-require "logstash/timestamp"
+require "logstash/timestamp"

data/lib/logstash-core-event-java/version.rb

@@ -5,4 +5,4 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
 
-LOGSTASH_CORE_EVENT_JAVA_VERSION = "5.0.0.alpha6.snapshot5"
+LOGSTASH_CORE_EVENT_JAVA_VERSION = "5.0.0"

data/lib/logstash/event.rb

@@ -29,9 +29,26 @@ module LogStash
 
   # LogStash::SHUTDOWN is used by plugins
   SHUTDOWN = ShutdownEvent.new
+
+  class Event
+    MSG_BRACKETS_METHOD_MISSING = "Direct event field references (i.e. event['field']) have been disabled in favor of using event get and set methods (e.g. event.get('field')). Please consult the Logstash 5.0 breaking changes documentation for more details.".freeze
+    MSG_BRACKETS_EQUALS_METHOD_MISSING = "Direct event field references (i.e. event['field'] = 'value') have been disabled in favor of using event get and set methods (e.g. event.set('field', 'value')). Please consult the Logstash 5.0 breaking changes documentation for more details.".freeze
+    RE_BRACKETS_METHOD = /^\[\]$/.freeze
+    RE_BRACKETS_EQUALS_METHOD = /^\[\]=$/.freeze
+
+    def method_missing(method_name, *arguments, &block)
+      if RE_BRACKETS_METHOD.match(method_name.to_s)
+        raise NoMethodError.new(MSG_BRACKETS_METHOD_MISSING)
+      end
+      if RE_BRACKETS_EQUALS_METHOD.match(method_name.to_s)
+        raise NoMethodError.new(MSG_BRACKETS_EQUALS_METHOD_MISSING)
+      end
+      super
+    end
+  end
 end
 
 # for backward compatibility, require "logstash/event" is used a lots of places so let's bootstrap the
 # Java code loading from here.
 # TODO: (colin) I think we should mass replace require "logstash/event" with require "logstash-core-event"
-require "logstash-core-event"
+require "logstash-core-event"

data/lib/logstash/string_interpolation.rb

@@ -6,12 +6,12 @@ module LogStash
 
     # clear the global compiled templates cache
     def clear_cache
-      Java::ComLogstash::StringInterpolation.get_instance.clear_cache;
+      Java::OrgLogstash::StringInterpolation.get_instance.clear_cache;
     end
 
     # @return [Fixnum] the compiled templates cache size
     def cache_size
-      Java::ComLogstash::StringInterpolation.get_instance.cache_size;
+      Java::OrgLogstash::StringInterpolation.get_instance.cache_size;
     end
   end
 end

data/spec/event_spec.rb

@@ -5,7 +5,6 @@ require "logstash/util"
 require "logstash/event"
 require "json"
 require "java"
-# java_import 'com.logstash.Util'
 
 TIMESTAMP = "@timestamp"
 
@@ -36,7 +35,7 @@ describe LogStash::Event do
     end
   end
 
-  context "[]" do
+  context "#get" do
     it "should get simple values" do
       e = LogStash::Event.new({"foo" => "bar", "bar" => 1, "baz" => 1.0, TIMESTAMP => "2015-05-28T23:02:05.350Z"})
       expect(e.get("foo")).to eq("bar")
@@ -64,7 +63,7 @@ describe LogStash::Event do
     end
   end
 
-  context "[]=" do
+  context "#set" do
     it "should set simple values" do
       e = LogStash::Event.new()
       expect(e.set("foo", "bar")).to eq("bar")
@@ -123,7 +122,7 @@ describe LogStash::Event do
     end
 
     it "should set XXJavaProxy Jackson crafted" do
-      proxy = com.logstash.Util.getMapFixtureJackson()
+      proxy = org.logstash.Util.getMapFixtureJackson()
       # proxy is {"string": "foo", "int": 42, "float": 42.42, "array": ["bar","baz"], "hash": {"string":"quux"} }
       e = LogStash::Event.new()
       e.set("[proxy]", proxy)
@@ -136,7 +135,7 @@ describe LogStash::Event do
     end
 
     it "should set XXJavaProxy hand crafted" do
-      proxy = com.logstash.Util.getMapFixtureHandcrafted()
+      proxy = org.logstash.Util.getMapFixtureHandcrafted()
       # proxy is {"string": "foo", "int": 42, "float": 42.42, "array": ["bar","baz"], "hash": {"string":"quux"} }
       e = LogStash::Event.new()
       e.set("[proxy]", proxy)
@@ -159,12 +158,12 @@ describe LogStash::Event do
     it "to_hash should inject a Ruby LogStash::Timestamp" do
       e = LogStash::Event.new()
 
-      expect(e.to_java).to be_kind_of(Java::ComLogstash::Event)
-      expect(e.to_java.get_field(TIMESTAMP)).to be_kind_of(Java::ComLogstash::Timestamp)
+      expect(e.to_java).to be_kind_of(Java::OrgLogstash::Event)
+      expect(e.to_java.get_field(TIMESTAMP)).to be_kind_of(Java::OrgLogstash::Timestamp)
 
       expect(e.to_hash[TIMESTAMP]).to be_kind_of(LogStash::Timestamp)
       # now make sure the original map was not touched
-      expect(e.to_java.get_field(TIMESTAMP)).to be_kind_of(Java::ComLogstash::Timestamp)
+      expect(e.to_java.get_field(TIMESTAMP)).to be_kind_of(Java::OrgLogstash::Timestamp)
     end
 
     it "should set timestamp" do
@@ -307,4 +306,20 @@ describe LogStash::Event do
     end
 
   end
+
+  context "method missing exception messages" do
+    subject { LogStash::Event.new({"foo" => "bar"}) }
+
+    it "#[] method raises a better exception message" do
+      expect { subject["foo"] }.to raise_error(NoMethodError, /Direct event field references \(i\.e\. event\['field'\]\)/)
+    end
+
+    it "#[]= method raises a better exception message" do
+      expect { subject["foo"] = "baz" }.to raise_error(NoMethodError, /Direct event field references \(i\.e\. event\['field'\] = 'value'\)/)
+    end
+
+    it "other missing method raises normal exception message" do
+      expect { subject.baz() }.to raise_error(NoMethodError, /undefined method `baz' for/)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core-event-java
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha6.snapshot5
+  version: 5.0.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -46,9 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/com/fasterxml/jackson/core/jackson-annotations/2.7.0/jackson-annotations-2.7.0.jar
-- lib/com/fasterxml/jackson/core/jackson-core/2.7.1/jackson-core-2.7.1.jar
 - lib/com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar
-- lib/com/fasterxml/jackson/core/jackson-databind/2.7.1-1/jackson-databind-2.7.1-1.jar
 - lib/com/fasterxml/jackson/core/jackson-databind/2.7.3/jackson-databind-2.7.3.jar
 - lib/logstash-core-event-java.rb
 - lib/logstash-core-event-java/logstash-core-event-java.jar
@@ -77,9 +75,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - jar com.fasterxml.jackson.core:jackson-core, 2.7.3
 - jar com.fasterxml.jackson.core:jackson-databind, 2.7.3