Skip to content
Snippets Groups Projects
Commit f0fc164f authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge remote-tracking branch 'origin/f-consol-json-print' into dev

parents 442869b1 5aa82589
No related branches found
No related tags found
No related merge requests found
Pipeline #12318 passed
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest

#12325

    Hide whitespace changes
    Inline Side-by-side
    include/caosdb/entity.h
    + 6
    − 4
    View file @ f0fc164f
    ...@@ -367,7 +367,8 @@ public: ...@@ -367,7 +367,8 @@ public:
    * This is intended for debugging. * This is intended for debugging.
    */ */
    inline auto ToString() const -> const std::string { inline auto ToString() const -> const std::string {
    google::protobuf::util::JsonOptions options; google::protobuf::util::JsonPrintOptions options;
    options.add_whitespace = true;
    std::string out; std::string out;
    google::protobuf::util::MessageToJsonString(*(this->wrapped), &out, options); google::protobuf::util::MessageToJsonString(*(this->wrapped), &out, options);
    return out; return out;
    ...@@ -538,10 +539,10 @@ public: ...@@ -538,10 +539,10 @@ public:
    * This is intended for debugging * This is intended for debugging
    */ */
    inline auto ToString() const -> const std::string { inline auto ToString() const -> const std::string {
    google::protobuf::util::JsonOptions options; google::protobuf::util::JsonPrintOptions options;
    options.add_whitespace = true;
    std::string out; std::string out;
    google::protobuf::util::MessageToJsonString(*(this->wrapped), &out, options); google::protobuf::util::MessageToJsonString(*(this->wrapped), &out, options);
    return out; return out;
    } }
    ...@@ -649,7 +650,8 @@ public: ...@@ -649,7 +650,8 @@ public:
    [[nodiscard]] auto GetInfos() const -> const Messages & { return infos; } [[nodiscard]] auto GetInfos() const -> const Messages & { return infos; }
    inline auto ToString() const -> const std::string { inline auto ToString() const -> const std::string {
    google::protobuf::util::JsonOptions options; google::protobuf::util::JsonPrintOptions options;
    options.add_whitespace = true;
    std::string out; std::string out;
    google::protobuf::util::MessageToJsonString(*(this->wrapped), &out, options); google::protobuf::util::MessageToJsonString(*(this->wrapped), &out, options);
    return out; return out;
    ......
    include/caosdb/transaction.h
    + 4
    − 2
    View file @ f0fc164f
    ...@@ -391,7 +391,8 @@ public: ...@@ -391,7 +391,8 @@ public:
    * For debugging. * For debugging.
    */ */
    inline auto ResponseToString() const -> const std::string { inline auto ResponseToString() const -> const std::string {
    google::protobuf::util::JsonOptions options; google::protobuf::util::JsonPrintOptions options;
    options.add_whitespace = true;
    std::string out; std::string out;
    google::protobuf::util::MessageToJsonString(*this->response, &out, options); google::protobuf::util::MessageToJsonString(*this->response, &out, options);
    return out; return out;
    ...@@ -403,7 +404,8 @@ public: ...@@ -403,7 +404,8 @@ public:
    * For debugging. * For debugging.
    */ */
    inline auto RequestToString() const -> const std::string { inline auto RequestToString() const -> const std::string {
    google::protobuf::util::JsonOptions options; google::protobuf::util::JsonPrintOptions options;
    options.add_whitespace = true;
    std::string out; std::string out;
    google::protobuf::util::MessageToJsonString(*this->request, &out, options); google::protobuf::util::MessageToJsonString(*this->request, &out, options);
    return out; return out;
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment