Skip to content

Commit f912b6c

Browse files
plugin-api 2.0 migration
1 parent 7514ba0 commit f912b6c

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

.travis.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
sudo: false
2+
jdk:
3+
- oraclejdk8
24
language: ruby
35
cache: bundler
46
rvm:
5-
- jruby-1.7.23
6-
script:
7+
- jruby-1.7.25
8+
before_install:
9+
- git clone -b feature/event_interface https://github.com/elastic/logstash
10+
script:
711
- bundle exec rspec spec

Gemfile

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
source 'https://rubygems.org'
2-
gemspec
2+
gemspec
3+
4+
# this is temporary for the feature/plugin-api-2_0 branch and is meant for travis testing
5+
gem "logstash-core", :path => "./logstash/logstash-core"
6+
gem "logstash-core-plugin-api", :path => "./logstash/logstash-core-plugin-api"
7+
gem "logstash-core-event-java", :path => "./logstash/logstash-core-event-java"
8+
gem "logstash-devutils", :github => "elastic/logstash-devutils", :branch => "feature/plugin-api-2_0"

logstash-codec-line.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
2121

2222
# Gem dependencies
23-
s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
23+
s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
2424

2525
s.add_development_dependency 'logstash-devutils'
2626
end

spec/codecs/line_spec.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@
5151
subject.decode("hello world\n") do |e|
5252
decoded = true
5353
insist { e.is_a?(LogStash::Event) }
54-
insist { e["message"] } == "hello world"
54+
insist { e.get("message") } == "hello world"
5555
end
5656
insist { decoded } == true
5757
end
5858

5959
it "should return an event from a valid utf-8 string" do
6060
subject.decode("München\n") do |e|
6161
insist { e.is_a?(LogStash::Event) }
62-
insist { e["message"] } == "München"
62+
insist { e.get("message") } == "München"
6363
end
6464
end
6565

@@ -74,17 +74,17 @@
7474
subject.decode(line) { |e| result << e }
7575
subject.flush { |e| result << e }
7676
expect(result.size).to eq(1)
77-
expect(result[0]["message"]).to eq(line)
77+
expect(result[0].get("message")).to eq(line)
7878
end
7979

8080
it "should break lines by that delimiter" do
8181
result = []
8282
subject.decode("line1|line2|line3|") { |e| result << e }
8383
subject.flush { |e| result << e }
8484
expect(result.size).to eq(3)
85-
expect(result[0]["message"]).to eq("line1")
86-
expect(result[1]["message"]).to eq("line2")
87-
expect(result[2]["message"]).to eq("line3")
85+
expect(result[0].get("message")).to eq("line1")
86+
expect(result[1].get("message")).to eq("line2")
87+
expect(result[2].get("message")).to eq("line3")
8888
end
8989
end
9090
end
@@ -98,7 +98,7 @@
9898
count = 0
9999
subject.flush do |event|
100100
count += 1
101-
insist { event["message"].encoding } == Encoding::UTF_8
101+
insist { event.get("message").encoding } == Encoding::UTF_8
102102
end
103103
insist { count } == 1
104104
end

0 commit comments

Comments
 (0)