Skip to content

Commit 79e4089

Browse files
wolfconwolfcon
authored
remove deprecated methods (#706)
1 parent 84c09b8 commit 79e4089

File tree

6 files changed

+0
-384
lines changed

6 files changed

+0
-384
lines changed

‎MJExtension/NSObject+MJKeyValue.h‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -185,42 +185,3 @@
185185
*/
186186
- (NSString *)mj_JSONString;
187187
@end
188-
189-
@interface NSObject (MJKeyValueDeprecated_v_2_5_16)
190-
- (instancetype)setKeyValues:(id)keyValue MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
191-
- (instancetype)setKeyValues:(id)keyValues error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
192-
- (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
193-
- (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
194-
+ (void)referenceReplacedKeyWhenCreatingKeyValues:(BOOL)reference MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
195-
- (NSMutableDictionary *)keyValues MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
196-
- (NSMutableDictionary *)keyValuesWithError:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
197-
- (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
198-
- (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
199-
- (NSMutableDictionary *)keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
200-
- (NSMutableDictionary *)keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
201-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
202-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
203-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
204-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
205-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
206-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
207-
+ (instancetype)objectWithKeyValues:(id)keyValues MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
208-
+ (instancetype)objectWithKeyValues:(id)keyValues error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
209-
+ (instancetype)objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
210-
+ (instancetype)objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
211-
+ (instancetype)objectWithFilename:(NSString *)filename MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
212-
+ (instancetype)objectWithFilename:(NSString *)filename error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
213-
+ (instancetype)objectWithFile:(NSString *)file MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
214-
+ (instancetype)objectWithFile:(NSString *)file error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
215-
+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
216-
+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
217-
+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
218-
+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
219-
+ (NSMutableArray *)objectArrayWithFilename:(NSString *)filename MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
220-
+ (NSMutableArray *)objectArrayWithFilename:(NSString *)filename error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
221-
+ (NSMutableArray *)objectArrayWithFile:(NSString *)file MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
222-
+ (NSMutableArray *)objectArrayWithFile:(NSString *)file error:(NSError **)error MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
223-
- (NSData *)JSONData MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
224-
- (id)JSONObject MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
225-
- (NSString *)JSONString MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
226-
@end

‎MJExtension/NSObject+MJKeyValue.m‎

Lines changed: 0 additions & 246 deletions
Original file line numberDiff line numberDiff line change
@@ -476,251 +476,5 @@ - (NSString *)mj_JSONString
476476

477477
return [[NSString alloc] initWithData:[self mj_JSONData] encoding:NSUTF8StringEncoding];
478478
}
479-
@end
480-
481-
@implementation NSObject (MJKeyValueDeprecated_v_2_5_16)
482-
- (instancetype)setKeyValues:(id)keyValues
483-
{
484-
return [self mj_setKeyValues:keyValues];
485-
}
486-
487-
- (instancetype)setKeyValues:(id)keyValues error:(NSError **)error
488-
{
489-
id value = [self mj_setKeyValues:keyValues];
490-
if (error != NULL) {
491-
*error = [self.class mj_error];
492-
}
493-
return value;
494-
495-
}
496-
497-
- (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context
498-
{
499-
return [self mj_setKeyValues:keyValues context:context];
500-
}
501-
502-
- (instancetype)setKeyValues:(id)keyValues context:(NSManagedObjectContext *)context error:(NSError **)error
503-
{
504-
id value = [self mj_setKeyValues:keyValues context:context];
505-
if (error != NULL) {
506-
*error = [self.class mj_error];
507-
}
508-
return value;
509-
}
510479

511-
+ (void)referenceReplacedKeyWhenCreatingKeyValues:(BOOL)reference
512-
{
513-
[self mj_referenceReplacedKeyWhenCreatingKeyValues:reference];
514-
}
515-
516-
- (NSMutableDictionary *)keyValues
517-
{
518-
return [self mj_keyValues];
519-
}
520-
521-
- (NSMutableDictionary *)keyValuesWithError:(NSError **)error
522-
{
523-
id value = [self mj_keyValues];
524-
if (error != NULL) {
525-
*error = [self.class mj_error];
526-
}
527-
return value;
528-
}
529-
530-
- (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys
531-
{
532-
return [self mj_keyValuesWithKeys:keys];
533-
}
534-
535-
- (NSMutableDictionary *)keyValuesWithKeys:(NSArray *)keys error:(NSError **)error
536-
{
537-
id value = [self mj_keyValuesWithKeys:keys];
538-
if (error != NULL) {
539-
*error = [self.class mj_error];
540-
}
541-
return value;
542-
}
543-
544-
- (NSMutableDictionary *)keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys
545-
{
546-
return [self mj_keyValuesWithIgnoredKeys:ignoredKeys];
547-
}
548-
549-
- (NSMutableDictionary *)keyValuesWithIgnoredKeys:(NSArray *)ignoredKeys error:(NSError **)error
550-
{
551-
id value = [self mj_keyValuesWithIgnoredKeys:ignoredKeys];
552-
if (error != NULL) {
553-
*error = [self.class mj_error];
554-
}
555-
return value;
556-
}
557-
558-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray
559-
{
560-
return [self mj_keyValuesArrayWithObjectArray:objectArray];
561-
}
562-
563-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray error:(NSError **)error
564-
{
565-
id value = [self mj_keyValuesArrayWithObjectArray:objectArray];
566-
if (error != NULL) {
567-
*error = [self mj_error];
568-
}
569-
return value;
570-
}
571-
572-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys
573-
{
574-
return [self mj_keyValuesArrayWithObjectArray:objectArray keys:keys];
575-
}
576-
577-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray keys:(NSArray *)keys error:(NSError **)error
578-
{
579-
id value = [self mj_keyValuesArrayWithObjectArray:objectArray keys:keys];
580-
if (error != NULL) {
581-
*error = [self mj_error];
582-
}
583-
return value;
584-
}
585-
586-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys
587-
{
588-
return [self mj_keyValuesArrayWithObjectArray:objectArray ignoredKeys:ignoredKeys];
589-
}
590-
591-
+ (NSMutableArray *)keyValuesArrayWithObjectArray:(NSArray *)objectArray ignoredKeys:(NSArray *)ignoredKeys error:(NSError **)error
592-
{
593-
id value = [self mj_keyValuesArrayWithObjectArray:objectArray ignoredKeys:ignoredKeys];
594-
if (error != NULL) {
595-
*error = [self mj_error];
596-
}
597-
return value;
598-
}
599-
600-
+ (instancetype)objectWithKeyValues:(id)keyValues
601-
{
602-
return [self mj_objectWithKeyValues:keyValues];
603-
}
604-
605-
+ (instancetype)objectWithKeyValues:(id)keyValues error:(NSError **)error
606-
{
607-
id value = [self mj_objectWithKeyValues:keyValues];
608-
if (error != NULL) {
609-
*error = [self mj_error];
610-
}
611-
return value;
612-
}
613-
614-
+ (instancetype)objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context
615-
{
616-
return [self mj_objectWithKeyValues:keyValues context:context];
617-
}
618-
619-
+ (instancetype)objectWithKeyValues:(id)keyValues context:(NSManagedObjectContext *)context error:(NSError **)error
620-
{
621-
id value = [self mj_objectWithKeyValues:keyValues context:context];
622-
if (error != NULL) {
623-
*error = [self mj_error];
624-
}
625-
return value;
626-
}
627-
628-
+ (instancetype)objectWithFilename:(NSString *)filename
629-
{
630-
return [self mj_objectWithFilename:filename];
631-
}
632-
633-
+ (instancetype)objectWithFilename:(NSString *)filename error:(NSError **)error
634-
{
635-
id value = [self mj_objectWithFilename:filename];
636-
if (error != NULL) {
637-
*error = [self mj_error];
638-
}
639-
return value;
640-
}
641-
642-
+ (instancetype)objectWithFile:(NSString *)file
643-
{
644-
return [self mj_objectWithFile:file];
645-
}
646-
647-
+ (instancetype)objectWithFile:(NSString *)file error:(NSError **)error
648-
{
649-
id value = [self mj_objectWithFile:file];
650-
if (error != NULL) {
651-
*error = [self mj_error];
652-
}
653-
return value;
654-
}
655-
656-
+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray
657-
{
658-
return [self mj_objectArrayWithKeyValuesArray:keyValuesArray];
659-
}
660-
661-
+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray error:(NSError **)error
662-
{
663-
id value = [self mj_objectArrayWithKeyValuesArray:keyValuesArray];
664-
if (error != NULL) {
665-
*error = [self mj_error];
666-
}
667-
return value;
668-
}
669-
670-
+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context
671-
{
672-
return [self mj_objectArrayWithKeyValuesArray:keyValuesArray context:context];
673-
}
674-
675-
+ (NSMutableArray *)objectArrayWithKeyValuesArray:(id)keyValuesArray context:(NSManagedObjectContext *)context error:(NSError **)error
676-
{
677-
id value = [self mj_objectArrayWithKeyValuesArray:keyValuesArray context:context];
678-
if (error != NULL) {
679-
*error = [self mj_error];
680-
}
681-
return value;
682-
}
683-
684-
+ (NSMutableArray *)objectArrayWithFilename:(NSString *)filename
685-
{
686-
return [self mj_objectArrayWithFilename:filename];
687-
}
688-
689-
+ (NSMutableArray *)objectArrayWithFilename:(NSString *)filename error:(NSError **)error
690-
{
691-
id value = [self mj_objectArrayWithFilename:filename];
692-
if (error != NULL) {
693-
*error = [self mj_error];
694-
}
695-
return value;
696-
}
697-
698-
+ (NSMutableArray *)objectArrayWithFile:(NSString *)file
699-
{
700-
return [self mj_objectArrayWithFile:file];
701-
}
702-
703-
+ (NSMutableArray *)objectArrayWithFile:(NSString *)file error:(NSError **)error
704-
{
705-
id value = [self mj_objectArrayWithFile:file];
706-
if (error != NULL) {
707-
*error = [self mj_error];
708-
}
709-
return value;
710-
}
711-
712-
- (NSData *)JSONData
713-
{
714-
return [self mj_JSONData];
715-
}
716-
717-
- (id)JSONObject
718-
{
719-
return [self mj_JSONObject];
720-
}
721-
722-
- (NSString *)JSONString
723-
{
724-
return [self mj_JSONString];
725-
}
726480
@end

‎MJExtension/NSObject+MJProperty.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,3 @@ typedef id (^MJNewValueFromOldValue)(id object, id oldValue, MJProperty *propert
6868
*/
6969
+ (void)mj_setupObjectClassInArray:(MJObjectClassInArray)objectClassInArray;
7070
@end
71-
72-
@interface NSObject (MJPropertyDeprecated_v_2_5_16)
73-
+ (void)enumerateProperties:(MJPropertiesEnumeration)enumeration MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
74-
+ (void)setupNewValueFromOldValue:(MJNewValueFromOldValue)newValueFormOldValue MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
75-
+ (id)getNewValueFromObject:(__unsafe_unretained id)object oldValue:(__unsafe_unretained id)oldValue property:(__unsafe_unretained MJProperty *)property MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
76-
+ (void)setupReplacedKeyFromPropertyName:(MJReplacedKeyFromPropertyName)replacedKeyFromPropertyName MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
77-
+ (void)setupReplacedKeyFromPropertyName121:(MJReplacedKeyFromPropertyName121)replacedKeyFromPropertyName121 MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
78-
+ (void)setupObjectClassInArray:(MJObjectClassInArray)objectClassInArray MJExtensionDeprecated("请在方法名前面加上mj_前缀，使用mj_***");
79-
@end

‎MJExtension/NSObject+MJProperty.m‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ + (id)mj_propertyKey:(NSString *)propertyName
6262
if ([self respondsToSelector:@selector(mj_replacedKeyFromPropertyName121:)]) {
6363
key = [self mj_replacedKeyFromPropertyName121:propertyName];
6464
}
65-
// 兼容旧版本
66-
if ([self respondsToSelector:@selector(replacedKeyFromPropertyName121:)]) {
67-
key = [self performSelector:@selector(replacedKeyFromPropertyName121:) withObject:propertyName];
68-
}
6965

7066
// 调用block
7167
if (!key) {
@@ -82,10 +78,6 @@ + (id)mj_propertyKey:(NSString *)propertyName
8278
if ((!key || [key isEqual:propertyName]) && [self respondsToSelector:@selector(mj_replacedKeyFromPropertyName)]) {
8379
key = [self mj_replacedKeyFromPropertyName][propertyName];
8480
}
85-
// 兼容旧版本
86-
if ((!key || [key isEqual:propertyName]) && [self respondsToSelector:@selector(replacedKeyFromPropertyName)]) {
87-
key = [self performSelector:@selector(replacedKeyFromPropertyName)][propertyName];
88-
}
8981

9082
if (!key || [key isEqual:propertyName]) {
9183
[self mj_enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
@@ -109,10 +101,6 @@ + (Class)mj_propertyObjectClassInArray:(NSString *)propertyName
109101
if ([self respondsToSelector:@selector(mj_objectClassInArray)]) {
110102
clazz = [self mj_objectClassInArray][propertyName];
111103
}
112-
// 兼容旧版本
113-
if ([self respondsToSelector:@selector(objectClassInArray)]) {
114-
clazz = [self performSelector:@selector(objectClassInArray)][propertyName];
115-
}
116104

117105
if (!clazz) {
118106
[self mj_enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
@@ -197,10 +185,6 @@ + (id)mj_getNewValueFromObject:(__unsafe_unretained id)object oldValue:(__unsafe
197185
if ([object respondsToSelector:@selector(mj_newValueFromOldValue:property:)]) {
198186
return [object mj_newValueFromOldValue:oldValue property:property];
199187
}
200-
// 兼容旧版本
201-
if ([self respondsToSelector:@selector(newValueFromOldValue:property:)]) {
202-
return [self performSelector:@selector(newValueFromOldValue:property:) withObject:oldValue withObject:property];
203-
}
204188

205189
// 查看静态设置
206190
__block id newValue = oldValue;
@@ -246,37 +230,4 @@ + (void)mj_setupReplacedKeyFromPropertyName121:(MJReplacedKeyFromPropertyName121
246230
MJExtensionSemaphoreSignal
247231
}
248232
@end
249-
250-
@implementation NSObject (MJPropertyDeprecated_v_2_5_16)
251-
+ (void)enumerateProperties:(MJPropertiesEnumeration)enumeration
252-
{
253-
[self mj_enumerateProperties:enumeration];
254-
}
255-
256-
+ (void)setupNewValueFromOldValue:(MJNewValueFromOldValue)newValueFormOldValue
257-
{
258-
[self mj_setupNewValueFromOldValue:newValueFormOldValue];
259-
}
260-
261-
+ (id)getNewValueFromObject:(__unsafe_unretained id)object oldValue:(__unsafe_unretained id)oldValue property:(__unsafe_unretained MJProperty *)property
262-
{
263-
return [self mj_getNewValueFromObject:object oldValue:oldValue property:property];
264-
}
265-
266-
+ (void)setupReplacedKeyFromPropertyName:(MJReplacedKeyFromPropertyName)replacedKeyFromPropertyName
267-
{
268-
[self mj_setupReplacedKeyFromPropertyName:replacedKeyFromPropertyName];
269-
}
270-
271-
+ (void)setupReplacedKeyFromPropertyName121:(MJReplacedKeyFromPropertyName121)replacedKeyFromPropertyName121
272-
{
273-
[self mj_setupReplacedKeyFromPropertyName121:replacedKeyFromPropertyName121];
274-
}
275-
276-
+ (void)setupObjectClassInArray:(MJObjectClassInArray)objectClassInArray
277-
{
278-
[self mj_setupObjectClassInArray:objectClassInArray];
279-
}
280-
@end
281-
282233
#pragma clang diagnostic pop

0 commit comments

Comments
 (0)