Moving CoreData stack from thread confinement to main/private queue

DEV-451
- Using NSConfinementConcurrencyType with NSManagedObjectContext has been deprecated since iOS 9
- First step towards completely replacing the RestKit dependency in our apps
- Replaces the CoreData stack with contexts using Main and Private queue concurrency types
- Also using NSPersistentContainer to setup the CoreData stack
- Removes the "contextForCurrentThread" helper as not suitable for Main/Private queue contexts
- NSManagedObject ActiveRecord helpers require context to be passed in now

Author: HaydnM

Code/CoreData/NSManagedObject+ActiveRecord.h

@@ -15,9 +15,8 @@
  */
 @interface NSManagedObjectContext (ActiveRecord)
 
-+ (NSManagedObjectContext *)defaultContext;
-+ (void)setDefaultContext:(NSManagedObjectContext *)context;
-+ (NSManagedObjectContext *)contextForCurrentThread;
++ (NSManagedObjectContext *)contextForMainThread;
++ (NSManagedObjectContext *)contextForBackgroundThread;
 
 @end
 
@@ -27,91 +26,57 @@
  */
 @interface NSManagedObject (ActiveRecord)
 
-/**
- * The NSEntityDescription for the Subclass
- * defaults to the subclass className, may be overridden
- */
-+ (NSEntityDescription*)MR_entity;
-
-/**
- * Returns an initialized NSFetchRequest for the entity, with no predicate
- */
-+ (NSFetchRequest*)MR_fetchRequest;
-
 /**
  * Fetches all objects from the persistent store identified by the fetchRequest
  */
-+ (NSArray*)objectsWithFetchRequest:(NSFetchRequest*)fetchRequest;
++ (NSArray*)objectsWithFetchRequest:(NSFetchRequest*)fetchRequest inContext:(NSManagedObjectContext*)context;
 
 /**
  * Retrieves the number of objects that would be retrieved by the fetchRequest,
  * if executed
  */
-+ (NSUInteger)countOfObjectsWithFetchRequest:(NSFetchRequest*)fetchRequest;
-
-/**
- * Fetches all objects from the persistent store via a set of fetch requests and
- * returns all results in a single array.
- */
-+ (NSArray*)objectsWithFetchRequests:(NSArray*)fetchRequests;
++ (NSUInteger)countOfObjectsWithFetchRequest:(NSFetchRequest*)fetchRequest inContext:(NSManagedObjectContext*)context;
 
 /**
  * Fetches the first object identified by the fetch request. A limit of one will be
  * applied to the fetch request before dispatching.
  */
-+ (id)objectWithFetchRequest:(NSFetchRequest*)fetchRequest;
++ (id)objectWithFetchRequest:(NSFetchRequest*)fetchRequest inContext:(NSManagedObjectContext*)context;
 
 /**
  * Fetches all objects from the persistent store by constructing a fetch request and
  * applying the predicate supplied. A short-cut for doing filtered searches on the objects
  * of this class under management.
  */
-+ (NSArray*)objectsWithPredicate:(NSPredicate*)predicate;
++ (NSArray*)objectsWithPredicate:(NSPredicate*)predicate inContext:(NSManagedObjectContext*)context;
 
 /**
  * Fetches the first object matching a predicate from the persistent store. A fetch request
  * will be constructed for you and a fetch limit of 1 will be applied.
  */
-+ (id)objectWithPredicate:(NSPredicate*)predicate;
++ (id)objectWithPredicate:(NSPredicate*)predicate inContext:(NSManagedObjectContext*)context;
 
 /**
  * Fetches all managed objects of this class from the persistent store as an array
  */
-+ (NSArray*)allObjects;
++ (NSArray*)allObjectsInContext:(NSManagedObjectContext*)context;
 
 /**
  * Returns a count of all managed objects of this class in the persistent store. On
  * error, will populate the error argument
  */
-+ (NSUInteger)count:(NSError**)error;
-
-/**
- * Returns a count of all managed objects of this class in the persistent store. Deprecated
- * use the error form above
- *
- * @deprecated
- */
-+ (NSUInteger)count DEPRECATED_ATTRIBUTE;
++ (NSUInteger)countInContext:(NSManagedObjectContext*)context error:(NSError**)error;
 
 /**
  * Creates a new managed object and inserts it into the managedObjectContext.
  */
-+ (id)object;
++ (id)objectInContext:(NSManagedObjectContext *)context;
 
 /**
  * Returns YES when an object has not been saved to the managed object context yet
  */
 - (BOOL)isNew;
 
