remove main/api references

Author: wu-hui

firestore/src/common/local_cache_settings.cc

@@ -36,11 +36,6 @@ using CoreMemoryEagerGcSettings = api::MemoryEagerGcSettings;
 using CoreMemoryLruGcSettings = api::MemoryLruGcSettings;
 }  // namespace
 
-bool operator==(const LocalCacheSettings& lhs, const LocalCacheSettings& rhs) {
-  return lhs.kind() == rhs.kind() &&
-         lhs.core_cache_settings() == rhs.core_cache_settings();
-}
-
 PersistentCacheSettings PersistentCacheSettings::Create() { return {}; }
 
 PersistentCacheSettings::PersistentCacheSettings() {
@@ -56,10 +51,6 @@ PersistentCacheSettings PersistentCacheSettings::WithSizeBytes(
   return new_settings;
 }
 
-const CoreCacheSettings& PersistentCacheSettings::core_cache_settings() const {
-  return settings_internal_->core_settings();
-}
-
 int64_t PersistentCacheSettings::size_bytes() const {
   return settings_internal_->core_settings().size_bytes();
 }
@@ -71,11 +62,6 @@ MemoryEagerGCSettings::MemoryEagerGCSettings() {
       CoreMemoryEagerGcSettings{});
 }
 
-const api::MemoryGargabeCollectorSettings&
-MemoryEagerGCSettings::core_gc_settings() const {
-  return settings_internal_->core_settings();
-}
-
 MemoryLruGCSettings MemoryLruGCSettings::Create() { return {}; }
 
 MemoryLruGCSettings::MemoryLruGCSettings() {
@@ -97,11 +83,6 @@ int64_t MemoryLruGCSettings::size_bytes() const {
   return settings_internal_->core_settings().size_bytes();
 }
 
-const api::MemoryGargabeCollectorSettings&
-MemoryLruGCSettings::core_gc_settings() const {
-  return settings_internal_->core_settings();
-}
-
 MemoryCacheSettings MemoryCacheSettings::Create() { return {}; }
 
 MemoryCacheSettings::MemoryCacheSettings() {
@@ -115,12 +96,13 @@ MemoryCacheSettings MemoryCacheSettings::WithGarbageCollectorSettings(
   CoreMemorySettings core_settings = result.settings_internal_->core_settings();
   result.settings_internal_->set_core_settings(
       core_settings.WithMemoryGarbageCollectorSettings(
-          settings.core_gc_settings()));
+          settings.internal().core_settings()));
   return result;
 }
 
