delete includes from main

Author: wu-hui

firestore/src/common/local_cache_settings.cc

@@ -55,13 +55,22 @@ int64_t PersistentCacheSettings::size_bytes() const {
   return settings_internal_->core_settings().size_bytes();
 }
 
+const CoreCacheSettings& PersistentCacheSettings::core_settings() const {
+  return settings_internal_->core_settings();
+}
+
 MemoryEagerGCSettings MemoryEagerGCSettings::Create() { return {}; }
 
 MemoryEagerGCSettings::MemoryEagerGCSettings() {
   settings_internal_ = std::make_shared<MemoryEagerGCSettingsInternal>(
       CoreMemoryEagerGcSettings{});
 }
 
+const CoreMemoryGarbageCollectorSettings& MemoryEagerGCSettings::core_settings()
+    const {
+  return settings_internal_->core_settings();
+}
+
 MemoryLruGCSettings MemoryLruGCSettings::Create() { return {}; }
 
 MemoryLruGCSettings::MemoryLruGCSettings() {
@@ -83,6 +92,11 @@ int64_t MemoryLruGCSettings::size_bytes() const {
   return settings_internal_->core_settings().size_bytes();
 }
 
+const CoreMemoryGarbageCollectorSettings& MemoryLruGCSettings::core_settings()
+    const {
+  return settings_internal_->core_settings();
+}
+
 MemoryCacheSettings MemoryCacheSettings::Create() { return {}; }
 
 MemoryCacheSettings::MemoryCacheSettings() {
@@ -96,13 +110,16 @@ MemoryCacheSettings MemoryCacheSettings::WithGarbageCollectorSettings(
   CoreMemorySettings core_settings = result.settings_internal_->core_settings();
   result.settings_internal_->set_core_settings(
       core_settings.WithMemoryGarbageCollectorSettings(
-          settings.internal().core_settings()));
+          settings.core_settings()));
   return result;
 }
 
+const CoreCacheSettings& MemoryCacheSettings::core_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();
+  return lhs.kind() == rhs.kind() && lhs.core_settings() == rhs.core_settings();
 }
 
 bool operator==(const MemoryCacheSettings& lhs,
@@ -117,7 +134,7 @@ bool operator==(const PersistentCacheSettings& lhs,
 
 bool operator==(const MemoryGarbageCollectorSettings& lhs,
                 const MemoryGarbageCollectorSettings& rhs) {
-  return lhs.internal().core_settings() == rhs.internal().core_settings();
+  return lhs.core_settings() == rhs.core_settings();
 }
 
 bool operator==(const MemoryEagerGCSettings& lhs,

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

@@ -21,12 +21,14 @@
 #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;
@@ -58,7 +60,7 @@ class LocalCacheSettings {
   LocalCacheSettings() = default;
 
   virtual Kind kind() const = 0;
-  virtual const LocalCacheSettingsInternal& internal() const = 0;
+  virtual const api::LocalCacheSettings& core_settings() const = 0;
 };
 
 /**
@@ -112,9 +114,7 @@ class PersistentCacheSettings final : public LocalCacheSettings {
   }
 
   // Get the corresponding settings object from the core sdk.
-  const PersistentCacheSettingsInternal& internal() const override {
-    return *settings_internal_;
-  }
+  const api::LocalCacheSettings& core_settings() const override;
 
   std::shared_ptr<PersistentCacheSettingsInternal> settings_internal_;
 };
@@ -155,10 +155,7 @@ class MemoryCacheSettings final : public LocalCacheSettings {
     return LocalCacheSettings::Kind::kMemory;
   }
 
-  // Get the corresponding settings object from the core sdk.
-  const MemoryCacheSettingsInternal& internal() const override {
-    return *settings_internal_;
-  }
+  const api::LocalCacheSettings& core_settings() const override;
 
   std::shared_ptr<MemoryCacheSettingsInternal> settings_internal_;
 };
@@ -184,7 +181,7 @@ class MemoryGarbageCollectorSettings {
 
   MemoryGarbageCollectorSettings() = default;
 
-  virtual const MemoryGarbageCollectorSettingsInternal& internal() const = 0;
+  virtual const api::MemoryGargabeCollectorSettings& core_settings() const = 0;
 };
 
 /**
@@ -214,9 +211,7 @@ class MemoryEagerGCSettings final : public MemoryGarbageCollectorSettings {
  private:
   friend class MemoryCacheSettings;
   MemoryEagerGCSettings();
-  const MemoryEagerGCSettingsInternal& internal() const override {
-    return *settings_internal_;
-  }
+  const api::MemoryGargabeCollectorSettings& core_settings() const override;
 
   std::shared_ptr<MemoryEagerGCSettingsInternal> settings_internal_;
 };
@@ -272,9 +267,7 @@ class MemoryLruGCSettings final : public MemoryGarbageCollectorSettings {
   MemoryLruGCSettings();
   MemoryLruGCSettings(const MemoryLruGCSettingsInternal& other);
 
-  const MemoryLruGCSettingsInternal& internal() const override {
-    return *settings_internal_;
-  }
+  const api::MemoryGargabeCollectorSettings& core_settings() const override;
 
   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().internal().core_settings());
+        from.local_cache_settings().core_settings());
   } else {
     settings.set_persistence_enabled(from.is_persistence_enabled());
     settings.set_cache_size_bytes(from.cache_size_bytes());