refactor part of code

Author: cherylEnkidu

FirebaseFirestoreInternal.podspec

@@ -30,7 +30,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   # framework.
   s.public_header_files = [
     'Firestore/Source/Public/FirebaseFirestore/*.h',
-    'Firestore/core/swift/include/*.h'
+    'Firestore/core/interfaceForSwift/api/*.h'
   ]
 
   # source_files contains most of the header and source files for the project.
@@ -55,7 +55,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
     'Firestore/core/include/**/*.{cc,mm}',
     'Firestore/core/src/**/*.{cc,mm}',
     'FirebaseAuth/Interop/**/*.h',
-    'Firestore/core/swift/**/*.{cc,h}',
+    'Firestore/core/interfaceForSwift/**/*.{cc,h}',
   ]
 
   # Internal headers that aren't necessarily globally unique. Most C++ internal

Firestore/Example/Firestore.xcodeproj/project.pbxproj

@@ -2184,8 +2184,8 @@
 			files = (
 				6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
 				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
-				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
 				DFA186FE5BBFB484C2A60439 /* Pods_Firestore_Example_iOS.framework in Frameworks */,
+				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2194,9 +2194,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
+				45CA70C602DD3DDAEF05DCAA /* Pods_Firestore_Tests_iOS.framework in Frameworks */,
 				6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
-				45CA70C602DD3DDAEF05DCAA /* Pods_Firestore_Tests_iOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2205,9 +2205,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				6EDD3B4620BF247500C33877 /* Foundation.framework in Frameworks */,
+				0E24350AA378A5A8D9927B9D /* Pods_Firestore_FuzzTests_iOS.framework in Frameworks */,
 				6EDD3B4820BF247500C33877 /* UIKit.framework in Frameworks */,
 				6EDD3B4920BF247500C33877 /* XCTest.framework in Frameworks */,
-				0E24350AA378A5A8D9927B9D /* Pods_Firestore_FuzzTests_iOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2224,9 +2224,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				DE03B2D61F2149D600A30B9C /* Foundation.framework in Frameworks */,
+				8F59A2CC5A9E99BB2DEA7F91 /* Pods_Firestore_IntegrationTests_iOS.framework in Frameworks */,
 				DE03B2D51F2149D600A30B9C /* UIKit.framework in Frameworks */,
 				DE03B2D41F2149D600A30B9C /* XCTest.framework in Frameworks */,
-				8F59A2CC5A9E99BB2DEA7F91 /* Pods_Firestore_IntegrationTests_iOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2623,8 +2623,6 @@
 			children = (
 				6003F58F195388D20070C39A /* CoreGraphics.framework */,
 				6003F58D195388D20070C39A /* Foundation.framework */,
-				6003F591195388D20070C39A /* UIKit.framework */,
-				6003F5AF195388D20070C39A /* XCTest.framework */,
 				8F598CD89DBDF6EE959C7F82 /* Pods_Firestore_Benchmarks_iOS.framework */,
 				27A5406BD14580197A127B93 /* Pods_Firestore_Example_iOS.framework */,
 				75532670EC61672D0CF0D743 /* Pods_Firestore_Example_macOS.framework */,
@@ -2636,6 +2634,8 @@
 				BAAC6F56A47F795224077898 /* Pods_Firestore_Tests_iOS.framework */,
 				11DF548295F98F22C70127D8 /* Pods_Firestore_Tests_macOS.framework */,
 				46E38E88A7A020F4E721E373 /* Pods_Firestore_Tests_tvOS.framework */,
+				6003F591195388D20070C39A /* UIKit.framework */,
+				6003F5AF195388D20070C39A /* XCTest.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

Firestore/Example/Tests/API/FIRAggregateQueryUnitTests.mm

@@ -40,7 +40,7 @@ @interface FIRAggregateQueryUnitTests : XCTestCase
 @implementation FIRAggregateQueryUnitTests
 
 - (void)testEquals {
-  std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().wrapped;
+  std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().cppFirestorePtr;
   FIRAggregateQuery *queryFoo =
       [[FIRQuery alloc] initWithQuery:Query("foo") firestore:firestore].count;
   FIRAggregateQuery *queryFooDup =

Firestore/Example/Tests/API/FIRQuerySnapshotTests.mm

@@ -99,7 +99,7 @@ - (void)testIncludeMetadataChanges {
       DocumentViewChange(doc2New, DocumentViewChange::Type::Modified),
   };
 
-  std::shared_ptr<Firestore> firestore = FSTTestFirestore().wrapped;
+  std::shared_ptr<Firestore> firestore = FSTTestFirestore().cppFirestorePtr;
   core::Query query = Query("foo");
   ViewSnapshot viewSnapshot(query, newDocuments, oldDocuments, std::move(documentChanges),
                             /*mutated_keys=*/DocumentKeySet(),

Firestore/Example/Tests/API/FIRQueryUnitTests.mm

@@ -38,7 +38,7 @@ @interface FIRQueryUnitTests : XCTestCase
 @implementation FIRQueryUnitTests
 
 - (void)testEquals {
-  std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().wrapped;
+  std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().cppFirestorePtr;
   FIRQuery *queryFoo = [[FIRQuery alloc] initWithQuery:Query("foo") firestore:firestore];
   FIRQuery *queryFooDup = [[FIRQuery alloc] initWithQuery:Query("foo") firestore:firestore];
   FIRQuery *queryBar = [[FIRQuery alloc] initWithQuery:Query("bar") firestore:firestore];
@@ -58,7 +58,7 @@ - (void)testEquals {
 }
 
 - (void)testFilteringWithPredicate {
-  std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().wrapped;
+  std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().cppFirestorePtr;
   FIRQuery *query = [[FIRQuery alloc] initWithQuery:Query("foo") firestore:firestore];
   FIRQuery *query1 = [query queryWhereField:@"f" isLessThanOrEqualTo:@1];
   FIRQuery *query2 = [query queryFilteredUsingPredicate:[NSPredicate predicateWithFormat:@"f<=1"]];

Firestore/Example/Tests/API/FSTAPIHelpers.mm

@@ -103,12 +103,12 @@
 
 FIRCollectionReference *FSTTestCollectionRef(const char *path) {
   return [[FIRCollectionReference alloc] initWithPath:Resource(path)
-                                            firestore:FSTTestFirestore().wrapped];
+                                            firestore:FSTTestFirestore().cppFirestorePtr];
 }
 
 FIRDocumentReference *FSTTestDocRef(const char *path) {
   return [[FIRDocumentReference alloc] initWithPath:Resource(path)
-                                          firestore:FSTTestFirestore().wrapped];
+                                          firestore:FSTTestFirestore().cppFirestorePtr];
 }
 
 /** A convenience method for creating a query snapshots for tests. */
@@ -157,7 +157,7 @@
                             /*sync_state_changed=*/true,
                             /*excludes_metadata_changes=*/false,
                             static_cast<bool>(hasCachedResults)};
-  return [[FIRQuerySnapshot alloc] initWithFirestore:FSTTestFirestore().wrapped
+  return [[FIRQuerySnapshot alloc] initWithFirestore:FSTTestFirestore().cppFirestorePtr
                                        originalQuery:Query(path)
                                             snapshot:std::move(viewSnapshot)
                                             metadata:std::move(metadata)];

Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm

@@ -1523,7 +1523,7 @@ - (void)testAppDeleteLeadsToFirestoreTermination {
 
   [self deleteApp:app];
 
-  XCTAssertTrue(firestore.wrapped->client()->is_terminated());
+  XCTAssertTrue(firestore.cppFirestorePtr->client()->is_terminated());
 }
 
 // Ensures b/172958106 doesn't regress.

Firestore/Source/API/FIRAggregateQuerySnapshot.mm

@@ -92,7 +92,7 @@ - (id)valueForAggregateField:(FIRAggregateField *)aggregateField {
                          [aggregateField name], path);
   }
   FSTUserDataWriter *dataWriter =
-      [[FSTUserDataWriter alloc] initWithFirestore:_query.query.firestore.wrapped
+      [[FSTUserDataWriter alloc] initWithFirestore:_query.query.firestore.cppFirestorePtr
                            serverTimestampBehavior:serverTimestampBehavior];
   return [dataWriter convertedValue:*fieldValue];
 }

Firestore/Source/API/FIRDocumentSnapshot.mm

@@ -87,9 +87,9 @@ - (instancetype)initWithFirestore:(FIRFirestore *)firestore
   DocumentSnapshot wrapped;
   if (document.has_value()) {
     wrapped =
-        DocumentSnapshot::FromDocument(firestore.wrapped, document.value(), std::move(metadata));
+        DocumentSnapshot::FromDocument(firestore.cppFirestorePtr, document.value(), std::move(metadata));
   } else {
-    wrapped = DocumentSnapshot::FromNoDocument(firestore.wrapped, std::move(documentKey),
+    wrapped = DocumentSnapshot::FromNoDocument(firestore.cppFirestorePtr, std::move(documentKey),
                                                std::move(metadata));
   }
   _serializer.reset(new Serializer(firestore.databaseID));

Firestore/Source/API/FIRFirestore.mm

@@ -531,7 +531,7 @@ - (void)getQueryNamed:(NSString *)name completion:(void (^)(FIRQuery *_Nullable
 
 @implementation FIRFirestore (Internal)
 
-- (std::shared_ptr<Firestore>)wrapped {
+- (std::shared_ptr<Firestore>)cppFirestorePtr {
   return _firestore;
 }