From 2492aee358ae8ead8bc3f82961721722297734ba Mon Sep 17 00:00:00 2001
From: Paul Ingles <paul@oobaloo.co.uk>
Date: Fri, 7 Jun 2013 10:48:08 +0100
Subject: [PATCH] Revert "work on updating the api to work against 0.8"

This reverts commit 5286bbfbb6557429db7abbc38c8a813f23a5a334.
---
 src/clj_kafka/producer.clj       | 13 +++++--------
 test/clj_kafka/test/consumer.clj | 16 +++-------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/clj_kafka/producer.clj b/src/clj_kafka/producer.clj
index 92adc5a..31409ea 100644
--- a/src/clj_kafka/producer.clj
+++ b/src/clj_kafka/producer.clj
@@ -6,7 +6,8 @@
 
 (defn producer
   "Creates a Producer. m is the configuration
-   metadata.broker.list: host1:port1,host1:port2"
+   serializer.class : default is kafka.serializer.DefaultEncoder
+   zk.connect       : Zookeeper connection. e.g. localhost:2181 "
   [m]
   ^Producer (Producer. (ProducerConfig. (as-properties m))))
 
@@ -16,16 +17,12 @@
   [#^bytes payload]
   (Message. payload))
 
-(defn- keyed-message
-  [^String topic ^Message message]
-  (KeyedMessage. topic nil message))
-
-(defn send-message
+(defn send-messages
   "Sends a message.
    topic   : a string
    msgs    : a single message, or sequence of messages to send"
-  [^Producer producer ^String topic ^Message message]
-  (.send producer (keyed-message topic message)))
+  [^Producer producer ^String topic msgs]
+  (.send producer (map #(KeyedMessage. topic %) msgs)))
 
 
 (defprotocol ToMessage
diff --git a/test/clj_kafka/test/consumer.clj b/test/clj_kafka/test/consumer.clj
index c80e664..18e2c98 100644
--- a/test/clj_kafka/test/consumer.clj
+++ b/test/clj_kafka/test/consumer.clj
@@ -1,17 +1,7 @@
 (ns clj-kafka.test.consumer
   (:use [clojure.test]
-        [clj-kafka.test.utils :only (with-broker)]
-        [clj-kafka.core :only (with-resource)]
-        [clj-kafka.producer :only (producer to-message send-messages)])
-  (:require [clj-kafka.consumer.zk :as zk]))
+        [clj-kafka.test.utils :only (with-broker)]))
 
-(deftest zookeeper-consumer
+(deftest testing-something
   (with-broker
-    (let [p (producer {"metadata.broker.list" "localhost:9999"})]
-      (send-messages p "test" (to-message "Hello, world"))
-      (with-resource [c (zk/consumer {"zookeeper.connect" "127.0.0.1:2182"
-                                      "group.id" "clj-kafka.test.consumer"
-                                      "auto.offset.reset" "smallest"
-                                      "auto.commit.enable" "false"})]
-        zk/shutdown
-        (is (= 1 1))))))
\ No newline at end of file
+    (is (= 1 1))))
\ No newline at end of file