Merge pull request #400 from firebase/feature/mutable-data-copy-deprecation

Removed deprecated copy constructor from MutableData

Author: Alex Ames

database/src/android/mutable_data_android.cc

@@ -61,10 +61,6 @@ MutableDataInternal::~MutableDataInternal() {
   }
 }
 
-MutableDataInternal* MutableDataInternal::Clone() {
-  return new MutableDataInternal(db_, obj_);
-}
-
 bool MutableDataInternal::Initialize(App* app) {
   JNIEnv* env = app->GetJNIEnv();
   jobject activity = app->activity();

database/src/android/mutable_data_android.h

@@ -39,10 +39,6 @@ class MutableDataInternal {
  public:
   ~MutableDataInternal();
 
-  // Create a shallow copy of the MutableData.
-  // The caller owns the returned pointer and is responsible for deleting it.
-  MutableDataInternal* Clone();
-
   // Used to obtain a MutableData instance that encapsulates the data and
   // priority at the given relative path.
   MutableDataInternal* Child(const char* path);

database/src/common/mutable_data.cc

@@ -52,19 +52,6 @@ MutableData::MutableData(MutableDataInternal* internal) : internal_(internal) {
   CleanupFnMutableData::Register(this, internal_);
 }
 
-MutableData::MutableData(const MutableData& rhs)
-    : internal_(rhs.internal_ ? rhs.internal_->Clone() : nullptr) {
-  CleanupFnMutableData::Register(this, internal_);
-}
-
-MutableData& MutableData::operator=(const MutableData& rhs) {
-  CleanupFnMutableData::Unregister(this, internal_);
-  if (internal_) delete internal_;
-  internal_ = rhs.internal_ ? rhs.internal_->Clone() : nullptr;
-  CleanupFnMutableData::Register(this, internal_);
-  return *this;
-}
-
 #if defined(FIREBASE_USE_MOVE_OPERATORS)
 MutableData::MutableData(MutableData&& rhs) : internal_(rhs.internal_) {
   rhs.internal_ = nullptr;

database/src/desktop/mutable_data_desktop.cc

@@ -43,11 +43,6 @@ MutableDataInternal::MutableDataInternal(const MutableDataInternal& other,
                                          const Path& path)
     : db_(other.db_), path_(path), holder_(other.holder_) {}
 
-MutableDataInternal* MutableDataInternal::Clone() {
-  // Just use the copy constructor
-  return new MutableDataInternal(*this);
-}
-
 MutableDataInternal* MutableDataInternal::Child(const char* path) {
   return new MutableDataInternal(*this, path_.GetChild(path));
 }

database/src/desktop/mutable_data_desktop.h

@@ -33,10 +33,6 @@ class MutableDataInternal {
   // This constructor is used when creating the original copy of MutableData
   explicit MutableDataInternal(DatabaseInternal* database, const Variant& data);
 
-  // Create a shallow copy of the MutableData.
-  // The caller owns the returned pointer and is responsible for deleting it.
-  MutableDataInternal* Clone();
-
   // Used to obtain a MutableData instance that encapsulates the data and
   // priority at the given relative path.
   MutableDataInternal* Child(const char* path);
@@ -90,6 +86,7 @@ class MutableDataInternal {
                                const Path& path);
 
   DatabaseInternal* db_;
+
   // Path relative to the root of holder_
   Path path_;
 

database/src/include/firebase/database/mutable_data.h

@@ -34,19 +34,6 @@ class Repo;
 #endif  // SWIG
 class MutableData {
  public:
-  /// @brief Copy constructor.
-  ///
-  /// This only makes a shallow copy and copies of MutableData will share the
-  /// same internal data. I.e. changes to one copy will appear in the other.
-  /// The main reason the copy constructor is provided is to allow the Child
-  /// method to return a MutableData by value.
-  MutableData(const MutableData& rhs);
-
-  /// @brief Copy assignment operator
-  ///
-  /// @deprecated MutableData is not supposed to be assigned.
-  FIREBASE_DEPRECATED MutableData& operator=(const MutableData& rhs);
-
 #if defined(FIREBASE_USE_MOVE_OPERATORS)
   /// Move constructor
   /// Move is more efficient than copy and delete.
@@ -166,6 +153,9 @@ class MutableData {
 
   explicit MutableData(internal::MutableDataInternal* internal);
 
+  MutableData(const MutableData& rhs) = delete;
+  MutableData& operator=(const MutableData& rhs) = delete;
+
   internal::MutableDataInternal* internal_;
 };
 

database/src/ios/mutable_data_ios.h

@@ -43,10 +43,6 @@ class MutableDataInternal {
  public:
   ~MutableDataInternal();
 
-  // Create a shallow copy of the MutableData.
-  // The caller owns the returned pointer and is responsible for deleting it.
-  MutableDataInternal* Clone();
-
   // Used to obtain a MutableData instance that encapsulates the data and
   // priority at the given relative path.
   MutableDataInternal* Child(const char* path);

database/src/ios/mutable_data_ios.mm

@@ -35,10 +35,6 @@
 
 MutableDataInternal::~MutableDataInternal() {}
 
-MutableDataInternal* MutableDataInternal::Clone() {
-  return new MutableDataInternal(db_, MakeUnique<FIRMutableDataPointer>(impl()));
-}
-
 MutableDataInternal* MutableDataInternal::Child(const char* path) {
   return new MutableDataInternal(
       db_, MakeUnique<FIRMutableDataPointer>([impl() childDataByAppendingPath:@(path)]));