ApiObject private constructor to force common obj creation

Author: dezed-ukaea

include/fdp/fdp.hxx

@@ -7,35 +7,35 @@
 
 namespace FDP {
 
-class DataPipeline {
+    class DataPipeline {
 
-public:
-  // 'initialise' method for the API
+        public:
+            // 'initialise' method for the API
 
-  ~DataPipeline();
+            ~DataPipeline();
 
-  explicit DataPipeline(
-      const std::string &config_file_path,
-      const std::string &script_file_path,
-      std::string token = "",
-      spdlog::level::level_enum log_level = spdlog::level::info);
+            explicit DataPipeline(
+                    const std::string &config_file_path,
+                    const std::string &script_file_path,
+                    std::string token = "",
+                    spdlog::level::level_enum log_level = spdlog::level::info);
 
 
-  DataPipeline(DataPipeline &&rhs) noexcept;
-  DataPipeline &operator=(DataPipeline &&rhs) noexcept;
+            DataPipeline(DataPipeline &&rhs) noexcept;
+            DataPipeline &operator=(DataPipeline &&rhs) noexcept;
 
-  DataPipeline(const DataPipeline &rhs);
-  DataPipeline &operator=(const DataPipeline &rhs);
+            DataPipeline(const DataPipeline &rhs);
+            DataPipeline &operator=(const DataPipeline &rhs);
 
-  ghc::filesystem::path link_read(std::string &data_product);
-  ghc::filesystem::path link_write(std::string &data_product);
-  void finalise();
+            ghc::filesystem::path link_read(std::string &data_product);
+            ghc::filesystem::path link_write(std::string &data_product);
+            void finalise();
 
-private:
-   class impl;
- 
-   std::shared_ptr< DataPipeline::impl > pimpl_;
-};
+        private:
+            class impl;
+
+            std::shared_ptr< DataPipeline::impl > pimpl_;
+    };
 }; // namespace FDP
 
 #endif

include/fdp/objects/api_object.hxx

@@ -15,18 +15,34 @@ namespace FDP {
     class ApiObject {
         private:
             Json::Value obj_;
+
+            ApiObject();
+
         public:
 
             typedef std::unique_ptr< ApiObject > uptr;
             typedef std::shared_ptr< ApiObject > sptr;
 
-            ApiObject() : obj_(Json::Value()){};
+            static uptr from_json( const Json::Value& j );
+
+            //static copy( const ApiObject& src );
+
             /**
              * @brief Construct a new Api Object object
              * 
              * @param uri uri of the api object e.g. http://127.0.0.1/object/1
              */
-            ApiObject(Json::Value obj) : obj_(obj){}
+
+            static ApiObject::uptr construct( void );
+
+            
+            int add( const std::string& key, int value );
+            int add( const std::string& key, float value );
+            int add( const std::string& key, double value );
+            int add( const std::string& key, const std::string& value );
+            int add( const std::string& key, const ApiObject& value );
+
+            int remove( const std::string& key );
             /**
              * @brief Get the object id from the uri
              * 

include/fdp/objects/config.hxx

@@ -39,7 +39,7 @@ namespace FDP {
             YAML::Node config_data_;            
             std::string api_url_;
             std::string token_;
-            std::shared_ptr<API> api_;
+            API::sptr api_;
 
             ApiObject::uptr user_;
             ApiObject::uptr author_;
@@ -113,7 +113,7 @@ namespace FDP {
 
             YAML::Node get_config_data() const {return config_data_;}
 
-            std::shared_ptr<API> get_api(){return api_;}
+            API::sptr get_api(){return api_;}
 
             RESTAPI get_rest_api_location(){return rest_api_location_;}
 

include/fdp/registry/api.hxx

@@ -117,6 +117,8 @@ public:
  *****************************************************************************/
 class API {
 public:
+    typedef std::shared_ptr< API > sptr;
+
   /*! *************************************************************************
    * @brief construct an API object using the given URL as the root
    * @author K. Zarebski (UKAEA)
@@ -246,4 +248,4 @@ std::string url_encode(std::string url);
 
 }; // namespace FDP
 
-#endif
+#endif

src/fdp.cxx

@@ -12,6 +12,7 @@ namespace FDP {
       std::string token_() const {return config_->get_token();}
       RESTAPI api_location_() {return config_->get_rest_api_location();}
   public:
+      typedef std::shared_ptr< impl > sptr;
 
   /*! *************************************************************************
    * @brief construct a DataPipelineImpl_ instance from configurations and setup

src/objects/api_object.cxx

@@ -1,6 +1,72 @@
 #include "fdp/objects/api_object.hxx"
 
 namespace FDP {
+
+    ApiObject::ApiObject() : obj_(Json::Value() )
+    {
+    }
+
+    ApiObject::uptr ApiObject::from_json( const Json::Value& j )
+    {
+       // ApiObject::uptr pobj = std::unique_ptr< ApiObject >( new ApiObject( j ) );
+
+        ApiObject::uptr pobj = ApiObject::construct();
+        pobj->obj_ = j;
+
+        return pobj;
+    }
+
+    ApiObject::uptr ApiObject::construct(void)
+    {
+        ApiObject::uptr pobj = std::unique_ptr< ApiObject >( new ApiObject() );
+        return pobj;
+    }
+#if 0
+    ApiObject::uptr ApiObject::copy( const ApiObject& src )
+    {
+        ApiObject::uptr pobj = std::unique_ptr< ApiObject >( new ApiObject() );
+
+        pobj->obj_.copy( src.obj_ );
+        return obj;
+    }
+#endif
+    int ApiObject::add( const std::string& key, int value )
+    {
+        this->obj_[ key ] = value;
+        return 0;
+    }
+    int ApiObject::add( const std::string& key, float value )
+    {
+        this->obj_[ key ] = value;
+        return 0;
+    }
+
+    int ApiObject::add( const std::string& key, double value )
+    {
+        this->obj_[ key ] = value;
+        return 0;
+    }
+
+    int ApiObject::add( const std::string& key, const std::string& value )
+    {
+        this->obj_[ key ] = value;
+        return 0;
+    }
+
+    int ApiObject::add( const std::string& key, const ApiObject& value )
+    {
+        this->obj_[ key ] = value.obj_;
+        return 0;
+    }
+
+
+    int ApiObject::remove( const std::string& key )
+    {
+        this->obj_.removeMember( key );
+        return 0;
+    }
+
+
     /**
      * @brief Returns the object id from the object uri_
      * 
@@ -51,4 +117,4 @@ namespace FDP {
     std::string ApiObject::get_first_component() const{
         return obj_["components"][0].asString();
     }
-};
+};