Skip to content
Snippets Groups Projects
Commit 705e09d0 authored by florian's avatar florian
Browse files

DRAFT: Disable messages for properties and parents for now

parent f6af9e0e
No related branches found
No related tags found
1 merge request!4ENH: Allow insertion and deletion of single entities
Pipeline #11185 passed
Pipeline: caosdb-cppinttest

#11186

    ......@@ -54,8 +54,10 @@ public:
    }
    friend class Entity;
    friend class Parent;
    friend class Property;
    // TODO(fspreck) Re-enable once we have decided how messages are
    // appended to parents and properties
    // friend class Parent;
    // friend class Property;
    friend class Messages;
    private:
    ......@@ -76,8 +78,9 @@ public:
    }
    friend class Entity;
    friend class Parent;
    friend class Property;
    // TODO(fspreck) Same here.
    // friend class Parent;
    // friend class Property;
    private:
    inline Messages() : wrapped(nullptr){};
    ......@@ -138,32 +141,32 @@ public:
    return out;
    }
    // TODO(fspreck) These need implementations. See Entity::GetErrors for
    // inspiration.
    /**
    * Return the error messages of this parent.
    */
    [[nodiscard]] inline auto GetErrors() const -> const Messages & {
    return errors;
    }
    [[nodiscard]] inline auto HasErrors() const -> bool {
    return this->errors.wrapped->size() > 0;
    }
    /**
    * Return the warning messages of this parent.
    */
    [[nodiscard]] inline auto GetWarnings() const -> const Messages & {
    return warnings;
    }
    [[nodiscard]] inline auto HasWarnings() const -> bool {
    return this->warnings.wrapped->size() > 0;
    }
    /**
    * Return the info messages of this parent.
    */
    [[nodiscard]] inline auto GetInfos() const -> const Messages & {
    return infos;
    }
    // TODO(fspreck) Finish the following implementations once we have
    // decided how to attach messages to parents.
    // /**
    // * Return the error messages of this parent.
    // */
    // [[nodiscard]] inline auto GetErrors() const -> const Messages & {
    // return errors;
    // }
    // [[nodiscard]] inline auto HasErrors() const -> bool {
    // return this->errors.wrapped->size() > 0;
    // }
    // /**
    // * Return the warning messages of this parent.
    // */
    // [[nodiscard]] inline auto GetWarnings() const -> const Messages & {
    // return warnings;
    // }
    // [[nodiscard]] inline auto HasWarnings() const -> bool {
    // return this->warnings.wrapped->size() > 0;
    // }
    // /**
    // * Return the info messages of this parent.
    // */
    // [[nodiscard]] inline auto GetInfos() const -> const Messages & {
    // return infos;
    // }
    friend class Entity;
    friend class Parents;
    ......@@ -185,9 +188,9 @@ private:
    * Message which serves as storage backend.
    */
    mutable caosdb::entity::v1alpha1::Parent *wrapped;
    Messages errors;
    Messages warnings;
    Messages infos;
    // Messages errors;
    // Messages warnings;
    // Messages infos;
    };
    /**
    ......@@ -252,9 +255,11 @@ public:
    [[nodiscard]] auto GetValue() const -> const std::string &;
    [[nodiscard]] auto GetUnit() const -> const std::string &;
    [[nodiscard]] auto GetDatatype() const -> const std::string &;
    [[nodiscard]] auto GetErrors() const -> const Messages &;
    [[nodiscard]] auto GetWarnings() const -> const Messages &;
    [[nodiscard]] auto GetInfos() const -> const Messages &;
    // TODO(fspreck) Implement these when we have decided how to attach
    // messages to properties.
    // [[nodiscard]] auto GetErrors() const -> const Messages &;
    // [[nodiscard]] auto GetWarnings() const -> const Messages &;
    // [[nodiscard]] auto GetInfos() const -> const Messages &;
    auto SetId(const std::string &id) -> void;
    auto SetName(const std::string &name) -> void;
    ......
    ......@@ -29,9 +29,11 @@ using ProtoEntity = caosdb::entity::v1alpha1::Entity;
    using caosdb::utility::get_arena;
    Parent::Parent() : wrapped(Parent::CreateProtoParent()) {
    errors.wrapped = this->wrapped->mutable_errors();
    warnings.wrapped = this->wrapped->mutable_warnings();
    infos.wrapped = this->wrapped->mutable_infos();
    // TODO(fspreck) Re-enable once we have decided how to attach
    // messages to parents.
    // errors.wrapped = this->wrapped->mutable_errors();
    // warnings.wrapped = this->wrapped->mutable_warnings();
    // infos.wrapped = this->wrapped->mutable_infos();
    }
    auto Parent::CreateProtoParent() -> ProtoParent * {
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment