WIP

Author: schmidt-sebastian

Firestore/core/src/model/mutable_document.cc

@@ -28,11 +28,9 @@ namespace model {
 /* static */
 MutableDocument MutableDocument::InvalidDocument(
     const firebase::firestore::model::DocumentKey& document_key) {
-  // TODO(mrschmidt): This constructor is not found
-  MutableDocument doc{document_key, DocumentType::kInvalid,
-                      SnapshotVersion::None(), ObjectValue{},
-                      DocumentState::kSynced};
-  return doc;
+  return MutableDocument{document_key, DocumentType::kInvalid,
+                         SnapshotVersion::None(), ObjectValue{},
+                         DocumentState::kSynced};
 }
 
 /* static */
@@ -52,6 +50,7 @@ MutableDocument MutableDocument::UnknownDocument(
       InvalidDocument(document_key).ConvertToUnknownDocument(version));
 }
 
+/* static */
 MutableDocument MutableDocument::NoDocument(
     const firebase::firestore::model::DocumentKey& document_key,
     const firebase::firestore::model::SnapshotVersion& version) {
@@ -130,8 +129,8 @@ std::ostream& operator<<(std::ostream& os,
 
 std::ostream& operator<<(std::ostream& os, const MutableDocument& doc) {
   return os << "MutableDocument(key=" << doc.key_
-            << ", version=" << doc.version_ << ", type=" << doc.document_type_
-            << ", state=" << doc.document_state_ << ", value=" << doc.value_;
+            << ", type=" << doc.document_type_ << ", version=" << doc.version_
+            << ", value=" << doc.value_ << ", state=" << doc.document_state_;
 }
 
 }  // namespace model

Firestore/core/src/model/mutable_document.h

@@ -80,17 +80,17 @@ class MutableDocument {
   };
 
  public:
-  // MutableDocument contain Proto data that cannot be implicitly create or
+  // MutableDocument contain Proto data that cannot be implicitly created or
   // copied.
   MutableDocument() = delete;
   MutableDocument(const MutableDocument&) = delete;
   MutableDocument& operator=(const MutableDocument&) = delete;
 
   MutableDocument(MutableDocument&& other) noexcept
       : key_{std::move(other.key_)},
+        document_type_{other.document_type_},
         version_{other.version_},
         value_{std::move(other.value_)},
-        document_type_{other.document_type_},
         document_state_{other.document_state_} {
   }
 
@@ -200,21 +200,21 @@ class MutableDocument {
 
  private:
   MutableDocument(DocumentKey key,
+                  DocumentType document_type,
                   SnapshotVersion version,
                   ObjectValue value,
-                  DocumentType document_type,
                   DocumentState document_state)
       : key_{std::move(key)},
+        document_type_{document_type},
         version_{version},
         value_{std::move(value)},
-        document_type_{document_type},
         document_state_{document_state} {
   }
 
   DocumentKey key_;
+  DocumentType document_type_ = DocumentType::kInvalid;
   SnapshotVersion version_;
   ObjectValue value_;
-  DocumentType document_type_ = DocumentType::kInvalid;
   DocumentState document_state_ = DocumentState::kSynced;
 };