Move info structure to dedicated file, correct rest exception

Author: a-pavlov

client_demo/netlicensing_client_demo.cc

@@ -48,7 +48,10 @@ int main(int argc, char* argv[]) {
     }
   }
   catch (const netlicensing::RestException& e) {
-    std::cerr << "REST error: " << e.what() << std::endl;
+    std::cerr << e.what() << " code " << e.http_code() << std::endl;
+    for (auto det : e.get_details()) {
+      std::cerr << det.to_string() << std::endl;
+    }
     return 2;
   }
   catch (const std::runtime_error& err) {

include/netlicensing/entity.h

@@ -72,14 +72,6 @@ class Entity {
   std::string to_string() const;
 };
 
-struct Info {
-  std::string value_;
-  std::string id_;
-  std::string type_;
-
-  void add_property(const std::string& name, const std::string& value);
-};
-
 }
 
 #endif //__ENTITY_H__

include/netlicensing/exception.h

@@ -2,6 +2,7 @@
 #define __EXCEPTION_H__
 
 #include <stdexcept>
+#include "netlicensing/info.h"
 
 namespace netlicensing {
 
@@ -35,12 +36,18 @@ class ServiceException : public std::runtime_error {
 class RestException : public std::runtime_error {
  private:
   int code_;
+  std::list<Info> details_;
  public:
-  RestException(const std::string& msg, int code) : std::runtime_error(msg), code_(code) {}
+  RestException(const std::list<Info>& details, int code) : 
+    std::runtime_error("REST error"), code_(code), details_(details) {}
 
   int http_code() const {
     return code_;
   }
+
+  const std::list<Info> get_details() const {
+    return details_;
+  }
 };
 
 class MalformedArgumentsException : public std::runtime_error {

include/netlicensing/info.h

@@ -0,0 +1,19 @@
+#ifndef __INFO_H__
+#define __INFO_H__
+
+#include <string>
+
+namespace netlicensing {
+
+struct Info {
+  std::string value_;
+  std::string id_;
+  std::string type_;
+
+  void add_property(const std::string& name, const std::string& value);
+  std::string to_string() const;
+};
+
+}
+
+#endif //__INFO_H__

include/netlicensing/service.h

@@ -5,6 +5,7 @@
 #include "netlicensing/validation_result.h"
 #include "netlicensing/mapper.h"
 #include "netlicensing/traversal.h"
+#include "netlicensing/exception.h"
 
 namespace netlicensing {
 
@@ -36,6 +37,11 @@ inline std::list<ValidationResult> validate(Context& ctx,
   std::string res = ctx.get(endpoint, params, http_code);
   Mapper<ValidationResult> mp;
   traverse(mp, res);
+
+  if (http_code != 200) {
+    throw RestException(mp.info_, http_code);
+  }
+  
   return mp.items;
 }
 

include/netlicensing/validation_result.h

@@ -2,6 +2,7 @@
 #define __VALIDATION_RESULT_H__
 
 #include "netlicensing/entity.h"
+#include "netlicensing/info.h"
 
 namespace netlicensing {
 

src/entity.cc

@@ -23,10 +23,4 @@ std::string Entity::to_string() const {
   return ss.str();
 }
 
-void Info::add_property(const std::string& name, const std::string& value) {
-  if (name == "value") value_ = value;
-  else if (name == "id") id_ = value;
-  else if (name == "type") type_ = value;
-}
-
 }

src/info.cc

@@ -0,0 +1,15 @@
+#include "netlicensing/info.h"
+
+namespace netlicensing {
+
+void Info::add_property(const std::string& name, const std::string& value) {
+  if (name == "value") value_ = value;
+  else if (name == "id") id_ = value;
+  else if (name == "type") type_ = value;
+}
+
+std::string Info::to_string() const {
+  return type_ + ": " + value_;
+}
+
+}

tests/test_errors_parsing.cc

@@ -8,6 +8,7 @@
 
 #include "netlicensing/entity.h"
 #include "netlicensing/traversal.h"
+#include "netlicensing/info.h"
 
 using netlicensing::Info;