jruby-kafka 0.2.0-java → 0.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c550cc97c9b34ca77bd8b4b6e7db5fa18a6835
-  data.tar.gz: c20ccd7aab41df5a3738239b4beaba87db81df29
+  metadata.gz: c112e1cf70476e795e3f9eed4d2e5c4f770d8534
+  data.tar.gz: 628055947aa72d34e19f9a59addc5e83f831643a
 SHA512:
-  metadata.gz: 375d163f4a8a12828c83911c7763a24e70c7e3e4e1ceaa0eb1882543f18b3a1a370b27fcd24ab818484cd1c2f335d7d4da5c69e9eddd0634187bb04a24ce3055
-  data.tar.gz: 4533509f03e2f893e472cf9026d284a08e3e5999be1f6fb6ddfbc078deb58e5e31fc90b71145150ec59478b478e98edb844467c42ac6756a742c7a723feaf755
+  metadata.gz: d786ffd66d26ceb1de0406d28f5598e1f7f734e42c2c6ed65c30f76a9cbdabb9da817d6160bdfc4433488541a414b55acac44992463841b9952b16293fbf2dff
+  data.tar.gz: 059b12bec092caf78a7cd1b783eb783b615995e2f76a81ed81427d883e4a825c6a5d61d04eb5805465062840147d27d6abfdcac9ab87b2dcf6396bbd0bce3baa

data/lib/jruby-kafka.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="CompassSettings">
+    <option name="compassSupportEnabled" value="true" />
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

data/lib/jruby-kafka.rb

@@ -7,12 +7,12 @@
 #
 if not defined? JBUNDLER_CLASSPATH and ENV['KAFKA_PATH']
   require 'jruby-kafka/loader'
-  Kafka.load_jars()
+  Kafka.load_jars
 end
 
-require "jruby-kafka/consumer"
-require "jruby-kafka/group"
-require "jruby-kafka/producer"
+require 'jruby-kafka/consumer'
+require 'jruby-kafka/group'
+require 'jruby-kafka/producer'
 
 module Kafka
 end

data/lib/jruby-kafka/consumer.rb

@@ -1,33 +1,34 @@
-require "java"
-require "jruby-kafka/namespace"
-
-java_import 'kafka.consumer.ConsumerIterator'
-java_import 'kafka.consumer.KafkaStream'
-java_import 'kafka.common.ConsumerRebalanceFailedException'
-java_import 'kafka.consumer.ConsumerTimeoutException'
+require 'java'
+require 'jruby-kafka/namespace'
 
+# noinspection JRubyStringImportInspection
 class Kafka::Consumer
+  java_import 'kafka.consumer.ConsumerIterator'
+  java_import 'kafka.consumer.KafkaStream'
+  java_import 'kafka.common.ConsumerRebalanceFailedException'
+  java_import 'kafka.consumer.ConsumerTimeoutException'
+
   include Java::JavaLang::Runnable
   java_signature 'void run()'
 
   @m_stream
-  @m_threadNumber
+  @m_thread_number
   @m_queue
 
-    def initialize(a_stream, a_threadNumber, a_queue, a_bool_restart_on_exception, a_sleep_ms)
-      @m_threadNumber = a_threadNumber
+    def initialize(a_stream, a_thread_number, a_queue, restart_on_exception, a_sleep_ms)
+      @m_thread_number = a_thread_number
       @m_stream = a_stream
       @m_queue = a_queue
-      @m_restart_on_exception = a_bool_restart_on_exception
+      @m_restart_on_exception = restart_on_exception
       @m_sleep_ms = 1.0 / 1000.0 * Float(a_sleep_ms)
     end
 
     def run
-      it = @m_stream.iterator()
+      it = @m_stream.iterator
       begin
-        while it.hasNext()
+        while it.hasNext
           begin
-            @m_queue << it.next().message()
+            @m_queue << it.next.message
           end
         end
       rescue Exception => e

data/lib/jruby-kafka/error.rb

@@ -1,4 +1,4 @@
-require "jruby-kafka/namespace"
+require 'jruby-kafka/namespace'
 
 class KafkaError < StandardError
   attr_reader :object

data/lib/jruby-kafka/group.rb

@@ -1,16 +1,17 @@
 # basically we are porting this https://cwiki.apache.org/confluence/display/KAFKA/Consumer+Group+Example
 
-require "java"
+require 'java'
 
-require "jruby-kafka/namespace"
-require "jruby-kafka/consumer"
-require "jruby-kafka/error"
-
-java_import 'java.util.concurrent.ExecutorService'
-java_import 'java.util.concurrent.Executors'
-java_import 'org.I0Itec.zkclient.exception.ZkException'
+require 'jruby-kafka/namespace'
+require 'jruby-kafka/consumer'
+require 'jruby-kafka/error'
 
+# noinspection JRubyStringImportInspection
 class Kafka::Group
+  java_import 'java.util.concurrent.ExecutorService'
+  java_import 'java.util.concurrent.Executors'
+  java_import 'org.I0Itec.zkclient.exception.ZkException'
+
   @consumer
   @executor
   @topic
@@ -136,81 +137,80 @@ class Kafka::Group
     end
   end
 
