logstash-integration-rabbitmq 7.0.2-java → 7.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc7f493804f0991ccbf4ef181068fdc8e372b661a4f90f0ab0e322735e9c6378
-  data.tar.gz: 658056957b677154fe94fb7a9d1d83a7caeadfe35d107e1ea76b526f9810da78
+  metadata.gz: 6997aa19019326916e120623107352d7ba274e8370312017561cb4fae3a2e064
+  data.tar.gz: 3fc3f9aff8d9700f233392a7311637f0b78d26c66681d8e83f1b52e991285c72
 SHA512:
-  metadata.gz: 438909c98dd41120e55a79ee931714d788adce0313797d7579dcee76d3d12218aa1b94611a11ce568a3557db898a2a5090ec6b1d39e8e5315932b9dc021efbd1
-  data.tar.gz: 45d0ac6550002efd2660b86cc930d4e69305c9a8cd9903ec3f9b13fd5c66b4a75abf21677515efb91af7a4d24b032feb244e74c1d4c6b66f937b57f732196f87
+  metadata.gz: 5c0265553a26b422764bd45d9f3e0599d39f391f98a2effcc20a171f30b4219869d831cb54519142dc4ee8b4a3aabf47135548e4e69d327fc780f80a0fe766ac
+  data.tar.gz: 28255006283a7f813b7336732bd99e0c5c32a27e53f3464cc2686ab514895c4cf5cbe772245ace33c564277115ffac64ff4c864c70c8eeabdb95224278f24b6b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 7.0.3
+  - Refactor: scope (and remove unused) java imports [#29](https://github.com/logstash-plugins/logstash-integration-rabbitmq/pull/29)
+
 ## 7.0.2
   - Fixes issue in Output where failure to register connection reovery hooks prevented the output from starting
 

data/lib/logstash/inputs/rabbitmq.rb

@@ -2,8 +2,6 @@
 require_relative '../plugin_mixins/rabbitmq_connection'
 require 'logstash/inputs/threadable'
 require 'logstash/event'
-java_import java.util.concurrent.ArrayBlockingQueue
-java_import java.util.concurrent.TimeUnit
 
 module LogStash
   module Inputs
@@ -59,6 +57,9 @@ module LogStash
     # Additionally, any message headers will be saved in the
     # `[@metadata][rabbitmq_headers]` field.
     class RabbitMQ < LogStash::Inputs::Threadable
+
+      java_import java.util.concurrent.TimeUnit
+
       include ::LogStash::PluginMixins::RabbitMQConnection
 
       # The properties to extract from each message and store in a

data/lib/logstash/outputs/rabbitmq.rb

@@ -1,14 +1,12 @@
 # encoding: UTF-8
 require "logstash/pipeline"
 require_relative '../plugin_mixins/rabbitmq_connection'
-java_import java.util.concurrent.TimeoutException
-java_import com.rabbitmq.client.AlreadyClosedException
 
 require 'back_pressure'
 
 # Push events to a RabbitMQ exchange. Requires RabbitMQ 2.x
 # or later version (3.x is recommended).
-# 
+#
 # Relevant links:
 #
 # * http://www.rabbitmq.com/[RabbitMQ]
@@ -16,10 +14,14 @@ require 'back_pressure'
 module LogStash
   module Outputs
     class RabbitMQ < LogStash::Outputs::Base
+
+      java_import java.util.concurrent.TimeoutException
+      java_import com.rabbitmq.client.AlreadyClosedException
+
       include LogStash::PluginMixins::RabbitMQConnection
 
       config_name "rabbitmq"
-      
+
       concurrency :shared
 
       # The default codec for this plugin is JSON. You can override this to suit your particular needs however.
@@ -128,4 +130,4 @@ module LogStash
       end
     end
   end
-end
+end

data/logstash-integration-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-integration-rabbitmq'
-  s.version         = '7.0.2'
+  s.version         = '7.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Integration with RabbitMQ - input and output plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline "+
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'stud', '~> 0.0.22'
   s.add_runtime_dependency 'back_pressure', '~> 1.0'
 
-  s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'logstash-devutils', '~>2.0'
   s.add_development_dependency 'logstash-input-generator'
   s.add_development_dependency 'logstash-codec-plain'
 end

data/spec/inputs/rabbitmq_spec.rb

@@ -129,9 +129,10 @@ describe LogStash::Inputs::RabbitMQ do
   end
 end
 
-describe "with a live server", :integration => true do
+describe "LogStash::Inputs::RabbitMQ with a live server", :integration => true do
   let(:klass) { LogStash::Inputs::RabbitMQ }
-  let(:config) { {"host" => "127.0.0.1", "auto_delete" => true, "codec" => "plain", "add_field" => {"[@metadata][foo]" => "bar"} } }
+  let(:rabbitmq_host) { ENV["RABBITMQ_HOST"] || "127.0.0.1" }
+  let(:config) { {"host" => rabbitmq_host, "auto_delete" => true, "codec" => "plain", "add_field" => {"[@metadata][foo]" => "bar"} } }
   let(:instance) { klass.new(config) }
   let(:hare_info) { instance.instance_variable_get(:@hare_info) }
   let(:output_queue) { Queue.new }
@@ -237,7 +238,7 @@ describe "with a live server", :integration => true do
         expect(event).to include("@metadata")
         expect(event.get("@metadata")).to include("rabbitmq_properties")
 
-        props = event.get("[@metadata][rabbitmq_properties")
+        props = event.get("[@metadata][rabbitmq_properties]")
         expect(props["app-id"]).to eq(app_id)
         expect(props["delivery-mode"]).to eq(1)
         expect(props["exchange"]).to eq(exchange_name)
@@ -274,6 +275,7 @@ describe "with a live server", :integration => true do
   end
 
   describe LogStash::Inputs::RabbitMQ do
+    require "logstash/devutils/rspec/shared_examples"
     it_behaves_like "an interruptible input plugin"
   end
 end

data/spec/outputs/rabbitmq_spec.rb

@@ -2,7 +2,6 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/pipeline"
 require "logstash/outputs/rabbitmq"
-java_import java.util.concurrent.TimeoutException
 
 describe LogStash::Outputs::RabbitMQ do
   let(:klass) { LogStash::Outputs::RabbitMQ }
@@ -124,7 +123,7 @@ describe LogStash::Outputs::RabbitMQ do
         end
 
         context 'when it is a TimeoutException' do
-          let(:exception) { TimeoutException.new }
+          let(:exception) { java.util.concurrent.TimeoutException.new }
           it_behaves_like 'recovers from exception gracefully'
         end
       end
@@ -133,14 +132,15 @@ describe LogStash::Outputs::RabbitMQ do
 end
 
 
-describe "with a live server", :integration => true do
+describe "LogStash::Outputs::RabbitMQ with a live server", :integration => true do
+  let(:rabbitmq_host) { ENV["RABBITMQ_HOST"] || "127.0.0.1" }
   let(:klass) { LogStash::Outputs::RabbitMQ }
   let(:exchange) { "myexchange" }
   let(:exchange_type) { "topic" }
   let(:priority) { 34 }
   let(:default_plugin_config) {
     {
-      "host" => "127.0.0.1",
+      "host" => rabbitmq_host,
       "exchange" => exchange,
       "exchange_type" => exchange_type,
       "key" => "foo",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -103,17 +103,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   name: logstash-devutils
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Integration with RabbitMQ - input and output plugins