From 03d26a76a0f7efb7ed3bb142a8e558fb68e4cccf Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Wed, 30 May 2018 10:24:40 -0700
Subject: Remove nearly all usages of WrapNSStringNoCopy (#1351)

---
 Firestore/Source/API/FIRFirestore.mm         |  4 ++--
 Firestore/Source/API/FSTUserDataConverter.mm | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'Firestore/Source/API')

diff --git a/Firestore/Source/API/FIRFirestore.mm b/Firestore/Source/API/FIRFirestore.mm
index 3671b51..fb4a1ec 100644
--- a/Firestore/Source/API/FIRFirestore.mm
+++ b/Firestore/Source/API/FIRFirestore.mm
@@ -128,11 +128,11 @@ extern "C" NSString *const FIRFirestoreErrorDomain = @"FIRFirestoreErrorDomain";
                          @"Failed to get FirebaseApp instance. Please call FirebaseApp.configure() "
                          @"before using Firestore");
   }
-  return [self firestoreForApp:app database:util::WrapNSStringNoCopy(DatabaseId::kDefault)];
+  return [self firestoreForApp:app database:util::WrapNSString(DatabaseId::kDefault)];
 }
 
 + (instancetype)firestoreForApp:(FIRApp *)app {
-  return [self firestoreForApp:app database:util::WrapNSStringNoCopy(DatabaseId::kDefault)];
+  return [self firestoreForApp:app database:util::WrapNSString(DatabaseId::kDefault)];
 }
 
 // TODO(b/62410906): make this public
diff --git a/Firestore/Source/API/FSTUserDataConverter.mm b/Firestore/Source/API/FSTUserDataConverter.mm
index 44e46da..d73a870 100644
--- a/Firestore/Source/API/FSTUserDataConverter.mm
+++ b/Firestore/Source/API/FSTUserDataConverter.mm
@@ -17,6 +17,7 @@
 #import "Firestore/Source/API/FSTUserDataConverter.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -41,6 +42,7 @@
 #include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
 #include "absl/memory/memory.h"
+#include "absl/strings/match.h"
 
 namespace util = firebase::firestore::util;
 using firebase::firestore::model::ArrayTransform;
@@ -55,7 +57,7 @@ using firebase::firestore::model::TransformOperation;
 
 NS_ASSUME_NONNULL_BEGIN
 
-static NSString *const RESERVED_FIELD_DESIGNATOR = @"__";
+static const char *RESERVED_FIELD_DESIGNATOR = "__";
 
 #pragma mark - FSTParsedSetData
 
@@ -277,7 +279,7 @@ typedef NS_ENUM(NSInteger, FSTUserDataSource) {
                                                         arrayElement:NO
                                                      fieldTransforms:_fieldTransforms
                                                            fieldMask:_fieldMask];
-  [context validatePathSegment:fieldName];
+  [context validatePathSegment:util::MakeStringView(fieldName)];
   return context;
 }
 
@@ -334,15 +336,16 @@ typedef NS_ENUM(NSInteger, FSTUserDataSource) {
   if (_path == nullptr) {
     return;
   }
-  for (const auto &segment : *_path) {
-    [self validatePathSegment:util::WrapNSStringNoCopy(segment)];
+  for (const std::string &segment : *_path) {
+    [self validatePathSegment:segment];
   }
 }
 
-- (void)validatePathSegment:(NSString *)segment {
-  if ([self isWrite] && [segment hasPrefix:RESERVED_FIELD_DESIGNATOR] &&
-      [segment hasSuffix:RESERVED_FIELD_DESIGNATOR]) {
-    FSTThrowInvalidArgument(@"Document fields cannot begin and end with %@%@",
+- (void)validatePathSegment:(absl::string_view)segment {
+  absl::string_view designator{RESERVED_FIELD_DESIGNATOR};
+  if ([self isWrite] && absl::StartsWith(segment, designator) &&
+      absl::EndsWith(segment, designator)) {
+    FSTThrowInvalidArgument(@"Document fields cannot begin and end with %s%@",
                             RESERVED_FIELD_DESIGNATOR, [self fieldDescription]);
   }
 }
-- 
cgit v1.2.3