-  private
-  def validate_required_arguments(options={})
-    [:zk_connect, :group_id, :topic_id].each do |opt|
-      raise(ArgumentError, "#{opt} is required.") unless options[opt]
-    end
-  end
-
   public
-  def shutdown()
+
+  def shutdown
     if @consumer
-      @consumer.shutdown()
+      @consumer.shutdown
     end
     if @executor
-      @executor.shutdown()
+      @executor.shutdown
     end
     @running = false
   end
 
-  public
-  def run(a_numThreads, a_queue)
+  def run(a_num_threads, a_queue)
     begin
       if @auto_offset_reset == 'smallest'
         Java::kafka::utils::ZkUtils.maybeDeletePath(@zk_connect, "/consumers/#{@group_id}")
       end
 
-      @consumer = Java::kafka::consumer::Consumer.createJavaConsumerConnector(createConsumerConfig())
+      @consumer = Java::kafka::consumer::Consumer.createJavaConsumerConnector(create_consumer_config)
     rescue ZkException => e
       raise KafkaError.new(e), "Got ZkException: #{e}"
     end
-    topicCountMap = java.util.HashMap.new()
-    thread_value = a_numThreads.to_java Java::int
-    topicCountMap.put(@topic, thread_value)
-    consumerMap = @consumer.createMessageStreams(topicCountMap)
-    streams = Array.new(consumerMap[@topic])
+    topic_count_map = java.util.HashMap.new
+    thread_value = a_num_threads.to_java Java::int
+    topic_count_map.put(@topic, thread_value)
+    consumer_map = @consumer.createMessageStreams(topic_count_map)
+    streams = Array.new(consumer_map[@topic])
 
-    @executor = Executors.newFixedThreadPool(a_numThreads)
+    @executor = Executors.newFixedThreadPool(a_num_threads)
     @executor_submit = @executor.java_method(:submit, [Java::JavaLang::Runnable.java_class])
 
-    threadNumber = 0
-    for stream in streams
-      @executor_submit.call(Kafka::Consumer.new(stream, threadNumber, a_queue, @consumer_restart_on_error, @consumer_restart_sleep_ms))
-      threadNumber += 1
+    thread_number = 0
+    streams.each do |stream|
+      @executor_submit.call(Kafka::Consumer.new(stream, thread_number, a_queue, @consumer_restart_on_error, @consumer_restart_sleep_ms))
+      thread_number += 1
     end
     @running = true
   end
 
-  public
   def running?
     @running
   end
 
   private
-  def createConsumerConfig()
-    properties = java.util.Properties.new()
-    properties.put("zookeeper.connect", @zk_connect)
-    properties.put("group.id", @group_id)
-    properties.put("zookeeper.connection.timeout.ms", @zk_connect_timeout)
-    properties.put("zookeeper.session.timeout.ms", @zk_session_timeout)
-    properties.put("zookeeper.sync.time.ms", @zk_sync_time)
-    properties.put("auto.commit.interval.ms", @auto_commit_interval)
-    properties.put("auto.offset.reset", @auto_offset_reset)
-    properties.put("rebalance.max.retries", @rebalance_max_retries)
-    properties.put("rebalance.backoff.ms", @rebalance_backoff_ms)
-    properties.put("socket.timeout.ms", @socket_timeout_ms)
-    properties.put("socket.receive.buffer.bytes", @socket_receive_buffer_bytes)
-    properties.put("fetch.message.max.bytes", @fetch_message_max_bytes)
-    properties.put("auto.commit.enable", @auto_commit_enable)
-    properties.put("queued.max.message.chunks", @queued_max_message_chunks)
-    properties.put("fetch.min.bytes", @fetch_min_bytes)
-    properties.put("fetch.wait.max.ms", @fetch_wait_max_ms)
-    properties.put("refresh.leader.backoff.ms", @refresh_leader_backoff_ms)
-    properties.put("consumer.timeout.ms", @consumer_timeout_ms)
+
+  def validate_required_arguments(options={})
+    [:zk_connect, :group_id, :topic_id].each do |opt|
+      raise(ArgumentError, "#{opt} is required.") unless options[opt]
+    end
+  end
+
+  def create_consumer_config
+    properties = java.util.Properties.new
+    properties.put('zookeeper.connect', @zk_connect)
+    properties.put('group.id', @group_id)
+    properties.put('zookeeper.connection.timeout.ms', @zk_connect_timeout)
+    properties.put('zookeeper.session.timeout.ms', @zk_session_timeout)
+    properties.put('zookeeper.sync.time.ms', @zk_sync_time)
+    properties.put('auto.commit.interval.ms', @auto_commit_interval)
+    properties.put('auto.offset.reset', @auto_offset_reset)
+    properties.put('rebalance.max.retries', @rebalance_max_retries)
+    properties.put('rebalance.backoff.ms', @rebalance_backoff_ms)
+    properties.put('socket.timeout.ms', @socket_timeout_ms)
+    properties.put('socket.receive.buffer.bytes', @socket_receive_buffer_bytes)
+    properties.put('fetch.message.max.bytes', @fetch_message_max_bytes)
+    properties.put('auto.commit.enable', @auto_commit_enable)
+    properties.put('queued.max.message.chunks', @queued_max_message_chunks)
+    properties.put('fetch.min.bytes', @fetch_min_bytes)
+    properties.put('fetch.wait.max.ms', @fetch_wait_max_ms)
+    properties.put('refresh.leader.backoff.ms', @refresh_leader_backoff_ms)
+    properties.put('consumer.timeout.ms', @consumer_timeout_ms)
     unless @consumer_id.nil?
       properties.put('consumer.id', @consumer_id)
     end
