hermann 0.19.0-java → 0.20.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6ae048936233d039e0422d5fcf03deff436b95a
-  data.tar.gz: c9d8807df3dd9d8e9efd089a325471b24a27bb3f
+  metadata.gz: 34aa174c3645cce1f7bc1df218e72a00063b5264
+  data.tar.gz: e05f7192889002138624e8c3b8826f8ae0031660
 SHA512:
-  metadata.gz: c38aeb5099c6cf1f33b262b3a9f2b552ab964fc35d3c19a48280005580cf8d6b74401e15352ad93f73bea60d9d460af773f28ddf81058870a278eb37addce371
-  data.tar.gz: f8dddc93793e276ba0efe55875b1054ab5ba37c46f4e0bceba09dee39a91fcc05ddb17642db1a8ff854317cb8536374b72a0965a95b4bcbf498a7209a6587031
+  metadata.gz: bb665839477beea15207e8f5030708f3771c754f75a5f09f8e907f33043d9226f47aa09ac2be9b3ea701bb1b9dbae2ce4390147787f19d9c2c25af4a20e07f59
+  data.tar.gz: 74dd000daab4034ba6ce79d73c99bb57fbda367bcfe49cc78dcb26e30cf4e52314049632794b515208a33092ccfd1bf52a7463770d3f1847f60e2d4ca91e12b5

data/Rakefile

@@ -11,21 +11,25 @@ Rake::ExtensionTask.new do |t|
   t.gem_spec = Gem::Specification.load('hermann.gemspec')
 end
 
-RSpec::Core::RakeTask.new(:spec) do |r|
-  options = ['--tag ~type:integration']
-
+def add_rspec_options(options)
   if RUBY_PLATFORM == 'java'
     options << '--tag ~platform:mri'
   else
     options << '--tag ~platform:java'
   end
+  return options
+end
+
+RSpec::Core::RakeTask.new(:spec) do |r|
+  options = add_rspec_options(['--tag ~type:integration'])
 
   r.rspec_opts = options.join(' ')
 end
 
 namespace :spec do
   RSpec::Core::RakeTask.new(:integration) do |r|
-    r.rspec_opts = '--tag type:integration'
+    options = add_rspec_options(['--tag type:integration'])
+    r.rspec_opts = options.join(' ')
   end
 end
 

data/lib/hermann/discovery/zookeeper.rb

@@ -24,8 +24,7 @@ module Hermann
       #    tickTime (as set in the server configuration) and a maximum
       #    of 20 times the tickTime2 times the tick time set on server"
       #
-      # @return [String] comma separated list of brokers
-      #
+      # @return [Array] List of brokers from ZK
       # @raises [NoBrokersError] if could not discover brokers thru zookeeper
       def get_brokers(timeout=0)
         brokers = []
@@ -35,7 +34,7 @@ module Hermann
         if brokers.empty?
           raise Hermann::Errors::NoBrokersError
         end
-        brokers.join(',')
+        return brokers
       end
 
       private
@@ -82,4 +81,4 @@ module Hermann
         end
     end
   end
-end
+end

data/lib/hermann/errors.rb

@@ -1,8 +1,7 @@
 
 module Hermann
   module Errors
-    # Error for connectivity problems with the Kafka brokers
-    class ConnectivityError < StandardError
+    class GeneralError < StandardError
       attr_reader :java_exception
 
       # Initialize a connectivity error
@@ -11,17 +10,20 @@ module Hermann
       # @param [Hash[ options
       # @option options [Java::Lang::RuntimeException] :java_exception An
       #   underlying Java exception
-      def initialize(message, options={})
+      def initialize(message='', options={})
         super(message)
         @java_exception = options[:java_exception]
       end
     end
 
+    # Error for connectivity problems with the Kafka brokers
+    class ConnectivityError < GeneralError; end
+
     # For passing incorrect config and options to kafka
-    class ConfigurationError < StandardError; end
+    class ConfigurationError < GeneralError; end
 
     # cannot discover brokers from zookeeper
-    class NoBrokersError < StandardError; end
+    class NoBrokersError < GeneralError; end
   end
 end
 

data/lib/hermann/producer.rb

@@ -21,7 +21,7 @@ module Hermann
       @topic = topic
       @brokers = ThreadSafe::Array.new(brokers)
       if Hermann.jruby?
-        @internal = Hermann::Provider::JavaProducer.new(brokers, opts)
+        @internal = Hermann::Provider::JavaProducer.new(brokers.join(','), opts)
       else
         @internal = Hermann::Lib::Producer.new(brokers.join(','))
       end

data/lib/hermann/provider/java_producer.rb

@@ -13,7 +13,6 @@ module Hermann
 
       #default kafka Producer options
       DEFAULTS = {
-                    'serializer.class'      => 'kafka.serializer.StringEncoder',
                     'partitioner.class'     => 'kafka.producer.DefaultPartitioner',
                     'request.required.acks' => '1',
                     'message.send.max.retries' => '0'
@@ -46,12 +45,15 @@ module Hermann
       #   will be set
       def push_single(msg, topic, unused)
         Concurrent::Promise.execute {
-          data = ProducerUtil::KeyedMessage.new(topic, msg)
+          data = ProducerUtil::KeyedMessage.new(topic, msg.to_java_bytes)
           begin
             @producer.send(data)
           rescue Java::KafkaCommon::FailedToSendMessageException => jexc
             raise Hermann::Errors::ConnectivityError.new(jexc.message,
                                                          :java_exception => jexc)
+          rescue => e
+            raise Hermann::Errors::GeneralError.new(e.message,
+                                                         :java_exception => e)
           end
         }
       end

data/lib/hermann/provider/java_simple_consumer.rb

@@ -60,7 +60,8 @@ module Hermann
           stream = get_stream(topic)
           it = stream.iterator
           while it.hasNext do
-            yield it.next.message.to_s
+            message = it.next.message
+            yield String.from_java_bytes(message)
           end
         rescue Exception => e
           puts "#{self.class.name}#consume exception: #{e.class.name}"

data/lib/hermann/version.rb

@@ -1,3 +1,3 @@
 module Hermann
-  VERSION = '0.19.0'
+  VERSION = '0.20.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermann
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: java
 authors:
 - R. Tyler Croy
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement