Merge pull request #747 from firebase/rsgowman/nanopb

Integrate nanopb

5 files changed, 110 insertions, 0 deletions

diff --git a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
index 43320ce..a218e3b 100644
--- a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
+++ b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
@@ -17,6 +17,9 @@ cc_library(
   SOURCES
     datastore.h
     datastore.cc
+    serializer.h
+    serializer.cc
   DEPENDS
     grpc::grpc
+    nanopb
 )
diff --git a/Firestore/core/src/firebase/firestore/remote/serializer.cc b/Firestore/core/src/firebase/firestore/remote/serializer.cc
new file mode 100644
index 0000000..d3cdd3f
--- /dev/null
+++ b/Firestore/core/src/firebase/firestore/remote/serializer.cc
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Firestore/core/src/firebase/firestore/remote/serializer.h"
+
+// TODO(rsgowman): These are (currently!) unnecessary includes. Adding for now
+// to ensure we can find nanopb's generated header files.
+#include "Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h"
+#include "Firestore/Protos/nanopb/google/protobuf/timestamp.pb.h"
+
+namespace firebase {
+namespace firestore {
+namespace remote {
+
+Serializer::Serializer() {
+}
+
+}  // namespace remote
+}  // namespace firestore
+}  // namespace firebase
diff --git a/Firestore/core/src/firebase/firestore/remote/serializer.h b/Firestore/core/src/firebase/firestore/remote/serializer.h
new file mode 100644
index 0000000..4dc6b9e
--- /dev/null
+++ b/Firestore/core/src/firebase/firestore/remote/serializer.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_REMOTE_SERIALIZER_H_
+#define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_REMOTE_SERIALIZER_H_
+
+namespace firebase {
+namespace firestore {
+namespace remote {
+
+/**
+ * @brief Converts internal model objects to their equivalent protocol buffer
+ * form.
+ *
+ * Methods starting with "Encode" convert to a protocol buffer and methods
+ * starting with "Decode" convert from a protocol buffer.
+ *
+ */
+// TODO(rsgowman): Original docs also has this: "Throws an exception if a
+// protocol buffer is missing a critical field or has a value we can't
+// interpret." Adjust for C++.
+class Serializer {
+ public:
+  // TODO(rsgowman): Adjust ctor to accept a DatabaseID... once that exists.
+  Serializer(/*DatabaseID databaseId*/);
+};
+
+}  // namespace remote
+}  // namespace firestore
+}  // namespace firebase
+
+#endif  // FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_REMOTE_SERIALIZER_H_
diff --git a/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
index 7d99e6f..d42b107 100644
--- a/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
@@ -16,6 +16,7 @@ cc_test(
   firebase_firestore_remote_test
   SOURCES
     datastore_test.cc
+    serializer_test.cc
   DEPENDS
     firebase_firestore_remote
 )
diff --git a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc
new file mode 100644
index 0000000..1be5a87
--- /dev/null
+++ b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Firestore/core/src/firebase/firestore/remote/serializer.h"
+
+#include <gtest/gtest.h>
+#include <pb_encode.h>
+
+TEST(Serializer, CanLinkToNanopb) {
+  // This test doesn't actually do anything interesting as far as actually using
+  // nanopb is concerned but that it can run at all is proof that all the
+  // libraries required for nanopb to work are actually linked correctly into
+  // the test.
+  pb_ostream_from_buffer(NULL, 0);
+}