-    return Java::kafka::consumer::ConsumerConfig.new(properties)
+    Java::kafka::consumer::ConsumerConfig.new(properties)
   end
 end

data/lib/jruby-kafka/jruby-kafka.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="CompassSettings">
+    <option name="compassSupportEnabled" value="true" />
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

data/lib/jruby-kafka/producer.rb

@@ -1,22 +1,24 @@
 # basically we are porting this https://cwiki.apache.org/confluence/display/KAFKA/0.8.0+Producer+Example
 
-require "java"
+require 'java'
 
-require "jruby-kafka/namespace"
-require "jruby-kafka/error"
+require 'jruby-kafka/namespace'
+require 'jruby-kafka/error'
 
+# noinspection JRubyStringImportInspection
 class Kafka::Producer
+  extend Gem::Deprecate
   java_import 'kafka.producer.ProducerConfig'
   java_import 'kafka.producer.KeyedMessage'
-  KafkaProducer = Java::kafka.javaapi.producer.Producer
+  KAFKA_PRODUCER = Java::kafka.javaapi.producer.Producer
   java_import 'kafka.message.NoCompressionCodec'
   java_import 'kafka.message.GZIPCompressionCodec'
   java_import 'kafka.message.SnappyCompressionCodec'
 
   VALIDATIONS = {
-    'request.required.acks' => %w[ 0 1 -1 ],
-    'required.codecs' => [NoCompressionCodec.name, GZIPCompressionCodec.name, SnappyCompressionCodec.name],
-    'producer.type' => %w[ sync async ]
+    :'request.required.acks' => %w[ 0 1 -1 ],
+    :'required.codecs' => [NoCompressionCodec.name, GZIPCompressionCodec.name, SnappyCompressionCodec.name],
+    :'producer.type' => %w[ sync async ]
   }
 
   REQUIRED = %w[
@@ -42,33 +44,40 @@ class Kafka::Producer
   # options:
   # metadata_broker_list: ["localhost:9092"] - REQUIRED: a seed list of kafka brokers
   def initialize(opts = {})
-    @options = opts.reduce({}) do |opts, (k, v)|
-      opts[k.to_s.gsub(/_/, '.')] = v
-      opts
+    @options = opts.reduce({}) do |opts_array, (k, v)|
+      unless v.nil?
+        opts_array[k.to_s.gsub(/_/, '.')] = v
+      end
+      opts_array
     end
     if options['broker.list']
       options['metadata.broker.list'] = options.delete 'broker.list'
     end
-    if options['compressed.topics'].to_s == 'none'
-      options.delete 'compressed.topics'
-    end
     if options['metadata.broker.list'].is_a? Array
       options['metadata.broker.list'] = options['metadata.broker.list'].join(',')
     end
+    if options['compressed.topics'].is_a? Array
+      options['compressed.topics'] = options['compressed.topics'].join(',')
+    end
     validate_arguments
-    @send_method = proc { throw StandardError.new "Producer is not connected" }
+    @send_method = proc { throw StandardError.new 'Producer is not connected' }
   end
 
   def connect
-    @producer = KafkaProducer.new(createProducerConfig)
+    @producer = KAFKA_PRODUCER.new(create_producer_config)
     @send_method = producer.java_method :send, [KeyedMessage]
   end
 
   # throws FailedToSendMessageException or if not connected, StandardError.
-  def sendMsg(topic, key, msg)
+  def send_msg(topic, key, msg)
     send_method.call(KeyedMessage.new(topic, key, msg))
   end
 
+  def sendMsg(topic, key, msg)
+    send_msg(topic, key, msg)
+  end
+  deprecate :sendMsg, :send_msg, 2015, 01
+
   def close
     @producer.close
   end
@@ -87,9 +96,9 @@ class Kafka::Producer
     end
   end
 
-  def createProducerConfig
-    properties = java.util.Properties.new()
+  def create_producer_config
+    properties = java.util.Properties.new
     options.each { |opt, value| properties.put opt, value.to_s }
-    return ProducerConfig.new(properties)
+    ProducerConfig.new(properties)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: java
 authors:
 - Joseph Lawson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
@@ -31,10 +31,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/jruby-kafka.iml
 - lib/jruby-kafka.rb
 - lib/jruby-kafka/consumer.rb
 - lib/jruby-kafka/error.rb
 - lib/jruby-kafka/group.rb
+- lib/jruby-kafka/jruby-kafka.iml
 - lib/jruby-kafka/loader.rb
 - lib/jruby-kafka/namespace.rb
 - lib/jruby-kafka/producer.rb