Add Error class

include/cppkafka/configuration.h

@@ -46,6 +46,7 @@
 namespace cppkafka {
 
 class Message;
+class Error;
 class Producer;
 class Consumer;
 class KafkaHandleBase;
@@ -61,7 +62,7 @@ class KafkaHandleBase;
 class CPPKAFKA_API Configuration : public ConfigurationBase<Configuration> {
 public:
     using DeliveryReportCallback = std::function<void(Producer& producer, const Message&)>;
-    using OffsetCommitCallback = std::function<void(Consumer& consumer, rd_kafka_resp_err_t,
+    using OffsetCommitCallback = std::function<void(Consumer& consumer, Error,
                                                     const TopicPartitionList& topic_partitions)>;
     using ErrorCallback = std::function<void(KafkaHandleBase& handle, int error,
                                              const std::string& reason)>;

include/cppkafka/consumer.h

@@ -37,6 +37,7 @@
 #include "kafka_handle_base.h"
 #include "message.h"
 #include "macros.h"
+#include "error.h"
 
 namespace cppkafka {
 
@@ -82,7 +83,7 @@ class TopicConfiguration;
  *     Message msg = consumer.poll(); 
  *     if (msg) {
  *         // It's a valid message!
- *         if (!msg.has_error()) {
+ *         if (!msg.get_error()) {
  *             // It's an actual message. Get the payload and print it to stdout
  *             cout << msg.get_payload().as_string() << endl;
  *         }
@@ -98,7 +99,7 @@ class CPPKAFKA_API Consumer : public KafkaHandleBase {
 public:
     using AssignmentCallback = std::function<void(TopicPartitionList&)>;
     using RevocationCallback = std::function<void(const TopicPartitionList&)>;
-    using RebalanceErrorCallback = std::function<void(rd_kafka_resp_err_t)>;
+    using RebalanceErrorCallback = std::function<void(Error)>;
 
     /**
      * \brief Creates an instance of a consumer.

include/cppkafka/error.h

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016, Matias Fontanini
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef CPPKAFKA_ERROR_H
+#define CPPKAFKA_ERROR_H
+
+#include <string>
+#include <iosfwd>
+#include <librdkafka/rdkafka.h>
+#include "macros.h"
+
+namespace cppkafka {
+
+/**
+ * Abstraction for an rdkafka error
+ */
+class CPPKAFKA_API Error {
+public:
+    /**
+     * Constructs an error object
+     */
+    Error(rd_kafka_resp_err_t error);
+
+    /**
+     * Gets the error value
+     */
+    rd_kafka_resp_err_t get_error() const;
+
+    /**
+     * Gets the error string
+     */
+    std::string to_string() const;
+
+    /**
+     * Checks whether this error contains an actual error (and not RD_KAFKA_RESP_ERR_NO_ERROR)
+     */
+    explicit operator bool() const;
+
+    /**
+     * Compares this error for equality
+     */
+    bool operator==(const Error& rhs) const;
+
+    /**
+     * Compares this error for inequality
+     */
+    bool operator!=(const Error& rhs) const;
+
+    /**
+     * Writes this error's string representation into a stream
+     */
+    friend std::ostream& operator<<(std::ostream& output, const Error& rhs);
+private:
+    rd_kafka_resp_err_t error_;
+};
+
+} // cppkafka
+
+#endif // CPPKAFKA_ERROR_H

include/cppkafka/exceptions.h

@@ -34,6 +34,7 @@
 #include <string>
 #include <librdkafka/rdkafka.h>
 #include "macros.h"
+#include "error.h"
 
 namespace cppkafka {
 
@@ -78,11 +79,11 @@ public:
  */
 class CPPKAFKA_API HandleException : public Exception {
 public:
-    HandleException(rd_kafka_resp_err_t error_code);
+    HandleException(Error error);
 
-    rd_kafka_resp_err_t get_error_code() const;
+    Error get_error() const;
 private:
-    rd_kafka_resp_err_t error_code_;
+    Error error_;
 };
 
 } // cppkafka

include/cppkafka/message.h

@@ -37,6 +37,7 @@
 #include "buffer.h"
 #include "topic.h"
 #include "macros.h"
+#include "error.h"
 
 namespace cppkafka {
 
@@ -78,20 +79,10 @@ public:
     Message& operator=(const Message&) = delete;
     Message& operator=(Message&& rhs) = default;
 
-    /**
-     * Indicates whether this is a message carrying an error notification
-     */
-    bool has_error() const;
-
     /**
      * Gets the error attribute
      */
-    rd_kafka_resp_err_t get_error() const;
-
-    /**
-     * Gets the error as a string
-     */
-    std::string get_error_string() const;    
+    Error get_error() const;  
 
     /**
      * Utility function to check for get_error() == RD_KAFKA_RESP_ERR__PARTITION_EOF

include/cppkafka/metadata.h

@@ -40,6 +40,8 @@
 
 namespace cppkafka {
 
+class Error;
+
 /**
  * Represents the metadata for a partition
  */
@@ -55,7 +57,7 @@ public:
     /**
      * Gets the partition error as reported by the broker
      */
-    rd_kafka_resp_err_t get_error() const;
+    Error get_error() const;
 
     /**
      * Gets the leader broker id
@@ -94,7 +96,7 @@ public:
     /**
      * Gets the topic error
      */
-    rd_kafka_resp_err_t get_error() const;
+    Error get_error() const;
 
     /**
      * Gets the partitions' metadata