Skip to content

Remove legacy Core Data stack #19770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 19, 2022
Merged

Remove legacy Core Data stack #19770

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f7558bd
Remove LegacyContextFactory
crazytonyli Nov 10, 2022
5828347
Translating ContextManager to Swift
crazytonyli Dec 12, 2022
f7c9c8c
Reinstate PR #19765
crazytonyli Dec 12, 2022
264c86b
Rename a test file
crazytonyli Dec 12, 2022
ef467fd
Missed the code that sets `mergePolicy` when merging `ContainerContex…
crazytonyli Dec 13, 2022
285fda8
Remove a semicolon
crazytonyli Dec 13, 2022
f3ec3f2
Various minor changes
crazytonyli Dec 19, 2022
1e1d18e
Remove a TODO
crazytonyli Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WordPress/Classes/Categories/Media+WPMediaAsset.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "Media+WPMediaAsset.h"
#import "MediaService.h"
#import "Blog.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WordPress-Swift.h"

@implementation Media(WPMediaAsset)
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Models/AbstractPost.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "AbstractPost.h"
#import "Media.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WordPress-Swift.h"
#import "BasePost.h"
@import WordPressKit;
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Models/BasePost.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "BasePost.h"
#import "Media.h"
#import "NSMutableDictionary+Helpers.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
@import WordPressShared;

@implementation BasePost
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Models/Blog.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#import "WPAccount.h"
#import "AccountService.h"
#import "NSURL+IDN.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "Constants.h"
#import "WordPress-Swift.h"
#import "WPUserAgent.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Models/Media.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "Media.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WordPress-Swift.h"

@implementation Media
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Models/ReaderPost.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "ReaderPost.h"
#import "AccountService.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "SourcePostAttribution.h"
#import "WPAccount.h"
#import "WPAvatarSource.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Models/Theme.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "Theme.h"
#import "Blog.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WPAccount.h"
#import "AccountService.h"
#import "WordPress-Swift.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/AccountService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "AccountService.h"
#import "WPAccount.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "Blog.h"
#import "BlogService.h"
#import "TodayExtensionService.h"
Expand Down
4 changes: 2 additions & 2 deletions WordPress/Classes/Services/BlogService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
#import "Blog.h"
#import "WPAccount.h"
#import "AccountService.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WPError.h"
#import "Media.h"
#import "PostCategoryService.h"
#import "CommentService.h"
#import "PostService.h"
#import "TodayExtensionService.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
Copy link
Contributor

@mokagio mokagio Dec 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this import is duplicated from line 5.

Suggested change
#import "CoreDataStack.h"

#import "WordPress-Swift.h"
#import "PostType.h"
@import WordPressKit;
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/BlogSyncFacade.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "BlogSyncFacade.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "BlogService.h"
#import "AccountService.h"
#import "Blog.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/CommentService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "CommentService.h"
#import "AccountService.h"
#import "Blog.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "ReaderPost.h"
#import "WPAccount.h"
#import "PostService.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/MediaService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#import "AccountService.h"
#import "Media.h"
#import "WPAccount.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "Blog.h"
#import <MobileCoreServices/MobileCoreServices.h>
#import "WordPress-Swift.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/MenusService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#import "Menu.h"
#import "MenuItem.h"
#import "MenuLocation.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "PostService.h"
#import "WordPress-Swift.h"
@import WordPressKit;
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/PostCategoryService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "PostCategoryService.h"
#import "PostCategory.h"
#import "Blog.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WordPress-Swift.h"
@import WordPressKit;

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/PostService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#import "Coordinate.h"
#import "PostCategory.h"
#import "PostCategoryService.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "CommentService.h"
#import "MediaService.h"
#import "Media.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/PostTagService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "PostTagService.h"
#import "Blog.h"
#import "PostTag.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WordPress-Swift.h"
@import WordPressKit;

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/ReaderPostService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "ReaderPostService.h"

#import "AccountService.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "ReaderGapMarker.h"
#import "ReaderPost.h"
#import "ReaderSiteService.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/ReaderSiteService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "ReaderSiteService.h"

#import "AccountService.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "ReaderPostService.h"
#import "ReaderPost.h"
#import "WPAccount.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/ReaderTopicService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "ReaderTopicService.h"

#import "AccountService.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "ReaderPost.h"
#import "ReaderPostService.h"
#import "WPAccount.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/ThemeService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#import "Blog.h"
#import "Theme.h"
#import "WPAccount.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WordPress-Swift.h"
@import WordPressKit;

Expand Down
3 changes: 1 addition & 2 deletions WordPress/Classes/System/WordPress-Bridging-Header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
#import "ConfigurablePostView.h"
#import "Confirmable.h"
#import "Constants.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "Coordinate.h"
#import "CustomHighlightButton.h"

#import "EditCommentViewController.h"

#import "LegacyContextFactory.h"
#import "LocalCoreDataService.h"

#import "Media.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "WPAnalyticsTrackerAutomatticTracks.h"
#import "ContextManager.h"
#import "CoreDataStack.h"
#import "AccountService.h"
#import "BlogService.h"
#import "WPAccount.h"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Utility/Analytics/WPAppAnalytics.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "WPAppAnalytics.h"

#import "ContextManager.h"
#import "CoreDataStack.h"
#import "WPAnalyticsTrackerWPCom.h"
#import "WPAnalyticsTrackerAutomatticTracks.h"
#import "WPTabBarController.h"
Expand Down
44 changes: 0 additions & 44 deletions WordPress/Classes/Utility/ContainerContextFactory.swift
View file
Open in desktop

This file was deleted.

13 changes: 2 additions & 11 deletions WordPress/Classes/Utility/ContextManager+ErrorHandling.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,7 @@ private extension NSExceptionName {
static let coreDataSaveDerivedException = NSExceptionName("Unresolved Core Data save error (Derived Context)")
}

extension LegacyContextFactory {

/// A wrapper of `internalSave(_:)` to expose it as an Objective-C API for `LegacyContextFactory` to call.
@objc func internalSaveContext(_ context: NSManagedObjectContext) {
internalSave(context)
}

}

extension ManagedObjectContextFactory {
extension ContextManager {

func internalSave(_ context: NSManagedObjectContext) {
guard context.hasChanges else {
Expand All @@ -87,7 +78,7 @@ extension ManagedObjectContextFactory {

}

private extension ManagedObjectContextFactory {
private extension ContextManager {

func handleSaveError(_ error: NSError, in context: NSManagedObjectContext) {
let isMainContext = context == mainContext
Expand Down
107 changes: 0 additions & 107 deletions WordPress/Classes/Utility/ContextManager.h
View file
Open in desktop

This file was deleted.

Loading