-/**
- Finds the instance of the receiver's entity with the given value for the primary key attribute
- in the managed object context for the current thread.
-
- @param primaryKeyValue The value for the receiving entity's primary key attribute.
- @return The object with the primary key attribute equal to the given value or nil.
- */
-+ (id)findByPrimaryKey:(id)primaryKeyValue;
-
 /**
  Finds the instance of the receiver's entity with the given value for the primary key attribute in
  the given managed object context.
@@ -124,90 +89,53 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-+ (NSManagedObjectContext*)currentContext;
-
 + (void)handleErrors:(NSError *)error;
 
-+ (NSArray *)executeFetchRequest:(NSFetchRequest *)request;
 + (NSArray *)executeFetchRequest:(NSFetchRequest *)request inContext:(NSManagedObjectContext *)context;
-+ (NSFetchRequest *)createFetchRequest;
 + (NSFetchRequest *)createFetchRequestInContext:(NSManagedObjectContext *)context;
-+ (NSEntityDescription *)entityDescription;
 + (NSEntityDescription *)entityDescriptionInContext:(NSManagedObjectContext *)context;
-+ (NSArray *)propertiesNamed:(NSArray *)properties;
 
-+ (id)createEntity;
 + (id)createInContext:(NSManagedObjectContext *)context;
-- (BOOL)deleteEntity;
 - (BOOL)deleteInContext:(NSManagedObjectContext *)context;
 
-+ (BOOL)truncateAll;
 + (BOOL)truncateAllInContext:(NSManagedObjectContext *)context;
 
 + (NSArray *)ascendingSortDescriptors:(id)attributesToSortBy, ...;
 + (NSArray *)descendingSortDescriptors:(id)attributesToSortyBy, ...;
 
-+ (NSNumber *)numberOfEntities;
 + (NSNumber *)numberOfEntitiesWithContext:(NSManagedObjectContext *)context;
-+ (NSNumber *)numberOfEntitiesWithPredicate:(NSPredicate *)searchTerm;
 + (NSNumber *)numberOfEntitiesWithPredicate:(NSPredicate *)searchTerm inContext:(NSManagedObjectContext *)context;
 
-+ (BOOL) hasAtLeastOneEntity;
 + (BOOL) hasAtLeastOneEntityInContext:(NSManagedObjectContext *)context;
 
-+ (NSFetchRequest *)requestAll;
 + (NSFetchRequest *)requestAllInContext:(NSManagedObjectContext *)context;
-+ (NSFetchRequest *)requestAllWhere:(NSString *)property isEqualTo:(id)value;
 + (NSFetchRequest *)requestAllWhere:(NSString *)property isEqualTo:(id)value inContext:(NSManagedObjectContext *)context;
-+ (NSFetchRequest *)requestFirstWithPredicate:(NSPredicate *)searchTerm;
 + (NSFetchRequest *)requestFirstWithPredicate:(NSPredicate *)searchTerm inContext:(NSManagedObjectContext *)context;
-+ (NSFetchRequest *)requestFirstByAttribute:(NSString *)attribute withValue:(id)searchValue;
 + (NSFetchRequest *)requestFirstByAttribute:(NSString *)attribute withValue:(id)searchValue inContext:(NSManagedObjectContext *)context;
-+ (NSFetchRequest *)requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending;
 + (NSFetchRequest *)requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
-+ (NSFetchRequest *)requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm;
 + (NSFetchRequest *)requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm inContext:(NSManagedObjectContext *)context;
 
-+ (NSArray *)findAll;
 + (NSArray *)findAllInContext:(NSManagedObjectContext *)context;
-+ (NSArray *)findAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending;
 + (NSArray *)findAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
-+ (NSArray *)findAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm;
 + (NSArray *)findAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm inContext:(NSManagedObjectContext *)context;
-+ (NSArray *)findAllWithPredicate:(NSPredicate *)searchTerm;
 + (NSArray *)findAllWithPredicate:(NSPredicate *)searchTerm inContext:(NSManagedObjectContext *)context;
 
-+ (NSNumber *)maxValueFor:(NSString *)property;
-+ (id) objectWithMinValueFor:(NSString *)property;
-+ (id) objectWithMinValueFor:(NSString *)property inContext:(NSManagedObjectContext *)context;
-
-+ (id)findFirst;
 + (id)findFirstInContext:(NSManagedObjectContext *)context;
-+ (id)findFirstWithPredicate:(NSPredicate *)searchTerm;
 + (id)findFirstWithPredicate:(NSPredicate *)searchTerm inContext:(NSManagedObjectContext *)context;
-+ (id)findFirstWithPredicate:(NSPredicate *)searchterm sortedBy:(NSString *)property ascending:(BOOL)ascending;
 + (id)findFirstWithPredicate:(NSPredicate *)searchterm sortedBy:(NSString *)property ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
-+ (id)findFirstWithPredicate:(NSPredicate *)searchTerm andRetrieveAttributes:(NSArray *)attributes;
 + (id)findFirstWithPredicate:(NSPredicate *)searchTerm andRetrieveAttributes:(NSArray *)attributes inContext:(NSManagedObjectContext *)context;
-+ (id)findFirstWithPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortBy ascending:(BOOL)ascending andRetrieveAttributes:(id)attributes, ...;
 + (id)findFirstWithPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortBy ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context andRetrieveAttributes:(id)attributes, ...;
 
-+ (id)findFirstByAttribute:(NSString *)attribute withValue:(id)searchValue;
 + (id)findFirstByAttribute:(NSString *)attribute withValue:(id)searchValue inContext:(NSManagedObjectContext *)context;
-+ (NSArray *)findByAttribute:(NSString *)attribute withValue:(id)searchValue;
 + (NSArray *)findByAttribute:(NSString *)attribute withValue:(id)searchValue inContext:(NSManagedObjectContext *)context;
-+ (NSArray *)findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending;
 + (NSArray *)findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
 
 #if TARGET_OS_IPHONE
 
-+ (NSFetchedResultsController *)fetchAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm groupBy:(NSString *)groupingKeyPath;
 + (NSFetchedResultsController *)fetchAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm groupBy:(NSString *)groupingKeyPath inContext:(NSManagedObjectContext *)context;
 
-+ (NSFetchedResultsController *)fetchRequest:(NSFetchRequest *)request groupedBy:(NSString *)group;
 + (NSFetchedResultsController *)fetchRequest:(NSFetchRequest *)request groupedBy:(NSString *)group inContext:(NSManagedObjectContext *)context;
 
-+ (NSFetchedResultsController *)fetchRequestAllGroupedBy:(NSString *)group withPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortTerm ascending:(BOOL)ascending;
 + (NSFetchedResultsController *)fetchRequestAllGroupedBy:(NSString *)group withPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
 
 #endif