-const CoreCacheSettings& MemoryCacheSettings::core_cache_settings() const {
-  return settings_internal_->core_settings();
+bool operator==(const LocalCacheSettings& lhs, const LocalCacheSettings& rhs) {
+  return lhs.kind() == rhs.kind() &&
+         lhs.internal().core_settings() == rhs.internal().core_settings();
 }
 
 bool operator==(const MemoryCacheSettings& lhs,
@@ -135,7 +117,7 @@ bool operator==(const PersistentCacheSettings& lhs,
 
 bool operator==(const MemoryGarbageCollectorSettings& lhs,
                 const MemoryGarbageCollectorSettings& rhs) {
-  return lhs.core_gc_settings() == rhs.core_gc_settings();
+  return lhs.internal().core_settings() == rhs.internal().core_settings();
 }
 
 bool operator==(const MemoryEagerGCSettings& lhs,

firestore/src/include/firebase/firestore/local_cache_settings.h

@@ -21,14 +21,12 @@
 #include <memory>
 
 #include "firestore/src/include/firebase/firestore/settings.h"
+#include "firestore/src/main/local_cache_settings_main.h"
 
 namespace firebase {
 namespace firestore {
-namespace api {
-class LocalCacheSettings;
-class MemoryGargabeCollectorSettings;
-}  // namespace api
 
+class LocalCacheSettingsInternal;
 class PersistentCacheSettingsInternal;
 class MemoryCacheSettingsInternal;
 class MemoryLruGCSettingsInternal;
@@ -56,7 +54,7 @@ class LocalCacheSettings {
   friend class Settings;
 
   virtual Kind kind() const = 0;
-  virtual const api::LocalCacheSettings& core_cache_settings() const = 0;
+  virtual const LocalCacheSettingsInternal& internal() const = 0;
 };
 
 /**
@@ -110,7 +108,9 @@ class PersistentCacheSettings final : public LocalCacheSettings {
   }
 
   // Get the corresponding settings object from the core sdk.
-  const api::LocalCacheSettings& core_cache_settings() const override;
+  const PersistentCacheSettingsInternal& internal() const override {
+    return *settings_internal_;
+  }
 
   std::shared_ptr<PersistentCacheSettingsInternal> settings_internal_;
 };
@@ -152,7 +152,9 @@ class MemoryCacheSettings final : public LocalCacheSettings {
   }
 
   // Get the corresponding settings object from the core sdk.
-  const api::LocalCacheSettings& core_cache_settings() const override;
+  const MemoryCacheSettingsInternal& internal() const override {
+    return *settings_internal_;
+  }
 
   std::shared_ptr<MemoryCacheSettingsInternal> settings_internal_;
 };
@@ -173,8 +175,7 @@ class MemoryGarbageCollectorSettings {
 
  private:
   friend class MemoryCacheSettings;
-  virtual const api::MemoryGargabeCollectorSettings& core_gc_settings()
-      const = 0;
+  virtual const MemoryGarbageCollectorSettingsInternal& internal() const = 0;
 };
 
 /**
@@ -204,8 +205,9 @@ class MemoryEagerGCSettings final : public MemoryGarbageCollectorSettings {
  private:
   friend class MemoryCacheSettings;
   MemoryEagerGCSettings();
-
-  const api::MemoryGargabeCollectorSettings& core_gc_settings() const override;
+  const MemoryEagerGCSettingsInternal& internal() const override {
+    return *settings_internal_;
+  }
 
   std::shared_ptr<MemoryEagerGCSettingsInternal> settings_internal_;
 };
@@ -261,7 +263,9 @@ class MemoryLruGCSettings final : public MemoryGarbageCollectorSettings {
   MemoryLruGCSettings();
   MemoryLruGCSettings(const MemoryLruGCSettingsInternal& other);
 
-  const api::MemoryGargabeCollectorSettings& core_gc_settings() const override;
+  const MemoryLruGCSettingsInternal& internal() const override {
+    return *settings_internal_;
+  }
 
   std::shared_ptr<MemoryLruGCSettingsInternal> settings_internal_;
 };

firestore/src/main/firestore_main.cc

@@ -221,7 +221,7 @@ void FirestoreInternal::set_settings(Settings from) {
   // this special logic should go away when legacy cache config is removed.
   if (from.cache_settings_source_ == Settings::CacheSettingsSource::kNew) {
     settings.set_local_cache_settings(
-        from.local_cache_settings().core_cache_settings());
+        from.local_cache_settings().internal().core_settings());
   } else {
     settings.set_persistence_enabled(from.is_persistence_enabled());
     settings.set_cache_size_bytes(from.cache_size_bytes());

firestore/src/main/local_cache_settings_main.h

@@ -25,7 +25,10 @@
 namespace firebase {
 namespace firestore {
 
-class LocalCacheSettingsInternal {};
+class LocalCacheSettingsInternal {
+ public:
+  virtual const api::LocalCacheSettings& core_settings() const = 0;
+};
 
 class PersistentCacheSettingsInternal final
     : public LocalCacheSettingsInternal {
@@ -39,7 +42,9 @@ class PersistentCacheSettingsInternal final
     return &lhs == &rhs || lhs.settings_ == rhs.settings_;
   }
 
-  const api::PersistentCacheSettings& core_settings() { return settings_; }
+  const api::PersistentCacheSettings& core_settings() const override {
+    return settings_;
+  }
   void set_core_settings(const api::PersistentCacheSettings& settings) {
     settings_ = settings;
   }
@@ -48,7 +53,10 @@ class PersistentCacheSettingsInternal final
   api::PersistentCacheSettings settings_;
 };
 
-class MemoryGarbageCollectorSettingsInternal {};
+class MemoryGarbageCollectorSettingsInternal {
+ public:
+  virtual const api::MemoryGargabeCollectorSettings& core_settings() const = 0;
+};
 
 class MemoryEagerGCSettingsInternal final
     : public MemoryGarbageCollectorSettingsInternal {
@@ -62,7 +70,9 @@ class MemoryEagerGCSettingsInternal final
     return &lhs == &rhs || lhs.settings_ == rhs.settings_;
   }
 
-  const api::MemoryEagerGcSettings& core_settings() { return settings_; }
+  const api::MemoryEagerGcSettings& core_settings() const override {
+    return settings_;
+  }
   void set_core_settings(const api::MemoryEagerGcSettings& settings) {
     settings_ = settings;
   }
@@ -83,7 +93,9 @@ class MemoryLruGCSettingsInternal final
     return &lhs == &rhs || lhs.settings_ == rhs.settings_;
   }
 
-  const api::MemoryLruGcSettings& core_settings() { return settings_; }
+  const api::MemoryLruGcSettings& core_settings() const override {
+    return settings_;
+  }
   void set_core_settings(const api::MemoryLruGcSettings& settings) {
     settings_ = settings;
   }
@@ -103,7 +115,9 @@ class MemoryCacheSettingsInternal final : public LocalCacheSettingsInternal {
     return &lhs == &rhs || lhs.settings_ == rhs.settings_;
   }
 
-  const api::MemoryCacheSettings& core_settings() { return settings_; }
+  const api::MemoryCacheSettings& core_settings() const override {
+    return settings_;
+  }
   void set_core_settings(const api::MemoryCacheSettings& settings) {
     settings_ = settings;
   }