Moved PersistentConnection::Tag to a standalone Tag typedef in its own header.

PiperOrigin-RevId: 269854964

Author: amablue

database/src/desktop/connection/persistent_connection.cc

@@ -26,6 +26,7 @@
 #include "app/src/time.h"
 #include "app/src/variant_util.h"
 #include "database/src/desktop/core/constants.h"
+#include "database/src/desktop/core/tag.h"
 #include "database/src/desktop/util_desktop.h"
 #include "database/src/include/firebase/database/common.h"
 
@@ -352,8 +353,7 @@ void PersistentConnection::ScheduleShutdown() {
       }));
 }
 
-void PersistentConnection::Listen(const QuerySpec& query_spec,
-                                  const Optional<int64_t>& tag,
+void PersistentConnection::Listen(const QuerySpec& query_spec, const Tag& tag,
                                   ResponsePtr response) {
   CheckAuthTokenAndSendOnChange();
   logger_->LogDebug("%s Listening on %s", log_id_.c_str(),

database/src/desktop/connection/persistent_connection.h

@@ -35,6 +35,7 @@
 #include "database/src/common/query_spec.h"
 #include "database/src/desktop/connection/connection.h"
 #include "database/src/desktop/connection/host_info.h"
+#include "database/src/desktop/core/tag.h"
 #include "database/src/include/firebase/database/common.h"
 
 namespace firebase {
@@ -100,7 +101,7 @@ typedef SharedPtr<Response> ResponsePtr;
 class PersistentConnection : public ConnectionEventHandler {
  public:
   // Tag for listen request/response
-  typedef Optional<int64_t> Tag;
+  typedef Tag Tag;
 
   explicit PersistentConnection(App* app, const HostInfo& info,
                                 PersistentConnectionEventHandler* event_handler,
@@ -564,8 +565,7 @@ class PersistentConnectionEventHandler {
       const std::map<Variant, Variant>& updates) = 0;
 
   virtual void OnDataUpdate(const Path& path, const Variant& payload_data,
-                            bool is_merge,
-                            const PersistentConnection::Tag& tag) = 0;
+                            bool is_merge, const Tag& tag) = 0;
 };
 
 }  // namespace connection

database/src/desktop/core/repo.cc

@@ -23,6 +23,7 @@
 #include "database/src/desktop/core/constants.h"
 #include "database/src/desktop/core/info_listen_provider.h"
 #include "database/src/desktop/core/server_values.h"
+#include "database/src/desktop/core/tag.h"
 #include "database/src/desktop/core/value_event_registration.h"
 #include "database/src/desktop/core/web_socket_listen_provider.h"
 #include "database/src/desktop/core/write_tree.h"
@@ -541,7 +542,7 @@ void Repo::OnServerInfoUpdate(const std::map<Variant, Variant>& updates) {
 }
 
 void Repo::OnDataUpdate(const Path& path, const Variant& data, bool is_merge,
-                        const connection::PersistentConnection::Tag& tag) {
+                        const Tag& tag) {
   SAFE_REFERENCE_RETURN_VOID_IF_INVALID(ThisRefLock, lock, safe_this_);
 
   std::vector<Event> events;

database/src/desktop/core/repo.h

@@ -26,6 +26,7 @@
 #include "database/src/desktop/core/event_registration.h"
 #include "database/src/desktop/core/sparse_snapshot_tree.h"
 #include "database/src/desktop/core/sync_tree.h"
+#include "database/src/desktop/core/tag.h"
 #include "database/src/desktop/core/tree.h"
 #include "database/src/desktop/transaction_data.h"
 #include "database/src/desktop/view/event.h"
@@ -102,8 +103,7 @@ class Repo : public connection::PersistentConnectionEventHandler {
   void OnServerInfoUpdate(const std::map<Variant, Variant>& updates) override;
 
   void OnDataUpdate(const Path& path, const Variant& payload_data,
-                    bool is_merge,
-                    const connection::PersistentConnection::Tag& tag) override;
+                    bool is_merge, const Tag& tag) override;
 
   const std::string& url() const { return url_; }
 

database/src/desktop/core/tag.h

@@ -0,0 +1,32 @@
+// Copyright 2019 Google LLC
+//
+// 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 FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TAG_H_
+#define FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TAG_H_
+
+#include <cstdint>
+
+#include "app/src/optional.h"
+
+namespace firebase {
+namespace database {
+namespace internal {
+
+typedef Optional<int64_t> Tag;
+
+}  // namespace internal
+}  // namespace database
+}  // namespace firebase
+
+#endif  // FIREBASE_DATABASE_CLIENT_CPP_SRC_DESKTOP_CORE_TAG_H_

database/src/desktop/core/web_socket_listen_provider.cc

@@ -17,6 +17,7 @@
 #include "database/src/common/query_spec.h"
 #include "database/src/desktop/connection/persistent_connection.h"
 #include "database/src/desktop/core/listen_provider.h"
+#include "database/src/desktop/core/tag.h"
 #include "database/src/desktop/view/view.h"
 
 namespace firebase {
@@ -56,7 +57,7 @@ class WebSocketListenResponse : public connection::Response {
 void WebSocketListenProvider::StartListening(const QuerySpec& query_spec,
                                              const View* view) {
   connection_->Listen(
-      query_spec, PersistentConnection::Tag(),
+      query_spec, Tag(),
       MakeShared<WebSocketListenResponse>(
           [](const SharedPtr<connection::Response>& connection_response) {
             WebSocketListenResponse* response =