diff --git a/Pod/Classes/PNObject+Protected.h b/Pod/Classes/PNObject+Protected.h index 093c423..b9bc086 100644 --- a/Pod/Classes/PNObject+Protected.h +++ b/Pod/Classes/PNObject+Protected.h @@ -8,14 +8,6 @@ #import "PNObject.h" -#pragma mark MappingSelector Keys - -extern NSString* _Nonnull const PNObjectMappingKey; -extern NSString* _Nonnull const PNObjectMappingType; -extern NSString* _Nonnull const PNObjectMappingSelector; - -#pragma mark - - @interface PNObject (Protected) /** * <#Description#> diff --git a/Pod/Classes/PNObject+Protected.m b/Pod/Classes/PNObject+Protected.m index e34cac1..a120dab 100644 --- a/Pod/Classes/PNObject+Protected.m +++ b/Pod/Classes/PNObject+Protected.m @@ -11,13 +11,7 @@ #import #import "objc/runtime.h" -extern NSString* _Nonnull const PNObjectMappingKey; -extern NSString* _Nonnull const PNObjectMappingType; -extern NSString* _Nonnull const PNObjectMappingSelector; -NSString * const PNObjectMappingKey = @"PNObjectLocalNotificationRefreshTokenClientCredentialSuccess"; -NSString * const PNObjectMappingType = @"PNObjectLocalNotificationRefreshTokenClientCredentialFail"; -NSString * const PNObjectMappingSelector = @"PNObjectLocalNotificationRefreshTokenClientCredentialFail"; @implementation PNObject (Protected) @@ -51,8 +45,8 @@ NSString * const PNObjectMappingSelector = @"PNObjectLocalNotificationRefreshTok id mappingValue = [[[self class] objcetMapping] valueForKey:propertyName]; if([mappingValue isKindOfClass:NSDictionary.class]) { - mappedJSONKey = [mappingValue valueForKey:@"key"]; - mappedJSONType = [mappingValue valueForKey:@"type"]; + mappedJSONKey = [mappingValue valueForKey:PNObjectMappingKey]; + mappedJSONType = [mappingValue valueForKey:PNObjectMappingType]; } else { mappedJSONKey = mappingValue; } diff --git a/Pod/Classes/PNObject.h b/Pod/Classes/PNObject.h index 75952b6..a05f387 100644 --- a/Pod/Classes/PNObject.h +++ b/Pod/Classes/PNObject.h @@ -10,6 +10,14 @@ #import "PNObjectConfig.h" #import "PNObjectModel.h" +#pragma mark MappingSelector Keys + +extern NSString* _Nonnull const PNObjectMappingKey; +extern NSString* _Nonnull const PNObjectMappingType; +extern NSString* _Nonnull const PNObjectMappingSelector; + +#pragma mark - + @protocol PNObjectSubclassing @required diff --git a/Pod/Classes/PNObject.m b/Pod/Classes/PNObject.m index 5d1b6d8..b43569d 100644 --- a/Pod/Classes/PNObject.m +++ b/Pod/Classes/PNObject.m @@ -17,6 +17,10 @@ #define PNOBJECT_DIR @"PNObjects" +NSString * const PNObjectMappingKey = @"key"; +NSString * const PNObjectMappingType = @"type"; +NSString * const PNObjectMappingSelector = @"selector"; + @interface PNObject()