From d5a6726be6809014d3fd5833ac7ebcc978d9bdf2 Mon Sep 17 00:00:00 2001 From: Bruno Farache Date: Fri, 19 Jun 2015 15:44:44 -0300 Subject: [PATCH] Regenerate --- .../v62/address/LRAddressService_v62.m | 36 +- .../LRAnnouncementsDeliveryService_v62.m | 2 +- .../LRAnnouncementsEntryService_v62.m | 24 +- .../LRAssetCategoryService_v62.m | 44 +-- .../LRAssetCategoryPropertyService_v62.m | 10 +- .../v62/assetentry/LRAssetEntryService_v62.m | 62 ++-- .../v62/assettag/LRAssetTagService_v62.m | 52 +-- .../LRAssetTagPropertyService_v62.m | 10 +- .../LRAssetVocabularyService_v62.m | 52 +-- .../LRBackgroundTaskService_v62.m | 4 +- .../v62/blogsentry/LRBlogsEntryService_v62.m | 26 +- .../LRBookmarksEntryService_v62.m | 14 +- .../LRBookmarksFolderService_v62.m | 10 +- .../v62/classname/LRClassNameService_v62.m | 6 +- .../v62/company/LRCompanyService_v62.m | 38 +- .../v62/country/LRCountryService_v62.m | 20 +- .../v62/ddlrecord/LRDDLRecordService_v62.m | 6 +- .../ddlrecordset/LRDDLRecordSetService_v62.m | 28 +- .../ddmstructure/LRDDMStructureService_v62.m | 86 ++--- .../ddmtemplate/LRDDMTemplateService_v62.m | 152 ++++---- .../Service/v62/dlapp/LRDLAppService_v62.m | 144 ++++---- .../dlfileentry/LRDLFileEntryService_v62.m | 38 +- .../LRDLFileEntryTypeService_v62.m | 42 +-- .../v62/dlfolder/LRDLFolderService_v62.m | 34 +- .../emailaddress/LREmailAddressService_v62.m | 12 +- .../LRExpandoColumnService_v62.m | 14 +- .../expandovalue/LRExpandoValueService_v62.m | 32 +- .../v62/flagsentry/LRFlagsEntryService_v62.m | 10 +- .../Service/v62/group/LRGroupService_v62.m | 70 ++-- .../LRJournalArticleService_v62.m | 268 +++++++------- .../journalfeed/LRJournalFeedService_v62.m | 56 +-- .../LRJournalFolderService_v62.m | 12 +- .../LRJournalStructureService_v62.m | 56 +-- .../LRJournalTemplateService_v62.m | 108 +++--- .../Service/v62/layout/LRLayoutService_v62.m | 240 ++++++------ .../layoutbranch/LRLayoutBranchService_v62.m | 8 +- .../LRLayoutPrototypeService_v62.m | 16 +- .../LRLayoutRevisionService_v62.m | 22 +- .../v62/layoutset/LRLayoutSetService_v62.m | 14 +- .../LRLayoutSetBranchService_v62.m | 8 +- .../LRLayoutSetPrototypeService_v62.m | 10 +- .../v62/listtype/LRListTypeService_v62.m | 6 +- .../v62/mbcategory/LRMBCategoryService_v62.m | 62 ++-- .../v62/mbmessage/LRMBMessageService_v62.m | 100 ++--- .../v62/mbthread/LRMBThreadService_v62.m | 2 +- .../v62/mdraction/LRMDRActionService_v62.m | 28 +- .../v62/mdrrule/LRMDRRuleService_v62.m | 22 +- .../mdrrulegroup/LRMDRRuleGroupService_v62.m | 8 +- .../LRMDRRuleGroupInstanceService_v62.m | 8 +- .../LRMembershipRequestService_v62.m | 4 +- .../organization/LROrganizationService_v62.m | 102 +++--- .../LRPasswordPolicyService_v62.m | 20 +- .../v62/permission/LRPermissionService_v62.m | 4 +- .../Service/v62/phone/LRPhoneService_v62.m | 18 +- .../LRPluginSettingService_v62.m | 6 +- .../LRPollsQuestionService_v62.m | 12 +- .../Service/v62/portal/LRPortalService_v62.m | 10 +- .../v62/portlet/LRPortletService_v62.m | 4 +- .../LRPortletPreferencesService_v62.m | 12 +- .../ratingsentry/LRRatingsEntryService_v62.m | 4 +- .../Service/v62/region/LRRegionService_v62.m | 8 +- .../v62/repository/LRRepositoryService_v62.m | 12 +- .../LRResourceBlockService_v62.m | 44 +-- .../LRResourcePermissionService_v62.m | 28 +- .../Service/v62/role/LRRoleService_v62.m | 36 +- .../LRSCFrameworkVersionService_v62.m | 8 +- .../v62/sclicense/LRSCLicenseService_v62.m | 8 +- .../LRSCProductEntryService_v62.m | 48 +-- .../LRSCProductVersionService_v62.m | 20 +- .../LRShoppingCategoryService_v62.m | 10 +- .../LRShoppingCouponService_v62.m | 26 +- .../shoppingitem/LRShoppingItemService_v62.m | 56 +-- .../LRShoppingOrderService_v62.m | 70 ++-- .../LRSocialActivityService_v62.m | 8 +- .../LRSocialActivitySettingService_v62.m | 14 +- .../v62/staging/LRStagingService_v62.m | 8 +- .../Service/v62/team/LRTeamService_v62.m | 10 +- .../v62/trashentry/LRTrashEntryService_v62.m | 8 +- .../Service/v62/user/LRUserService_v62.m | 346 +++++++++--------- .../v62/usergroup/LRUserGroupService_v62.m | 26 +- .../LRUserGroupGroupRoleService_v62.m | 8 +- .../LRUserGroupRoleService_v62.m | 8 +- .../v62/website/LRWebsiteService_v62.m | 12 +- .../v62/wikinode/LRWikiNodeService_v62.m | 10 +- .../v62/wikipage/LRWikiPageService_v62.m | 148 ++++---- 85 files changed, 1654 insertions(+), 1654 deletions(-) diff --git a/ios/Source/Service/v62/address/LRAddressService_v62.m b/ios/Source/Service/v62/address/LRAddressService_v62.m index ca4840e5..835b936a 100644 --- a/ios/Source/Service/v62/address/LRAddressService_v62.m +++ b/ios/Source/Service/v62/address/LRAddressService_v62.m @@ -21,13 +21,13 @@ @implementation LRAddressService_v62 - (NSDictionary *)addAddressWithClassName:(NSString *)className classPK:(long long)classPK street1:(NSString *)street1 street2:(NSString *)street2 street3:(NSString *)street3 city:(NSString *)city zip:(NSString *)zip regionId:(long long)regionId countryId:(long long)countryId typeId:(int)typeId mailing:(BOOL)mailing primary:(BOOL)primary error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"street1": street1, - @"street2": street2, - @"street3": street3, - @"city": city, - @"zip": zip, + @"street1": [self checkNull: street1], + @"street2": [self checkNull: street2], + @"street3": [self checkNull: street3], + @"city": [self checkNull: city], + @"zip": [self checkNull: zip], @"regionId": @(regionId), @"countryId": @(countryId), @"typeId": @(typeId), @@ -42,13 +42,13 @@ - (NSDictionary *)addAddressWithClassName:(NSString *)className classPK:(long lo - (NSDictionary *)addAddressWithClassName:(NSString *)className classPK:(long long)classPK street1:(NSString *)street1 street2:(NSString *)street2 street3:(NSString *)street3 city:(NSString *)city zip:(NSString *)zip regionId:(long long)regionId countryId:(long long)countryId typeId:(int)typeId mailing:(BOOL)mailing primary:(BOOL)primary serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"street1": street1, - @"street2": street2, - @"street3": street3, - @"city": city, - @"zip": zip, + @"street1": [self checkNull: street1], + @"street2": [self checkNull: street2], + @"street3": [self checkNull: street3], + @"city": [self checkNull: city], + @"zip": [self checkNull: zip], @"regionId": @(regionId), @"countryId": @(countryId), @"typeId": @(typeId), @@ -85,7 +85,7 @@ - (NSDictionary *)getAddressWithAddressId:(long long)addressId error:(NSError ** - (NSArray *)getAddressesWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -97,11 +97,11 @@ - (NSArray *)getAddressesWithClassName:(NSString *)className classPK:(long long) - (NSDictionary *)updateAddressWithAddressId:(long long)addressId street1:(NSString *)street1 street2:(NSString *)street2 street3:(NSString *)street3 city:(NSString *)city zip:(NSString *)zip regionId:(long long)regionId countryId:(long long)countryId typeId:(int)typeId mailing:(BOOL)mailing primary:(BOOL)primary error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"addressId": @(addressId), - @"street1": street1, - @"street2": street2, - @"street3": street3, - @"city": city, - @"zip": zip, + @"street1": [self checkNull: street1], + @"street2": [self checkNull: street2], + @"street3": [self checkNull: street3], + @"city": [self checkNull: city], + @"zip": [self checkNull: zip], @"regionId": @(regionId), @"countryId": @(countryId), @"typeId": @(typeId), diff --git a/ios/Source/Service/v62/announcementsdelivery/LRAnnouncementsDeliveryService_v62.m b/ios/Source/Service/v62/announcementsdelivery/LRAnnouncementsDeliveryService_v62.m index 0556eb65..314b4f16 100644 --- a/ios/Source/Service/v62/announcementsdelivery/LRAnnouncementsDeliveryService_v62.m +++ b/ios/Source/Service/v62/announcementsdelivery/LRAnnouncementsDeliveryService_v62.m @@ -22,7 +22,7 @@ @implementation LRAnnouncementsDeliveryService_v62 - (NSDictionary *)updateDeliveryWithUserId:(long long)userId type:(NSString *)type email:(BOOL)email sms:(BOOL)sms website:(BOOL)website error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"type": type, + @"type": [self checkNull: type], @"email": @(email), @"sms": @(sms), @"website": @(website) diff --git a/ios/Source/Service/v62/announcementsentry/LRAnnouncementsEntryService_v62.m b/ios/Source/Service/v62/announcementsentry/LRAnnouncementsEntryService_v62.m index 8e92369e..937870d9 100644 --- a/ios/Source/Service/v62/announcementsentry/LRAnnouncementsEntryService_v62.m +++ b/ios/Source/Service/v62/announcementsentry/LRAnnouncementsEntryService_v62.m @@ -24,10 +24,10 @@ - (NSDictionary *)addEntryWithPlid:(long long)plid classNameId:(long long)classN @"plid": @(plid), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"title": title, - @"content": content, - @"url": url, - @"type": type, + @"title": [self checkNull: title], + @"content": [self checkNull: content], + @"url": [self checkNull: url], + @"type": [self checkNull: type], @"displayDateMonth": @(displayDateMonth), @"displayDateDay": @(displayDateDay), @"displayDateYear": @(displayDateYear), @@ -52,10 +52,10 @@ - (NSDictionary *)addEntryWithPlid:(long long)plid classNameId:(long long)classN @"plid": @(plid), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"title": title, - @"content": content, - @"url": url, - @"type": type, + @"title": [self checkNull: title], + @"content": [self checkNull: content], + @"url": [self checkNull: url], + @"type": [self checkNull: type], @"displayDateMonth": @(displayDateMonth), @"displayDateDay": @(displayDateDay), @"displayDateYear": @(displayDateYear), @@ -99,10 +99,10 @@ - (NSDictionary *)getEntryWithEntryId:(long long)entryId error:(NSError **)error - (NSDictionary *)updateEntryWithEntryId:(long long)entryId title:(NSString *)title content:(NSString *)content url:(NSString *)url type:(NSString *)type displayDateMonth:(int)displayDateMonth displayDateDay:(int)displayDateDay displayDateYear:(int)displayDateYear displayDateHour:(int)displayDateHour displayDateMinute:(int)displayDateMinute displayImmediately:(BOOL)displayImmediately expirationDateMonth:(int)expirationDateMonth expirationDateDay:(int)expirationDateDay expirationDateYear:(int)expirationDateYear expirationDateHour:(int)expirationDateHour expirationDateMinute:(int)expirationDateMinute priority:(int)priority error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"entryId": @(entryId), - @"title": title, - @"content": content, - @"url": url, - @"type": type, + @"title": [self checkNull: title], + @"content": [self checkNull: content], + @"url": [self checkNull: url], + @"type": [self checkNull: type], @"displayDateMonth": @(displayDateMonth), @"displayDateDay": @(displayDateDay), @"displayDateYear": @(displayDateYear), diff --git a/ios/Source/Service/v62/assetcategory/LRAssetCategoryService_v62.m b/ios/Source/Service/v62/assetcategory/LRAssetCategoryService_v62.m index ff5ab82a..f09c2891 100644 --- a/ios/Source/Service/v62/assetcategory/LRAssetCategoryService_v62.m +++ b/ios/Source/Service/v62/assetcategory/LRAssetCategoryService_v62.m @@ -21,7 +21,7 @@ @implementation LRAssetCategoryService_v62 - (NSDictionary *)addCategoryWithTitle:(NSString *)title vocabularyId:(long long)vocabularyId serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"title": title, + @"title": [self checkNull: title], @"vocabularyId": @(vocabularyId), }]; @@ -35,10 +35,10 @@ - (NSDictionary *)addCategoryWithTitle:(NSString *)title vocabularyId:(long long - (NSDictionary *)addCategoryWithParentCategoryId:(long long)parentCategoryId titleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap vocabularyId:(long long)vocabularyId categoryProperties:(NSArray *)categoryProperties serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentCategoryId": @(parentCategoryId), - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], @"vocabularyId": @(vocabularyId), - @"categoryProperties": categoryProperties, + @"categoryProperties": [self checkNull: categoryProperties], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -50,7 +50,7 @@ - (NSDictionary *)addCategoryWithParentCategoryId:(long long)parentCategoryId ti - (void)deleteCategoriesWithCategoryIds:(NSArray *)categoryIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"categoryIds": categoryIds + @"categoryIds": [self checkNull: categoryIds] }]; NSDictionary *_command = @{@"/assetcategory/delete-categories": _params}; @@ -60,7 +60,7 @@ - (void)deleteCategoriesWithCategoryIds:(NSArray *)categoryIds error:(NSError ** - (NSArray *)deleteCategoriesWithCategoryIds:(NSArray *)categoryIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"categoryIds": categoryIds, + @"categoryIds": [self checkNull: categoryIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -82,7 +82,7 @@ - (void)deleteCategoryWithCategoryId:(long long)categoryId error:(NSError **)err - (NSArray *)getCategoriesWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -128,8 +128,8 @@ - (NSArray *)getChildCategoriesWithParentCategoryId:(long long)parentCategoryId - (NSArray *)getJsonSearchWithGroupId:(long long)groupId name:(NSString *)name vocabularyIds:(NSArray *)vocabularyIds start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"vocabularyIds": vocabularyIds, + @"name": [self checkNull: name], + @"vocabularyIds": [self checkNull: vocabularyIds], @"start": @(start), @"end": @(end) }]; @@ -156,7 +156,7 @@ - (NSDictionary *)getJsonVocabularyCategoriesWithVocabularyId:(long long)vocabul - (NSDictionary *)getJsonVocabularyCategoriesWithGroupId:(long long)groupId name:(NSString *)name vocabularyId:(long long)vocabularyId start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"vocabularyId": @(vocabularyId), @"start": @(start), @"end": @(end), @@ -201,7 +201,7 @@ - (NSArray *)getVocabularyCategoriesWithParentCategoryId:(long long)parentCatego - (NSArray *)getVocabularyCategoriesWithGroupId:(long long)groupId name:(NSString *)name vocabularyId:(long long)vocabularyId start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"vocabularyId": @(vocabularyId), @"start": @(start), @"end": @(end), @@ -228,7 +228,7 @@ - (NSNumber *)getVocabularyCategoriesCountWithGroupId:(long long)groupId vocabul - (NSNumber *)getVocabularyCategoriesCountWithGroupId:(long long)groupId name:(NSString *)name vocabularyId:(long long)vocabularyId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"vocabularyId": @(vocabularyId) }]; @@ -254,7 +254,7 @@ - (NSDictionary *)getVocabularyCategoriesDisplayWithVocabularyId:(long long)voca - (NSDictionary *)getVocabularyCategoriesDisplayWithGroupId:(long long)groupId name:(NSString *)name vocabularyId:(long long)vocabularyId start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"vocabularyId": @(vocabularyId), @"start": @(start), @"end": @(end), @@ -324,8 +324,8 @@ - (NSDictionary *)moveCategoryWithCategoryId:(long long)categoryId parentCategor - (NSArray *)searchWithGroupId:(long long)groupId name:(NSString *)name categoryProperties:(NSArray *)categoryProperties start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"categoryProperties": categoryProperties, + @"name": [self checkNull: name], + @"categoryProperties": [self checkNull: categoryProperties], @"start": @(start), @"end": @(end) }]; @@ -337,9 +337,9 @@ - (NSArray *)searchWithGroupId:(long long)groupId name:(NSString *)name category - (NSArray *)searchWithGroupIds:(NSArray *)groupIds name:(NSString *)name vocabularyIds:(NSArray *)vocabularyIds start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds, - @"name": name, - @"vocabularyIds": vocabularyIds, + @"groupIds": [self checkNull: groupIds], + @"name": [self checkNull: name], + @"vocabularyIds": [self checkNull: vocabularyIds], @"start": @(start), @"end": @(end) }]; @@ -352,7 +352,7 @@ - (NSArray *)searchWithGroupIds:(NSArray *)groupIds name:(NSString *)name vocabu - (NSArray *)searchWithGroupId:(long long)groupId keywords:(NSString *)keywords vocabularyId:(long long)vocabularyId start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"keywords": keywords, + @"keywords": [self checkNull: keywords], @"vocabularyId": @(vocabularyId), @"start": @(start), @"end": @(end), @@ -369,10 +369,10 @@ - (NSDictionary *)updateCategoryWithCategoryId:(long long)categoryId parentCateg NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"categoryId": @(categoryId), @"parentCategoryId": @(parentCategoryId), - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], @"vocabularyId": @(vocabularyId), - @"categoryProperties": categoryProperties, + @"categoryProperties": [self checkNull: categoryProperties], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/assetcategoryproperty/LRAssetCategoryPropertyService_v62.m b/ios/Source/Service/v62/assetcategoryproperty/LRAssetCategoryPropertyService_v62.m index ba22a922..df24ba2e 100644 --- a/ios/Source/Service/v62/assetcategoryproperty/LRAssetCategoryPropertyService_v62.m +++ b/ios/Source/Service/v62/assetcategoryproperty/LRAssetCategoryPropertyService_v62.m @@ -22,8 +22,8 @@ @implementation LRAssetCategoryPropertyService_v62 - (NSDictionary *)addCategoryPropertyWithEntryId:(long long)entryId key:(NSString *)key value:(NSString *)value error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"entryId": @(entryId), - @"key": key, - @"value": value + @"key": [self checkNull: key], + @"value": [self checkNull: value] }]; NSDictionary *_command = @{@"/assetcategoryproperty/add-category-property": _params}; @@ -54,7 +54,7 @@ - (NSArray *)getCategoryPropertiesWithEntryId:(long long)entryId error:(NSError - (NSArray *)getCategoryPropertyValuesWithCompanyId:(long long)companyId key:(NSString *)key error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"key": key + @"key": [self checkNull: key] }]; NSDictionary *_command = @{@"/assetcategoryproperty/get-category-property-values": _params}; @@ -65,8 +65,8 @@ - (NSArray *)getCategoryPropertyValuesWithCompanyId:(long long)companyId key:(NS - (NSDictionary *)updateCategoryPropertyWithCategoryPropertyId:(long long)categoryPropertyId key:(NSString *)key value:(NSString *)value error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"categoryPropertyId": @(categoryPropertyId), - @"key": key, - @"value": value + @"key": [self checkNull: key], + @"value": [self checkNull: value] }]; NSDictionary *_command = @{@"/assetcategoryproperty/update-category-property": _params}; diff --git a/ios/Source/Service/v62/assetentry/LRAssetEntryService_v62.m b/ios/Source/Service/v62/assetentry/LRAssetEntryService_v62.m index 7707dd08..937c458b 100644 --- a/ios/Source/Service/v62/assetentry/LRAssetEntryService_v62.m +++ b/ios/Source/Service/v62/assetentry/LRAssetEntryService_v62.m @@ -75,7 +75,7 @@ - (NSDictionary *)getEntryWithEntryId:(long long)entryId error:(NSError **)error - (NSDictionary *)incrementViewCounterWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -87,22 +87,22 @@ - (NSDictionary *)incrementViewCounterWithClassName:(NSString *)className classP - (NSDictionary *)updateEntryWithGroupId:(long long)groupId className:(NSString *)className classPK:(long long)classPK classUuid:(NSString *)classUuid classTypeId:(long long)classTypeId categoryIds:(NSArray *)categoryIds tagNames:(NSArray *)tagNames visible:(BOOL)visible startDate:(long long)startDate endDate:(long long)endDate expirationDate:(long long)expirationDate mimeType:(NSString *)mimeType title:(NSString *)title description:(NSString *)description summary:(NSString *)summary url:(NSString *)url layoutUuid:(NSString *)layoutUuid height:(int)height width:(int)width priority:(int)priority sync:(BOOL)sync error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"classUuid": classUuid, + @"classUuid": [self checkNull: classUuid], @"classTypeId": @(classTypeId), - @"categoryIds": categoryIds, - @"tagNames": tagNames, + @"categoryIds": [self checkNull: categoryIds], + @"tagNames": [self checkNull: tagNames], @"visible": @(visible), @"startDate": @(startDate), @"endDate": @(endDate), @"expirationDate": @(expirationDate), - @"mimeType": mimeType, - @"title": title, - @"description": description, - @"summary": summary, - @"url": url, - @"layoutUuid": layoutUuid, + @"mimeType": [self checkNull: mimeType], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"summary": [self checkNull: summary], + @"url": [self checkNull: url], + @"layoutUuid": [self checkNull: layoutUuid], @"height": @(height), @"width": @(width), @"priority": @(priority), @@ -117,23 +117,23 @@ - (NSDictionary *)updateEntryWithGroupId:(long long)groupId className:(NSString - (NSDictionary *)updateEntryWithGroupId:(long long)groupId className:(NSString *)className classPK:(long long)classPK classUuid:(NSString *)classUuid classTypeId:(long long)classTypeId categoryIds:(NSArray *)categoryIds tagNames:(NSArray *)tagNames visible:(BOOL)visible startDate:(long long)startDate endDate:(long long)endDate publishDate:(long long)publishDate expirationDate:(long long)expirationDate mimeType:(NSString *)mimeType title:(NSString *)title description:(NSString *)description summary:(NSString *)summary url:(NSString *)url layoutUuid:(NSString *)layoutUuid height:(int)height width:(int)width priority:(int)priority sync:(BOOL)sync error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"classUuid": classUuid, + @"classUuid": [self checkNull: classUuid], @"classTypeId": @(classTypeId), - @"categoryIds": categoryIds, - @"tagNames": tagNames, + @"categoryIds": [self checkNull: categoryIds], + @"tagNames": [self checkNull: tagNames], @"visible": @(visible), @"startDate": @(startDate), @"endDate": @(endDate), @"publishDate": @(publishDate), @"expirationDate": @(expirationDate), - @"mimeType": mimeType, - @"title": title, - @"description": description, - @"summary": summary, - @"url": url, - @"layoutUuid": layoutUuid, + @"mimeType": [self checkNull: mimeType], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"summary": [self checkNull: summary], + @"url": [self checkNull: url], + @"layoutUuid": [self checkNull: layoutUuid], @"height": @(height), @"width": @(width), @"priority": @(priority), @@ -150,22 +150,22 @@ - (NSDictionary *)updateEntryWithGroupId:(long long)groupId createDate:(long lon @"groupId": @(groupId), @"createDate": @(createDate), @"modifiedDate": @(modifiedDate), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"classUuid": classUuid, + @"classUuid": [self checkNull: classUuid], @"classTypeId": @(classTypeId), - @"categoryIds": categoryIds, - @"tagNames": tagNames, + @"categoryIds": [self checkNull: categoryIds], + @"tagNames": [self checkNull: tagNames], @"visible": @(visible), @"startDate": @(startDate), @"endDate": @(endDate), @"expirationDate": @(expirationDate), - @"mimeType": mimeType, - @"title": title, - @"description": description, - @"summary": summary, - @"url": url, - @"layoutUuid": layoutUuid, + @"mimeType": [self checkNull: mimeType], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"summary": [self checkNull: summary], + @"url": [self checkNull: url], + @"layoutUuid": [self checkNull: layoutUuid], @"height": @(height), @"width": @(width), @"priority": @(priority), diff --git a/ios/Source/Service/v62/assettag/LRAssetTagService_v62.m b/ios/Source/Service/v62/assettag/LRAssetTagService_v62.m index 262633f7..7a43089d 100644 --- a/ios/Source/Service/v62/assettag/LRAssetTagService_v62.m +++ b/ios/Source/Service/v62/assettag/LRAssetTagService_v62.m @@ -21,8 +21,8 @@ @implementation LRAssetTagService_v62 - (NSDictionary *)addTagWithName:(NSString *)name tagProperties:(NSArray *)tagProperties serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"tagProperties": tagProperties, + @"name": [self checkNull: name], + @"tagProperties": [self checkNull: tagProperties], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -44,7 +44,7 @@ - (void)deleteTagWithTagId:(long long)tagId error:(NSError **)error { - (void)deleteTagsWithTagIds:(NSArray *)tagIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"tagIds": tagIds + @"tagIds": [self checkNull: tagIds] }]; NSDictionary *_command = @{@"/assettag/delete-tags": _params}; @@ -89,7 +89,7 @@ - (NSNumber *)getGroupTagsCountWithGroupId:(long long)groupId error:(NSError **) - (NSDictionary *)getGroupTagsDisplayWithGroupId:(long long)groupId name:(NSString *)name start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"start": @(start), @"end": @(end) }]; @@ -101,7 +101,7 @@ - (NSDictionary *)getGroupTagsDisplayWithGroupId:(long long)groupId name:(NSStri - (NSArray *)getGroupsTagsWithGroupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/assettag/get-groups-tags": _params}; @@ -112,7 +112,7 @@ - (NSArray *)getGroupsTagsWithGroupIds:(NSArray *)groupIds error:(NSError **)err - (NSDictionary *)getJsonGroupTagsWithGroupId:(long long)groupId name:(NSString *)name start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"start": @(start), @"end": @(end) }]; @@ -134,7 +134,7 @@ - (NSDictionary *)getTagWithTagId:(long long)tagId error:(NSError **)error { - (NSArray *)getTagsWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -147,7 +147,7 @@ - (NSArray *)getTagsWithGroupId:(long long)groupId classNameId:(long long)classN NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/assettag/get-tags": _params}; @@ -158,8 +158,8 @@ - (NSArray *)getTagsWithGroupId:(long long)groupId classNameId:(long long)classN - (NSArray *)getTagsWithGroupId:(long long)groupId name:(NSString *)name tagProperties:(NSArray *)tagProperties start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"tagProperties": tagProperties, + @"name": [self checkNull: name], + @"tagProperties": [self checkNull: tagProperties], @"start": @(start), @"end": @(end) }]; @@ -171,9 +171,9 @@ - (NSArray *)getTagsWithGroupId:(long long)groupId name:(NSString *)name tagProp - (NSArray *)getTagsWithGroupIds:(NSArray *)groupIds name:(NSString *)name tagProperties:(NSArray *)tagProperties start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds, - @"name": name, - @"tagProperties": tagProperties, + @"groupIds": [self checkNull: groupIds], + @"name": [self checkNull: name], + @"tagProperties": [self checkNull: tagProperties], @"start": @(start), @"end": @(end) }]; @@ -187,7 +187,7 @@ - (NSArray *)getTagsWithGroupId:(long long)groupId classNameId:(long long)classN NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"name": name, + @"name": [self checkNull: name], @"start": @(start), @"end": @(end), }]; @@ -202,7 +202,7 @@ - (NSArray *)getTagsWithGroupId:(long long)groupId classNameId:(long long)classN - (NSNumber *)getTagsCountWithGroupId:(long long)groupId name:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/assettag/get-tags-count": _params}; @@ -214,7 +214,7 @@ - (NSNumber *)getTagsCountWithGroupId:(long long)groupId classNameId:(long long) NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/assettag/get-tags-count": _params}; @@ -225,8 +225,8 @@ - (NSNumber *)getTagsCountWithGroupId:(long long)groupId classNameId:(long long) - (NSNumber *)getTagsCountWithGroupId:(long long)groupId name:(NSString *)name tagProperties:(NSArray *)tagProperties error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"tagProperties": tagProperties + @"name": [self checkNull: name], + @"tagProperties": [self checkNull: tagProperties] }]; NSDictionary *_command = @{@"/assettag/get-tags-count": _params}; @@ -248,7 +248,7 @@ - (void)mergeTagsWithFromTagId:(long long)fromTagId toTagId:(long long)toTagId o - (void)mergeTagsWithFromTagIds:(NSArray *)fromTagIds toTagId:(long long)toTagId overrideProperties:(BOOL)overrideProperties error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"fromTagIds": fromTagIds, + @"fromTagIds": [self checkNull: fromTagIds], @"toTagId": @(toTagId), @"overrideProperties": @(overrideProperties) }]; @@ -261,8 +261,8 @@ - (void)mergeTagsWithFromTagIds:(NSArray *)fromTagIds toTagId:(long long)toTagId - (NSArray *)searchWithGroupId:(long long)groupId name:(NSString *)name tagProperties:(NSArray *)tagProperties start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"tagProperties": tagProperties, + @"name": [self checkNull: name], + @"tagProperties": [self checkNull: tagProperties], @"start": @(start), @"end": @(end) }]; @@ -274,9 +274,9 @@ - (NSArray *)searchWithGroupId:(long long)groupId name:(NSString *)name tagPrope - (NSArray *)searchWithGroupIds:(NSArray *)groupIds name:(NSString *)name tagProperties:(NSArray *)tagProperties start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds, - @"name": name, - @"tagProperties": tagProperties, + @"groupIds": [self checkNull: groupIds], + @"name": [self checkNull: name], + @"tagProperties": [self checkNull: tagProperties], @"start": @(start), @"end": @(end) }]; @@ -289,8 +289,8 @@ - (NSArray *)searchWithGroupIds:(NSArray *)groupIds name:(NSString *)name tagPro - (NSDictionary *)updateTagWithTagId:(long long)tagId name:(NSString *)name tagProperties:(NSArray *)tagProperties serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"tagId": @(tagId), - @"name": name, - @"tagProperties": tagProperties, + @"name": [self checkNull: name], + @"tagProperties": [self checkNull: tagProperties], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/assettagproperty/LRAssetTagPropertyService_v62.m b/ios/Source/Service/v62/assettagproperty/LRAssetTagPropertyService_v62.m index d4191075..03f0214a 100644 --- a/ios/Source/Service/v62/assettagproperty/LRAssetTagPropertyService_v62.m +++ b/ios/Source/Service/v62/assettagproperty/LRAssetTagPropertyService_v62.m @@ -22,8 +22,8 @@ @implementation LRAssetTagPropertyService_v62 - (NSDictionary *)addTagPropertyWithTagId:(long long)tagId key:(NSString *)key value:(NSString *)value error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"tagId": @(tagId), - @"key": key, - @"value": value + @"key": [self checkNull: key], + @"value": [self checkNull: value] }]; NSDictionary *_command = @{@"/assettagproperty/add-tag-property": _params}; @@ -54,7 +54,7 @@ - (NSArray *)getTagPropertiesWithTagId:(long long)tagId error:(NSError **)error - (NSArray *)getTagPropertyValuesWithCompanyId:(long long)companyId key:(NSString *)key error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"key": key + @"key": [self checkNull: key] }]; NSDictionary *_command = @{@"/assettagproperty/get-tag-property-values": _params}; @@ -65,8 +65,8 @@ - (NSArray *)getTagPropertyValuesWithCompanyId:(long long)companyId key:(NSStrin - (NSDictionary *)updateTagPropertyWithTagPropertyId:(long long)tagPropertyId key:(NSString *)key value:(NSString *)value error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"tagPropertyId": @(tagPropertyId), - @"key": key, - @"value": value + @"key": [self checkNull: key], + @"value": [self checkNull: value] }]; NSDictionary *_command = @{@"/assettagproperty/update-tag-property": _params}; diff --git a/ios/Source/Service/v62/assetvocabulary/LRAssetVocabularyService_v62.m b/ios/Source/Service/v62/assetvocabulary/LRAssetVocabularyService_v62.m index 0d746731..7afa516a 100644 --- a/ios/Source/Service/v62/assetvocabulary/LRAssetVocabularyService_v62.m +++ b/ios/Source/Service/v62/assetvocabulary/LRAssetVocabularyService_v62.m @@ -21,7 +21,7 @@ @implementation LRAssetVocabularyService_v62 - (NSDictionary *)addVocabularyWithTitle:(NSString *)title serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"title": title, + @"title": [self checkNull: title], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -33,9 +33,9 @@ - (NSDictionary *)addVocabularyWithTitle:(NSString *)title serviceContext:(LRJSO - (NSDictionary *)addVocabularyWithTitleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap settings:(NSString *)settings serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"settings": settings, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"settings": [self checkNull: settings], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -47,10 +47,10 @@ - (NSDictionary *)addVocabularyWithTitleMap:(NSDictionary *)titleMap description - (NSDictionary *)addVocabularyWithTitle:(NSString *)title titleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap settings:(NSString *)settings serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"title": title, - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"settings": settings, + @"title": [self checkNull: title], + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"settings": [self checkNull: settings], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -62,7 +62,7 @@ - (NSDictionary *)addVocabularyWithTitle:(NSString *)title titleMap:(NSDictionar - (void)deleteVocabulariesWithVocabularyIds:(NSArray *)vocabularyIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"vocabularyIds": vocabularyIds + @"vocabularyIds": [self checkNull: vocabularyIds] }]; NSDictionary *_command = @{@"/assetvocabulary/delete-vocabularies": _params}; @@ -72,7 +72,7 @@ - (void)deleteVocabulariesWithVocabularyIds:(NSArray *)vocabularyIds error:(NSEr - (NSArray *)deleteVocabulariesWithVocabularyIds:(NSArray *)vocabularyIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"vocabularyIds": vocabularyIds, + @"vocabularyIds": [self checkNull: vocabularyIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -140,7 +140,7 @@ - (NSArray *)getGroupVocabulariesWithGroupId:(long long)groupId start:(int)start - (NSArray *)getGroupVocabulariesWithGroupId:(long long)groupId name:(NSString *)name start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"start": @(start), @"end": @(end), }]; @@ -165,7 +165,7 @@ - (NSNumber *)getGroupVocabulariesCountWithGroupId:(long long)groupId error:(NSE - (NSNumber *)getGroupVocabulariesCountWithGroupId:(long long)groupId name:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/assetvocabulary/get-group-vocabularies-count": _params}; @@ -176,7 +176,7 @@ - (NSNumber *)getGroupVocabulariesCountWithGroupId:(long long)groupId name:(NSSt - (NSDictionary *)getGroupVocabulariesDisplayWithGroupId:(long long)groupId name:(NSString *)name start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"start": @(start), @"end": @(end), }]; @@ -191,7 +191,7 @@ - (NSDictionary *)getGroupVocabulariesDisplayWithGroupId:(long long)groupId name - (NSDictionary *)getGroupVocabulariesDisplayWithGroupId:(long long)groupId name:(NSString *)name start:(int)start end:(int)end addDefaultVocabulary:(BOOL)addDefaultVocabulary obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"start": @(start), @"end": @(end), @"addDefaultVocabulary": @(addDefaultVocabulary), @@ -206,7 +206,7 @@ - (NSDictionary *)getGroupVocabulariesDisplayWithGroupId:(long long)groupId name - (NSArray *)getGroupsVocabulariesWithGroupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/assetvocabulary/get-groups-vocabularies": _params}; @@ -216,8 +216,8 @@ - (NSArray *)getGroupsVocabulariesWithGroupIds:(NSArray *)groupIds error:(NSErro - (NSArray *)getGroupsVocabulariesWithGroupIds:(NSArray *)groupIds className:(NSString *)className error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds, - @"className": className + @"groupIds": [self checkNull: groupIds], + @"className": [self checkNull: className] }]; NSDictionary *_command = @{@"/assetvocabulary/get-groups-vocabularies": _params}; @@ -228,7 +228,7 @@ - (NSArray *)getGroupsVocabulariesWithGroupIds:(NSArray *)groupIds className:(NS - (NSDictionary *)getJsonGroupVocabulariesWithGroupId:(long long)groupId name:(NSString *)name start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"start": @(start), @"end": @(end), }]; @@ -242,7 +242,7 @@ - (NSDictionary *)getJsonGroupVocabulariesWithGroupId:(long long)groupId name:(N - (NSArray *)getVocabulariesWithVocabularyIds:(NSArray *)vocabularyIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"vocabularyIds": vocabularyIds + @"vocabularyIds": [self checkNull: vocabularyIds] }]; NSDictionary *_command = @{@"/assetvocabulary/get-vocabularies": _params}; @@ -263,9 +263,9 @@ - (NSDictionary *)getVocabularyWithVocabularyId:(long long)vocabularyId error:(N - (NSDictionary *)updateVocabularyWithVocabularyId:(long long)vocabularyId titleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap settings:(NSString *)settings serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"vocabularyId": @(vocabularyId), - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"settings": settings, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"settings": [self checkNull: settings], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -278,10 +278,10 @@ - (NSDictionary *)updateVocabularyWithVocabularyId:(long long)vocabularyId title - (NSDictionary *)updateVocabularyWithVocabularyId:(long long)vocabularyId title:(NSString *)title titleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap settings:(NSString *)settings serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"vocabularyId": @(vocabularyId), - @"title": title, - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"settings": settings, + @"title": [self checkNull: title], + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"settings": [self checkNull: settings], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/backgroundtask/LRBackgroundTaskService_v62.m b/ios/Source/Service/v62/backgroundtask/LRBackgroundTaskService_v62.m index 942da7b1..ca78817b 100644 --- a/ios/Source/Service/v62/backgroundtask/LRBackgroundTaskService_v62.m +++ b/ios/Source/Service/v62/backgroundtask/LRBackgroundTaskService_v62.m @@ -32,8 +32,8 @@ - (NSString *)getBackgroundTaskStatusJsonWithBackgroundTaskId:(long long)backgro - (NSNumber *)getBackgroundTasksCountWithGroupId:(long long)groupId taskExecutorClassName:(NSString *)taskExecutorClassName completed:(NSString *)completed error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"taskExecutorClassName": taskExecutorClassName, - @"completed": completed + @"taskExecutorClassName": [self checkNull: taskExecutorClassName], + @"completed": [self checkNull: completed] }]; NSDictionary *_command = @{@"/backgroundtask/get-background-tasks-count": _params}; diff --git a/ios/Source/Service/v62/blogsentry/LRBlogsEntryService_v62.m b/ios/Source/Service/v62/blogsentry/LRBlogsEntryService_v62.m index 0c8371bf..d8960b88 100644 --- a/ios/Source/Service/v62/blogsentry/LRBlogsEntryService_v62.m +++ b/ios/Source/Service/v62/blogsentry/LRBlogsEntryService_v62.m @@ -48,11 +48,11 @@ - (NSString *)getCompanyEntriesRssWithCompanyId:(long long)companyId displayDate @"displayDate": @(displayDate), @"status": @(status), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -75,7 +75,7 @@ - (NSDictionary *)getEntryWithEntryId:(long long)entryId error:(NSError **)error - (NSDictionary *)getEntryWithGroupId:(long long)groupId urlTitle:(NSString *)urlTitle error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"urlTitle": urlTitle + @"urlTitle": [self checkNull: urlTitle] }]; NSDictionary *_command = @{@"/blogsentry/get-entry": _params}; @@ -164,11 +164,11 @@ - (NSString *)getGroupEntriesRssWithGroupId:(long long)groupId displayDate:(long @"displayDate": @(displayDate), @"status": @(status), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -211,11 +211,11 @@ - (NSString *)getOrganizationEntriesRssWithOrganizationId:(long long)organizatio @"displayDate": @(displayDate), @"status": @(status), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; diff --git a/ios/Source/Service/v62/bookmarksentry/LRBookmarksEntryService_v62.m b/ios/Source/Service/v62/bookmarksentry/LRBookmarksEntryService_v62.m index 905dc146..6673b8f1 100644 --- a/ios/Source/Service/v62/bookmarksentry/LRBookmarksEntryService_v62.m +++ b/ios/Source/Service/v62/bookmarksentry/LRBookmarksEntryService_v62.m @@ -23,9 +23,9 @@ - (NSDictionary *)addEntryWithGroupId:(long long)groupId folderId:(long long)fol NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"name": name, - @"url": url, - @"description": description, + @"name": [self checkNull: name], + @"url": [self checkNull: url], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -109,7 +109,7 @@ - (NSDictionary *)getEntryWithEntryId:(long long)entryId error:(NSError **)error - (NSNumber *)getFoldersEntriesCountWithGroupId:(long long)groupId folderIds:(NSArray *)folderIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"folderIds": folderIds + @"folderIds": [self checkNull: folderIds] }]; NSDictionary *_command = @{@"/bookmarksentry/get-folders-entries-count": _params}; @@ -291,9 +291,9 @@ - (NSDictionary *)updateEntryWithEntryId:(long long)entryId groupId:(long long)g @"entryId": @(entryId), @"groupId": @(groupId), @"folderId": @(folderId), - @"name": name, - @"url": url, - @"description": description, + @"name": [self checkNull: name], + @"url": [self checkNull: url], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/bookmarksfolder/LRBookmarksFolderService_v62.m b/ios/Source/Service/v62/bookmarksfolder/LRBookmarksFolderService_v62.m index d7cc3b73..bd1b9d7c 100644 --- a/ios/Source/Service/v62/bookmarksfolder/LRBookmarksFolderService_v62.m +++ b/ios/Source/Service/v62/bookmarksfolder/LRBookmarksFolderService_v62.m @@ -22,8 +22,8 @@ @implementation LRBookmarksFolderService_v62 - (NSDictionary *)addFolderWithParentFolderId:(long long)parentFolderId name:(NSString *)name description:(NSString *)description serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentFolderId": @(parentFolderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -208,7 +208,7 @@ - (NSNumber *)getFoldersCountWithGroupId:(long long)groupId parentFolderId:(long - (void)getSubfolderIdsWithFolderIds:(NSArray *)folderIds groupId:(long long)groupId folderId:(long long)folderId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"groupId": @(groupId), @"folderId": @(folderId) }]; @@ -298,8 +298,8 @@ - (NSDictionary *)updateFolderWithFolderId:(long long)folderId parentFolderId:(l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"folderId": @(folderId), @"parentFolderId": @(parentFolderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"mergeWithParentFolder": @(mergeWithParentFolder), }]; diff --git a/ios/Source/Service/v62/classname/LRClassNameService_v62.m b/ios/Source/Service/v62/classname/LRClassNameService_v62.m index 7590ee39..dc77fd92 100644 --- a/ios/Source/Service/v62/classname/LRClassNameService_v62.m +++ b/ios/Source/Service/v62/classname/LRClassNameService_v62.m @@ -21,7 +21,7 @@ @implementation LRClassNameService_v62 - (NSDictionary *)fetchClassNameWithValue:(NSString *)value error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"value": value + @"value": [self checkNull: value] }]; NSDictionary *_command = @{@"/classname/fetch-class-name": _params}; @@ -31,7 +31,7 @@ - (NSDictionary *)fetchClassNameWithValue:(NSString *)value error:(NSError **)er - (NSNumber *)fetchClassNameIdWithClazz:(NSDictionary *)clazz error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"clazz": clazz + @"clazz": [self checkNull: clazz] }]; NSDictionary *_command = @{@"/classname/fetch-class-name-id": _params}; @@ -41,7 +41,7 @@ - (NSNumber *)fetchClassNameIdWithClazz:(NSDictionary *)clazz error:(NSError **) - (NSNumber *)fetchClassNameIdWithValue:(NSString *)value error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"value": value + @"value": [self checkNull: value] }]; NSDictionary *_command = @{@"/classname/fetch-class-name-id": _params}; diff --git a/ios/Source/Service/v62/company/LRCompanyService_v62.m b/ios/Source/Service/v62/company/LRCompanyService_v62.m index 6c70088f..0e6cf44e 100644 --- a/ios/Source/Service/v62/company/LRCompanyService_v62.m +++ b/ios/Source/Service/v62/company/LRCompanyService_v62.m @@ -51,7 +51,7 @@ - (NSDictionary *)getCompanyByLogoIdWithLogoId:(long long)logoId error:(NSError - (NSDictionary *)getCompanyByMxWithMx:(NSString *)mx error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"mx": mx + @"mx": [self checkNull: mx] }]; NSDictionary *_command = @{@"/company/get-company-by-mx": _params}; @@ -61,7 +61,7 @@ - (NSDictionary *)getCompanyByMxWithMx:(NSString *)mx error:(NSError **)error { - (NSDictionary *)getCompanyByVirtualHostWithVirtualHost:(NSString *)virtualHost error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"virtualHost": virtualHost + @"virtualHost": [self checkNull: virtualHost] }]; NSDictionary *_command = @{@"/company/get-company-by-virtual-host": _params}; @@ -71,7 +71,7 @@ - (NSDictionary *)getCompanyByVirtualHostWithVirtualHost:(NSString *)virtualHost - (NSDictionary *)getCompanyByWebIdWithWebId:(NSString *)webId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"webId": webId + @"webId": [self checkNull: webId] }]; NSDictionary *_command = @{@"/company/get-company-by-web-id": _params}; @@ -82,18 +82,18 @@ - (NSDictionary *)getCompanyByWebIdWithWebId:(NSString *)webId error:(NSError ** - (NSDictionary *)updateCompanyWithCompanyId:(long long)companyId virtualHost:(NSString *)virtualHost mx:(NSString *)mx homeURL:(NSString *)homeURL name:(NSString *)name legalName:(NSString *)legalName legalId:(NSString *)legalId legalType:(NSString *)legalType sicCode:(NSString *)sicCode tickerSymbol:(NSString *)tickerSymbol industry:(NSString *)industry type:(NSString *)type size:(NSString *)size error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"virtualHost": virtualHost, - @"mx": mx, - @"homeURL": homeURL, - @"name": name, - @"legalName": legalName, - @"legalId": legalId, - @"legalType": legalType, - @"sicCode": sicCode, - @"tickerSymbol": tickerSymbol, - @"industry": industry, - @"type": type, - @"size": size + @"virtualHost": [self checkNull: virtualHost], + @"mx": [self checkNull: mx], + @"homeURL": [self checkNull: homeURL], + @"name": [self checkNull: name], + @"legalName": [self checkNull: legalName], + @"legalId": [self checkNull: legalId], + @"legalType": [self checkNull: legalType], + @"sicCode": [self checkNull: sicCode], + @"tickerSymbol": [self checkNull: tickerSymbol], + @"industry": [self checkNull: industry], + @"type": [self checkNull: type], + @"size": [self checkNull: size] }]; NSDictionary *_command = @{@"/company/update-company": _params}; @@ -104,8 +104,8 @@ - (NSDictionary *)updateCompanyWithCompanyId:(long long)companyId virtualHost:(N - (NSDictionary *)updateCompanyWithCompanyId:(long long)companyId virtualHost:(NSString *)virtualHost mx:(NSString *)mx maxUsers:(int)maxUsers active:(BOOL)active error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"virtualHost": virtualHost, - @"mx": mx, + @"virtualHost": [self checkNull: virtualHost], + @"mx": [self checkNull: mx], @"maxUsers": @(maxUsers), @"active": @(active) }]; @@ -118,8 +118,8 @@ - (NSDictionary *)updateCompanyWithCompanyId:(long long)companyId virtualHost:(N - (void)updateDisplayWithCompanyId:(long long)companyId languageId:(NSString *)languageId timeZoneId:(NSString *)timeZoneId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"languageId": languageId, - @"timeZoneId": timeZoneId + @"languageId": [self checkNull: languageId], + @"timeZoneId": [self checkNull: timeZoneId] }]; NSDictionary *_command = @{@"/company/update-display": _params}; diff --git a/ios/Source/Service/v62/country/LRCountryService_v62.m b/ios/Source/Service/v62/country/LRCountryService_v62.m index f3336ce1..365ec54d 100644 --- a/ios/Source/Service/v62/country/LRCountryService_v62.m +++ b/ios/Source/Service/v62/country/LRCountryService_v62.m @@ -21,11 +21,11 @@ @implementation LRCountryService_v62 - (NSDictionary *)addCountryWithName:(NSString *)name a2:(NSString *)a2 a3:(NSString *)a3 number:(NSString *)number idd:(NSString *)idd active:(BOOL)active error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"a2": a2, - @"a3": a3, - @"number": number, - @"idd": idd, + @"name": [self checkNull: name], + @"a2": [self checkNull: a2], + @"a3": [self checkNull: a3], + @"number": [self checkNull: number], + @"idd": [self checkNull: idd], @"active": @(active) }]; @@ -46,7 +46,7 @@ - (NSDictionary *)fetchCountryWithCountryId:(long long)countryId error:(NSError - (NSDictionary *)fetchCountryByA2WithA2:(NSString *)a2 error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"a2": a2 + @"a2": [self checkNull: a2] }]; NSDictionary *_command = @{@"/country/fetch-country-by-a2": _params}; @@ -56,7 +56,7 @@ - (NSDictionary *)fetchCountryByA2WithA2:(NSString *)a2 error:(NSError **)error - (NSDictionary *)fetchCountryByA3WithA3:(NSString *)a3 error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"a3": a3 + @"a3": [self checkNull: a3] }]; NSDictionary *_command = @{@"/country/fetch-country-by-a3": _params}; @@ -95,7 +95,7 @@ - (NSDictionary *)getCountryWithCountryId:(long long)countryId error:(NSError ** - (NSDictionary *)getCountryByA2WithA2:(NSString *)a2 error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"a2": a2 + @"a2": [self checkNull: a2] }]; NSDictionary *_command = @{@"/country/get-country-by-a2": _params}; @@ -105,7 +105,7 @@ - (NSDictionary *)getCountryByA2WithA2:(NSString *)a2 error:(NSError **)error { - (NSDictionary *)getCountryByA3WithA3:(NSString *)a3 error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"a3": a3 + @"a3": [self checkNull: a3] }]; NSDictionary *_command = @{@"/country/get-country-by-a3": _params}; @@ -115,7 +115,7 @@ - (NSDictionary *)getCountryByA3WithA3:(NSString *)a3 error:(NSError **)error { - (NSDictionary *)getCountryByNameWithName:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/country/get-country-by-name": _params}; diff --git a/ios/Source/Service/v62/ddlrecord/LRDDLRecordService_v62.m b/ios/Source/Service/v62/ddlrecord/LRDDLRecordService_v62.m index 8b1583cf..9e55a2fd 100644 --- a/ios/Source/Service/v62/ddlrecord/LRDDLRecordService_v62.m +++ b/ios/Source/Service/v62/ddlrecord/LRDDLRecordService_v62.m @@ -39,7 +39,7 @@ - (NSDictionary *)addRecordWithGroupId:(long long)groupId recordSetId:(long long @"groupId": @(groupId), @"recordSetId": @(recordSetId), @"displayIndex": @(displayIndex), - @"fieldsMap": fieldsMap, + @"fieldsMap": [self checkNull: fieldsMap], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -52,7 +52,7 @@ - (NSDictionary *)addRecordWithGroupId:(long long)groupId recordSetId:(long long - (NSDictionary *)deleteRecordLocaleWithRecordId:(long long)recordId locale:(NSString *)locale serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"recordId": @(recordId), - @"locale": locale, + @"locale": [self checkNull: locale], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -76,7 +76,7 @@ - (NSDictionary *)updateRecordWithRecordId:(long long)recordId displayIndex:(int NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"recordId": @(recordId), @"displayIndex": @(displayIndex), - @"fieldsMap": fieldsMap, + @"fieldsMap": [self checkNull: fieldsMap], @"mergeFields": @(mergeFields), }]; diff --git a/ios/Source/Service/v62/ddlrecordset/LRDDLRecordSetService_v62.m b/ios/Source/Service/v62/ddlrecordset/LRDDLRecordSetService_v62.m index 38fdfa93..9c46f945 100644 --- a/ios/Source/Service/v62/ddlrecordset/LRDDLRecordSetService_v62.m +++ b/ios/Source/Service/v62/ddlrecordset/LRDDLRecordSetService_v62.m @@ -23,9 +23,9 @@ - (NSDictionary *)addRecordSetWithGroupId:(long long)groupId ddmStructureId:(lon NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"ddmStructureId": @(ddmStructureId), - @"recordSetKey": recordSetKey, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, + @"recordSetKey": [self checkNull: recordSetKey], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], @"minDisplayRows": @(minDisplayRows), @"scope": @(scope), }]; @@ -61,7 +61,7 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"keywords": keywords, + @"keywords": [self checkNull: keywords], @"scope": @(scope), @"start": @(start), @"end": @(end), @@ -78,8 +78,8 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"scope": @(scope), @"andOperator": @(andOperator), @"start": @(start), @@ -97,7 +97,7 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"keywords": keywords, + @"keywords": [self checkNull: keywords], @"scope": @(scope) }]; @@ -110,8 +110,8 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"scope": @(scope), @"andOperator": @(andOperator) }]; @@ -138,8 +138,8 @@ - (NSDictionary *)updateRecordSetWithRecordSetId:(long long)recordSetId ddmStruc NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"recordSetId": @(recordSetId), @"ddmStructureId": @(ddmStructureId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], @"minDisplayRows": @(minDisplayRows), }]; @@ -154,9 +154,9 @@ - (NSDictionary *)updateRecordSetWithGroupId:(long long)groupId ddmStructureId:( NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"ddmStructureId": @(ddmStructureId), - @"recordSetKey": recordSetKey, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, + @"recordSetKey": [self checkNull: recordSetKey], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], @"minDisplayRows": @(minDisplayRows), }]; diff --git a/ios/Source/Service/v62/ddmstructure/LRDDMStructureService_v62.m b/ios/Source/Service/v62/ddmstructure/LRDDMStructureService_v62.m index 04e8b8a3..3b8e07f5 100644 --- a/ios/Source/Service/v62/ddmstructure/LRDDMStructureService_v62.m +++ b/ios/Source/Service/v62/ddmstructure/LRDDMStructureService_v62.m @@ -24,11 +24,11 @@ - (NSDictionary *)addStructureWithGroupId:(long long)groupId parentStructureId:( @"groupId": @(groupId), @"parentStructureId": @(parentStructureId), @"classNameId": @(classNameId), - @"structureKey": structureKey, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsd": xsd, - @"storageType": storageType, + @"structureKey": [self checkNull: structureKey], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsd": [self checkNull: xsd], + @"storageType": [self checkNull: storageType], @"type": @(type), }]; @@ -43,13 +43,13 @@ - (NSDictionary *)addStructureWithUserId:(long long)userId groupId:(long long)gr NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), @"groupId": @(groupId), - @"parentStructureKey": parentStructureKey, + @"parentStructureKey": [self checkNull: parentStructureKey], @"classNameId": @(classNameId), - @"structureKey": structureKey, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsd": xsd, - @"storageType": storageType, + @"structureKey": [self checkNull: structureKey], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsd": [self checkNull: xsd], + @"storageType": [self checkNull: storageType], @"type": @(type), }]; @@ -65,9 +65,9 @@ - (NSDictionary *)addStructureWithUserId:(long long)userId groupId:(long long)gr @"userId": @(userId), @"groupId": @(groupId), @"classNameId": @(classNameId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsd": xsd, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsd": [self checkNull: xsd], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -92,8 +92,8 @@ - (NSDictionary *)copyStructureWithStructureId:(long long)structureId serviceCon - (NSDictionary *)copyStructureWithStructureId:(long long)structureId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"structureId": @(structureId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -117,7 +117,7 @@ - (NSDictionary *)fetchStructureWithGroupId:(long long)groupId classNameId:(long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"structureKey": structureKey + @"structureKey": [self checkNull: structureKey] }]; NSDictionary *_command = @{@"/ddmstructure/fetch-structure": _params}; @@ -139,7 +139,7 @@ - (NSDictionary *)getStructureWithGroupId:(long long)groupId classNameId:(long l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"structureKey": structureKey + @"structureKey": [self checkNull: structureKey] }]; NSDictionary *_command = @{@"/ddmstructure/get-structure": _params}; @@ -151,7 +151,7 @@ - (NSDictionary *)getStructureWithGroupId:(long long)groupId classNameId:(long l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"structureKey": structureKey, + @"structureKey": [self checkNull: structureKey], @"includeGlobalStructures": @(includeGlobalStructures) }]; @@ -172,7 +172,7 @@ - (NSArray *)getStructuresWithGroupId:(long long)groupId error:(NSError **)error - (NSArray *)getStructuresWithGroupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/ddmstructure/get-structures": _params}; @@ -183,11 +183,11 @@ - (NSArray *)getStructuresWithGroupIds:(NSArray *)groupIds error:(NSError **)err - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds classNameIds:(NSArray *)classNameIds name:(NSString *)name description:(NSString *)description storageType:(NSString *)storageType type:(int)type andOperator:(BOOL)andOperator start:(int)start end:(int)end orderByComparator:(LRJSONObjectWrapper *)orderByComparator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"classNameIds": classNameIds, - @"name": name, - @"description": description, - @"storageType": storageType, + @"groupIds": [self checkNull: groupIds], + @"classNameIds": [self checkNull: classNameIds], + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"storageType": [self checkNull: storageType], @"type": @(type), @"andOperator": @(andOperator), @"start": @(start), @@ -204,9 +204,9 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupI - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds classNameIds:(NSArray *)classNameIds keywords:(NSString *)keywords start:(int)start end:(int)end orderByComparator:(LRJSONObjectWrapper *)orderByComparator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"classNameIds": classNameIds, - @"keywords": keywords, + @"groupIds": [self checkNull: groupIds], + @"classNameIds": [self checkNull: classNameIds], + @"keywords": [self checkNull: keywords], @"start": @(start), @"end": @(end), }]; @@ -221,9 +221,9 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupI - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds classNameIds:(NSArray *)classNameIds keywords:(NSString *)keywords error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"classNameIds": classNameIds, - @"keywords": keywords + @"groupIds": [self checkNull: groupIds], + @"classNameIds": [self checkNull: classNameIds], + @"keywords": [self checkNull: keywords] }]; NSDictionary *_command = @{@"/ddmstructure/search-count": _params}; @@ -234,11 +234,11 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *) - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds classNameIds:(NSArray *)classNameIds name:(NSString *)name description:(NSString *)description storageType:(NSString *)storageType type:(int)type andOperator:(BOOL)andOperator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"classNameIds": classNameIds, - @"name": name, - @"description": description, - @"storageType": storageType, + @"groupIds": [self checkNull: groupIds], + @"classNameIds": [self checkNull: classNameIds], + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"storageType": [self checkNull: storageType], @"type": @(type), @"andOperator": @(andOperator) }]; @@ -252,9 +252,9 @@ - (NSDictionary *)updateStructureWithStructureId:(long long)structureId parentSt NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"structureId": @(structureId), @"parentStructureId": @(parentStructureId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsd": xsd, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsd": [self checkNull: xsd], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -269,10 +269,10 @@ - (NSDictionary *)updateStructureWithGroupId:(long long)groupId parentStructureI @"groupId": @(groupId), @"parentStructureId": @(parentStructureId), @"classNameId": @(classNameId), - @"structureKey": structureKey, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsd": xsd, + @"structureKey": [self checkNull: structureKey], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsd": [self checkNull: xsd], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/ddmtemplate/LRDDMTemplateService_v62.m b/ios/Source/Service/v62/ddmtemplate/LRDDMTemplateService_v62.m index 03f6f05c..ce2c7187 100644 --- a/ios/Source/Service/v62/ddmtemplate/LRDDMTemplateService_v62.m +++ b/ios/Source/Service/v62/ddmtemplate/LRDDMTemplateService_v62.m @@ -24,12 +24,12 @@ - (NSDictionary *)addTemplateWithGroupId:(long long)groupId classNameId:(long lo @"groupId": @(groupId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, - @"mode": mode, - @"language": language, - @"script": script, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], + @"language": [self checkNull: language], + @"script": [self checkNull: script], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -44,17 +44,17 @@ - (NSOperation *)addTemplateWithGroupId:(long long)groupId classNameId:(long lon @"groupId": @(groupId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"templateKey": templateKey, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, - @"mode": mode, - @"language": language, - @"script": script, + @"templateKey": [self checkNull: templateKey], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], + @"language": [self checkNull: language], + @"script": [self checkNull: script], @"cacheable": @(cacheable), @"smallImage": @(smallImage), - @"smallImageURL": smallImageURL, - @"smallImageFile": smallImageFile, + @"smallImageURL": [self checkNull: smallImageURL], + @"smallImageFile": [self checkNull: smallImageFile], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -79,8 +79,8 @@ - (NSDictionary *)copyTemplateWithTemplateId:(long long)templateId serviceContex - (NSDictionary *)copyTemplateWithTemplateId:(long long)templateId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"templateId": @(templateId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -95,7 +95,7 @@ - (NSArray *)copyTemplatesWithClassNameId:(long long)classNameId classPK:(long l @"classNameId": @(classNameId), @"classPK": @(classPK), @"newClassPK": @(newClassPK), - @"type": type, + @"type": [self checkNull: type], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -119,7 +119,7 @@ - (NSDictionary *)fetchTemplateWithGroupId:(long long)groupId classNameId:(long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"templateKey": templateKey + @"templateKey": [self checkNull: templateKey] }]; NSDictionary *_command = @{@"/ddmtemplate/fetch-template": _params}; @@ -141,7 +141,7 @@ - (NSDictionary *)getTemplateWithGroupId:(long long)groupId classNameId:(long lo NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"templateKey": templateKey + @"templateKey": [self checkNull: templateKey] }]; NSDictionary *_command = @{@"/ddmtemplate/get-template": _params}; @@ -153,7 +153,7 @@ - (NSDictionary *)getTemplateWithGroupId:(long long)groupId classNameId:(long lo NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"templateKey": templateKey, + @"templateKey": [self checkNull: templateKey], @"includeGlobalTemplates": @(includeGlobalTemplates) }]; @@ -190,7 +190,7 @@ - (NSArray *)getTemplatesWithGroupId:(long long)groupId classNameId:(long long)c @"groupId": @(groupId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"type": type + @"type": [self checkNull: type] }]; NSDictionary *_command = @{@"/ddmtemplate/get-templates": _params}; @@ -203,8 +203,8 @@ - (NSArray *)getTemplatesWithGroupId:(long long)groupId classNameId:(long long)c @"groupId": @(groupId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"type": type, - @"mode": mode + @"type": [self checkNull: type], + @"mode": [self checkNull: mode] }]; NSDictionary *_command = @{@"/ddmtemplate/get-templates": _params}; @@ -255,9 +255,9 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId @"groupId": @(groupId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"keywords": keywords, - @"type": type, - @"mode": mode, + @"keywords": [self checkNull: keywords], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], @"start": @(start), @"end": @(end), }]; @@ -272,12 +272,12 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds classNameIds:(NSArray *)classNameIds classPKs:(NSArray *)classPKs keywords:(NSString *)keywords type:(NSString *)type mode:(NSString *)mode start:(int)start end:(int)end orderByComparator:(LRJSONObjectWrapper *)orderByComparator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"classNameIds": classNameIds, - @"classPKs": classPKs, - @"keywords": keywords, - @"type": type, - @"mode": mode, + @"groupIds": [self checkNull: groupIds], + @"classNameIds": [self checkNull: classNameIds], + @"classPKs": [self checkNull: classPKs], + @"keywords": [self checkNull: keywords], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], @"start": @(start), @"end": @(end), }]; @@ -295,11 +295,11 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId @"groupId": @(groupId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"name": name, - @"description": description, - @"type": type, - @"mode": mode, - @"language": language, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], + @"language": [self checkNull: language], @"andOperator": @(andOperator), @"start": @(start), @"end": @(end), @@ -315,14 +315,14 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds classNameIds:(NSArray *)classNameIds classPKs:(NSArray *)classPKs name:(NSString *)name description:(NSString *)description type:(NSString *)type mode:(NSString *)mode language:(NSString *)language andOperator:(BOOL)andOperator start:(int)start end:(int)end orderByComparator:(LRJSONObjectWrapper *)orderByComparator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"classNameIds": classNameIds, - @"classPKs": classPKs, - @"name": name, - @"description": description, - @"type": type, - @"mode": mode, - @"language": language, + @"groupIds": [self checkNull: groupIds], + @"classNameIds": [self checkNull: classNameIds], + @"classPKs": [self checkNull: classPKs], + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], + @"language": [self checkNull: language], @"andOperator": @(andOperator), @"start": @(start), @"end": @(end), @@ -341,11 +341,11 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g @"groupId": @(groupId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"name": name, - @"description": description, - @"type": type, - @"mode": mode, - @"language": language, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], + @"language": [self checkNull: language], @"andOperator": @(andOperator) }]; @@ -357,14 +357,14 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds classNameIds:(NSArray *)classNameIds classPKs:(NSArray *)classPKs name:(NSString *)name description:(NSString *)description type:(NSString *)type mode:(NSString *)mode language:(NSString *)language andOperator:(BOOL)andOperator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"classNameIds": classNameIds, - @"classPKs": classPKs, - @"name": name, - @"description": description, - @"type": type, - @"mode": mode, - @"language": language, + @"groupIds": [self checkNull: groupIds], + @"classNameIds": [self checkNull: classNameIds], + @"classPKs": [self checkNull: classPKs], + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], + @"language": [self checkNull: language], @"andOperator": @(andOperator) }]; @@ -379,9 +379,9 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g @"groupId": @(groupId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"keywords": keywords, - @"type": type, - @"mode": mode + @"keywords": [self checkNull: keywords], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode] }]; NSDictionary *_command = @{@"/ddmtemplate/search-count": _params}; @@ -392,12 +392,12 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds classNameIds:(NSArray *)classNameIds classPKs:(NSArray *)classPKs keywords:(NSString *)keywords type:(NSString *)type mode:(NSString *)mode error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"classNameIds": classNameIds, - @"classPKs": classPKs, - @"keywords": keywords, - @"type": type, - @"mode": mode + @"groupIds": [self checkNull: groupIds], + @"classNameIds": [self checkNull: classNameIds], + @"classPKs": [self checkNull: classPKs], + @"keywords": [self checkNull: keywords], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode] }]; NSDictionary *_command = @{@"/ddmtemplate/search-count": _params}; @@ -409,16 +409,16 @@ - (NSOperation *)updateTemplateWithTemplateId:(long long)templateId classPK:(lon NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"templateId": @(templateId), @"classPK": @(classPK), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, - @"mode": mode, - @"language": language, - @"script": script, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], + @"mode": [self checkNull: mode], + @"language": [self checkNull: language], + @"script": [self checkNull: script], @"cacheable": @(cacheable), @"smallImage": @(smallImage), - @"smallImageURL": smallImageURL, - @"smallImageFile": smallImageFile, + @"smallImageURL": [self checkNull: smallImageURL], + @"smallImageFile": [self checkNull: smallImageFile], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/dlapp/LRDLAppService_v62.m b/ios/Source/Service/v62/dlapp/LRDLAppService_v62.m index 87f24489..03c36837 100644 --- a/ios/Source/Service/v62/dlapp/LRDLAppService_v62.m +++ b/ios/Source/Service/v62/dlapp/LRDLAppService_v62.m @@ -23,11 +23,11 @@ - (NSDictionary *)addFileEntryWithRepositoryId:(long long)repositoryId folderId: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"folderId": @(folderId), - @"sourceFileName": sourceFileName, - @"mimeType": mimeType, - @"title": title, - @"description": description, - @"changeLog": changeLog, + @"sourceFileName": [self checkNull: sourceFileName], + @"mimeType": [self checkNull: mimeType], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"changeLog": [self checkNull: changeLog], @"bytes": [self toString:bytes], }]; @@ -42,12 +42,12 @@ - (NSOperation *)addFileEntryWithRepositoryId:(long long)repositoryId folderId:( NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"folderId": @(folderId), - @"sourceFileName": sourceFileName, - @"mimeType": mimeType, - @"title": title, - @"description": description, - @"changeLog": changeLog, - @"file": file, + @"sourceFileName": [self checkNull: sourceFileName], + @"mimeType": [self checkNull: mimeType], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"changeLog": [self checkNull: changeLog], + @"file": [self checkNull: file], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -75,8 +75,8 @@ - (NSDictionary *)addFolderWithRepositoryId:(long long)repositoryId parentFolder NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"parentFolderId": @(parentFolderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -90,10 +90,10 @@ - (NSOperation *)addTempFileEntryWithGroupId:(long long)groupId folderId:(long l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"fileName": fileName, - @"tempFolderName": tempFolderName, - @"file": file, - @"mimeType": mimeType + @"fileName": [self checkNull: fileName], + @"tempFolderName": [self checkNull: tempFolderName], + @"file": [self checkNull: file], + @"mimeType": [self checkNull: mimeType] }]; NSDictionary *_command = @{@"/dlapp/add-temp-file-entry": _params}; @@ -114,7 +114,7 @@ - (void)cancelCheckOutWithFileEntryId:(long long)fileEntryId error:(NSError **)e - (void)checkInFileEntryWithFileEntryId:(long long)fileEntryId lockUuid:(NSString *)lockUuid error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlapp/check-in-file-entry": _params}; @@ -125,7 +125,7 @@ - (void)checkInFileEntryWithFileEntryId:(long long)fileEntryId lockUuid:(NSStrin - (void)checkInFileEntryWithFileEntryId:(long long)fileEntryId lockUuid:(NSString *)lockUuid serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid, + @"lockUuid": [self checkNull: lockUuid], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -139,7 +139,7 @@ - (void)checkInFileEntryWithFileEntryId:(long long)fileEntryId majorVersion:(BOO NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), @"majorVersion": @(majorVersion), - @"changeLog": changeLog, + @"changeLog": [self checkNull: changeLog], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -164,7 +164,7 @@ - (void)checkOutFileEntryWithFileEntryId:(long long)fileEntryId serviceContext:( - (NSDictionary *)checkOutFileEntryWithFileEntryId:(long long)fileEntryId owner:(NSString *)owner expirationTime:(long long)expirationTime serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"owner": owner, + @"owner": [self checkNull: owner], @"expirationTime": @(expirationTime), }]; @@ -180,8 +180,8 @@ - (NSDictionary *)copyFolderWithRepositoryId:(long long)repositoryId sourceFolde @"repositoryId": @(repositoryId), @"sourceFolderId": @(sourceFolderId), @"parentFolderId": @(parentFolderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -205,7 +205,7 @@ - (void)deleteFileEntryByTitleWithRepositoryId:(long long)repositoryId folderId: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"folderId": @(folderId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/dlapp/delete-file-entry-by-title": _params}; @@ -226,7 +226,7 @@ - (void)deleteFileShortcutWithFileShortcutId:(long long)fileShortcutId error:(NS - (void)deleteFileVersionWithFileEntryId:(long long)fileEntryId version:(NSString *)version error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"version": version + @"version": [self checkNull: version] }]; NSDictionary *_command = @{@"/dlapp/delete-file-version": _params}; @@ -248,7 +248,7 @@ - (void)deleteFolderWithRepositoryId:(long long)repositoryId parentFolderId:(lon NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"parentFolderId": @(parentFolderId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/dlapp/delete-folder": _params}; @@ -260,8 +260,8 @@ - (void)deleteTempFileEntryWithGroupId:(long long)groupId folderId:(long long)fo NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"fileName": fileName, - @"tempFolderName": tempFolderName + @"fileName": [self checkNull: fileName], + @"tempFolderName": [self checkNull: tempFolderName] }]; NSDictionary *_command = @{@"/dlapp/delete-temp-file-entry": _params}; @@ -296,7 +296,7 @@ - (NSArray *)getFileEntriesWithRepositoryId:(long long)repositoryId folderId:(lo NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"folderId": @(folderId), - @"mimeTypes": mimeTypes + @"mimeTypes": [self checkNull: mimeTypes] }]; NSDictionary *_command = @{@"/dlapp/get-file-entries": _params}; @@ -393,7 +393,7 @@ - (NSNumber *)getFileEntriesAndFileShortcutsCountWithRepositoryId:(long long)rep @"repositoryId": @(repositoryId), @"folderId": @(folderId), @"status": @(status), - @"mimeTypes": mimeTypes + @"mimeTypes": [self checkNull: mimeTypes] }]; NSDictionary *_command = @{@"/dlapp/get-file-entries-and-file-shortcuts-count": _params}; @@ -438,7 +438,7 @@ - (NSDictionary *)getFileEntryWithGroupId:(long long)groupId folderId:(long long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/dlapp/get-file-entry": _params}; @@ -448,7 +448,7 @@ - (NSDictionary *)getFileEntryWithGroupId:(long long)groupId folderId:(long long - (NSDictionary *)getFileEntryByUuidAndGroupIdWithUuid:(NSString *)uuid groupId:(long long)groupId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"uuid": uuid, + @"uuid": [self checkNull: uuid], @"groupId": @(groupId) }]; @@ -481,7 +481,7 @@ - (NSDictionary *)getFolderWithRepositoryId:(long long)repositoryId parentFolder NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"parentFolderId": @(parentFolderId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/dlapp/get-folder": _params}; @@ -624,7 +624,7 @@ - (NSArray *)getFoldersAndFileEntriesAndFileShortcutsWithRepositoryId:(long long @"repositoryId": @(repositoryId), @"folderId": @(folderId), @"status": @(status), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"includeMountFolders": @(includeMountFolders), @"start": @(start), @"end": @(end), @@ -655,7 +655,7 @@ - (NSNumber *)getFoldersAndFileEntriesAndFileShortcutsCountWithRepositoryId:(lon @"repositoryId": @(repositoryId), @"folderId": @(folderId), @"status": @(status), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"includeMountFolders": @(includeMountFolders) }]; @@ -703,7 +703,7 @@ - (NSNumber *)getFoldersCountWithRepositoryId:(long long)repositoryId parentFold - (NSNumber *)getFoldersFileEntriesCountWithRepositoryId:(long long)repositoryId folderIds:(NSArray *)folderIds status:(int)status error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"status": @(status) }]; @@ -775,7 +775,7 @@ - (NSArray *)getGroupFileEntriesWithGroupId:(long long)groupId userId:(long long @"groupId": @(groupId), @"userId": @(userId), @"rootFolderId": @(rootFolderId), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"status": @(status), @"start": @(start), @"end": @(end), @@ -816,7 +816,7 @@ - (NSNumber *)getGroupFileEntriesCountWithGroupId:(long long)groupId userId:(lon @"groupId": @(groupId), @"userId": @(userId), @"rootFolderId": @(rootFolderId), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"status": @(status) }]; @@ -901,7 +901,7 @@ - (NSArray *)getSubfolderIdsWithRepositoryId:(long long)repositoryId folderId:(l - (void)getSubfolderIdsWithRepositoryId:(long long)repositoryId folderIds:(NSArray *)folderIds folderId:(long long)folderId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"folderId": @(folderId) }]; @@ -914,7 +914,7 @@ - (NSArray *)getTempFileEntryNamesWithGroupId:(long long)groupId folderId:(long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"tempFolderName": tempFolderName + @"tempFolderName": [self checkNull: tempFolderName] }]; NSDictionary *_command = @{@"/dlapp/get-temp-file-entry-names": _params}; @@ -935,7 +935,7 @@ - (NSDictionary *)lockFileEntryWithFileEntryId:(long long)fileEntryId error:(NSE - (NSDictionary *)lockFileEntryWithFileEntryId:(long long)fileEntryId owner:(NSString *)owner expirationTime:(long long)expirationTime error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"owner": owner, + @"owner": [self checkNull: owner], @"expirationTime": @(expirationTime) }]; @@ -959,7 +959,7 @@ - (NSDictionary *)lockFolderWithRepositoryId:(long long)repositoryId folderId:(l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"folderId": @(folderId), - @"owner": owner, + @"owner": [self checkNull: owner], @"inheritable": @(inheritable), @"expirationTime": @(expirationTime) }]; @@ -1066,7 +1066,7 @@ - (NSDictionary *)moveFolderToTrashWithFolderId:(long long)folderId error:(NSErr - (NSDictionary *)refreshFileEntryLockWithLockUuid:(NSString *)lockUuid companyId:(long long)companyId expirationTime:(long long)expirationTime error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"lockUuid": lockUuid, + @"lockUuid": [self checkNull: lockUuid], @"companyId": @(companyId), @"expirationTime": @(expirationTime) }]; @@ -1078,7 +1078,7 @@ - (NSDictionary *)refreshFileEntryLockWithLockUuid:(NSString *)lockUuid companyI - (NSDictionary *)refreshFolderLockWithLockUuid:(NSString *)lockUuid companyId:(long long)companyId expirationTime:(long long)expirationTime error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"lockUuid": lockUuid, + @"lockUuid": [self checkNull: lockUuid], @"companyId": @(companyId), @"expirationTime": @(expirationTime) }]; @@ -1121,7 +1121,7 @@ - (void)restoreFolderFromTrashWithFolderId:(long long)folderId error:(NSError ** - (void)revertFileEntryWithFileEntryId:(long long)fileEntryId version:(NSString *)version serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"version": version, + @"version": [self checkNull: version], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -1175,7 +1175,7 @@ - (NSDictionary *)searchWithRepositoryId:(long long)repositoryId creatorUserId:( @"repositoryId": @(repositoryId), @"creatorUserId": @(creatorUserId), @"folderId": @(folderId), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"status": @(status), @"start": @(start), @"end": @(end) @@ -1221,7 +1221,7 @@ - (void)unlockFileEntryWithFileEntryId:(long long)fileEntryId error:(NSError **) - (void)unlockFileEntryWithFileEntryId:(long long)fileEntryId lockUuid:(NSString *)lockUuid error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlapp/unlock-file-entry": _params}; @@ -1233,7 +1233,7 @@ - (void)unlockFolderWithRepositoryId:(long long)repositoryId folderId:(long long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"folderId": @(folderId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlapp/unlock-folder": _params}; @@ -1245,8 +1245,8 @@ - (void)unlockFolderWithRepositoryId:(long long)repositoryId parentFolderId:(lon NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"parentFolderId": @(parentFolderId), - @"name": name, - @"lockUuid": lockUuid + @"name": [self checkNull: name], + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlapp/unlock-folder": _params}; @@ -1279,11 +1279,11 @@ - (void)unsubscribeFolderWithGroupId:(long long)groupId folderId:(long long)fold - (NSDictionary *)updateFileEntryWithFileEntryId:(long long)fileEntryId sourceFileName:(NSString *)sourceFileName mimeType:(NSString *)mimeType title:(NSString *)title description:(NSString *)description changeLog:(NSString *)changeLog majorVersion:(BOOL)majorVersion bytes:(NSData *)bytes serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"sourceFileName": sourceFileName, - @"mimeType": mimeType, - @"title": title, - @"description": description, - @"changeLog": changeLog, + @"sourceFileName": [self checkNull: sourceFileName], + @"mimeType": [self checkNull: mimeType], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"changeLog": [self checkNull: changeLog], @"majorVersion": @(majorVersion), @"bytes": [self toString:bytes], }]; @@ -1298,13 +1298,13 @@ - (NSDictionary *)updateFileEntryWithFileEntryId:(long long)fileEntryId sourceFi - (NSOperation *)updateFileEntryWithFileEntryId:(long long)fileEntryId sourceFileName:(NSString *)sourceFileName mimeType:(NSString *)mimeType title:(NSString *)title description:(NSString *)description changeLog:(NSString *)changeLog majorVersion:(BOOL)majorVersion file:(LRUploadData *)file serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"sourceFileName": sourceFileName, - @"mimeType": mimeType, - @"title": title, - @"description": description, - @"changeLog": changeLog, + @"sourceFileName": [self checkNull: sourceFileName], + @"mimeType": [self checkNull: mimeType], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"changeLog": [self checkNull: changeLog], @"majorVersion": @(majorVersion), - @"file": file, + @"file": [self checkNull: file], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -1317,13 +1317,13 @@ - (NSOperation *)updateFileEntryWithFileEntryId:(long long)fileEntryId sourceFil - (NSOperation *)updateFileEntryAndCheckInWithFileEntryId:(long long)fileEntryId sourceFileName:(NSString *)sourceFileName mimeType:(NSString *)mimeType title:(NSString *)title description:(NSString *)description changeLog:(NSString *)changeLog majorVersion:(BOOL)majorVersion file:(LRUploadData *)file serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"sourceFileName": sourceFileName, - @"mimeType": mimeType, - @"title": title, - @"description": description, - @"changeLog": changeLog, + @"sourceFileName": [self checkNull: sourceFileName], + @"mimeType": [self checkNull: mimeType], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"changeLog": [self checkNull: changeLog], @"majorVersion": @(majorVersion), - @"file": file, + @"file": [self checkNull: file], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -1350,8 +1350,8 @@ - (NSDictionary *)updateFileShortcutWithFileShortcutId:(long long)fileShortcutId - (NSDictionary *)updateFolderWithFolderId:(long long)folderId name:(NSString *)name description:(NSString *)description serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"folderId": @(folderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -1365,7 +1365,7 @@ - (BOOL)verifyFileEntryCheckOutWithRepositoryId:(long long)repositoryId fileEntr NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlapp/verify-file-entry-check-out": _params}; @@ -1377,7 +1377,7 @@ - (BOOL)verifyFileEntryLockWithRepositoryId:(long long)repositoryId fileEntryId: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlapp/verify-file-entry-lock": _params}; @@ -1389,7 +1389,7 @@ - (BOOL)verifyInheritableLockWithRepositoryId:(long long)repositoryId folderId:( NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), @"folderId": @(folderId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlapp/verify-inheritable-lock": _params}; diff --git a/ios/Source/Service/v62/dlfileentry/LRDLFileEntryService_v62.m b/ios/Source/Service/v62/dlfileentry/LRDLFileEntryService_v62.m index 8f6aace1..58fb4d73 100644 --- a/ios/Source/Service/v62/dlfileentry/LRDLFileEntryService_v62.m +++ b/ios/Source/Service/v62/dlfileentry/LRDLFileEntryService_v62.m @@ -32,7 +32,7 @@ - (NSDictionary *)cancelCheckOutWithFileEntryId:(long long)fileEntryId error:(NS - (void)checkInFileEntryWithFileEntryId:(long long)fileEntryId lockUuid:(NSString *)lockUuid error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlfileentry/check-in-file-entry": _params}; @@ -43,7 +43,7 @@ - (void)checkInFileEntryWithFileEntryId:(long long)fileEntryId lockUuid:(NSStrin - (void)checkInFileEntryWithFileEntryId:(long long)fileEntryId lockUuid:(NSString *)lockUuid serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid, + @"lockUuid": [self checkNull: lockUuid], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -57,7 +57,7 @@ - (void)checkInFileEntryWithFileEntryId:(long long)fileEntryId major:(BOOL)major NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), @"major": @(major), - @"changeLog": changeLog, + @"changeLog": [self checkNull: changeLog], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -92,7 +92,7 @@ - (NSDictionary *)checkOutFileEntryWithFileEntryId:(long long)fileEntryId servic - (NSDictionary *)checkOutFileEntryWithFileEntryId:(long long)fileEntryId owner:(NSString *)owner expirationTime:(long long)expirationTime error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"owner": owner, + @"owner": [self checkNull: owner], @"expirationTime": @(expirationTime) }]; @@ -104,7 +104,7 @@ - (NSDictionary *)checkOutFileEntryWithFileEntryId:(long long)fileEntryId owner: - (NSDictionary *)checkOutFileEntryWithFileEntryId:(long long)fileEntryId owner:(NSString *)owner expirationTime:(long long)expirationTime serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"owner": owner, + @"owner": [self checkNull: owner], @"expirationTime": @(expirationTime), }]; @@ -144,7 +144,7 @@ - (void)deleteFileEntryWithGroupId:(long long)groupId folderId:(long long)folder NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/dlfileentry/delete-file-entry": _params}; @@ -155,7 +155,7 @@ - (void)deleteFileEntryWithGroupId:(long long)groupId folderId:(long long)folder - (void)deleteFileVersionWithFileEntryId:(long long)fileEntryId version:(NSString *)version error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"version": version + @"version": [self checkNull: version] }]; NSDictionary *_command = @{@"/dlfileentry/delete-file-version": _params}; @@ -208,7 +208,7 @@ - (NSArray *)getFileEntriesWithGroupId:(long long)groupId folderId:(long long)fo NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"start": @(start), @"end": @(end), }]; @@ -263,7 +263,7 @@ - (NSNumber *)getFileEntriesCountWithGroupId:(long long)groupId folderId:(long l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"mimeTypes": mimeTypes + @"mimeTypes": [self checkNull: mimeTypes] }]; NSDictionary *_command = @{@"/dlfileentry/get-file-entries-count": _params}; @@ -297,7 +297,7 @@ - (NSDictionary *)getFileEntryWithGroupId:(long long)groupId folderId:(long long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/dlfileentry/get-file-entry": _params}; @@ -307,7 +307,7 @@ - (NSDictionary *)getFileEntryWithGroupId:(long long)groupId folderId:(long long - (NSDictionary *)getFileEntryByUuidAndGroupIdWithUuid:(NSString *)uuid groupId:(long long)groupId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"uuid": uuid, + @"uuid": [self checkNull: uuid], @"groupId": @(groupId) }]; @@ -329,7 +329,7 @@ - (NSDictionary *)getFileEntryLockWithFileEntryId:(long long)fileEntryId error:( - (NSNumber *)getFoldersFileEntriesCountWithGroupId:(long long)groupId folderIds:(NSArray *)folderIds status:(int)status error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"status": @(status) }]; @@ -359,7 +359,7 @@ - (NSArray *)getGroupFileEntriesWithGroupId:(long long)groupId userId:(long long @"groupId": @(groupId), @"userId": @(userId), @"rootFolderId": @(rootFolderId), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"status": @(status), @"start": @(start), @"end": @(end), @@ -389,7 +389,7 @@ - (NSNumber *)getGroupFileEntriesCountWithGroupId:(long long)groupId userId:(lon @"groupId": @(groupId), @"userId": @(userId), @"rootFolderId": @(rootFolderId), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"status": @(status) }]; @@ -433,7 +433,7 @@ - (NSDictionary *)moveFileEntryWithFileEntryId:(long long)fileEntryId newFolderI - (NSDictionary *)refreshFileEntryLockWithLockUuid:(NSString *)lockUuid companyId:(long long)companyId expirationTime:(long long)expirationTime error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"lockUuid": lockUuid, + @"lockUuid": [self checkNull: lockUuid], @"companyId": @(companyId), @"expirationTime": @(expirationTime) }]; @@ -446,7 +446,7 @@ - (NSDictionary *)refreshFileEntryLockWithLockUuid:(NSString *)lockUuid companyI - (void)revertFileEntryWithFileEntryId:(long long)fileEntryId version:(NSString *)version serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"version": version, + @"version": [self checkNull: version], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -475,7 +475,7 @@ - (NSDictionary *)searchWithGroupId:(long long)groupId creatorUserId:(long long) @"groupId": @(groupId), @"creatorUserId": @(creatorUserId), @"folderId": @(folderId), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"status": @(status), @"start": @(start), @"end": @(end) @@ -489,7 +489,7 @@ - (NSDictionary *)searchWithGroupId:(long long)groupId creatorUserId:(long long) - (BOOL)verifyFileEntryCheckOutWithFileEntryId:(long long)fileEntryId lockUuid:(NSString *)lockUuid error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlfileentry/verify-file-entry-check-out": _params}; @@ -500,7 +500,7 @@ - (BOOL)verifyFileEntryCheckOutWithFileEntryId:(long long)fileEntryId lockUuid:( - (BOOL)verifyFileEntryLockWithFileEntryId:(long long)fileEntryId lockUuid:(NSString *)lockUuid error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryId": @(fileEntryId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlfileentry/verify-file-entry-lock": _params}; diff --git a/ios/Source/Service/v62/dlfileentrytype/LRDLFileEntryTypeService_v62.m b/ios/Source/Service/v62/dlfileentrytype/LRDLFileEntryTypeService_v62.m index 5123cd2d..bb867888 100644 --- a/ios/Source/Service/v62/dlfileentrytype/LRDLFileEntryTypeService_v62.m +++ b/ios/Source/Service/v62/dlfileentrytype/LRDLFileEntryTypeService_v62.m @@ -22,9 +22,9 @@ @implementation LRDLFileEntryTypeService_v62 - (NSDictionary *)addFileEntryTypeWithGroupId:(long long)groupId name:(NSString *)name description:(NSString *)description ddmStructureIds:(NSArray *)ddmStructureIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"description": description, - @"ddmStructureIds": ddmStructureIds, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"ddmStructureIds": [self checkNull: ddmStructureIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -37,10 +37,10 @@ - (NSDictionary *)addFileEntryTypeWithGroupId:(long long)groupId name:(NSString - (NSDictionary *)addFileEntryTypeWithGroupId:(long long)groupId fileEntryTypeKey:(NSString *)fileEntryTypeKey nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap ddmStructureIds:(NSArray *)ddmStructureIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"fileEntryTypeKey": fileEntryTypeKey, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"ddmStructureIds": ddmStructureIds, + @"fileEntryTypeKey": [self checkNull: fileEntryTypeKey], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"ddmStructureIds": [self checkNull: ddmStructureIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -72,7 +72,7 @@ - (NSDictionary *)getFileEntryTypeWithFileEntryTypeId:(long long)fileEntryTypeId - (NSArray *)getFileEntryTypesWithGroupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/dlfileentrytype/get-file-entry-types": _params}; @@ -82,7 +82,7 @@ - (NSArray *)getFileEntryTypesWithGroupIds:(NSArray *)groupIds error:(NSError ** - (NSArray *)getFileEntryTypesWithGroupIds:(NSArray *)groupIds start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds, + @"groupIds": [self checkNull: groupIds], @"start": @(start), @"end": @(end) }]; @@ -94,7 +94,7 @@ - (NSArray *)getFileEntryTypesWithGroupIds:(NSArray *)groupIds start:(int)start - (NSNumber *)getFileEntryTypesCountWithGroupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/dlfileentrytype/get-file-entry-types-count": _params}; @@ -104,7 +104,7 @@ - (NSNumber *)getFileEntryTypesCountWithGroupIds:(NSArray *)groupIds error:(NSEr - (NSArray *)getFolderFileEntryTypesWithGroupIds:(NSArray *)groupIds folderId:(long long)folderId inherited:(BOOL)inherited error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds, + @"groupIds": [self checkNull: groupIds], @"folderId": @(folderId), @"inherited": @(inherited) }]; @@ -117,8 +117,8 @@ - (NSArray *)getFolderFileEntryTypesWithGroupIds:(NSArray *)groupIds folderId:(l - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds keywords:(NSString *)keywords includeBasicFileEntryType:(BOOL)includeBasicFileEntryType start:(int)start end:(int)end orderByComparator:(LRJSONObjectWrapper *)orderByComparator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"keywords": keywords, + @"groupIds": [self checkNull: groupIds], + @"keywords": [self checkNull: keywords], @"includeBasicFileEntryType": @(includeBasicFileEntryType), @"start": @(start), @"end": @(end), @@ -134,8 +134,8 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupI - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds keywords:(NSString *)keywords includeBasicFileEntryType:(BOOL)includeBasicFileEntryType error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"keywords": keywords, + @"groupIds": [self checkNull: groupIds], + @"keywords": [self checkNull: keywords], @"includeBasicFileEntryType": @(includeBasicFileEntryType) }]; @@ -147,9 +147,9 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *) - (void)updateFileEntryTypeWithFileEntryTypeId:(long long)fileEntryTypeId name:(NSString *)name description:(NSString *)description ddmStructureIds:(NSArray *)ddmStructureIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryTypeId": @(fileEntryTypeId), - @"name": name, - @"description": description, - @"ddmStructureIds": ddmStructureIds, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"ddmStructureIds": [self checkNull: ddmStructureIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -162,9 +162,9 @@ - (void)updateFileEntryTypeWithFileEntryTypeId:(long long)fileEntryTypeId name:( - (void)updateFileEntryTypeWithFileEntryTypeId:(long long)fileEntryTypeId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap ddmStructureIds:(NSArray *)ddmStructureIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"fileEntryTypeId": @(fileEntryTypeId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"ddmStructureIds": ddmStructureIds, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"ddmStructureIds": [self checkNull: ddmStructureIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/dlfolder/LRDLFolderService_v62.m b/ios/Source/Service/v62/dlfolder/LRDLFolderService_v62.m index 8058befc..e8fccee7 100644 --- a/ios/Source/Service/v62/dlfolder/LRDLFolderService_v62.m +++ b/ios/Source/Service/v62/dlfolder/LRDLFolderService_v62.m @@ -25,8 +25,8 @@ - (NSDictionary *)addFolderWithGroupId:(long long)groupId repositoryId:(long lon @"repositoryId": @(repositoryId), @"mountPoint": @(mountPoint), @"parentFolderId": @(parentFolderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -61,7 +61,7 @@ - (void)deleteFolderWithGroupId:(long long)groupId parentFolderId:(long long)par NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"parentFolderId": @(parentFolderId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/dlfolder/delete-folder": _params}; @@ -100,7 +100,7 @@ - (NSNumber *)getFileEntriesAndFileShortcutsCountWithGroupId:(long long)groupId @"groupId": @(groupId), @"folderId": @(folderId), @"status": @(status), - @"mimeTypes": mimeTypes + @"mimeTypes": [self checkNull: mimeTypes] }]; NSDictionary *_command = @{@"/dlfolder/get-file-entries-and-file-shortcuts-count": _params}; @@ -122,7 +122,7 @@ - (NSDictionary *)getFolderWithGroupId:(long long)groupId parentFolderId:(long l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"parentFolderId": @(parentFolderId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/dlfolder/get-folder": _params}; @@ -195,7 +195,7 @@ - (NSArray *)getFoldersAndFileEntriesAndFileShortcutsWithGroupId:(long long)grou @"groupId": @(groupId), @"folderId": @(folderId), @"status": @(status), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"includeMountFolders": @(includeMountFolders), @"start": @(start), @"end": @(end), @@ -226,7 +226,7 @@ - (NSNumber *)getFoldersAndFileEntriesAndFileShortcutsCountWithGroupId:(long lon @"groupId": @(groupId), @"folderId": @(folderId), @"status": @(status), - @"mimeTypes": mimeTypes, + @"mimeTypes": [self checkNull: mimeTypes], @"includeMountFolders": @(includeMountFolders) }]; @@ -287,7 +287,7 @@ - (NSNumber *)getMountFoldersCountWithGroupId:(long long)groupId parentFolderId: - (void)getSubfolderIdsWithFolderIds:(NSArray *)folderIds groupId:(long long)groupId folderId:(long long)folderId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"groupId": @(groupId), @"folderId": @(folderId) }]; @@ -352,7 +352,7 @@ - (NSDictionary *)lockFolderWithFolderId:(long long)folderId error:(NSError **)e - (NSDictionary *)lockFolderWithFolderId:(long long)folderId owner:(NSString *)owner inheritable:(BOOL)inheritable expirationTime:(long long)expirationTime error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"folderId": @(folderId), - @"owner": owner, + @"owner": [self checkNull: owner], @"inheritable": @(inheritable), @"expirationTime": @(expirationTime) }]; @@ -377,7 +377,7 @@ - (NSDictionary *)moveFolderWithFolderId:(long long)folderId parentFolderId:(lon - (NSDictionary *)refreshFolderLockWithLockUuid:(NSString *)lockUuid companyId:(long long)companyId expirationTime:(long long)expirationTime error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"lockUuid": lockUuid, + @"lockUuid": [self checkNull: lockUuid], @"companyId": @(companyId), @"expirationTime": @(expirationTime) }]; @@ -390,7 +390,7 @@ - (NSDictionary *)refreshFolderLockWithLockUuid:(NSString *)lockUuid companyId:( - (void)unlockFolderWithFolderId:(long long)folderId lockUuid:(NSString *)lockUuid error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"folderId": @(folderId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlfolder/unlock-folder": _params}; @@ -402,8 +402,8 @@ - (void)unlockFolderWithGroupId:(long long)groupId parentFolderId:(long long)par NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"parentFolderId": @(parentFolderId), - @"name": name, - @"lockUuid": lockUuid + @"name": [self checkNull: name], + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlfolder/unlock-folder": _params}; @@ -414,10 +414,10 @@ - (void)unlockFolderWithGroupId:(long long)groupId parentFolderId:(long long)par - (NSDictionary *)updateFolderWithFolderId:(long long)folderId name:(NSString *)name description:(NSString *)description defaultFileEntryTypeId:(long long)defaultFileEntryTypeId fileEntryTypeIds:(NSArray *)fileEntryTypeIds overrideFileEntryTypes:(BOOL)overrideFileEntryTypes serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"folderId": @(folderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"defaultFileEntryTypeId": @(defaultFileEntryTypeId), - @"fileEntryTypeIds": fileEntryTypeIds, + @"fileEntryTypeIds": [self checkNull: fileEntryTypeIds], @"overrideFileEntryTypes": @(overrideFileEntryTypes), }]; @@ -431,7 +431,7 @@ - (NSDictionary *)updateFolderWithFolderId:(long long)folderId name:(NSString *) - (BOOL)verifyInheritableLockWithFolderId:(long long)folderId lockUuid:(NSString *)lockUuid error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"folderId": @(folderId), - @"lockUuid": lockUuid + @"lockUuid": [self checkNull: lockUuid] }]; NSDictionary *_command = @{@"/dlfolder/verify-inheritable-lock": _params}; diff --git a/ios/Source/Service/v62/emailaddress/LREmailAddressService_v62.m b/ios/Source/Service/v62/emailaddress/LREmailAddressService_v62.m index 8a2748d3..5c27724a 100644 --- a/ios/Source/Service/v62/emailaddress/LREmailAddressService_v62.m +++ b/ios/Source/Service/v62/emailaddress/LREmailAddressService_v62.m @@ -21,9 +21,9 @@ @implementation LREmailAddressService_v62 - (NSDictionary *)addEmailAddressWithClassName:(NSString *)className classPK:(long long)classPK address:(NSString *)address typeId:(int)typeId primary:(BOOL)primary error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"address": address, + @"address": [self checkNull: address], @"typeId": @(typeId), @"primary": @(primary) }]; @@ -35,9 +35,9 @@ - (NSDictionary *)addEmailAddressWithClassName:(NSString *)className classPK:(lo - (NSDictionary *)addEmailAddressWithClassName:(NSString *)className classPK:(long long)classPK address:(NSString *)address typeId:(int)typeId primary:(BOOL)primary serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"address": address, + @"address": [self checkNull: address], @"typeId": @(typeId), @"primary": @(primary), }]; @@ -71,7 +71,7 @@ - (NSDictionary *)getEmailAddressWithEmailAddressId:(long long)emailAddressId er - (NSArray *)getEmailAddressesWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -83,7 +83,7 @@ - (NSArray *)getEmailAddressesWithClassName:(NSString *)className classPK:(long - (NSDictionary *)updateEmailAddressWithEmailAddressId:(long long)emailAddressId address:(NSString *)address typeId:(int)typeId primary:(BOOL)primary error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"emailAddressId": @(emailAddressId), - @"address": address, + @"address": [self checkNull: address], @"typeId": @(typeId), @"primary": @(primary) }]; diff --git a/ios/Source/Service/v62/expandocolumn/LRExpandoColumnService_v62.m b/ios/Source/Service/v62/expandocolumn/LRExpandoColumnService_v62.m index 76445e60..dfe9b816 100644 --- a/ios/Source/Service/v62/expandocolumn/LRExpandoColumnService_v62.m +++ b/ios/Source/Service/v62/expandocolumn/LRExpandoColumnService_v62.m @@ -22,7 +22,7 @@ @implementation LRExpandoColumnService_v62 - (NSDictionary *)addColumnWithTableId:(long long)tableId name:(NSString *)name type:(int)type error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"tableId": @(tableId), - @"name": name, + @"name": [self checkNull: name], @"type": @(type) }]; @@ -34,9 +34,9 @@ - (NSDictionary *)addColumnWithTableId:(long long)tableId name:(NSString *)name - (NSDictionary *)addColumnWithTableId:(long long)tableId name:(NSString *)name type:(int)type defaultData:(NSDictionary *)defaultData error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"tableId": @(tableId), - @"name": name, + @"name": [self checkNull: name], @"type": @(type), - @"defaultData": defaultData + @"defaultData": [self checkNull: defaultData] }]; NSDictionary *_command = @{@"/expandocolumn/add-column": _params}; @@ -57,7 +57,7 @@ - (void)deleteColumnWithColumnId:(long long)columnId error:(NSError **)error { - (NSDictionary *)updateColumnWithColumnId:(long long)columnId name:(NSString *)name type:(int)type error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"columnId": @(columnId), - @"name": name, + @"name": [self checkNull: name], @"type": @(type) }]; @@ -69,9 +69,9 @@ - (NSDictionary *)updateColumnWithColumnId:(long long)columnId name:(NSString *) - (NSDictionary *)updateColumnWithColumnId:(long long)columnId name:(NSString *)name type:(int)type defaultData:(NSDictionary *)defaultData error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"columnId": @(columnId), - @"name": name, + @"name": [self checkNull: name], @"type": @(type), - @"defaultData": defaultData + @"defaultData": [self checkNull: defaultData] }]; NSDictionary *_command = @{@"/expandocolumn/update-column": _params}; @@ -82,7 +82,7 @@ - (NSDictionary *)updateColumnWithColumnId:(long long)columnId name:(NSString *) - (NSDictionary *)updateTypeSettingsWithColumnId:(long long)columnId typeSettings:(NSString *)typeSettings error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"columnId": @(columnId), - @"typeSettings": typeSettings + @"typeSettings": [self checkNull: typeSettings] }]; NSDictionary *_command = @{@"/expandocolumn/update-type-settings": _params}; diff --git a/ios/Source/Service/v62/expandovalue/LRExpandoValueService_v62.m b/ios/Source/Service/v62/expandovalue/LRExpandoValueService_v62.m index 62dbd251..edf3a230 100644 --- a/ios/Source/Service/v62/expandovalue/LRExpandoValueService_v62.m +++ b/ios/Source/Service/v62/expandovalue/LRExpandoValueService_v62.m @@ -22,11 +22,11 @@ @implementation LRExpandoValueService_v62 - (NSDictionary *)addValueWithCompanyId:(long long)companyId className:(NSString *)className tableName:(NSString *)tableName columnName:(NSString *)columnName classPK:(long long)classPK data:(NSString *)data error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"className": className, - @"tableName": tableName, - @"columnName": columnName, + @"className": [self checkNull: className], + @"tableName": [self checkNull: tableName], + @"columnName": [self checkNull: columnName], @"classPK": @(classPK), - @"data": data + @"data": [self checkNull: data] }]; NSDictionary *_command = @{@"/expandovalue/add-value": _params}; @@ -37,10 +37,10 @@ - (NSDictionary *)addValueWithCompanyId:(long long)companyId className:(NSString - (void)addValuesWithCompanyId:(long long)companyId className:(NSString *)className tableName:(NSString *)tableName classPK:(long long)classPK attributeValues:(NSDictionary *)attributeValues error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"className": className, - @"tableName": tableName, + @"className": [self checkNull: className], + @"tableName": [self checkNull: tableName], @"classPK": @(classPK), - @"attributeValues": attributeValues + @"attributeValues": [self checkNull: attributeValues] }]; NSDictionary *_command = @{@"/expandovalue/add-values": _params}; @@ -51,9 +51,9 @@ - (void)addValuesWithCompanyId:(long long)companyId className:(NSString *)classN - (NSDictionary *)getDataWithCompanyId:(long long)companyId className:(NSString *)className tableName:(NSString *)tableName columnName:(NSString *)columnName classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"className": className, - @"tableName": tableName, - @"columnName": columnName, + @"className": [self checkNull: className], + @"tableName": [self checkNull: tableName], + @"columnName": [self checkNull: columnName], @"classPK": @(classPK) }]; @@ -65,9 +65,9 @@ - (NSDictionary *)getDataWithCompanyId:(long long)companyId className:(NSString - (NSDictionary *)getDataWithCompanyId:(long long)companyId className:(NSString *)className tableName:(NSString *)tableName columnNames:(NSDictionary *)columnNames classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"className": className, - @"tableName": tableName, - @"columnNames": columnNames, + @"className": [self checkNull: className], + @"tableName": [self checkNull: tableName], + @"columnNames": [self checkNull: columnNames], @"classPK": @(classPK) }]; @@ -79,9 +79,9 @@ - (NSDictionary *)getDataWithCompanyId:(long long)companyId className:(NSString - (NSDictionary *)getJsonDataWithCompanyId:(long long)companyId className:(NSString *)className tableName:(NSString *)tableName columnName:(NSString *)columnName classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"className": className, - @"tableName": tableName, - @"columnName": columnName, + @"className": [self checkNull: className], + @"tableName": [self checkNull: tableName], + @"columnName": [self checkNull: columnName], @"classPK": @(classPK) }]; diff --git a/ios/Source/Service/v62/flagsentry/LRFlagsEntryService_v62.m b/ios/Source/Service/v62/flagsentry/LRFlagsEntryService_v62.m index 09fe7eb7..39d75f7a 100644 --- a/ios/Source/Service/v62/flagsentry/LRFlagsEntryService_v62.m +++ b/ios/Source/Service/v62/flagsentry/LRFlagsEntryService_v62.m @@ -21,13 +21,13 @@ @implementation LRFlagsEntryService_v62 - (void)addEntryWithClassName:(NSString *)className classPK:(long long)classPK reporterEmailAddress:(NSString *)reporterEmailAddress reportedUserId:(long long)reportedUserId contentTitle:(NSString *)contentTitle contentURL:(NSString *)contentURL reason:(NSString *)reason serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"reporterEmailAddress": reporterEmailAddress, + @"reporterEmailAddress": [self checkNull: reporterEmailAddress], @"reportedUserId": @(reportedUserId), - @"contentTitle": contentTitle, - @"contentURL": contentURL, - @"reason": reason, + @"contentTitle": [self checkNull: contentTitle], + @"contentURL": [self checkNull: contentURL], + @"reason": [self checkNull: reason], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/group/LRGroupService_v62.m b/ios/Source/Service/v62/group/LRGroupService_v62.m index 66faf687..1cfc880c 100644 --- a/ios/Source/Service/v62/group/LRGroupService_v62.m +++ b/ios/Source/Service/v62/group/LRGroupService_v62.m @@ -23,12 +23,12 @@ - (NSDictionary *)addGroupWithParentGroupId:(long long)parentGroupId liveGroupId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentGroupId": @(parentGroupId), @"liveGroupId": @(liveGroupId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"type": @(type), @"manualMembership": @(manualMembership), @"membershipRestriction": @(membershipRestriction), - @"friendlyURL": friendlyURL, + @"friendlyURL": [self checkNull: friendlyURL], @"site": @(site), @"active": @(active), }]; @@ -42,10 +42,10 @@ - (NSDictionary *)addGroupWithParentGroupId:(long long)parentGroupId liveGroupId - (NSDictionary *)addGroupWithName:(NSString *)name description:(NSString *)description type:(int)type friendlyURL:(NSString *)friendlyURL site:(BOOL)site active:(BOOL)active serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"type": @(type), - @"friendlyURL": friendlyURL, + @"friendlyURL": [self checkNull: friendlyURL], @"site": @(site), @"active": @(active), }]; @@ -60,10 +60,10 @@ - (NSDictionary *)addGroupWithName:(NSString *)name description:(NSString *)desc - (NSDictionary *)addGroupWithParentGroupId:(long long)parentGroupId name:(NSString *)name description:(NSString *)description type:(int)type friendlyURL:(NSString *)friendlyURL site:(BOOL)site active:(BOOL)active serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentGroupId": @(parentGroupId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"type": @(type), - @"friendlyURL": friendlyURL, + @"friendlyURL": [self checkNull: friendlyURL], @"site": @(site), @"active": @(active), }]; @@ -78,7 +78,7 @@ - (NSDictionary *)addGroupWithParentGroupId:(long long)parentGroupId name:(NSStr - (void)addRoleGroupsWithRoleId:(long long)roleId groupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"roleId": @(roleId), - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/group/add-role-groups": _params}; @@ -149,7 +149,7 @@ - (NSDictionary *)getGroupWithGroupId:(long long)groupId error:(NSError **)error - (NSDictionary *)getGroupWithCompanyId:(long long)companyId name:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/group/get-group": _params}; @@ -171,7 +171,7 @@ - (NSArray *)getGroupsWithCompanyId:(long long)companyId parentGroupId:(long lon - (NSArray *)getManageableSiteGroupsWithPortlets:(NSDictionary *)portlets max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"portlets": portlets, + @"portlets": [self checkNull: portlets], @"max": @(max) }]; @@ -182,7 +182,7 @@ - (NSArray *)getManageableSiteGroupsWithPortlets:(NSDictionary *)portlets max:(i - (NSArray *)getManageableSitesWithPortlets:(NSDictionary *)portlets max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"portlets": portlets, + @"portlets": [self checkNull: portlets], @"max": @(max) }]; @@ -193,7 +193,7 @@ - (NSArray *)getManageableSitesWithPortlets:(NSDictionary *)portlets max:(int)ma - (NSArray *)getOrganizationsGroupsWithOrganizations:(NSArray *)organizations error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"organizations": organizations + @"organizations": [self checkNull: organizations] }]; NSDictionary *_command = @{@"/group/get-organizations-groups": _params}; @@ -214,7 +214,7 @@ - (NSDictionary *)getUserGroupWithCompanyId:(long long)companyId userId:(long lo - (NSArray *)getUserGroupsGroupsWithUserGroups:(NSArray *)userGroups error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"userGroups": userGroups + @"userGroups": [self checkNull: userGroups] }]; NSDictionary *_command = @{@"/group/get-user-groups-groups": _params}; @@ -236,7 +236,7 @@ - (NSArray *)getUserOrganizationsGroupsWithUserId:(long long)userId start:(int)s - (NSArray *)getUserPlacesWithClassNames:(NSArray *)classNames max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"classNames": classNames, + @"classNames": [self checkNull: classNames], @"max": @(max) }]; @@ -248,7 +248,7 @@ - (NSArray *)getUserPlacesWithClassNames:(NSArray *)classNames max:(int)max erro - (NSArray *)getUserPlacesWithUserId:(long long)userId classNames:(NSArray *)classNames max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"classNames": classNames, + @"classNames": [self checkNull: classNames], @"max": @(max) }]; @@ -260,7 +260,7 @@ - (NSArray *)getUserPlacesWithUserId:(long long)userId classNames:(NSArray *)cla - (NSArray *)getUserPlacesWithUserId:(long long)userId classNames:(NSArray *)classNames includeControlPanel:(BOOL)includeControlPanel max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"classNames": classNames, + @"classNames": [self checkNull: classNames], @"includeControlPanel": @(includeControlPanel), @"max": @(max) }]; @@ -299,7 +299,7 @@ - (NSArray *)getUserSitesGroups:(NSError **)error { - (NSArray *)getUserSitesGroupsWithClassNames:(NSArray *)classNames max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"classNames": classNames, + @"classNames": [self checkNull: classNames], @"max": @(max) }]; @@ -311,7 +311,7 @@ - (NSArray *)getUserSitesGroupsWithClassNames:(NSArray *)classNames max:(int)max - (NSArray *)getUserSitesGroupsWithUserId:(long long)userId classNames:(NSArray *)classNames max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"classNames": classNames, + @"classNames": [self checkNull: classNames], @"max": @(max) }]; @@ -323,7 +323,7 @@ - (NSArray *)getUserSitesGroupsWithUserId:(long long)userId classNames:(NSArray - (NSArray *)getUserSitesGroupsWithUserId:(long long)userId classNames:(NSArray *)classNames includeControlPanel:(BOOL)includeControlPanel max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"classNames": classNames, + @"classNames": [self checkNull: classNames], @"includeControlPanel": @(includeControlPanel), @"max": @(max) }]; @@ -356,9 +356,9 @@ - (BOOL)hasUserGroupWithUserId:(long long)userId groupId:(long long)groupId erro - (NSArray *)searchWithCompanyId:(long long)companyId name:(NSString *)name description:(NSString *)description params:(NSArray *)params start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"name": name, - @"description": description, - @"params": params, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"params": [self checkNull: params], @"start": @(start), @"end": @(end) }]; @@ -371,9 +371,9 @@ - (NSArray *)searchWithCompanyId:(long long)companyId name:(NSString *)name desc - (NSNumber *)searchCountWithCompanyId:(long long)companyId name:(NSString *)name description:(NSString *)description params:(NSArray *)params error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"name": name, - @"description": description, - @"params": params + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"params": [self checkNull: params] }]; NSDictionary *_command = @{@"/group/search-count": _params}; @@ -384,7 +384,7 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId name:(NSString *)nam - (void)setRoleGroupsWithRoleId:(long long)roleId groupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"roleId": @(roleId), - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/group/set-role-groups": _params}; @@ -395,7 +395,7 @@ - (void)setRoleGroupsWithRoleId:(long long)roleId groupIds:(NSArray *)groupIds e - (void)unsetRoleGroupsWithRoleId:(long long)roleId groupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"roleId": @(roleId), - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/group/unset-role-groups": _params}; @@ -406,7 +406,7 @@ - (void)unsetRoleGroupsWithRoleId:(long long)roleId groupIds:(NSArray *)groupIds - (NSDictionary *)updateFriendlyUrlWithGroupId:(long long)groupId friendlyURL:(NSString *)friendlyURL error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"friendlyURL": friendlyURL + @"friendlyURL": [self checkNull: friendlyURL] }]; NSDictionary *_command = @{@"/group/update-friendly-url": _params}; @@ -418,12 +418,12 @@ - (NSDictionary *)updateGroupWithGroupId:(long long)groupId parentGroupId:(long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"parentGroupId": @(parentGroupId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"type": @(type), @"manualMembership": @(manualMembership), @"membershipRestriction": @(membershipRestriction), - @"friendlyURL": friendlyURL, + @"friendlyURL": [self checkNull: friendlyURL], @"active": @(active), }]; @@ -437,7 +437,7 @@ - (NSDictionary *)updateGroupWithGroupId:(long long)groupId parentGroupId:(long - (NSDictionary *)updateGroupWithGroupId:(long long)groupId typeSettings:(NSString *)typeSettings error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"typeSettings": typeSettings + @"typeSettings": [self checkNull: typeSettings] }]; NSDictionary *_command = @{@"/group/update-group": _params}; @@ -448,7 +448,7 @@ - (NSDictionary *)updateGroupWithGroupId:(long long)groupId typeSettings:(NSStri - (void)updateStagedPortletsWithGroupId:(long long)groupId stagedPortletIds:(NSDictionary *)stagedPortletIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"stagedPortletIds": stagedPortletIds + @"stagedPortletIds": [self checkNull: stagedPortletIds] }]; NSDictionary *_command = @{@"/group/update-staged-portlets": _params}; diff --git a/ios/Source/Service/v62/journalarticle/LRJournalArticleService_v62.m b/ios/Source/Service/v62/journalarticle/LRJournalArticleService_v62.m index f4660a78..d83c4ea5 100644 --- a/ios/Source/Service/v62/journalarticle/LRJournalArticleService_v62.m +++ b/ios/Source/Service/v62/journalarticle/LRJournalArticleService_v62.m @@ -25,15 +25,15 @@ - (NSDictionary *)addArticleWithGroupId:(long long)groupId folderId:(long long)f @"folderId": @(folderId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"autoArticleId": @(autoArticleId), - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"content": content, - @"type": type, - @"ddmStructureKey": ddmStructureKey, - @"ddmTemplateKey": ddmTemplateKey, - @"layoutUuid": layoutUuid, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"content": [self checkNull: content], + @"type": [self checkNull: type], + @"ddmStructureKey": [self checkNull: ddmStructureKey], + @"ddmTemplateKey": [self checkNull: ddmTemplateKey], + @"layoutUuid": [self checkNull: layoutUuid], @"displayDateMonth": @(displayDateMonth), @"displayDateDay": @(displayDateDay), @"displayDateYear": @(displayDateYear), @@ -52,7 +52,7 @@ - (NSDictionary *)addArticleWithGroupId:(long long)groupId folderId:(long long)f @"reviewDateMinute": @(reviewDateMinute), @"neverReview": @(neverReview), @"indexable": @(indexable), - @"articleURL": articleURL, + @"articleURL": [self checkNull: articleURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -68,15 +68,15 @@ - (NSOperation *)addArticleWithGroupId:(long long)groupId folderId:(long long)fo @"folderId": @(folderId), @"classNameId": @(classNameId), @"classPK": @(classPK), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"autoArticleId": @(autoArticleId), - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"content": content, - @"type": type, - @"ddmStructureKey": ddmStructureKey, - @"ddmTemplateKey": ddmTemplateKey, - @"layoutUuid": layoutUuid, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"content": [self checkNull: content], + @"type": [self checkNull: type], + @"ddmStructureKey": [self checkNull: ddmStructureKey], + @"ddmTemplateKey": [self checkNull: ddmTemplateKey], + @"layoutUuid": [self checkNull: layoutUuid], @"displayDateMonth": @(displayDateMonth), @"displayDateDay": @(displayDateDay), @"displayDateYear": @(displayDateYear), @@ -96,10 +96,10 @@ - (NSOperation *)addArticleWithGroupId:(long long)groupId folderId:(long long)fo @"neverReview": @(neverReview), @"indexable": @(indexable), @"smallImage": @(smallImage), - @"smallImageURL": smallImageURL, - @"smallFile": smallFile, - @"images": images, - @"articleURL": articleURL, + @"smallImageURL": [self checkNull: smallImageURL], + @"smallFile": [self checkNull: smallFile], + @"images": [self checkNull: images], + @"articleURL": [self checkNull: articleURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -112,8 +112,8 @@ - (NSOperation *)addArticleWithGroupId:(long long)groupId folderId:(long long)fo - (NSDictionary *)copyArticleWithGroupId:(long long)groupId oldArticleId:(NSString *)oldArticleId newArticleId:(NSString *)newArticleId autoArticleId:(BOOL)autoArticleId version:(double)version error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"oldArticleId": oldArticleId, - @"newArticleId": newArticleId, + @"oldArticleId": [self checkNull: oldArticleId], + @"newArticleId": [self checkNull: newArticleId], @"autoArticleId": @(autoArticleId), @"version": @(version) }]; @@ -126,8 +126,8 @@ - (NSDictionary *)copyArticleWithGroupId:(long long)groupId oldArticleId:(NSStri - (void)deleteArticleWithGroupId:(long long)groupId articleId:(NSString *)articleId articleURL:(NSString *)articleURL serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, - @"articleURL": articleURL, + @"articleId": [self checkNull: articleId], + @"articleURL": [self checkNull: articleURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -140,9 +140,9 @@ - (void)deleteArticleWithGroupId:(long long)groupId articleId:(NSString *)articl - (void)deleteArticleWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version articleURL:(NSString *)articleURL serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"articleURL": articleURL, + @"articleURL": [self checkNull: articleURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -155,8 +155,8 @@ - (void)deleteArticleWithGroupId:(long long)groupId articleId:(NSString *)articl - (void)expireArticleWithGroupId:(long long)groupId articleId:(NSString *)articleId articleURL:(NSString *)articleURL serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, - @"articleURL": articleURL, + @"articleId": [self checkNull: articleId], + @"articleURL": [self checkNull: articleURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -169,9 +169,9 @@ - (void)expireArticleWithGroupId:(long long)groupId articleId:(NSString *)articl - (NSDictionary *)expireArticleWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version articleURL:(NSString *)articleURL serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"articleURL": articleURL, + @"articleURL": [self checkNull: articleURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -194,7 +194,7 @@ - (NSDictionary *)getArticleWithId:(long long)id error:(NSError **)error { - (NSDictionary *)getArticleWithGroupId:(long long)groupId articleId:(NSString *)articleId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId + @"articleId": [self checkNull: articleId] }]; NSDictionary *_command = @{@"/journalarticle/get-article": _params}; @@ -205,7 +205,7 @@ - (NSDictionary *)getArticleWithGroupId:(long long)groupId articleId:(NSString * - (NSDictionary *)getArticleWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version) }]; @@ -217,7 +217,7 @@ - (NSDictionary *)getArticleWithGroupId:(long long)groupId articleId:(NSString * - (NSDictionary *)getArticleWithGroupId:(long long)groupId className:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -229,7 +229,7 @@ - (NSDictionary *)getArticleWithGroupId:(long long)groupId className:(NSString * - (NSDictionary *)getArticleByUrlTitleWithGroupId:(long long)groupId urlTitle:(NSString *)urlTitle error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"urlTitle": urlTitle + @"urlTitle": [self checkNull: urlTitle] }]; NSDictionary *_command = @{@"/journalarticle/get-article-by-url-title": _params}; @@ -240,8 +240,8 @@ - (NSDictionary *)getArticleByUrlTitleWithGroupId:(long long)groupId urlTitle:(N - (NSString *)getArticleContentWithGroupId:(long long)groupId articleId:(NSString *)articleId languageId:(NSString *)languageId themeDisplay:(LRJSONObjectWrapper *)themeDisplay error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, - @"languageId": languageId, + @"articleId": [self checkNull: articleId], + @"languageId": [self checkNull: languageId], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -254,9 +254,9 @@ - (NSString *)getArticleContentWithGroupId:(long long)groupId articleId:(NSStrin - (NSString *)getArticleContentWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version languageId:(NSString *)languageId themeDisplay:(LRJSONObjectWrapper *)themeDisplay error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"languageId": languageId, + @"languageId": [self checkNull: languageId], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -295,7 +295,7 @@ - (NSArray *)getArticlesWithGroupId:(long long)groupId folderId:(long long)folde - (NSArray *)getArticlesByArticleIdWithGroupId:(long long)groupId articleId:(NSString *)articleId start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"start": @(start), @"end": @(end), }]; @@ -310,7 +310,7 @@ - (NSArray *)getArticlesByArticleIdWithGroupId:(long long)groupId articleId:(NSS - (NSArray *)getArticlesByLayoutUuidWithGroupId:(long long)groupId layoutUuid:(NSString *)layoutUuid error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"layoutUuid": layoutUuid + @"layoutUuid": [self checkNull: layoutUuid] }]; NSDictionary *_command = @{@"/journalarticle/get-articles-by-layout-uuid": _params}; @@ -321,7 +321,7 @@ - (NSArray *)getArticlesByLayoutUuidWithGroupId:(long long)groupId layoutUuid:(N - (NSArray *)getArticlesByStructureIdWithGroupId:(long long)groupId ddmStructureKey:(NSString *)ddmStructureKey start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"ddmStructureKey": ddmStructureKey, + @"ddmStructureKey": [self checkNull: ddmStructureKey], @"start": @(start), @"end": @(end), }]; @@ -337,7 +337,7 @@ - (NSArray *)getArticlesByStructureIdWithGroupId:(long long)groupId classNameId: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"ddmStructureKey": ddmStructureKey, + @"ddmStructureKey": [self checkNull: ddmStructureKey], @"status": @(status), @"start": @(start), @"end": @(end), @@ -376,7 +376,7 @@ - (NSNumber *)getArticlesCountWithGroupId:(long long)groupId folderId:(long long - (NSNumber *)getArticlesCountByArticleIdWithGroupId:(long long)groupId articleId:(NSString *)articleId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId + @"articleId": [self checkNull: articleId] }]; NSDictionary *_command = @{@"/journalarticle/get-articles-count-by-article-id": _params}; @@ -387,7 +387,7 @@ - (NSNumber *)getArticlesCountByArticleIdWithGroupId:(long long)groupId articleI - (NSNumber *)getArticlesCountByStructureIdWithGroupId:(long long)groupId ddmStructureKey:(NSString *)ddmStructureKey error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"ddmStructureKey": ddmStructureKey + @"ddmStructureKey": [self checkNull: ddmStructureKey] }]; NSDictionary *_command = @{@"/journalarticle/get-articles-count-by-structure-id": _params}; @@ -399,7 +399,7 @@ - (NSNumber *)getArticlesCountByStructureIdWithGroupId:(long long)groupId classN NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"classNameId": @(classNameId), - @"ddmStructureKey": ddmStructureKey, + @"ddmStructureKey": [self checkNull: ddmStructureKey], @"status": @(status) }]; @@ -411,7 +411,7 @@ - (NSNumber *)getArticlesCountByStructureIdWithGroupId:(long long)groupId classN - (NSDictionary *)getDisplayArticleByUrlTitleWithGroupId:(long long)groupId urlTitle:(NSString *)urlTitle error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"urlTitle": urlTitle + @"urlTitle": [self checkNull: urlTitle] }]; NSDictionary *_command = @{@"/journalarticle/get-display-article-by-url-title": _params}; @@ -422,7 +422,7 @@ - (NSDictionary *)getDisplayArticleByUrlTitleWithGroupId:(long long)groupId urlT - (NSNumber *)getFoldersAndArticlesCountWithGroupId:(long long)groupId folderIds:(NSArray *)folderIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"folderIds": folderIds + @"folderIds": [self checkNull: folderIds] }]; NSDictionary *_command = @{@"/journalarticle/get-folders-and-articles-count": _params}; @@ -501,7 +501,7 @@ - (NSDictionary *)getLatestArticleWithResourcePrimKey:(long long)resourcePrimKey - (NSDictionary *)getLatestArticleWithGroupId:(long long)groupId articleId:(NSString *)articleId status:(int)status error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"status": @(status) }]; @@ -513,7 +513,7 @@ - (NSDictionary *)getLatestArticleWithGroupId:(long long)groupId articleId:(NSSt - (NSDictionary *)getLatestArticleWithGroupId:(long long)groupId className:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -525,7 +525,7 @@ - (NSDictionary *)getLatestArticleWithGroupId:(long long)groupId className:(NSSt - (void)moveArticleWithGroupId:(long long)groupId articleId:(NSString *)articleId newFolderId:(long long)newFolderId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"newFolderId": @(newFolderId) }]; @@ -537,7 +537,7 @@ - (void)moveArticleWithGroupId:(long long)groupId articleId:(NSString *)articleI - (NSDictionary *)moveArticleFromTrashWithGroupId:(long long)groupId articleId:(NSString *)articleId newFolderId:(long long)newFolderId serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"newFolderId": @(newFolderId), }]; @@ -565,7 +565,7 @@ - (NSDictionary *)moveArticleFromTrashWithGroupId:(long long)groupId resourcePri - (NSDictionary *)moveArticleToTrashWithGroupId:(long long)groupId articleId:(NSString *)articleId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId + @"articleId": [self checkNull: articleId] }]; NSDictionary *_command = @{@"/journalarticle/move-article-to-trash": _params}; @@ -576,7 +576,7 @@ - (NSDictionary *)moveArticleToTrashWithGroupId:(long long)groupId articleId:(NS - (void)removeArticleLocaleWithCompanyId:(long long)companyId languageId:(NSString *)languageId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"languageId": languageId + @"languageId": [self checkNull: languageId] }]; NSDictionary *_command = @{@"/journalarticle/remove-article-locale": _params}; @@ -587,9 +587,9 @@ - (void)removeArticleLocaleWithCompanyId:(long long)companyId languageId:(NSStri - (NSDictionary *)removeArticleLocaleWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version languageId:(NSString *)languageId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"languageId": languageId + @"languageId": [self checkNull: languageId] }]; NSDictionary *_command = @{@"/journalarticle/remove-article-locale": _params}; @@ -610,7 +610,7 @@ - (void)restoreArticleFromTrashWithResourcePrimKey:(long long)resourcePrimKey er - (void)restoreArticleFromTrashWithGroupId:(long long)groupId articleId:(NSString *)articleId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId + @"articleId": [self checkNull: articleId] }]; NSDictionary *_command = @{@"/journalarticle/restore-article-from-trash": _params}; @@ -622,13 +622,13 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"classNameId": @(classNameId), - @"keywords": keywords, + @"keywords": [self checkNull: keywords], @"version": @(version), - @"type": type, - @"ddmStructureKey": ddmStructureKey, - @"ddmTemplateKey": ddmTemplateKey, + @"type": [self checkNull: type], + @"ddmStructureKey": [self checkNull: ddmStructureKey], + @"ddmTemplateKey": [self checkNull: ddmTemplateKey], @"displayDateGT": @(displayDateGT), @"displayDateLT": @(displayDateLT), @"status": @(status), @@ -648,16 +648,16 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"classNameId": @(classNameId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"title": title, - @"description": description, - @"content": content, - @"type": type, - @"ddmStructureKey": ddmStructureKey, - @"ddmTemplateKey": ddmTemplateKey, + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"content": [self checkNull: content], + @"type": [self checkNull: type], + @"ddmStructureKey": [self checkNull: ddmStructureKey], + @"ddmTemplateKey": [self checkNull: ddmTemplateKey], @"displayDateGT": @(displayDateGT), @"displayDateLT": @(displayDateLT), @"status": @(status), @@ -678,16 +678,16 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupId:(long long)groupId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"classNameId": @(classNameId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"title": title, - @"description": description, - @"content": content, - @"type": type, - @"ddmStructureKeys": ddmStructureKeys, - @"ddmTemplateKeys": ddmTemplateKeys, + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"content": [self checkNull: content], + @"type": [self checkNull: type], + @"ddmStructureKeys": [self checkNull: ddmStructureKeys], + @"ddmTemplateKeys": [self checkNull: ddmTemplateKeys], @"displayDateGT": @(displayDateGT), @"displayDateLT": @(displayDateLT), @"status": @(status), @@ -722,13 +722,13 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"classNameId": @(classNameId), - @"keywords": keywords, + @"keywords": [self checkNull: keywords], @"version": @(version), - @"type": type, - @"ddmStructureKey": ddmStructureKey, - @"ddmTemplateKey": ddmTemplateKey, + @"type": [self checkNull: type], + @"ddmStructureKey": [self checkNull: ddmStructureKey], + @"ddmTemplateKey": [self checkNull: ddmTemplateKey], @"displayDateGT": @(displayDateGT), @"displayDateLT": @(displayDateLT), @"status": @(status), @@ -744,16 +744,16 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"classNameId": @(classNameId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"title": title, - @"description": description, - @"content": content, - @"type": type, - @"ddmStructureKey": ddmStructureKey, - @"ddmTemplateKey": ddmTemplateKey, + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"content": [self checkNull: content], + @"type": [self checkNull: type], + @"ddmStructureKey": [self checkNull: ddmStructureKey], + @"ddmTemplateKey": [self checkNull: ddmTemplateKey], @"displayDateGT": @(displayDateGT), @"displayDateLT": @(displayDateLT), @"status": @(status), @@ -770,16 +770,16 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupId:(long long)g NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"classNameId": @(classNameId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"title": title, - @"description": description, - @"content": content, - @"type": type, - @"ddmStructureKeys": ddmStructureKeys, - @"ddmTemplateKeys": ddmTemplateKeys, + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"content": [self checkNull: content], + @"type": [self checkNull: type], + @"ddmStructureKeys": [self checkNull: ddmStructureKeys], + @"ddmTemplateKeys": [self checkNull: ddmTemplateKeys], @"displayDateGT": @(displayDateGT), @"displayDateLT": @(displayDateLT), @"status": @(status), @@ -817,12 +817,12 @@ - (NSDictionary *)updateArticleWithUserId:(long long)userId groupId:(long long)g @"userId": @(userId), @"groupId": @(groupId), @"folderId": @(folderId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"content": content, - @"layoutUuid": layoutUuid, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"content": [self checkNull: content], + @"layoutUuid": [self checkNull: layoutUuid], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -836,15 +836,15 @@ - (NSOperation *)updateArticleWithGroupId:(long long)groupId folderId:(long long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"content": content, - @"type": type, - @"ddmStructureKey": ddmStructureKey, - @"ddmTemplateKey": ddmTemplateKey, - @"layoutUuid": layoutUuid, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"content": [self checkNull: content], + @"type": [self checkNull: type], + @"ddmStructureKey": [self checkNull: ddmStructureKey], + @"ddmTemplateKey": [self checkNull: ddmTemplateKey], + @"layoutUuid": [self checkNull: layoutUuid], @"displayDateMonth": @(displayDateMonth), @"displayDateDay": @(displayDateDay), @"displayDateYear": @(displayDateYear), @@ -864,10 +864,10 @@ - (NSOperation *)updateArticleWithGroupId:(long long)groupId folderId:(long long @"neverReview": @(neverReview), @"indexable": @(indexable), @"smallImage": @(smallImage), - @"smallImageURL": smallImageURL, - @"smallFile": smallFile, - @"images": images, - @"articleURL": articleURL, + @"smallImageURL": [self checkNull: smallImageURL], + @"smallFile": [self checkNull: smallFile], + @"images": [self checkNull: images], + @"articleURL": [self checkNull: articleURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -881,9 +881,9 @@ - (NSDictionary *)updateArticleWithGroupId:(long long)groupId folderId:(long lon NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"folderId": @(folderId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"content": content, + @"content": [self checkNull: content], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -896,13 +896,13 @@ - (NSDictionary *)updateArticleWithGroupId:(long long)groupId folderId:(long lon - (NSDictionary *)updateArticleTranslationWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version locale:(NSString *)locale title:(NSString *)title description:(NSString *)description content:(NSString *)content images:(NSDictionary *)images error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"locale": locale, - @"title": title, - @"description": description, - @"content": content, - @"images": images + @"locale": [self checkNull: locale], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"content": [self checkNull: content], + @"images": [self checkNull: images] }]; NSDictionary *_command = @{@"/journalarticle/update-article-translation": _params}; @@ -913,13 +913,13 @@ - (NSDictionary *)updateArticleTranslationWithGroupId:(long long)groupId article - (NSDictionary *)updateArticleTranslationWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version locale:(NSString *)locale title:(NSString *)title description:(NSString *)description content:(NSString *)content images:(NSDictionary *)images serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"locale": locale, - @"title": title, - @"description": description, - @"content": content, - @"images": images, + @"locale": [self checkNull: locale], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"content": [self checkNull: content], + @"images": [self checkNull: images], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -932,9 +932,9 @@ - (NSDictionary *)updateArticleTranslationWithGroupId:(long long)groupId article - (NSDictionary *)updateContentWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version content:(NSString *)content error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), - @"content": content + @"content": [self checkNull: content] }]; NSDictionary *_command = @{@"/journalarticle/update-content": _params}; @@ -945,10 +945,10 @@ - (NSDictionary *)updateContentWithGroupId:(long long)groupId articleId:(NSStrin - (NSDictionary *)updateStatusWithGroupId:(long long)groupId articleId:(NSString *)articleId version:(double)version status:(int)status articleURL:(NSString *)articleURL serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"articleId": articleId, + @"articleId": [self checkNull: articleId], @"version": @(version), @"status": @(status), - @"articleURL": articleURL, + @"articleURL": [self checkNull: articleURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/journalfeed/LRJournalFeedService_v62.m b/ios/Source/Service/v62/journalfeed/LRJournalFeedService_v62.m index c6f47579..06c16185 100644 --- a/ios/Source/Service/v62/journalfeed/LRJournalFeedService_v62.m +++ b/ios/Source/Service/v62/journalfeed/LRJournalFeedService_v62.m @@ -22,21 +22,21 @@ @implementation LRJournalFeedService_v62 - (NSDictionary *)addFeedWithGroupId:(long long)groupId feedId:(NSString *)feedId autoFeedId:(BOOL)autoFeedId name:(NSString *)name description:(NSString *)description type:(NSString *)type structureId:(NSString *)structureId templateId:(NSString *)templateId rendererTemplateId:(NSString *)rendererTemplateId delta:(int)delta orderByCol:(NSString *)orderByCol orderByType:(NSString *)orderByType targetLayoutFriendlyUrl:(NSString *)targetLayoutFriendlyUrl targetPortletId:(NSString *)targetPortletId contentField:(NSString *)contentField feedType:(NSString *)feedType feedVersion:(double)feedVersion serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"feedId": feedId, + @"feedId": [self checkNull: feedId], @"autoFeedId": @(autoFeedId), - @"name": name, - @"description": description, - @"type": type, - @"structureId": structureId, - @"templateId": templateId, - @"rendererTemplateId": rendererTemplateId, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"type": [self checkNull: type], + @"structureId": [self checkNull: structureId], + @"templateId": [self checkNull: templateId], + @"rendererTemplateId": [self checkNull: rendererTemplateId], @"delta": @(delta), - @"orderByCol": orderByCol, - @"orderByType": orderByType, - @"targetLayoutFriendlyUrl": targetLayoutFriendlyUrl, - @"targetPortletId": targetPortletId, - @"contentField": contentField, - @"feedType": feedType, + @"orderByCol": [self checkNull: orderByCol], + @"orderByType": [self checkNull: orderByType], + @"targetLayoutFriendlyUrl": [self checkNull: targetLayoutFriendlyUrl], + @"targetPortletId": [self checkNull: targetPortletId], + @"contentField": [self checkNull: contentField], + @"feedType": [self checkNull: feedType], @"feedVersion": @(feedVersion), }]; @@ -60,7 +60,7 @@ - (void)deleteFeedWithFeedId:(long long)feedId error:(NSError **)error { - (void)deleteFeedWithGroupId:(long long)groupId feedId:(NSString *)feedId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"feedId": feedId + @"feedId": [self checkNull: feedId] }]; NSDictionary *_command = @{@"/journalfeed/delete-feed": _params}; @@ -81,7 +81,7 @@ - (NSDictionary *)getFeedWithFeedId:(long long)feedId error:(NSError **)error { - (NSDictionary *)getFeedWithGroupId:(long long)groupId feedId:(NSString *)feedId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"feedId": feedId + @"feedId": [self checkNull: feedId] }]; NSDictionary *_command = @{@"/journalfeed/get-feed": _params}; @@ -92,20 +92,20 @@ - (NSDictionary *)getFeedWithGroupId:(long long)groupId feedId:(NSString *)feedI - (NSDictionary *)updateFeedWithGroupId:(long long)groupId feedId:(NSString *)feedId name:(NSString *)name description:(NSString *)description type:(NSString *)type structureId:(NSString *)structureId templateId:(NSString *)templateId rendererTemplateId:(NSString *)rendererTemplateId delta:(int)delta orderByCol:(NSString *)orderByCol orderByType:(NSString *)orderByType targetLayoutFriendlyUrl:(NSString *)targetLayoutFriendlyUrl targetPortletId:(NSString *)targetPortletId contentField:(NSString *)contentField feedType:(NSString *)feedType feedVersion:(double)feedVersion serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"feedId": feedId, - @"name": name, - @"description": description, - @"type": type, - @"structureId": structureId, - @"templateId": templateId, - @"rendererTemplateId": rendererTemplateId, + @"feedId": [self checkNull: feedId], + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"type": [self checkNull: type], + @"structureId": [self checkNull: structureId], + @"templateId": [self checkNull: templateId], + @"rendererTemplateId": [self checkNull: rendererTemplateId], @"delta": @(delta), - @"orderByCol": orderByCol, - @"orderByType": orderByType, - @"targetLayoutFriendlyUrl": targetLayoutFriendlyUrl, - @"targetPortletId": targetPortletId, - @"contentField": contentField, - @"feedType": feedType, + @"orderByCol": [self checkNull: orderByCol], + @"orderByType": [self checkNull: orderByType], + @"targetLayoutFriendlyUrl": [self checkNull: targetLayoutFriendlyUrl], + @"targetPortletId": [self checkNull: targetPortletId], + @"contentField": [self checkNull: contentField], + @"feedType": [self checkNull: feedType], @"feedVersion": @(feedVersion), }]; diff --git a/ios/Source/Service/v62/journalfolder/LRJournalFolderService_v62.m b/ios/Source/Service/v62/journalfolder/LRJournalFolderService_v62.m index c8c6d25b..a69cb381 100644 --- a/ios/Source/Service/v62/journalfolder/LRJournalFolderService_v62.m +++ b/ios/Source/Service/v62/journalfolder/LRJournalFolderService_v62.m @@ -23,8 +23,8 @@ - (NSDictionary *)addFolderWithGroupId:(long long)groupId parentFolderId:(long l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"parentFolderId": @(parentFolderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -193,7 +193,7 @@ - (NSNumber *)getFoldersAndArticlesCountWithGroupId:(long long)groupId folderId: - (NSNumber *)getFoldersAndArticlesCountWithGroupId:(long long)groupId folderIds:(NSArray *)folderIds status:(int)status error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"status": @(status) }]; @@ -227,7 +227,7 @@ - (NSNumber *)getFoldersCountWithGroupId:(long long)groupId parentFolderId:(long - (void)getSubfolderIdsWithFolderIds:(NSArray *)folderIds groupId:(long long)groupId folderId:(long long)folderId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"folderIds": folderIds, + @"folderIds": [self checkNull: folderIds], @"groupId": @(groupId), @"folderId": @(folderId) }]; @@ -299,8 +299,8 @@ - (NSDictionary *)updateFolderWithFolderId:(long long)folderId parentFolderId:(l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"folderId": @(folderId), @"parentFolderId": @(parentFolderId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"mergeWithParentFolder": @(mergeWithParentFolder), }]; diff --git a/ios/Source/Service/v62/journalstructure/LRJournalStructureService_v62.m b/ios/Source/Service/v62/journalstructure/LRJournalStructureService_v62.m index e687c63f..104b8adb 100644 --- a/ios/Source/Service/v62/journalstructure/LRJournalStructureService_v62.m +++ b/ios/Source/Service/v62/journalstructure/LRJournalStructureService_v62.m @@ -22,12 +22,12 @@ @implementation LRJournalStructureService_v62 - (NSDictionary *)addStructureWithGroupId:(long long)groupId structureId:(NSString *)structureId autoStructureId:(BOOL)autoStructureId parentStructureId:(NSString *)parentStructureId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap xsd:(NSString *)xsd serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"structureId": structureId, + @"structureId": [self checkNull: structureId], @"autoStructureId": @(autoStructureId), - @"parentStructureId": parentStructureId, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsd": xsd, + @"parentStructureId": [self checkNull: parentStructureId], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsd": [self checkNull: xsd], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -40,8 +40,8 @@ - (NSDictionary *)addStructureWithGroupId:(long long)groupId structureId:(NSStri - (NSDictionary *)copyStructureWithGroupId:(long long)groupId oldStructureId:(NSString *)oldStructureId newStructureId:(NSString *)newStructureId autoStructureId:(BOOL)autoStructureId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"oldStructureId": oldStructureId, - @"newStructureId": newStructureId, + @"oldStructureId": [self checkNull: oldStructureId], + @"newStructureId": [self checkNull: newStructureId], @"autoStructureId": @(autoStructureId) }]; @@ -53,7 +53,7 @@ - (NSDictionary *)copyStructureWithGroupId:(long long)groupId oldStructureId:(NS - (void)deleteStructureWithGroupId:(long long)groupId structureId:(NSString *)structureId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"structureId": structureId + @"structureId": [self checkNull: structureId] }]; NSDictionary *_command = @{@"/journalstructure/delete-structure": _params}; @@ -64,7 +64,7 @@ - (void)deleteStructureWithGroupId:(long long)groupId structureId:(NSString *)st - (NSDictionary *)getStructureWithGroupId:(long long)groupId structureId:(NSString *)structureId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"structureId": structureId + @"structureId": [self checkNull: structureId] }]; NSDictionary *_command = @{@"/journalstructure/get-structure": _params}; @@ -75,7 +75,7 @@ - (NSDictionary *)getStructureWithGroupId:(long long)groupId structureId:(NSStri - (NSDictionary *)getStructureWithGroupId:(long long)groupId structureId:(NSString *)structureId includeGlobalStructures:(BOOL)includeGlobalStructures error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"structureId": structureId, + @"structureId": [self checkNull: structureId], @"includeGlobalStructures": @(includeGlobalStructures) }]; @@ -96,7 +96,7 @@ - (NSArray *)getStructuresWithGroupId:(long long)groupId error:(NSError **)error - (NSArray *)getStructuresWithGroupIds:(NSArray *)groupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"groupIds": groupIds + @"groupIds": [self checkNull: groupIds] }]; NSDictionary *_command = @{@"/journalstructure/get-structures": _params}; @@ -107,8 +107,8 @@ - (NSArray *)getStructuresWithGroupIds:(NSArray *)groupIds error:(NSError **)err - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds keywords:(NSString *)keywords start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"keywords": keywords, + @"groupIds": [self checkNull: groupIds], + @"keywords": [self checkNull: keywords], @"start": @(start), @"end": @(end), }]; @@ -123,10 +123,10 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupI - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds structureId:(NSString *)structureId name:(NSString *)name description:(NSString *)description andOperator:(BOOL)andOperator start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"structureId": structureId, - @"name": name, - @"description": description, + @"groupIds": [self checkNull: groupIds], + @"structureId": [self checkNull: structureId], + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"andOperator": @(andOperator), @"start": @(start), @"end": @(end), @@ -142,8 +142,8 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupI - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds keywords:(NSString *)keywords error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"keywords": keywords + @"groupIds": [self checkNull: groupIds], + @"keywords": [self checkNull: keywords] }]; NSDictionary *_command = @{@"/journalstructure/search-count": _params}; @@ -154,10 +154,10 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *) - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds structureId:(NSString *)structureId name:(NSString *)name description:(NSString *)description andOperator:(BOOL)andOperator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"structureId": structureId, - @"name": name, - @"description": description, + @"groupIds": [self checkNull: groupIds], + @"structureId": [self checkNull: structureId], + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"andOperator": @(andOperator) }]; @@ -169,11 +169,11 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *) - (NSDictionary *)updateStructureWithGroupId:(long long)groupId structureId:(NSString *)structureId parentStructureId:(NSString *)parentStructureId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap xsd:(NSString *)xsd serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"structureId": structureId, - @"parentStructureId": parentStructureId, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsd": xsd, + @"structureId": [self checkNull: structureId], + @"parentStructureId": [self checkNull: parentStructureId], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsd": [self checkNull: xsd], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/journaltemplate/LRJournalTemplateService_v62.m b/ios/Source/Service/v62/journaltemplate/LRJournalTemplateService_v62.m index 1c30ca9a..5c02d7d2 100644 --- a/ios/Source/Service/v62/journaltemplate/LRJournalTemplateService_v62.m +++ b/ios/Source/Service/v62/journaltemplate/LRJournalTemplateService_v62.m @@ -22,14 +22,14 @@ @implementation LRJournalTemplateService_v62 - (NSDictionary *)addTemplateWithGroupId:(long long)groupId templateId:(NSString *)templateId autoTemplateId:(BOOL)autoTemplateId structureId:(NSString *)structureId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap xsl:(NSString *)xsl formatXsl:(BOOL)formatXsl langType:(NSString *)langType cacheable:(BOOL)cacheable serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"templateId": templateId, + @"templateId": [self checkNull: templateId], @"autoTemplateId": @(autoTemplateId), - @"structureId": structureId, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsl": xsl, + @"structureId": [self checkNull: structureId], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsl": [self checkNull: xsl], @"formatXsl": @(formatXsl), - @"langType": langType, + @"langType": [self checkNull: langType], @"cacheable": @(cacheable), }]; @@ -43,18 +43,18 @@ - (NSDictionary *)addTemplateWithGroupId:(long long)groupId templateId:(NSString - (NSOperation *)addTemplateWithGroupId:(long long)groupId templateId:(NSString *)templateId autoTemplateId:(BOOL)autoTemplateId structureId:(NSString *)structureId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap xsl:(NSString *)xsl formatXsl:(BOOL)formatXsl langType:(NSString *)langType cacheable:(BOOL)cacheable smallImage:(BOOL)smallImage smallImageURL:(NSString *)smallImageURL smallFile:(LRUploadData *)smallFile serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"templateId": templateId, + @"templateId": [self checkNull: templateId], @"autoTemplateId": @(autoTemplateId), - @"structureId": structureId, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsl": xsl, + @"structureId": [self checkNull: structureId], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsl": [self checkNull: xsl], @"formatXsl": @(formatXsl), - @"langType": langType, + @"langType": [self checkNull: langType], @"cacheable": @(cacheable), @"smallImage": @(smallImage), - @"smallImageURL": smallImageURL, - @"smallFile": smallFile, + @"smallImageURL": [self checkNull: smallImageURL], + @"smallFile": [self checkNull: smallFile], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -67,8 +67,8 @@ - (NSOperation *)addTemplateWithGroupId:(long long)groupId templateId:(NSString - (NSDictionary *)copyTemplateWithGroupId:(long long)groupId oldTemplateId:(NSString *)oldTemplateId newTemplateId:(NSString *)newTemplateId autoTemplateId:(BOOL)autoTemplateId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"oldTemplateId": oldTemplateId, - @"newTemplateId": newTemplateId, + @"oldTemplateId": [self checkNull: oldTemplateId], + @"newTemplateId": [self checkNull: newTemplateId], @"autoTemplateId": @(autoTemplateId) }]; @@ -80,7 +80,7 @@ - (NSDictionary *)copyTemplateWithGroupId:(long long)groupId oldTemplateId:(NSSt - (void)deleteTemplateWithGroupId:(long long)groupId templateId:(NSString *)templateId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"templateId": templateId + @"templateId": [self checkNull: templateId] }]; NSDictionary *_command = @{@"/journaltemplate/delete-template": _params}; @@ -91,7 +91,7 @@ - (void)deleteTemplateWithGroupId:(long long)groupId templateId:(NSString *)temp - (NSArray *)getStructureTemplatesWithGroupId:(long long)groupId structureId:(NSString *)structureId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"structureId": structureId + @"structureId": [self checkNull: structureId] }]; NSDictionary *_command = @{@"/journaltemplate/get-structure-templates": _params}; @@ -102,7 +102,7 @@ - (NSArray *)getStructureTemplatesWithGroupId:(long long)groupId structureId:(NS - (NSDictionary *)getTemplateWithGroupId:(long long)groupId templateId:(NSString *)templateId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"templateId": templateId + @"templateId": [self checkNull: templateId] }]; NSDictionary *_command = @{@"/journaltemplate/get-template": _params}; @@ -113,7 +113,7 @@ - (NSDictionary *)getTemplateWithGroupId:(long long)groupId templateId:(NSString - (NSDictionary *)getTemplateWithGroupId:(long long)groupId templateId:(NSString *)templateId includeGlobalTemplates:(BOOL)includeGlobalTemplates error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"templateId": templateId, + @"templateId": [self checkNull: templateId], @"includeGlobalTemplates": @(includeGlobalTemplates) }]; @@ -125,12 +125,12 @@ - (NSDictionary *)getTemplateWithGroupId:(long long)groupId templateId:(NSString - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds templateId:(NSString *)templateId structureId:(NSString *)structureId structureIdComparator:(NSString *)structureIdComparator name:(NSString *)name description:(NSString *)description andOperator:(BOOL)andOperator start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"templateId": templateId, - @"structureId": structureId, - @"structureIdComparator": structureIdComparator, - @"name": name, - @"description": description, + @"groupIds": [self checkNull: groupIds], + @"templateId": [self checkNull: templateId], + @"structureId": [self checkNull: structureId], + @"structureIdComparator": [self checkNull: structureIdComparator], + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"andOperator": @(andOperator), @"start": @(start), @"end": @(end), @@ -146,10 +146,10 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupI - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds keywords:(NSString *)keywords structureId:(NSString *)structureId structureIdComparator:(NSString *)structureIdComparator start:(int)start end:(int)end obc:(LRJSONObjectWrapper *)obc error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"keywords": keywords, - @"structureId": structureId, - @"structureIdComparator": structureIdComparator, + @"groupIds": [self checkNull: groupIds], + @"keywords": [self checkNull: keywords], + @"structureId": [self checkNull: structureId], + @"structureIdComparator": [self checkNull: structureIdComparator], @"start": @(start), @"end": @(end), }]; @@ -164,10 +164,10 @@ - (NSArray *)searchWithCompanyId:(long long)companyId groupIds:(NSArray *)groupI - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds keywords:(NSString *)keywords structureId:(NSString *)structureId structureIdComparator:(NSString *)structureIdComparator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"keywords": keywords, - @"structureId": structureId, - @"structureIdComparator": structureIdComparator + @"groupIds": [self checkNull: groupIds], + @"keywords": [self checkNull: keywords], + @"structureId": [self checkNull: structureId], + @"structureIdComparator": [self checkNull: structureIdComparator] }]; NSDictionary *_command = @{@"/journaltemplate/search-count": _params}; @@ -178,12 +178,12 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *) - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *)groupIds templateId:(NSString *)templateId structureId:(NSString *)structureId structureIdComparator:(NSString *)structureIdComparator name:(NSString *)name description:(NSString *)description andOperator:(BOOL)andOperator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"groupIds": groupIds, - @"templateId": templateId, - @"structureId": structureId, - @"structureIdComparator": structureIdComparator, - @"name": name, - @"description": description, + @"groupIds": [self checkNull: groupIds], + @"templateId": [self checkNull: templateId], + @"structureId": [self checkNull: structureId], + @"structureIdComparator": [self checkNull: structureIdComparator], + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"andOperator": @(andOperator) }]; @@ -195,13 +195,13 @@ - (NSNumber *)searchCountWithCompanyId:(long long)companyId groupIds:(NSArray *) - (NSDictionary *)updateTemplateWithGroupId:(long long)groupId templateId:(NSString *)templateId structureId:(NSString *)structureId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap xsl:(NSString *)xsl formatXsl:(BOOL)formatXsl langType:(NSString *)langType cacheable:(BOOL)cacheable serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"templateId": templateId, - @"structureId": structureId, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsl": xsl, + @"templateId": [self checkNull: templateId], + @"structureId": [self checkNull: structureId], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsl": [self checkNull: xsl], @"formatXsl": @(formatXsl), - @"langType": langType, + @"langType": [self checkNull: langType], @"cacheable": @(cacheable), }]; @@ -215,17 +215,17 @@ - (NSDictionary *)updateTemplateWithGroupId:(long long)groupId templateId:(NSStr - (NSOperation *)updateTemplateWithGroupId:(long long)groupId templateId:(NSString *)templateId structureId:(NSString *)structureId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap xsl:(NSString *)xsl formatXsl:(BOOL)formatXsl langType:(NSString *)langType cacheable:(BOOL)cacheable smallImage:(BOOL)smallImage smallImageURL:(NSString *)smallImageURL smallFile:(LRUploadData *)smallFile serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"templateId": templateId, - @"structureId": structureId, - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"xsl": xsl, + @"templateId": [self checkNull: templateId], + @"structureId": [self checkNull: structureId], + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"xsl": [self checkNull: xsl], @"formatXsl": @(formatXsl), - @"langType": langType, + @"langType": [self checkNull: langType], @"cacheable": @(cacheable), @"smallImage": @(smallImage), - @"smallImageURL": smallImageURL, - @"smallFile": smallFile, + @"smallImageURL": [self checkNull: smallImageURL], + @"smallFile": [self checkNull: smallFile], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/layout/LRLayoutService_v62.m b/ios/Source/Service/v62/layout/LRLayoutService_v62.m index ea1e28d5..14dcecdc 100644 --- a/ios/Source/Service/v62/layout/LRLayoutService_v62.m +++ b/ios/Source/Service/v62/layout/LRLayoutService_v62.m @@ -24,12 +24,12 @@ - (NSDictionary *)addLayoutWithGroupId:(long long)groupId privateLayout:(BOOL)pr @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"parentLayoutId": @(parentLayoutId), - @"name": name, - @"title": title, - @"description": description, - @"type": type, + @"name": [self checkNull: name], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"type": [self checkNull: type], @"hidden": @(hidden), - @"friendlyURL": friendlyURL, + @"friendlyURL": [self checkNull: friendlyURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -44,14 +44,14 @@ - (NSDictionary *)addLayoutWithGroupId:(long long)groupId privateLayout:(BOOL)pr @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"parentLayoutId": @(parentLayoutId), - @"localeNamesMap": localeNamesMap, - @"localeTitlesMap": localeTitlesMap, - @"descriptionMap": descriptionMap, - @"keywordsMap": keywordsMap, - @"robotsMap": robotsMap, - @"type": type, + @"localeNamesMap": [self checkNull: localeNamesMap], + @"localeTitlesMap": [self checkNull: localeTitlesMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"keywordsMap": [self checkNull: keywordsMap], + @"robotsMap": [self checkNull: robotsMap], + @"type": [self checkNull: type], @"hidden": @(hidden), - @"friendlyURL": friendlyURL, + @"friendlyURL": [self checkNull: friendlyURL], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -66,15 +66,15 @@ - (NSDictionary *)addLayoutWithGroupId:(long long)groupId privateLayout:(BOOL)pr @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"parentLayoutId": @(parentLayoutId), - @"localeNamesMap": localeNamesMap, - @"localeTitlesMap": localeTitlesMap, - @"descriptionMap": descriptionMap, - @"keywordsMap": keywordsMap, - @"robotsMap": robotsMap, - @"type": type, - @"typeSettings": typeSettings, + @"localeNamesMap": [self checkNull: localeNamesMap], + @"localeTitlesMap": [self checkNull: localeTitlesMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"keywordsMap": [self checkNull: keywordsMap], + @"robotsMap": [self checkNull: robotsMap], + @"type": [self checkNull: type], + @"typeSettings": [self checkNull: typeSettings], @"hidden": @(hidden), - @"friendlyURLMap": friendlyURLMap, + @"friendlyURLMap": [self checkNull: friendlyURLMap], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -113,8 +113,8 @@ - (void)deleteLayoutWithGroupId:(long long)groupId privateLayout:(BOOL)privateLa - (void)deleteTempFileEntryWithGroupId:(long long)groupId fileName:(NSString *)fileName tempFolderName:(NSString *)tempFolderName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"fileName": fileName, - @"tempFolderName": tempFolderName + @"fileName": [self checkNull: fileName], + @"tempFolderName": [self checkNull: tempFolderName] }]; NSDictionary *_command = @{@"/layout/delete-temp-file-entry": _params}; @@ -126,7 +126,7 @@ - (NSArray *)exportLayoutsWithGroupId:(long long)groupId privateLayout:(BOOL)pri NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"parameterMap": parameterMap, + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate) }]; @@ -140,8 +140,8 @@ - (NSArray *)exportLayoutsWithGroupId:(long long)groupId privateLayout:(BOOL)pri NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"layoutIds": layoutIds, - @"parameterMap": parameterMap, + @"layoutIds": [self checkNull: layoutIds], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate) }]; @@ -155,8 +155,8 @@ - (NSDictionary *)exportLayoutsAsFileWithGroupId:(long long)groupId privateLayou NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"layoutIds": layoutIds, - @"parameterMap": parameterMap, + @"layoutIds": [self checkNull: layoutIds], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate) }]; @@ -168,14 +168,14 @@ - (NSDictionary *)exportLayoutsAsFileWithGroupId:(long long)groupId privateLayou - (NSNumber *)exportLayoutsAsFileInBackgroundWithTaskName:(NSString *)taskName groupId:(long long)groupId privateLayout:(BOOL)privateLayout layoutIds:(NSArray *)layoutIds parameterMap:(NSDictionary *)parameterMap startDate:(long long)startDate endDate:(long long)endDate fileName:(NSString *)fileName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"taskName": taskName, + @"taskName": [self checkNull: taskName], @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"layoutIds": layoutIds, - @"parameterMap": parameterMap, + @"layoutIds": [self checkNull: layoutIds], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate), - @"fileName": fileName + @"fileName": [self checkNull: fileName] }]; NSDictionary *_command = @{@"/layout/export-layouts-as-file-in-background": _params}; @@ -186,8 +186,8 @@ - (NSNumber *)exportLayoutsAsFileInBackgroundWithTaskName:(NSString *)taskName g - (NSArray *)exportPortletInfoWithCompanyId:(long long)companyId portletId:(NSString *)portletId parameterMap:(NSDictionary *)parameterMap startDate:(long long)startDate endDate:(long long)endDate error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"portletId": portletId, - @"parameterMap": parameterMap, + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate) }]; @@ -201,8 +201,8 @@ - (NSArray *)exportPortletInfoWithPlid:(long long)plid groupId:(long long)groupI NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"plid": @(plid), @"groupId": @(groupId), - @"portletId": portletId, - @"parameterMap": parameterMap, + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate) }]; @@ -214,8 +214,8 @@ - (NSArray *)exportPortletInfoWithPlid:(long long)plid groupId:(long long)groupI - (NSDictionary *)exportPortletInfoAsFileWithPortletId:(NSString *)portletId parameterMap:(NSDictionary *)parameterMap startDate:(long long)startDate endDate:(long long)endDate error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"portletId": portletId, - @"parameterMap": parameterMap, + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate) }]; @@ -229,8 +229,8 @@ - (NSDictionary *)exportPortletInfoAsFileWithPlid:(long long)plid groupId:(long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"plid": @(plid), @"groupId": @(groupId), - @"portletId": portletId, - @"parameterMap": parameterMap, + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate) }]; @@ -242,12 +242,12 @@ - (NSDictionary *)exportPortletInfoAsFileWithPlid:(long long)plid groupId:(long - (NSNumber *)exportPortletInfoAsFileInBackgroundWithTaskName:(NSString *)taskName portletId:(NSString *)portletId parameterMap:(NSDictionary *)parameterMap startDate:(long long)startDate endDate:(long long)endDate fileName:(NSString *)fileName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"taskName": taskName, - @"portletId": portletId, - @"parameterMap": parameterMap, + @"taskName": [self checkNull: taskName], + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate), - @"fileName": fileName + @"fileName": [self checkNull: fileName] }]; NSDictionary *_command = @{@"/layout/export-portlet-info-as-file-in-background": _params}; @@ -257,14 +257,14 @@ - (NSNumber *)exportPortletInfoAsFileInBackgroundWithTaskName:(NSString *)taskNa - (NSNumber *)exportPortletInfoAsFileInBackgroundWithTaskName:(NSString *)taskName plid:(long long)plid groupId:(long long)groupId portletId:(NSString *)portletId parameterMap:(NSDictionary *)parameterMap startDate:(long long)startDate endDate:(long long)endDate fileName:(NSString *)fileName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"taskName": taskName, + @"taskName": [self checkNull: taskName], @"plid": @(plid), @"groupId": @(groupId), - @"portletId": portletId, - @"parameterMap": parameterMap, + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], @"startDate": @(startDate), @"endDate": @(endDate), - @"fileName": fileName + @"fileName": [self checkNull: fileName] }]; NSDictionary *_command = @{@"/layout/export-portlet-info-as-file-in-background": _params}; @@ -286,7 +286,7 @@ - (NSNumber *)getDefaultPlidWithGroupId:(long long)groupId scopeGroupId:(long lo NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"scopeGroupId": @(scopeGroupId), - @"portletId": portletId + @"portletId": [self checkNull: portletId] }]; NSDictionary *_command = @{@"/layout/get-default-plid": _params}; @@ -299,7 +299,7 @@ - (NSNumber *)getDefaultPlidWithGroupId:(long long)groupId scopeGroupId:(long lo @"groupId": @(groupId), @"scopeGroupId": @(scopeGroupId), @"privateLayout": @(privateLayout), - @"portletId": portletId + @"portletId": [self checkNull: portletId] }]; NSDictionary *_command = @{@"/layout/get-default-plid": _params}; @@ -309,7 +309,7 @@ - (NSNumber *)getDefaultPlidWithGroupId:(long long)groupId scopeGroupId:(long lo - (NSDictionary *)getLayoutByUuidAndGroupIdWithUuid:(NSString *)uuid groupId:(long long)groupId privateLayout:(BOOL)privateLayout error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"uuid": uuid, + @"uuid": [self checkNull: uuid], @"groupId": @(groupId), @"privateLayout": @(privateLayout) }]; @@ -324,7 +324,7 @@ - (NSString *)getLayoutNameWithGroupId:(long long)groupId privateLayout:(BOOL)pr @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"layoutId": @(layoutId), - @"languageId": languageId + @"languageId": [self checkNull: languageId] }]; NSDictionary *_command = @{@"/layout/get-layout-name": _params}; @@ -335,9 +335,9 @@ - (NSString *)getLayoutNameWithGroupId:(long long)groupId privateLayout:(BOOL)pr - (NSArray *)getLayoutReferencesWithCompanyId:(long long)companyId portletId:(NSString *)portletId preferencesKey:(NSString *)preferencesKey preferencesValue:(NSString *)preferencesValue error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"portletId": portletId, - @"preferencesKey": preferencesKey, - @"preferencesValue": preferencesValue + @"portletId": [self checkNull: portletId], + @"preferencesKey": [self checkNull: preferencesKey], + @"preferencesValue": [self checkNull: preferencesValue] }]; NSDictionary *_command = @{@"/layout/get-layout-references": _params}; @@ -386,7 +386,7 @@ - (NSArray *)getLayoutsWithGroupId:(long long)groupId privateLayout:(BOOL)privat - (NSArray *)getTempFileEntryNamesWithGroupId:(long long)groupId tempFolderName:(NSString *)tempFolderName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"tempFolderName": tempFolderName + @"tempFolderName": [self checkNull: tempFolderName] }]; NSDictionary *_command = @{@"/layout/get-temp-file-entry-names": _params}; @@ -398,7 +398,7 @@ - (void)importLayoutsWithGroupId:(long long)groupId privateLayout:(BOOL)privateL NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"parameterMap": parameterMap, + @"parameterMap": [self checkNull: parameterMap], @"bytes": [self toString:bytes] }]; @@ -411,8 +411,8 @@ - (NSOperation *)importLayoutsWithGroupId:(long long)groupId privateLayout:(BOOL NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"parameterMap": parameterMap, - @"file": file + @"parameterMap": [self checkNull: parameterMap], + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layout/import-layouts": _params}; @@ -422,11 +422,11 @@ - (NSOperation *)importLayoutsWithGroupId:(long long)groupId privateLayout:(BOOL - (NSOperation *)importLayoutsInBackgroundWithTaskName:(NSString *)taskName groupId:(long long)groupId privateLayout:(BOOL)privateLayout parameterMap:(NSDictionary *)parameterMap file:(LRUploadData *)file error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"taskName": taskName, + @"taskName": [self checkNull: taskName], @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"parameterMap": parameterMap, - @"file": file + @"parameterMap": [self checkNull: parameterMap], + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layout/import-layouts-in-background": _params}; @@ -436,9 +436,9 @@ - (NSOperation *)importLayoutsInBackgroundWithTaskName:(NSString *)taskName grou - (NSOperation *)importPortletInfoWithPortletId:(NSString *)portletId parameterMap:(NSDictionary *)parameterMap file:(LRUploadData *)file error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"portletId": portletId, - @"parameterMap": parameterMap, - @"file": file + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layout/import-portlet-info": _params}; @@ -450,9 +450,9 @@ - (NSOperation *)importPortletInfoWithPlid:(long long)plid groupId:(long long)gr NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"plid": @(plid), @"groupId": @(groupId), - @"portletId": portletId, - @"parameterMap": parameterMap, - @"file": file + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layout/import-portlet-info": _params}; @@ -462,10 +462,10 @@ - (NSOperation *)importPortletInfoWithPlid:(long long)plid groupId:(long long)gr - (NSOperation *)importPortletInfoInBackgroundWithTaskName:(NSString *)taskName portletId:(NSString *)portletId parameterMap:(NSDictionary *)parameterMap file:(LRUploadData *)file error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"taskName": taskName, - @"portletId": portletId, - @"parameterMap": parameterMap, - @"file": file + @"taskName": [self checkNull: taskName], + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layout/import-portlet-info-in-background": _params}; @@ -475,12 +475,12 @@ - (NSOperation *)importPortletInfoInBackgroundWithTaskName:(NSString *)taskName - (NSOperation *)importPortletInfoInBackgroundWithTaskName:(NSString *)taskName plid:(long long)plid groupId:(long long)groupId portletId:(NSString *)portletId parameterMap:(NSDictionary *)parameterMap file:(LRUploadData *)file error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"taskName": taskName, + @"taskName": [self checkNull: taskName], @"plid": @(plid), @"groupId": @(groupId), - @"portletId": portletId, - @"parameterMap": parameterMap, - @"file": file + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layout/import-portlet-info-in-background": _params}; @@ -493,16 +493,16 @@ - (void)schedulePublishToLiveWithSourceGroupId:(long long)sourceGroupId targetGr @"sourceGroupId": @(sourceGroupId), @"targetGroupId": @(targetGroupId), @"privateLayout": @(privateLayout), - @"layoutIdMap": layoutIdMap, - @"parameterMap": parameterMap, - @"scope": scope, + @"layoutIdMap": [self checkNull: layoutIdMap], + @"parameterMap": [self checkNull: parameterMap], + @"scope": [self checkNull: scope], @"startDate": @(startDate), @"endDate": @(endDate), - @"groupName": groupName, - @"cronText": cronText, + @"groupName": [self checkNull: groupName], + @"cronText": [self checkNull: cronText], @"schedulerStartDate": @(schedulerStartDate), @"schedulerEndDate": @(schedulerEndDate), - @"description": description + @"description": [self checkNull: description] }]; NSDictionary *_command = @{@"/layout/schedule-publish-to-live": _params}; @@ -514,21 +514,21 @@ - (void)schedulePublishToRemoteWithSourceGroupId:(long long)sourceGroupId privat NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"sourceGroupId": @(sourceGroupId), @"privateLayout": @(privateLayout), - @"layoutIdMap": layoutIdMap, - @"parameterMap": parameterMap, - @"remoteAddress": remoteAddress, + @"layoutIdMap": [self checkNull: layoutIdMap], + @"parameterMap": [self checkNull: parameterMap], + @"remoteAddress": [self checkNull: remoteAddress], @"remotePort": @(remotePort), - @"remotePathContext": remotePathContext, + @"remotePathContext": [self checkNull: remotePathContext], @"secureConnection": @(secureConnection), @"remoteGroupId": @(remoteGroupId), @"remotePrivateLayout": @(remotePrivateLayout), @"startDate": @(startDate), @"endDate": @(endDate), - @"groupName": groupName, - @"cronText": cronText, + @"groupName": [self checkNull: groupName], + @"cronText": [self checkNull: cronText], @"schedulerStartDate": @(schedulerStartDate), @"schedulerEndDate": @(schedulerEndDate), - @"description": description + @"description": [self checkNull: description] }]; NSDictionary *_command = @{@"/layout/schedule-publish-to-remote": _params}; @@ -541,7 +541,7 @@ - (void)setLayoutsWithGroupId:(long long)groupId privateLayout:(BOOL)privateLayo @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"parentLayoutId": @(parentLayoutId), - @"layoutIds": layoutIds, + @"layoutIds": [self checkNull: layoutIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -554,8 +554,8 @@ - (void)setLayoutsWithGroupId:(long long)groupId privateLayout:(BOOL)privateLayo - (void)unschedulePublishToLiveWithGroupId:(long long)groupId jobName:(NSString *)jobName groupName:(NSString *)groupName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"jobName": jobName, - @"groupName": groupName + @"jobName": [self checkNull: jobName], + @"groupName": [self checkNull: groupName] }]; NSDictionary *_command = @{@"/layout/unschedule-publish-to-live": _params}; @@ -566,8 +566,8 @@ - (void)unschedulePublishToLiveWithGroupId:(long long)groupId jobName:(NSString - (void)unschedulePublishToRemoteWithGroupId:(long long)groupId jobName:(NSString *)jobName groupName:(NSString *)groupName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"jobName": jobName, - @"groupName": groupName + @"jobName": [self checkNull: jobName], + @"groupName": [self checkNull: groupName] }]; NSDictionary *_command = @{@"/layout/unschedule-publish-to-remote": _params}; @@ -581,14 +581,14 @@ - (NSDictionary *)updateLayoutWithGroupId:(long long)groupId privateLayout:(BOOL @"privateLayout": @(privateLayout), @"layoutId": @(layoutId), @"parentLayoutId": @(parentLayoutId), - @"localeNamesMap": localeNamesMap, - @"localeTitlesMap": localeTitlesMap, - @"descriptionMap": descriptionMap, - @"keywordsMap": keywordsMap, - @"robotsMap": robotsMap, - @"type": type, + @"localeNamesMap": [self checkNull: localeNamesMap], + @"localeTitlesMap": [self checkNull: localeTitlesMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"keywordsMap": [self checkNull: keywordsMap], + @"robotsMap": [self checkNull: robotsMap], + @"type": [self checkNull: type], @"hidden": @(hidden), - @"friendlyURL": friendlyURL, + @"friendlyURL": [self checkNull: friendlyURL], @"iconImage": @(iconImage), @"iconBytes": [self toString:iconBytes], }]; @@ -606,14 +606,14 @@ - (NSDictionary *)updateLayoutWithGroupId:(long long)groupId privateLayout:(BOOL @"privateLayout": @(privateLayout), @"layoutId": @(layoutId), @"parentLayoutId": @(parentLayoutId), - @"localeNamesMap": localeNamesMap, - @"localeTitlesMap": localeTitlesMap, - @"descriptionMap": descriptionMap, - @"keywordsMap": keywordsMap, - @"robotsMap": robotsMap, - @"type": type, + @"localeNamesMap": [self checkNull: localeNamesMap], + @"localeTitlesMap": [self checkNull: localeTitlesMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"keywordsMap": [self checkNull: keywordsMap], + @"robotsMap": [self checkNull: robotsMap], + @"type": [self checkNull: type], @"hidden": @(hidden), - @"friendlyURLMap": friendlyURLMap, + @"friendlyURLMap": [self checkNull: friendlyURLMap], @"iconImage": @(iconImage), @"iconBytes": [self toString:iconBytes], }]; @@ -630,7 +630,7 @@ - (NSDictionary *)updateLayoutWithGroupId:(long long)groupId privateLayout:(BOOL @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"layoutId": @(layoutId), - @"typeSettings": typeSettings + @"typeSettings": [self checkNull: typeSettings] }]; NSDictionary *_command = @{@"/layout/update-layout": _params}; @@ -643,9 +643,9 @@ - (NSDictionary *)updateLookAndFeelWithGroupId:(long long)groupId privateLayout: @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"layoutId": @(layoutId), - @"themeId": themeId, - @"colorSchemeId": colorSchemeId, - @"css": css, + @"themeId": [self checkNull: themeId], + @"colorSchemeId": [self checkNull: colorSchemeId], + @"css": [self checkNull: css], @"wapTheme": @(wapTheme) }]; @@ -657,8 +657,8 @@ - (NSDictionary *)updateLookAndFeelWithGroupId:(long long)groupId privateLayout: - (NSDictionary *)updateNameWithPlid:(long long)plid name:(NSString *)name languageId:(NSString *)languageId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"plid": @(plid), - @"name": name, - @"languageId": languageId + @"name": [self checkNull: name], + @"languageId": [self checkNull: languageId] }]; NSDictionary *_command = @{@"/layout/update-name": _params}; @@ -671,8 +671,8 @@ - (NSDictionary *)updateNameWithGroupId:(long long)groupId privateLayout:(BOOL)p @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"layoutId": @(layoutId), - @"name": name, - @"languageId": languageId + @"name": [self checkNull: name], + @"languageId": [self checkNull: languageId] }]; NSDictionary *_command = @{@"/layout/update-name": _params}; @@ -746,8 +746,8 @@ - (NSOperation *)validateImportLayoutsFileWithGroupId:(long long)groupId private NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"parameterMap": parameterMap, - @"file": file + @"parameterMap": [self checkNull: parameterMap], + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layout/validate-import-layouts-file": _params}; @@ -759,9 +759,9 @@ - (NSOperation *)validateImportPortletInfoWithPlid:(long long)plid groupId:(long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"plid": @(plid), @"groupId": @(groupId), - @"portletId": portletId, - @"parameterMap": parameterMap, - @"file": file + @"portletId": [self checkNull: portletId], + @"parameterMap": [self checkNull: parameterMap], + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layout/validate-import-portlet-info": _params}; diff --git a/ios/Source/Service/v62/layoutbranch/LRLayoutBranchService_v62.m b/ios/Source/Service/v62/layoutbranch/LRLayoutBranchService_v62.m index ad9518ad..db9d698f 100644 --- a/ios/Source/Service/v62/layoutbranch/LRLayoutBranchService_v62.m +++ b/ios/Source/Service/v62/layoutbranch/LRLayoutBranchService_v62.m @@ -22,8 +22,8 @@ @implementation LRLayoutBranchService_v62 - (NSDictionary *)addLayoutBranchWithLayoutRevisionId:(long long)layoutRevisionId name:(NSString *)name description:(NSString *)description master:(BOOL)master serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"layoutRevisionId": @(layoutRevisionId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"master": @(master), }]; @@ -47,8 +47,8 @@ - (void)deleteLayoutBranchWithLayoutBranchId:(long long)layoutBranchId error:(NS - (NSDictionary *)updateLayoutBranchWithLayoutBranchId:(long long)layoutBranchId name:(NSString *)name description:(NSString *)description serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"layoutBranchId": @(layoutBranchId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/layoutprototype/LRLayoutPrototypeService_v62.m b/ios/Source/Service/v62/layoutprototype/LRLayoutPrototypeService_v62.m index 164eb889..e0ada5ae 100644 --- a/ios/Source/Service/v62/layoutprototype/LRLayoutPrototypeService_v62.m +++ b/ios/Source/Service/v62/layoutprototype/LRLayoutPrototypeService_v62.m @@ -21,8 +21,8 @@ @implementation LRLayoutPrototypeService_v62 - (NSDictionary *)addLayoutPrototypeWithNameMap:(NSDictionary *)nameMap description:(NSString *)description active:(BOOL)active error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"nameMap": nameMap, - @"description": description, + @"nameMap": [self checkNull: nameMap], + @"description": [self checkNull: description], @"active": @(active) }]; @@ -33,8 +33,8 @@ - (NSDictionary *)addLayoutPrototypeWithNameMap:(NSDictionary *)nameMap descript - (NSDictionary *)addLayoutPrototypeWithNameMap:(NSDictionary *)nameMap description:(NSString *)description active:(BOOL)active serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"nameMap": nameMap, - @"description": description, + @"nameMap": [self checkNull: nameMap], + @"description": [self checkNull: description], @"active": @(active), }]; @@ -81,8 +81,8 @@ - (NSArray *)searchWithCompanyId:(long long)companyId active:(BOOL)active obc:(L - (NSDictionary *)updateLayoutPrototypeWithLayoutPrototypeId:(long long)layoutPrototypeId nameMap:(NSDictionary *)nameMap description:(NSString *)description active:(BOOL)active error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"layoutPrototypeId": @(layoutPrototypeId), - @"nameMap": nameMap, - @"description": description, + @"nameMap": [self checkNull: nameMap], + @"description": [self checkNull: description], @"active": @(active) }]; @@ -94,8 +94,8 @@ - (NSDictionary *)updateLayoutPrototypeWithLayoutPrototypeId:(long long)layoutPr - (NSDictionary *)updateLayoutPrototypeWithLayoutPrototypeId:(long long)layoutPrototypeId nameMap:(NSDictionary *)nameMap description:(NSString *)description active:(BOOL)active serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"layoutPrototypeId": @(layoutPrototypeId), - @"nameMap": nameMap, - @"description": description, + @"nameMap": [self checkNull: nameMap], + @"description": [self checkNull: description], @"active": @(active), }]; diff --git a/ios/Source/Service/v62/layoutrevision/LRLayoutRevisionService_v62.m b/ios/Source/Service/v62/layoutrevision/LRLayoutRevisionService_v62.m index 59449d15..00898a00 100644 --- a/ios/Source/Service/v62/layoutrevision/LRLayoutRevisionService_v62.m +++ b/ios/Source/Service/v62/layoutrevision/LRLayoutRevisionService_v62.m @@ -29,19 +29,19 @@ - (NSDictionary *)addLayoutRevisionWithUserId:(long long)userId layoutSetBranchI @"plid": @(plid), @"portletPreferencesPlid": @(portletPreferencesPlid), @"privateLayout": @(privateLayout), - @"name": name, - @"title": title, - @"description": description, - @"keywords": keywords, - @"robots": robots, - @"typeSettings": typeSettings, + @"name": [self checkNull: name], + @"title": [self checkNull: title], + @"description": [self checkNull: description], + @"keywords": [self checkNull: keywords], + @"robots": [self checkNull: robots], + @"typeSettings": [self checkNull: typeSettings], @"iconImage": @(iconImage), @"iconImageId": @(iconImageId), - @"themeId": themeId, - @"colorSchemeId": colorSchemeId, - @"wapThemeId": wapThemeId, - @"wapColorSchemeId": wapColorSchemeId, - @"css": css, + @"themeId": [self checkNull: themeId], + @"colorSchemeId": [self checkNull: colorSchemeId], + @"wapThemeId": [self checkNull: wapThemeId], + @"wapColorSchemeId": [self checkNull: wapColorSchemeId], + @"css": [self checkNull: css], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/layoutset/LRLayoutSetService_v62.m b/ios/Source/Service/v62/layoutset/LRLayoutSetService_v62.m index 57d5cb04..effd94e9 100644 --- a/ios/Source/Service/v62/layoutset/LRLayoutSetService_v62.m +++ b/ios/Source/Service/v62/layoutset/LRLayoutSetService_v62.m @@ -24,7 +24,7 @@ - (void)updateLayoutSetPrototypeLinkEnabledWithGroupId:(long long)groupId privat @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"layoutSetPrototypeLinkEnabled": @(layoutSetPrototypeLinkEnabled), - @"layoutSetPrototypeUuid": layoutSetPrototypeUuid + @"layoutSetPrototypeUuid": [self checkNull: layoutSetPrototypeUuid] }]; NSDictionary *_command = @{@"/layoutset/update-layout-set-prototype-link-enabled": _params}; @@ -50,7 +50,7 @@ - (NSOperation *)updateLogoWithGroupId:(long long)groupId privateLayout:(BOOL)pr @"groupId": @(groupId), @"privateLayout": @(privateLayout), @"logo": @(logo), - @"file": file + @"file": [self checkNull: file] }]; NSDictionary *_command = @{@"/layoutset/update-logo": _params}; @@ -62,9 +62,9 @@ - (NSDictionary *)updateLookAndFeelWithGroupId:(long long)groupId privateLayout: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"themeId": themeId, - @"colorSchemeId": colorSchemeId, - @"css": css, + @"themeId": [self checkNull: themeId], + @"colorSchemeId": [self checkNull: colorSchemeId], + @"css": [self checkNull: css], @"wapTheme": @(wapTheme) }]; @@ -77,7 +77,7 @@ - (NSDictionary *)updateSettingsWithGroupId:(long long)groupId privateLayout:(BO NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"settings": settings + @"settings": [self checkNull: settings] }]; NSDictionary *_command = @{@"/layoutset/update-settings": _params}; @@ -89,7 +89,7 @@ - (NSDictionary *)updateVirtualHostWithGroupId:(long long)groupId privateLayout: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"virtualHost": virtualHost + @"virtualHost": [self checkNull: virtualHost] }]; NSDictionary *_command = @{@"/layoutset/update-virtual-host": _params}; diff --git a/ios/Source/Service/v62/layoutsetbranch/LRLayoutSetBranchService_v62.m b/ios/Source/Service/v62/layoutsetbranch/LRLayoutSetBranchService_v62.m index 031b4b5a..ae7a9dec 100644 --- a/ios/Source/Service/v62/layoutsetbranch/LRLayoutSetBranchService_v62.m +++ b/ios/Source/Service/v62/layoutsetbranch/LRLayoutSetBranchService_v62.m @@ -23,8 +23,8 @@ - (NSDictionary *)addLayoutSetBranchWithGroupId:(long long)groupId privateLayout NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"privateLayout": @(privateLayout), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"master": @(master), @"copyLayoutSetBranchId": @(copyLayoutSetBranchId), }]; @@ -74,8 +74,8 @@ - (NSDictionary *)updateLayoutSetBranchWithGroupId:(long long)groupId layoutSetB NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"layoutSetBranchId": @(layoutSetBranchId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/layoutsetprototype/LRLayoutSetPrototypeService_v62.m b/ios/Source/Service/v62/layoutsetprototype/LRLayoutSetPrototypeService_v62.m index 9d43cb85..51585834 100644 --- a/ios/Source/Service/v62/layoutsetprototype/LRLayoutSetPrototypeService_v62.m +++ b/ios/Source/Service/v62/layoutsetprototype/LRLayoutSetPrototypeService_v62.m @@ -21,8 +21,8 @@ @implementation LRLayoutSetPrototypeService_v62 - (NSDictionary *)addLayoutSetPrototypeWithNameMap:(NSDictionary *)nameMap description:(NSString *)description active:(BOOL)active layoutsUpdateable:(BOOL)layoutsUpdateable serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"nameMap": nameMap, - @"description": description, + @"nameMap": [self checkNull: nameMap], + @"description": [self checkNull: description], @"active": @(active), @"layoutsUpdateable": @(layoutsUpdateable), }]; @@ -70,7 +70,7 @@ - (NSArray *)searchWithCompanyId:(long long)companyId active:(BOOL)active obc:(L - (NSDictionary *)updateLayoutSetPrototypeWithLayoutSetPrototypeId:(long long)layoutSetPrototypeId settings:(NSString *)settings error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"layoutSetPrototypeId": @(layoutSetPrototypeId), - @"settings": settings + @"settings": [self checkNull: settings] }]; NSDictionary *_command = @{@"/layoutsetprototype/update-layout-set-prototype": _params}; @@ -81,8 +81,8 @@ - (NSDictionary *)updateLayoutSetPrototypeWithLayoutSetPrototypeId:(long long)la - (NSDictionary *)updateLayoutSetPrototypeWithLayoutSetPrototypeId:(long long)layoutSetPrototypeId nameMap:(NSDictionary *)nameMap description:(NSString *)description active:(BOOL)active layoutsUpdateable:(BOOL)layoutsUpdateable serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"layoutSetPrototypeId": @(layoutSetPrototypeId), - @"nameMap": nameMap, - @"description": description, + @"nameMap": [self checkNull: nameMap], + @"description": [self checkNull: description], @"active": @(active), @"layoutsUpdateable": @(layoutsUpdateable), }]; diff --git a/ios/Source/Service/v62/listtype/LRListTypeService_v62.m b/ios/Source/Service/v62/listtype/LRListTypeService_v62.m index f1600eb9..628d3550 100644 --- a/ios/Source/Service/v62/listtype/LRListTypeService_v62.m +++ b/ios/Source/Service/v62/listtype/LRListTypeService_v62.m @@ -31,7 +31,7 @@ - (NSDictionary *)getListTypeWithListTypeId:(int)listTypeId error:(NSError **)er - (NSArray *)getListTypesWithType:(NSString *)type error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"type": type + @"type": [self checkNull: type] }]; NSDictionary *_command = @{@"/listtype/get-list-types": _params}; @@ -42,7 +42,7 @@ - (NSArray *)getListTypesWithType:(NSString *)type error:(NSError **)error { - (void)validateWithListTypeId:(int)listTypeId type:(NSString *)type error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"listTypeId": @(listTypeId), - @"type": type + @"type": [self checkNull: type] }]; NSDictionary *_command = @{@"/listtype/validate": _params}; @@ -54,7 +54,7 @@ - (void)validateWithListTypeId:(int)listTypeId classNameId:(long long)classNameI NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"listTypeId": @(listTypeId), @"classNameId": @(classNameId), - @"type": type + @"type": [self checkNull: type] }]; NSDictionary *_command = @{@"/listtype/validate": _params}; diff --git a/ios/Source/Service/v62/mbcategory/LRMBCategoryService_v62.m b/ios/Source/Service/v62/mbcategory/LRMBCategoryService_v62.m index f62d66b0..f9e6d364 100644 --- a/ios/Source/Service/v62/mbcategory/LRMBCategoryService_v62.m +++ b/ios/Source/Service/v62/mbcategory/LRMBCategoryService_v62.m @@ -22,24 +22,24 @@ @implementation LRMBCategoryService_v62 - (NSDictionary *)addCategoryWithParentCategoryId:(long long)parentCategoryId name:(NSString *)name description:(NSString *)description displayStyle:(NSString *)displayStyle emailAddress:(NSString *)emailAddress inProtocol:(NSString *)inProtocol inServerName:(NSString *)inServerName inServerPort:(int)inServerPort inUseSSL:(BOOL)inUseSSL inUserName:(NSString *)inUserName inPassword:(NSString *)inPassword inReadInterval:(int)inReadInterval outEmailAddress:(NSString *)outEmailAddress outCustom:(BOOL)outCustom outServerName:(NSString *)outServerName outServerPort:(int)outServerPort outUseSSL:(BOOL)outUseSSL outUserName:(NSString *)outUserName outPassword:(NSString *)outPassword mailingListActive:(BOOL)mailingListActive allowAnonymousEmail:(BOOL)allowAnonymousEmail serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentCategoryId": @(parentCategoryId), - @"name": name, - @"description": description, - @"displayStyle": displayStyle, - @"emailAddress": emailAddress, - @"inProtocol": inProtocol, - @"inServerName": inServerName, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"displayStyle": [self checkNull: displayStyle], + @"emailAddress": [self checkNull: emailAddress], + @"inProtocol": [self checkNull: inProtocol], + @"inServerName": [self checkNull: inServerName], @"inServerPort": @(inServerPort), @"inUseSSL": @(inUseSSL), - @"inUserName": inUserName, - @"inPassword": inPassword, + @"inUserName": [self checkNull: inUserName], + @"inPassword": [self checkNull: inPassword], @"inReadInterval": @(inReadInterval), - @"outEmailAddress": outEmailAddress, + @"outEmailAddress": [self checkNull: outEmailAddress], @"outCustom": @(outCustom), - @"outServerName": outServerName, + @"outServerName": [self checkNull: outServerName], @"outServerPort": @(outServerPort), @"outUseSSL": @(outUseSSL), - @"outUserName": outUserName, - @"outPassword": outPassword, + @"outUserName": [self checkNull: outUserName], + @"outPassword": [self checkNull: outPassword], @"mailingListActive": @(mailingListActive), @"allowAnonymousEmail": @(allowAnonymousEmail), }]; @@ -55,8 +55,8 @@ - (NSDictionary *)addCategoryWithUserId:(long long)userId parentCategoryId:(long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), @"parentCategoryId": @(parentCategoryId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -125,7 +125,7 @@ - (NSArray *)getCategoriesWithGroupId:(long long)groupId parentCategoryId:(long - (NSArray *)getCategoriesWithGroupId:(long long)groupId parentCategoryIds:(NSArray *)parentCategoryIds start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"parentCategoryIds": parentCategoryIds, + @"parentCategoryIds": [self checkNull: parentCategoryIds], @"start": @(start), @"end": @(end) }]; @@ -152,7 +152,7 @@ - (NSArray *)getCategoriesWithGroupId:(long long)groupId parentCategoryId:(long - (NSArray *)getCategoriesWithGroupId:(long long)groupId parentCategoryIds:(NSArray *)parentCategoryIds status:(int)status start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"parentCategoryIds": parentCategoryIds, + @"parentCategoryIds": [self checkNull: parentCategoryIds], @"status": @(status), @"start": @(start), @"end": @(end) @@ -177,7 +177,7 @@ - (NSNumber *)getCategoriesCountWithGroupId:(long long)groupId parentCategoryId: - (NSNumber *)getCategoriesCountWithGroupId:(long long)groupId parentCategoryIds:(NSArray *)parentCategoryIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"parentCategoryIds": parentCategoryIds + @"parentCategoryIds": [self checkNull: parentCategoryIds] }]; NSDictionary *_command = @{@"/mbcategory/get-categories-count": _params}; @@ -200,7 +200,7 @@ - (NSNumber *)getCategoriesCountWithGroupId:(long long)groupId parentCategoryId: - (NSNumber *)getCategoriesCountWithGroupId:(long long)groupId parentCategoryIds:(NSArray *)parentCategoryIds status:(int)status error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"parentCategoryIds": parentCategoryIds, + @"parentCategoryIds": [self checkNull: parentCategoryIds], @"status": @(status) }]; @@ -232,7 +232,7 @@ - (NSArray *)getCategoryIdsWithGroupId:(long long)groupId categoryId:(long long) - (NSArray *)getSubcategoryIdsWithCategoryIds:(NSArray *)categoryIds groupId:(long long)groupId categoryId:(long long)categoryId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"categoryIds": categoryIds, + @"categoryIds": [self checkNull: categoryIds], @"groupId": @(groupId), @"categoryId": @(categoryId) }]; @@ -335,24 +335,24 @@ - (NSDictionary *)updateCategoryWithCategoryId:(long long)categoryId parentCateg NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"categoryId": @(categoryId), @"parentCategoryId": @(parentCategoryId), - @"name": name, - @"description": description, - @"displayStyle": displayStyle, - @"emailAddress": emailAddress, - @"inProtocol": inProtocol, - @"inServerName": inServerName, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"displayStyle": [self checkNull: displayStyle], + @"emailAddress": [self checkNull: emailAddress], + @"inProtocol": [self checkNull: inProtocol], + @"inServerName": [self checkNull: inServerName], @"inServerPort": @(inServerPort), @"inUseSSL": @(inUseSSL), - @"inUserName": inUserName, - @"inPassword": inPassword, + @"inUserName": [self checkNull: inUserName], + @"inPassword": [self checkNull: inPassword], @"inReadInterval": @(inReadInterval), - @"outEmailAddress": outEmailAddress, + @"outEmailAddress": [self checkNull: outEmailAddress], @"outCustom": @(outCustom), - @"outServerName": outServerName, + @"outServerName": [self checkNull: outServerName], @"outServerPort": @(outServerPort), @"outUseSSL": @(outUseSSL), - @"outUserName": outUserName, - @"outPassword": outPassword, + @"outUserName": [self checkNull: outUserName], + @"outPassword": [self checkNull: outPassword], @"mailingListActive": @(mailingListActive), @"allowAnonymousEmail": @(allowAnonymousEmail), @"mergeWithParentCategory": @(mergeWithParentCategory), diff --git a/ios/Source/Service/v62/mbmessage/LRMBMessageService_v62.m b/ios/Source/Service/v62/mbmessage/LRMBMessageService_v62.m index dbe19671..c4ee057a 100644 --- a/ios/Source/Service/v62/mbmessage/LRMBMessageService_v62.m +++ b/ios/Source/Service/v62/mbmessage/LRMBMessageService_v62.m @@ -22,15 +22,15 @@ @implementation LRMBMessageService_v62 - (NSDictionary *)addDiscussionMessageWithGroupId:(long long)groupId className:(NSString *)className classPK:(long long)classPK permissionClassName:(NSString *)permissionClassName permissionClassPK:(long long)permissionClassPK permissionOwnerId:(long long)permissionOwnerId threadId:(long long)threadId parentMessageId:(long long)parentMessageId subject:(NSString *)subject body:(NSString *)body serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"permissionClassName": permissionClassName, + @"permissionClassName": [self checkNull: permissionClassName], @"permissionClassPK": @(permissionClassPK), @"permissionOwnerId": @(permissionOwnerId), @"threadId": @(threadId), @"parentMessageId": @(parentMessageId), - @"subject": subject, - @"body": body, + @"subject": [self checkNull: subject], + @"body": [self checkNull: body], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -44,10 +44,10 @@ - (NSDictionary *)addMessageWithGroupId:(long long)groupId categoryId:(long long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"categoryId": @(categoryId), - @"subject": subject, - @"body": body, - @"format": format, - @"inputStreamOVPs": inputStreamOVPs, + @"subject": [self checkNull: subject], + @"body": [self checkNull: body], + @"format": [self checkNull: format], + @"inputStreamOVPs": [self checkNull: inputStreamOVPs], @"anonymous": @(anonymous), @"priority": @(priority), @"allowPingbacks": @(allowPingbacks), @@ -66,10 +66,10 @@ - (NSDictionary *)addMessageWithGroupId:(long long)groupId categoryId:(long long @"categoryId": @(categoryId), @"threadId": @(threadId), @"parentMessageId": @(parentMessageId), - @"subject": subject, - @"body": body, - @"format": format, - @"inputStreamOVPs": inputStreamOVPs, + @"subject": [self checkNull: subject], + @"body": [self checkNull: body], + @"format": [self checkNull: format], + @"inputStreamOVPs": [self checkNull: inputStreamOVPs], @"anonymous": @(anonymous), @"priority": @(priority), @"allowPingbacks": @(allowPingbacks), @@ -85,8 +85,8 @@ - (NSDictionary *)addMessageWithGroupId:(long long)groupId categoryId:(long long - (NSDictionary *)addMessageWithCategoryId:(long long)categoryId subject:(NSString *)subject body:(NSString *)body serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"categoryId": @(categoryId), - @"subject": subject, - @"body": body, + @"subject": [self checkNull: subject], + @"body": [self checkNull: body], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -99,10 +99,10 @@ - (NSDictionary *)addMessageWithCategoryId:(long long)categoryId subject:(NSStri - (NSDictionary *)addMessageWithParentMessageId:(long long)parentMessageId subject:(NSString *)subject body:(NSString *)body format:(NSString *)format inputStreamOVPs:(NSArray *)inputStreamOVPs anonymous:(BOOL)anonymous priority:(double)priority allowPingbacks:(BOOL)allowPingbacks serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentMessageId": @(parentMessageId), - @"subject": subject, - @"body": body, - @"format": format, - @"inputStreamOVPs": inputStreamOVPs, + @"subject": [self checkNull: subject], + @"body": [self checkNull: body], + @"format": [self checkNull: format], + @"inputStreamOVPs": [self checkNull: inputStreamOVPs], @"anonymous": @(anonymous), @"priority": @(priority), @"allowPingbacks": @(allowPingbacks), @@ -118,9 +118,9 @@ - (NSDictionary *)addMessageWithParentMessageId:(long long)parentMessageId subje - (void)deleteDiscussionMessageWithGroupId:(long long)groupId className:(NSString *)className classPK:(long long)classPK permissionClassName:(NSString *)permissionClassName permissionClassPK:(long long)permissionClassPK permissionOwnerId:(long long)permissionOwnerId messageId:(long long)messageId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"permissionClassName": permissionClassName, + @"permissionClassName": [self checkNull: permissionClassName], @"permissionClassPK": @(permissionClassPK), @"permissionOwnerId": @(permissionOwnerId), @"messageId": @(messageId) @@ -183,11 +183,11 @@ - (NSString *)getCategoryMessagesRssWithGroupId:(long long)groupId categoryId:(l @"categoryId": @(categoryId), @"status": @(status), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -202,11 +202,11 @@ - (NSString *)getCompanyMessagesRssWithCompanyId:(long long)companyId status:(in @"companyId": @(companyId), @"status": @(status), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -233,11 +233,11 @@ - (NSString *)getGroupMessagesRssWithGroupId:(long long)groupId userId:(long lon @"userId": @(userId), @"status": @(status), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -252,11 +252,11 @@ - (NSString *)getGroupMessagesRssWithGroupId:(long long)groupId status:(int)stat @"groupId": @(groupId), @"status": @(status), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -280,7 +280,7 @@ - (NSDictionary *)getMessageDisplayWithMessageId:(long long)messageId status:(in NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"messageId": @(messageId), @"status": @(status), - @"threadView": threadView, + @"threadView": [self checkNull: threadView], @"includePrevAndNext": @(includePrevAndNext) }]; @@ -334,11 +334,11 @@ - (NSString *)getThreadMessagesRssWithThreadId:(long long)threadId status:(int)s @"threadId": @(threadId), @"status": @(status), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], }]; [self mangleWrapperWithParams:_params name:@"themeDisplay" className:@"com.liferay.portal.theme.ThemeDisplay" wrapper:themeDisplay]; @@ -351,7 +351,7 @@ - (NSString *)getThreadMessagesRssWithThreadId:(long long)threadId status:(int)s - (void)restoreMessageAttachmentFromTrashWithMessageId:(long long)messageId fileName:(NSString *)fileName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"messageId": @(messageId), - @"fileName": fileName + @"fileName": [self checkNull: fileName] }]; NSDictionary *_command = @{@"/mbmessage/restore-message-attachment-from-trash": _params}; @@ -393,14 +393,14 @@ - (void)updateAnswerWithMessageId:(long long)messageId answer:(BOOL)answer casca - (NSDictionary *)updateDiscussionMessageWithClassName:(NSString *)className classPK:(long long)classPK permissionClassName:(NSString *)permissionClassName permissionClassPK:(long long)permissionClassPK permissionOwnerId:(long long)permissionOwnerId messageId:(long long)messageId subject:(NSString *)subject body:(NSString *)body serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"permissionClassName": permissionClassName, + @"permissionClassName": [self checkNull: permissionClassName], @"permissionClassPK": @(permissionClassPK), @"permissionOwnerId": @(permissionOwnerId), @"messageId": @(messageId), - @"subject": subject, - @"body": body, + @"subject": [self checkNull: subject], + @"body": [self checkNull: body], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -413,10 +413,10 @@ - (NSDictionary *)updateDiscussionMessageWithClassName:(NSString *)className cla - (NSDictionary *)updateMessageWithMessageId:(long long)messageId subject:(NSString *)subject body:(NSString *)body inputStreamOVPs:(NSArray *)inputStreamOVPs existingFiles:(NSArray *)existingFiles priority:(double)priority allowPingbacks:(BOOL)allowPingbacks serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"messageId": @(messageId), - @"subject": subject, - @"body": body, - @"inputStreamOVPs": inputStreamOVPs, - @"existingFiles": existingFiles, + @"subject": [self checkNull: subject], + @"body": [self checkNull: body], + @"inputStreamOVPs": [self checkNull: inputStreamOVPs], + @"existingFiles": [self checkNull: existingFiles], @"priority": @(priority), @"allowPingbacks": @(allowPingbacks), }]; diff --git a/ios/Source/Service/v62/mbthread/LRMBThreadService_v62.m b/ios/Source/Service/v62/mbthread/LRMBThreadService_v62.m index 04697f45..7efe3046 100644 --- a/ios/Source/Service/v62/mbthread/LRMBThreadService_v62.m +++ b/ios/Source/Service/v62/mbthread/LRMBThreadService_v62.m @@ -252,7 +252,7 @@ - (NSDictionary *)searchWithGroupId:(long long)groupId creatorUserId:(long long) - (NSDictionary *)splitThreadWithMessageId:(long long)messageId subject:(NSString *)subject serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"messageId": @(messageId), - @"subject": subject, + @"subject": [self checkNull: subject], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/mdraction/LRMDRActionService_v62.m b/ios/Source/Service/v62/mdraction/LRMDRActionService_v62.m index 1fcb0239..38eb8772 100644 --- a/ios/Source/Service/v62/mdraction/LRMDRActionService_v62.m +++ b/ios/Source/Service/v62/mdraction/LRMDRActionService_v62.m @@ -22,10 +22,10 @@ @implementation LRMDRActionService_v62 - (NSDictionary *)addActionWithRuleGroupInstanceId:(long long)ruleGroupInstanceId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap type:(NSString *)type typeSettings:(NSString *)typeSettings serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"ruleGroupInstanceId": @(ruleGroupInstanceId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, - @"typeSettings": typeSettings, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], + @"typeSettings": [self checkNull: typeSettings], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -38,9 +38,9 @@ - (NSDictionary *)addActionWithRuleGroupInstanceId:(long long)ruleGroupInstanceI - (NSDictionary *)addActionWithRuleGroupInstanceId:(long long)ruleGroupInstanceId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap type:(NSString *)type typeSettingsProperties:(LRJSONObjectWrapper *)typeSettingsProperties serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"ruleGroupInstanceId": @(ruleGroupInstanceId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], }]; [self mangleWrapperWithParams:_params name:@"typeSettingsProperties" className:@"com.liferay.portal.kernel.util.UnicodeProperties" wrapper:typeSettingsProperties]; @@ -84,10 +84,10 @@ - (NSDictionary *)getActionWithActionId:(long long)actionId error:(NSError **)er - (NSDictionary *)updateActionWithActionId:(long long)actionId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap type:(NSString *)type typeSettings:(NSString *)typeSettings serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"actionId": @(actionId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, - @"typeSettings": typeSettings, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], + @"typeSettings": [self checkNull: typeSettings], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -100,9 +100,9 @@ - (NSDictionary *)updateActionWithActionId:(long long)actionId nameMap:(NSDictio - (NSDictionary *)updateActionWithActionId:(long long)actionId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap type:(NSString *)type typeSettingsProperties:(LRJSONObjectWrapper *)typeSettingsProperties serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"actionId": @(actionId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], }]; [self mangleWrapperWithParams:_params name:@"typeSettingsProperties" className:@"com.liferay.portal.kernel.util.UnicodeProperties" wrapper:typeSettingsProperties]; diff --git a/ios/Source/Service/v62/mdrrule/LRMDRRuleService_v62.m b/ios/Source/Service/v62/mdrrule/LRMDRRuleService_v62.m index 01c522be..82141a01 100644 --- a/ios/Source/Service/v62/mdrrule/LRMDRRuleService_v62.m +++ b/ios/Source/Service/v62/mdrrule/LRMDRRuleService_v62.m @@ -22,10 +22,10 @@ @implementation LRMDRRuleService_v62 - (NSDictionary *)addRuleWithRuleGroupId:(long long)ruleGroupId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap type:(NSString *)type typeSettings:(NSString *)typeSettings serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"ruleGroupId": @(ruleGroupId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, - @"typeSettings": typeSettings, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], + @"typeSettings": [self checkNull: typeSettings], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -68,10 +68,10 @@ - (NSDictionary *)getRuleWithRuleId:(long long)ruleId error:(NSError **)error { - (NSDictionary *)updateRuleWithRuleId:(long long)ruleId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap type:(NSString *)type typeSettings:(NSString *)typeSettings serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"ruleId": @(ruleId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, - @"typeSettings": typeSettings, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], + @"typeSettings": [self checkNull: typeSettings], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -84,9 +84,9 @@ - (NSDictionary *)updateRuleWithRuleId:(long long)ruleId nameMap:(NSDictionary * - (NSDictionary *)updateRuleWithRuleId:(long long)ruleId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap type:(NSString *)type typeSettingsProperties:(LRJSONObjectWrapper *)typeSettingsProperties serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"ruleId": @(ruleId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, - @"type": type, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"type": [self checkNull: type], }]; [self mangleWrapperWithParams:_params name:@"typeSettingsProperties" className:@"com.liferay.portal.kernel.util.UnicodeProperties" wrapper:typeSettingsProperties]; diff --git a/ios/Source/Service/v62/mdrrulegroup/LRMDRRuleGroupService_v62.m b/ios/Source/Service/v62/mdrrulegroup/LRMDRRuleGroupService_v62.m index 9ae1c4cc..c74324ca 100644 --- a/ios/Source/Service/v62/mdrrulegroup/LRMDRRuleGroupService_v62.m +++ b/ios/Source/Service/v62/mdrrulegroup/LRMDRRuleGroupService_v62.m @@ -22,8 +22,8 @@ @implementation LRMDRRuleGroupService_v62 - (NSDictionary *)addRuleGroupWithGroupId:(long long)groupId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -79,8 +79,8 @@ - (NSDictionary *)getRuleGroupWithRuleGroupId:(long long)ruleGroupId error:(NSEr - (NSDictionary *)updateRuleGroupWithRuleGroupId:(long long)ruleGroupId nameMap:(NSDictionary *)nameMap descriptionMap:(NSDictionary *)descriptionMap serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"ruleGroupId": @(ruleGroupId), - @"nameMap": nameMap, - @"descriptionMap": descriptionMap, + @"nameMap": [self checkNull: nameMap], + @"descriptionMap": [self checkNull: descriptionMap], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/mdrrulegroupinstance/LRMDRRuleGroupInstanceService_v62.m b/ios/Source/Service/v62/mdrrulegroupinstance/LRMDRRuleGroupInstanceService_v62.m index 6cd4cbd8..89fa9bc1 100644 --- a/ios/Source/Service/v62/mdrrulegroupinstance/LRMDRRuleGroupInstanceService_v62.m +++ b/ios/Source/Service/v62/mdrrulegroupinstance/LRMDRRuleGroupInstanceService_v62.m @@ -22,7 +22,7 @@ @implementation LRMDRRuleGroupInstanceService_v62 - (NSDictionary *)addRuleGroupInstanceWithGroupId:(long long)groupId className:(NSString *)className classPK:(long long)classPK ruleGroupId:(long long)ruleGroupId serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), @"ruleGroupId": @(ruleGroupId), }]; @@ -37,7 +37,7 @@ - (NSDictionary *)addRuleGroupInstanceWithGroupId:(long long)groupId className:( - (NSDictionary *)addRuleGroupInstanceWithGroupId:(long long)groupId className:(NSString *)className classPK:(long long)classPK ruleGroupId:(long long)ruleGroupId priority:(int)priority serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), @"ruleGroupId": @(ruleGroupId), @"priority": @(priority), @@ -62,7 +62,7 @@ - (void)deleteRuleGroupInstanceWithRuleGroupInstanceId:(long long)ruleGroupInsta - (NSArray *)getRuleGroupInstancesWithClassName:(NSString *)className classPK:(long long)classPK start:(int)start end:(int)end orderByComparator:(LRJSONObjectWrapper *)orderByComparator error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), @"start": @(start), @"end": @(end), @@ -77,7 +77,7 @@ - (NSArray *)getRuleGroupInstancesWithClassName:(NSString *)className classPK:(l - (NSNumber *)getRuleGroupInstancesCountWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; diff --git a/ios/Source/Service/v62/membershiprequest/LRMembershipRequestService_v62.m b/ios/Source/Service/v62/membershiprequest/LRMembershipRequestService_v62.m index c421cc5b..3312ceb9 100644 --- a/ios/Source/Service/v62/membershiprequest/LRMembershipRequestService_v62.m +++ b/ios/Source/Service/v62/membershiprequest/LRMembershipRequestService_v62.m @@ -22,7 +22,7 @@ @implementation LRMembershipRequestService_v62 - (NSDictionary *)addMembershipRequestWithGroupId:(long long)groupId comments:(NSString *)comments serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"comments": comments, + @"comments": [self checkNull: comments], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -56,7 +56,7 @@ - (NSDictionary *)getMembershipRequestWithMembershipRequestId:(long long)members - (void)updateStatusWithMembershipRequestId:(long long)membershipRequestId reviewComments:(NSString *)reviewComments statusId:(int)statusId serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"membershipRequestId": @(membershipRequestId), - @"reviewComments": reviewComments, + @"reviewComments": [self checkNull: reviewComments], @"statusId": @(statusId), }]; diff --git a/ios/Source/Service/v62/organization/LROrganizationService_v62.m b/ios/Source/Service/v62/organization/LROrganizationService_v62.m index 444c82ad..0c57212d 100644 --- a/ios/Source/Service/v62/organization/LROrganizationService_v62.m +++ b/ios/Source/Service/v62/organization/LROrganizationService_v62.m @@ -22,7 +22,7 @@ @implementation LROrganizationService_v62 - (void)addGroupOrganizationsWithGroupId:(long long)groupId organizationIds:(NSArray *)organizationIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"organizationIds": organizationIds + @"organizationIds": [self checkNull: organizationIds] }]; NSDictionary *_command = @{@"/organization/add-group-organizations": _params}; @@ -33,13 +33,13 @@ - (void)addGroupOrganizationsWithGroupId:(long long)groupId organizationIds:(NSA - (NSDictionary *)addOrganizationWithParentOrganizationId:(long long)parentOrganizationId name:(NSString *)name type:(NSString *)type recursable:(BOOL)recursable regionId:(long long)regionId countryId:(long long)countryId statusId:(int)statusId comments:(NSString *)comments site:(BOOL)site serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentOrganizationId": @(parentOrganizationId), - @"name": name, - @"type": type, + @"name": [self checkNull: name], + @"type": [self checkNull: type], @"recursable": @(recursable), @"regionId": @(regionId), @"countryId": @(countryId), @"statusId": @(statusId), - @"comments": comments, + @"comments": [self checkNull: comments], @"site": @(site), }]; @@ -53,18 +53,18 @@ - (NSDictionary *)addOrganizationWithParentOrganizationId:(long long)parentOrgan - (NSDictionary *)addOrganizationWithParentOrganizationId:(long long)parentOrganizationId name:(NSString *)name type:(NSString *)type regionId:(long long)regionId countryId:(long long)countryId statusId:(int)statusId comments:(NSString *)comments site:(BOOL)site addresses:(NSArray *)addresses emailAddresses:(NSArray *)emailAddresses orgLabors:(NSArray *)orgLabors phones:(NSArray *)phones websites:(NSArray *)websites serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentOrganizationId": @(parentOrganizationId), - @"name": name, - @"type": type, + @"name": [self checkNull: name], + @"type": [self checkNull: type], @"regionId": @(regionId), @"countryId": @(countryId), @"statusId": @(statusId), - @"comments": comments, + @"comments": [self checkNull: comments], @"site": @(site), - @"addresses": addresses, - @"emailAddresses": emailAddresses, - @"orgLabors": orgLabors, - @"phones": phones, - @"websites": websites, + @"addresses": [self checkNull: addresses], + @"emailAddresses": [self checkNull: emailAddresses], + @"orgLabors": [self checkNull: orgLabors], + @"phones": [self checkNull: phones], + @"websites": [self checkNull: websites], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -77,19 +77,19 @@ - (NSDictionary *)addOrganizationWithParentOrganizationId:(long long)parentOrgan - (NSDictionary *)addOrganizationWithParentOrganizationId:(long long)parentOrganizationId name:(NSString *)name type:(NSString *)type recursable:(BOOL)recursable regionId:(long long)regionId countryId:(long long)countryId statusId:(int)statusId comments:(NSString *)comments site:(BOOL)site addresses:(NSArray *)addresses emailAddresses:(NSArray *)emailAddresses orgLabors:(NSArray *)orgLabors phones:(NSArray *)phones websites:(NSArray *)websites serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentOrganizationId": @(parentOrganizationId), - @"name": name, - @"type": type, + @"name": [self checkNull: name], + @"type": [self checkNull: type], @"recursable": @(recursable), @"regionId": @(regionId), @"countryId": @(countryId), @"statusId": @(statusId), - @"comments": comments, + @"comments": [self checkNull: comments], @"site": @(site), - @"addresses": addresses, - @"emailAddresses": emailAddresses, - @"orgLabors": orgLabors, - @"phones": phones, - @"websites": websites, + @"addresses": [self checkNull: addresses], + @"emailAddresses": [self checkNull: emailAddresses], + @"orgLabors": [self checkNull: orgLabors], + @"phones": [self checkNull: phones], + @"websites": [self checkNull: websites], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -102,12 +102,12 @@ - (NSDictionary *)addOrganizationWithParentOrganizationId:(long long)parentOrgan - (NSDictionary *)addOrganizationWithParentOrganizationId:(long long)parentOrganizationId name:(NSString *)name type:(NSString *)type regionId:(long long)regionId countryId:(long long)countryId statusId:(int)statusId comments:(NSString *)comments site:(BOOL)site serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentOrganizationId": @(parentOrganizationId), - @"name": name, - @"type": type, + @"name": [self checkNull: name], + @"type": [self checkNull: type], @"regionId": @(regionId), @"countryId": @(countryId), @"statusId": @(statusId), - @"comments": comments, + @"comments": [self checkNull: comments], @"site": @(site), }]; @@ -121,7 +121,7 @@ - (NSDictionary *)addOrganizationWithParentOrganizationId:(long long)parentOrgan - (void)addPasswordPolicyOrganizationsWithPasswordPolicyId:(long long)passwordPolicyId organizationIds:(NSArray *)organizationIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"passwordPolicyId": @(passwordPolicyId), - @"organizationIds": organizationIds + @"organizationIds": [self checkNull: organizationIds] }]; NSDictionary *_command = @{@"/organization/add-password-policy-organizations": _params}; @@ -151,7 +151,7 @@ - (void)deleteOrganizationWithOrganizationId:(long long)organizationId error:(NS - (NSArray *)getManageableOrganizationsWithActionId:(NSString *)actionId max:(int)max error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"actionId": actionId, + @"actionId": [self checkNull: actionId], @"max": @(max) }]; @@ -173,7 +173,7 @@ - (NSDictionary *)getOrganizationWithOrganizationId:(long long)organizationId er - (NSNumber *)getOrganizationIdWithCompanyId:(long long)companyId name:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/organization/get-organization-id": _params}; @@ -229,7 +229,7 @@ - (NSArray *)getUserOrganizationsWithUserId:(long long)userId error:(NSError **) - (void)setGroupOrganizationsWithGroupId:(long long)groupId organizationIds:(NSArray *)organizationIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"organizationIds": organizationIds + @"organizationIds": [self checkNull: organizationIds] }]; NSDictionary *_command = @{@"/organization/set-group-organizations": _params}; @@ -240,7 +240,7 @@ - (void)setGroupOrganizationsWithGroupId:(long long)groupId organizationIds:(NSA - (void)unsetGroupOrganizationsWithGroupId:(long long)groupId organizationIds:(NSArray *)organizationIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"organizationIds": organizationIds + @"organizationIds": [self checkNull: organizationIds] }]; NSDictionary *_command = @{@"/organization/unset-group-organizations": _params}; @@ -251,7 +251,7 @@ - (void)unsetGroupOrganizationsWithGroupId:(long long)groupId organizationIds:(N - (void)unsetPasswordPolicyOrganizationsWithPasswordPolicyId:(long long)passwordPolicyId organizationIds:(NSArray *)organizationIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"passwordPolicyId": @(passwordPolicyId), - @"organizationIds": organizationIds + @"organizationIds": [self checkNull: organizationIds] }]; NSDictionary *_command = @{@"/organization/unset-password-policy-organizations": _params}; @@ -263,12 +263,12 @@ - (NSDictionary *)updateOrganizationWithOrganizationId:(long long)organizationId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"organizationId": @(organizationId), @"parentOrganizationId": @(parentOrganizationId), - @"name": name, - @"type": type, + @"name": [self checkNull: name], + @"type": [self checkNull: type], @"regionId": @(regionId), @"countryId": @(countryId), @"statusId": @(statusId), - @"comments": comments, + @"comments": [self checkNull: comments], @"site": @(site), }]; @@ -283,13 +283,13 @@ - (NSDictionary *)updateOrganizationWithOrganizationId:(long long)organizationId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"organizationId": @(organizationId), @"parentOrganizationId": @(parentOrganizationId), - @"name": name, - @"type": type, + @"name": [self checkNull: name], + @"type": [self checkNull: type], @"recursable": @(recursable), @"regionId": @(regionId), @"countryId": @(countryId), @"statusId": @(statusId), - @"comments": comments, + @"comments": [self checkNull: comments], @"site": @(site), }]; @@ -304,18 +304,18 @@ - (NSDictionary *)updateOrganizationWithOrganizationId:(long long)organizationId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"organizationId": @(organizationId), @"parentOrganizationId": @(parentOrganizationId), - @"name": name, - @"type": type, + @"name": [self checkNull: name], + @"type": [self checkNull: type], @"regionId": @(regionId), @"countryId": @(countryId), @"statusId": @(statusId), - @"comments": comments, + @"comments": [self checkNull: comments], @"site": @(site), - @"addresses": addresses, - @"emailAddresses": emailAddresses, - @"orgLabors": orgLabors, - @"phones": phones, - @"websites": websites, + @"addresses": [self checkNull: addresses], + @"emailAddresses": [self checkNull: emailAddresses], + @"orgLabors": [self checkNull: orgLabors], + @"phones": [self checkNull: phones], + @"websites": [self checkNull: websites], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -329,19 +329,19 @@ - (NSDictionary *)updateOrganizationWithOrganizationId:(long long)organizationId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"organizationId": @(organizationId), @"parentOrganizationId": @(parentOrganizationId), - @"name": name, - @"type": type, + @"name": [self checkNull: name], + @"type": [self checkNull: type], @"recursable": @(recursable), @"regionId": @(regionId), @"countryId": @(countryId), @"statusId": @(statusId), - @"comments": comments, + @"comments": [self checkNull: comments], @"site": @(site), - @"addresses": addresses, - @"emailAddresses": emailAddresses, - @"orgLabors": orgLabors, - @"phones": phones, - @"websites": websites, + @"addresses": [self checkNull: addresses], + @"emailAddresses": [self checkNull: emailAddresses], + @"orgLabors": [self checkNull: orgLabors], + @"phones": [self checkNull: phones], + @"websites": [self checkNull: websites], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/passwordpolicy/LRPasswordPolicyService_v62.m b/ios/Source/Service/v62/passwordpolicy/LRPasswordPolicyService_v62.m index bd2b9242..af9bef81 100644 --- a/ios/Source/Service/v62/passwordpolicy/LRPasswordPolicyService_v62.m +++ b/ios/Source/Service/v62/passwordpolicy/LRPasswordPolicyService_v62.m @@ -21,8 +21,8 @@ @implementation LRPasswordPolicyService_v62 - (NSDictionary *)addPasswordPolicyWithName:(NSString *)name description:(NSString *)description changeable:(BOOL)changeable changeRequired:(BOOL)changeRequired minAge:(long long)minAge checkSyntax:(BOOL)checkSyntax allowDictionaryWords:(BOOL)allowDictionaryWords minAlphanumeric:(int)minAlphanumeric minLength:(int)minLength minLowerCase:(int)minLowerCase minNumbers:(int)minNumbers minSymbols:(int)minSymbols minUpperCase:(int)minUpperCase history:(BOOL)history historyCount:(int)historyCount expireable:(BOOL)expireable maxAge:(long long)maxAge warningTime:(long long)warningTime graceLimit:(int)graceLimit lockout:(BOOL)lockout maxFailure:(int)maxFailure lockoutDuration:(long long)lockoutDuration resetFailureCount:(long long)resetFailureCount resetTicketMaxAge:(long long)resetTicketMaxAge error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"changeable": @(changeable), @"changeRequired": @(changeRequired), @"minAge": @(minAge), @@ -54,8 +54,8 @@ - (NSDictionary *)addPasswordPolicyWithName:(NSString *)name description:(NSStri - (NSDictionary *)addPasswordPolicyWithName:(NSString *)name description:(NSString *)description changeable:(BOOL)changeable changeRequired:(BOOL)changeRequired minAge:(long long)minAge checkSyntax:(BOOL)checkSyntax allowDictionaryWords:(BOOL)allowDictionaryWords minAlphanumeric:(int)minAlphanumeric minLength:(int)minLength minLowerCase:(int)minLowerCase minNumbers:(int)minNumbers minSymbols:(int)minSymbols minUpperCase:(int)minUpperCase regex:(NSString *)regex history:(BOOL)history historyCount:(int)historyCount expireable:(BOOL)expireable maxAge:(long long)maxAge warningTime:(long long)warningTime graceLimit:(int)graceLimit lockout:(BOOL)lockout maxFailure:(int)maxFailure lockoutDuration:(long long)lockoutDuration resetFailureCount:(long long)resetFailureCount resetTicketMaxAge:(long long)resetTicketMaxAge serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"changeable": @(changeable), @"changeRequired": @(changeRequired), @"minAge": @(minAge), @@ -67,7 +67,7 @@ - (NSDictionary *)addPasswordPolicyWithName:(NSString *)name description:(NSStri @"minNumbers": @(minNumbers), @"minSymbols": @(minSymbols), @"minUpperCase": @(minUpperCase), - @"regex": regex, + @"regex": [self checkNull: regex], @"history": @(history), @"historyCount": @(historyCount), @"expireable": @(expireable), @@ -101,8 +101,8 @@ - (void)deletePasswordPolicyWithPasswordPolicyId:(long long)passwordPolicyId err - (NSDictionary *)updatePasswordPolicyWithPasswordPolicyId:(long long)passwordPolicyId name:(NSString *)name description:(NSString *)description changeable:(BOOL)changeable changeRequired:(BOOL)changeRequired minAge:(long long)minAge checkSyntax:(BOOL)checkSyntax allowDictionaryWords:(BOOL)allowDictionaryWords minAlphanumeric:(int)minAlphanumeric minLength:(int)minLength minLowerCase:(int)minLowerCase minNumbers:(int)minNumbers minSymbols:(int)minSymbols minUpperCase:(int)minUpperCase history:(BOOL)history historyCount:(int)historyCount expireable:(BOOL)expireable maxAge:(long long)maxAge warningTime:(long long)warningTime graceLimit:(int)graceLimit lockout:(BOOL)lockout maxFailure:(int)maxFailure lockoutDuration:(long long)lockoutDuration resetFailureCount:(long long)resetFailureCount resetTicketMaxAge:(long long)resetTicketMaxAge error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"passwordPolicyId": @(passwordPolicyId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"changeable": @(changeable), @"changeRequired": @(changeRequired), @"minAge": @(minAge), @@ -135,8 +135,8 @@ - (NSDictionary *)updatePasswordPolicyWithPasswordPolicyId:(long long)passwordPo - (NSDictionary *)updatePasswordPolicyWithPasswordPolicyId:(long long)passwordPolicyId name:(NSString *)name description:(NSString *)description changeable:(BOOL)changeable changeRequired:(BOOL)changeRequired minAge:(long long)minAge checkSyntax:(BOOL)checkSyntax allowDictionaryWords:(BOOL)allowDictionaryWords minAlphanumeric:(int)minAlphanumeric minLength:(int)minLength minLowerCase:(int)minLowerCase minNumbers:(int)minNumbers minSymbols:(int)minSymbols minUpperCase:(int)minUpperCase regex:(NSString *)regex history:(BOOL)history historyCount:(int)historyCount expireable:(BOOL)expireable maxAge:(long long)maxAge warningTime:(long long)warningTime graceLimit:(int)graceLimit lockout:(BOOL)lockout maxFailure:(int)maxFailure lockoutDuration:(long long)lockoutDuration resetFailureCount:(long long)resetFailureCount resetTicketMaxAge:(long long)resetTicketMaxAge serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"passwordPolicyId": @(passwordPolicyId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"changeable": @(changeable), @"changeRequired": @(changeRequired), @"minAge": @(minAge), @@ -148,7 +148,7 @@ - (NSDictionary *)updatePasswordPolicyWithPasswordPolicyId:(long long)passwordPo @"minNumbers": @(minNumbers), @"minSymbols": @(minSymbols), @"minUpperCase": @(minUpperCase), - @"regex": regex, + @"regex": [self checkNull: regex], @"history": @(history), @"historyCount": @(historyCount), @"expireable": @(expireable), diff --git a/ios/Source/Service/v62/permission/LRPermissionService_v62.m b/ios/Source/Service/v62/permission/LRPermissionService_v62.m index 74927676..a7b25901 100644 --- a/ios/Source/Service/v62/permission/LRPermissionService_v62.m +++ b/ios/Source/Service/v62/permission/LRPermissionService_v62.m @@ -22,8 +22,8 @@ @implementation LRPermissionService_v62 - (void)checkPermissionWithGroupId:(long long)groupId name:(NSString *)name primKey:(NSString *)primKey error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"primKey": primKey + @"name": [self checkNull: name], + @"primKey": [self checkNull: primKey] }]; NSDictionary *_command = @{@"/permission/check-permission": _params}; diff --git a/ios/Source/Service/v62/phone/LRPhoneService_v62.m b/ios/Source/Service/v62/phone/LRPhoneService_v62.m index c43f01da..2607edc4 100644 --- a/ios/Source/Service/v62/phone/LRPhoneService_v62.m +++ b/ios/Source/Service/v62/phone/LRPhoneService_v62.m @@ -21,10 +21,10 @@ @implementation LRPhoneService_v62 - (NSDictionary *)addPhoneWithClassName:(NSString *)className classPK:(long long)classPK number:(NSString *)number extension:(NSString *)extension typeId:(int)typeId primary:(BOOL)primary error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"number": number, - @"extension": extension, + @"number": [self checkNull: number], + @"extension": [self checkNull: extension], @"typeId": @(typeId), @"primary": @(primary) }]; @@ -36,10 +36,10 @@ - (NSDictionary *)addPhoneWithClassName:(NSString *)className classPK:(long long - (NSDictionary *)addPhoneWithClassName:(NSString *)className classPK:(long long)classPK number:(NSString *)number extension:(NSString *)extension typeId:(int)typeId primary:(BOOL)primary serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"number": number, - @"extension": extension, + @"number": [self checkNull: number], + @"extension": [self checkNull: extension], @"typeId": @(typeId), @"primary": @(primary), }]; @@ -73,7 +73,7 @@ - (NSDictionary *)getPhoneWithPhoneId:(long long)phoneId error:(NSError **)error - (NSArray *)getPhonesWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -85,8 +85,8 @@ - (NSArray *)getPhonesWithClassName:(NSString *)className classPK:(long long)cla - (NSDictionary *)updatePhoneWithPhoneId:(long long)phoneId number:(NSString *)number extension:(NSString *)extension typeId:(int)typeId primary:(BOOL)primary error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"phoneId": @(phoneId), - @"number": number, - @"extension": extension, + @"number": [self checkNull: number], + @"extension": [self checkNull: extension], @"typeId": @(typeId), @"primary": @(primary) }]; diff --git a/ios/Source/Service/v62/pluginsetting/LRPluginSettingService_v62.m b/ios/Source/Service/v62/pluginsetting/LRPluginSettingService_v62.m index 6d09dd79..e1befb45 100644 --- a/ios/Source/Service/v62/pluginsetting/LRPluginSettingService_v62.m +++ b/ios/Source/Service/v62/pluginsetting/LRPluginSettingService_v62.m @@ -22,9 +22,9 @@ @implementation LRPluginSettingService_v62 - (NSDictionary *)updatePluginSettingWithCompanyId:(long long)companyId pluginId:(NSString *)pluginId pluginType:(NSString *)pluginType roles:(NSString *)roles active:(BOOL)active error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"pluginId": pluginId, - @"pluginType": pluginType, - @"roles": roles, + @"pluginId": [self checkNull: pluginId], + @"pluginType": [self checkNull: pluginType], + @"roles": [self checkNull: roles], @"active": @(active) }]; diff --git a/ios/Source/Service/v62/pollsquestion/LRPollsQuestionService_v62.m b/ios/Source/Service/v62/pollsquestion/LRPollsQuestionService_v62.m index 3119f345..8bda3b3a 100644 --- a/ios/Source/Service/v62/pollsquestion/LRPollsQuestionService_v62.m +++ b/ios/Source/Service/v62/pollsquestion/LRPollsQuestionService_v62.m @@ -21,15 +21,15 @@ @implementation LRPollsQuestionService_v62 - (NSDictionary *)addQuestionWithTitleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap expirationDateMonth:(int)expirationDateMonth expirationDateDay:(int)expirationDateDay expirationDateYear:(int)expirationDateYear expirationDateHour:(int)expirationDateHour expirationDateMinute:(int)expirationDateMinute neverExpire:(BOOL)neverExpire choices:(NSArray *)choices serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], @"expirationDateMonth": @(expirationDateMonth), @"expirationDateDay": @(expirationDateDay), @"expirationDateYear": @(expirationDateYear), @"expirationDateHour": @(expirationDateHour), @"expirationDateMinute": @(expirationDateMinute), @"neverExpire": @(neverExpire), - @"choices": choices, + @"choices": [self checkNull: choices], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -62,15 +62,15 @@ - (NSDictionary *)getQuestionWithQuestionId:(long long)questionId error:(NSError - (NSDictionary *)updateQuestionWithQuestionId:(long long)questionId titleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap expirationDateMonth:(int)expirationDateMonth expirationDateDay:(int)expirationDateDay expirationDateYear:(int)expirationDateYear expirationDateHour:(int)expirationDateHour expirationDateMinute:(int)expirationDateMinute neverExpire:(BOOL)neverExpire choices:(NSArray *)choices serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"questionId": @(questionId), - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], @"expirationDateMonth": @(expirationDateMonth), @"expirationDateDay": @(expirationDateDay), @"expirationDateYear": @(expirationDateYear), @"expirationDateHour": @(expirationDateHour), @"expirationDateMinute": @(expirationDateMinute), @"neverExpire": @(neverExpire), - @"choices": choices, + @"choices": [self checkNull: choices], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/portal/LRPortalService_v62.m b/ios/Source/Service/v62/portal/LRPortalService_v62.m index b16d3b9f..67b54b8c 100644 --- a/ios/Source/Service/v62/portal/LRPortalService_v62.m +++ b/ios/Source/Service/v62/portal/LRPortalService_v62.m @@ -39,7 +39,7 @@ - (NSNumber *)getBuildNumber:(NSError **)error { - (void)testAddClassNameAndTestTransactionPortletBar_PortalRollbackWithTransactionPortletBarText:(NSString *)transactionPortletBarText error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"transactionPortletBarText": transactionPortletBarText + @"transactionPortletBarText": [self checkNull: transactionPortletBarText] }]; NSDictionary *_command = @{@"/portal/test-add-class-name-and-test-transaction-portlet-bar_-portal-rollback": _params}; @@ -49,7 +49,7 @@ - (void)testAddClassNameAndTestTransactionPortletBar_PortalRollbackWithTransacti - (void)testAddClassNameAndTestTransactionPortletBar_PortletRollbackWithTransactionPortletBarText:(NSString *)transactionPortletBarText error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"transactionPortletBarText": transactionPortletBarText + @"transactionPortletBarText": [self checkNull: transactionPortletBarText] }]; NSDictionary *_command = @{@"/portal/test-add-class-name-and-test-transaction-portlet-bar_-portlet-rollback": _params}; @@ -59,7 +59,7 @@ - (void)testAddClassNameAndTestTransactionPortletBar_PortletRollbackWithTransact - (void)testAddClassNameAndTestTransactionPortletBar_SuccessWithTransactionPortletBarText:(NSString *)transactionPortletBarText error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"transactionPortletBarText": transactionPortletBarText + @"transactionPortletBarText": [self checkNull: transactionPortletBarText] }]; NSDictionary *_command = @{@"/portal/test-add-class-name-and-test-transaction-portlet-bar_-success": _params}; @@ -69,7 +69,7 @@ - (void)testAddClassNameAndTestTransactionPortletBar_SuccessWithTransactionPortl - (void)testAddClassName_RollbackWithClassNameValue:(NSString *)classNameValue error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"classNameValue": classNameValue + @"classNameValue": [self checkNull: classNameValue] }]; NSDictionary *_command = @{@"/portal/test-add-class-name_-rollback": _params}; @@ -79,7 +79,7 @@ - (void)testAddClassName_RollbackWithClassNameValue:(NSString *)classNameValue e - (void)testAddClassName_SuccessWithClassNameValue:(NSString *)classNameValue error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"classNameValue": classNameValue + @"classNameValue": [self checkNull: classNameValue] }]; NSDictionary *_command = @{@"/portal/test-add-class-name_-success": _params}; diff --git a/ios/Source/Service/v62/portlet/LRPortletService_v62.m b/ios/Source/Service/v62/portlet/LRPortletService_v62.m index 350551ab..a8996d0d 100644 --- a/ios/Source/Service/v62/portlet/LRPortletService_v62.m +++ b/ios/Source/Service/v62/portlet/LRPortletService_v62.m @@ -31,8 +31,8 @@ - (NSArray *)getWarPortlets:(NSError **)error { - (NSDictionary *)updatePortletWithCompanyId:(long long)companyId portletId:(NSString *)portletId roles:(NSString *)roles active:(BOOL)active error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"portletId": portletId, - @"roles": roles, + @"portletId": [self checkNull: portletId], + @"roles": [self checkNull: roles], @"active": @(active) }]; diff --git a/ios/Source/Service/v62/portletpreferences/LRPortletPreferencesService_v62.m b/ios/Source/Service/v62/portletpreferences/LRPortletPreferencesService_v62.m index 394151a9..6c1af395 100644 --- a/ios/Source/Service/v62/portletpreferences/LRPortletPreferencesService_v62.m +++ b/ios/Source/Service/v62/portletpreferences/LRPortletPreferencesService_v62.m @@ -32,7 +32,7 @@ - (void)deleteArchivedPreferencesWithPortletItemId:(long long)portletItemId erro - (void)restoreArchivedPreferencesWithGroupId:(long long)groupId layout:(LRJSONObjectWrapper *)layout portletId:(NSString *)portletId portletItem:(LRJSONObjectWrapper *)portletItem preferences:(LRJSONObjectWrapper *)preferences error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"portletId": portletId, + @"portletId": [self checkNull: portletId], }]; [self mangleWrapperWithParams:_params name:@"layout" className:@"com.liferay.portal.model.Layout" wrapper:layout]; @@ -47,7 +47,7 @@ - (void)restoreArchivedPreferencesWithGroupId:(long long)groupId layout:(LRJSONO - (void)restoreArchivedPreferencesWithGroupId:(long long)groupId layout:(LRJSONObjectWrapper *)layout portletId:(NSString *)portletId portletItemId:(long long)portletItemId preferences:(LRJSONObjectWrapper *)preferences error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"portletId": portletId, + @"portletId": [self checkNull: portletId], @"portletItemId": @(portletItemId), }]; @@ -62,8 +62,8 @@ - (void)restoreArchivedPreferencesWithGroupId:(long long)groupId layout:(LRJSONO - (void)restoreArchivedPreferencesWithGroupId:(long long)groupId name:(NSString *)name layout:(LRJSONObjectWrapper *)layout portletId:(NSString *)portletId preferences:(LRJSONObjectWrapper *)preferences error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"portletId": portletId, + @"name": [self checkNull: name], + @"portletId": [self checkNull: portletId], }]; [self mangleWrapperWithParams:_params name:@"layout" className:@"com.liferay.portal.model.Layout" wrapper:layout]; @@ -78,8 +78,8 @@ - (void)updateArchivePreferencesWithUserId:(long long)userId groupId:(long long) NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), @"groupId": @(groupId), - @"name": name, - @"portletId": portletId, + @"name": [self checkNull: name], + @"portletId": [self checkNull: portletId], }]; [self mangleWrapperWithParams:_params name:@"preferences" className:@"javax.portlet.PortletPreferences" wrapper:preferences]; diff --git a/ios/Source/Service/v62/ratingsentry/LRRatingsEntryService_v62.m b/ios/Source/Service/v62/ratingsentry/LRRatingsEntryService_v62.m index 6fab7468..748090a2 100644 --- a/ios/Source/Service/v62/ratingsentry/LRRatingsEntryService_v62.m +++ b/ios/Source/Service/v62/ratingsentry/LRRatingsEntryService_v62.m @@ -21,7 +21,7 @@ @implementation LRRatingsEntryService_v62 - (void)deleteEntryWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -32,7 +32,7 @@ - (void)deleteEntryWithClassName:(NSString *)className classPK:(long long)classP - (NSDictionary *)updateEntryWithClassName:(NSString *)className classPK:(long long)classPK score:(double)score error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), @"score": @(score) }]; diff --git a/ios/Source/Service/v62/region/LRRegionService_v62.m b/ios/Source/Service/v62/region/LRRegionService_v62.m index a6dea881..d9fc0298 100644 --- a/ios/Source/Service/v62/region/LRRegionService_v62.m +++ b/ios/Source/Service/v62/region/LRRegionService_v62.m @@ -22,8 +22,8 @@ @implementation LRRegionService_v62 - (NSDictionary *)addRegionWithCountryId:(long long)countryId regionCode:(NSString *)regionCode name:(NSString *)name active:(BOOL)active error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"countryId": @(countryId), - @"regionCode": regionCode, - @"name": name, + @"regionCode": [self checkNull: regionCode], + @"name": [self checkNull: name], @"active": @(active) }]; @@ -35,7 +35,7 @@ - (NSDictionary *)addRegionWithCountryId:(long long)countryId regionCode:(NSStri - (NSDictionary *)fetchRegionWithCountryId:(long long)countryId regionCode:(NSString *)regionCode error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"countryId": @(countryId), - @"regionCode": regionCode + @"regionCode": [self checkNull: regionCode] }]; NSDictionary *_command = @{@"/region/fetch-region": _params}; @@ -56,7 +56,7 @@ - (NSDictionary *)getRegionWithRegionId:(long long)regionId error:(NSError **)er - (NSDictionary *)getRegionWithCountryId:(long long)countryId regionCode:(NSString *)regionCode error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"countryId": @(countryId), - @"regionCode": regionCode + @"regionCode": [self checkNull: regionCode] }]; NSDictionary *_command = @{@"/region/get-region": _params}; diff --git a/ios/Source/Service/v62/repository/LRRepositoryService_v62.m b/ios/Source/Service/v62/repository/LRRepositoryService_v62.m index ab290f14..178bf831 100644 --- a/ios/Source/Service/v62/repository/LRRepositoryService_v62.m +++ b/ios/Source/Service/v62/repository/LRRepositoryService_v62.m @@ -24,9 +24,9 @@ - (NSDictionary *)addRepositoryWithGroupId:(long long)groupId classNameId:(long @"groupId": @(groupId), @"classNameId": @(classNameId), @"parentFolderId": @(parentFolderId), - @"name": name, - @"description": description, - @"portletId": portletId, + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"portletId": [self checkNull: portletId], }]; [self mangleWrapperWithParams:_params name:@"typeSettingsProperties" className:@"com.liferay.portal.kernel.util.UnicodeProperties" wrapper:typeSettingsProperties]; @@ -124,7 +124,7 @@ - (NSArray *)getSupportedConfigurationsWithClassNameId:(long long)classNameId er - (NSArray *)getSupportedParametersWithClassNameId:(long long)classNameId configuration:(NSString *)configuration error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"classNameId": @(classNameId), - @"configuration": configuration + @"configuration": [self checkNull: configuration] }]; NSDictionary *_command = @{@"/repository/get-supported-parameters": _params}; @@ -145,8 +145,8 @@ - (NSDictionary *)getTypeSettingsPropertiesWithRepositoryId:(long long)repositor - (void)updateRepositoryWithRepositoryId:(long long)repositoryId name:(NSString *)name description:(NSString *)description error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"repositoryId": @(repositoryId), - @"name": name, - @"description": description + @"name": [self checkNull: name], + @"description": [self checkNull: description] }]; NSDictionary *_command = @{@"/repository/update-repository": _params}; diff --git a/ios/Source/Service/v62/resourceblock/LRResourceBlockService_v62.m b/ios/Source/Service/v62/resourceblock/LRResourceBlockService_v62.m index 4122e68a..b3b78b4a 100644 --- a/ios/Source/Service/v62/resourceblock/LRResourceBlockService_v62.m +++ b/ios/Source/Service/v62/resourceblock/LRResourceBlockService_v62.m @@ -23,9 +23,9 @@ - (void)addCompanyScopePermissionWithScopeGroupId:(long long)scopeGroupId compan NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"scopeGroupId": @(scopeGroupId), @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourceblock/add-company-scope-permission": _params}; @@ -38,9 +38,9 @@ - (void)addGroupScopePermissionWithScopeGroupId:(long long)scopeGroupId companyI @"scopeGroupId": @(scopeGroupId), @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourceblock/add-group-scope-permission": _params}; @@ -52,10 +52,10 @@ - (void)addIndividualScopePermissionWithCompanyId:(long long)companyId groupId:( NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"primKey": @(primKey), @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourceblock/add-individual-scope-permission": _params}; @@ -67,9 +67,9 @@ - (void)removeAllGroupScopePermissionsWithScopeGroupId:(long long)scopeGroupId c NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"scopeGroupId": @(scopeGroupId), @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourceblock/remove-all-group-scope-permissions": _params}; @@ -81,9 +81,9 @@ - (void)removeCompanyScopePermissionWithScopeGroupId:(long long)scopeGroupId com NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"scopeGroupId": @(scopeGroupId), @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourceblock/remove-company-scope-permission": _params}; @@ -96,9 +96,9 @@ - (void)removeGroupScopePermissionWithScopeGroupId:(long long)scopeGroupId compa @"scopeGroupId": @(scopeGroupId), @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourceblock/remove-group-scope-permission": _params}; @@ -110,10 +110,10 @@ - (void)removeIndividualScopePermissionWithCompanyId:(long long)companyId groupI NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"primKey": @(primKey), @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourceblock/remove-individual-scope-permission": _params}; @@ -125,9 +125,9 @@ - (void)setCompanyScopePermissionsWithScopeGroupId:(long long)scopeGroupId compa NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"scopeGroupId": @(scopeGroupId), @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"roleId": @(roleId), - @"actionIds": actionIds + @"actionIds": [self checkNull: actionIds] }]; NSDictionary *_command = @{@"/resourceblock/set-company-scope-permissions": _params}; @@ -140,9 +140,9 @@ - (void)setGroupScopePermissionsWithScopeGroupId:(long long)scopeGroupId company @"scopeGroupId": @(scopeGroupId), @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"roleId": @(roleId), - @"actionIds": actionIds + @"actionIds": [self checkNull: actionIds] }]; NSDictionary *_command = @{@"/resourceblock/set-group-scope-permissions": _params}; @@ -154,9 +154,9 @@ - (void)setIndividualScopePermissionsWithCompanyId:(long long)companyId groupId: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"primKey": @(primKey), - @"roleIdsToActionIds": roleIdsToActionIds + @"roleIdsToActionIds": [self checkNull: roleIdsToActionIds] }]; NSDictionary *_command = @{@"/resourceblock/set-individual-scope-permissions": _params}; @@ -168,10 +168,10 @@ - (void)setIndividualScopePermissionsWithCompanyId:(long long)companyId groupId: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"groupId": @(groupId), - @"name": name, + @"name": [self checkNull: name], @"primKey": @(primKey), @"roleId": @(roleId), - @"actionIds": actionIds + @"actionIds": [self checkNull: actionIds] }]; NSDictionary *_command = @{@"/resourceblock/set-individual-scope-permissions": _params}; diff --git a/ios/Source/Service/v62/resourcepermission/LRResourcePermissionService_v62.m b/ios/Source/Service/v62/resourcepermission/LRResourcePermissionService_v62.m index 7ed0171e..2d44d0b3 100644 --- a/ios/Source/Service/v62/resourcepermission/LRResourcePermissionService_v62.m +++ b/ios/Source/Service/v62/resourcepermission/LRResourcePermissionService_v62.m @@ -23,11 +23,11 @@ - (void)addResourcePermissionWithGroupId:(long long)groupId companyId:(long long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"scope": @(scope), - @"primKey": primKey, + @"primKey": [self checkNull: primKey], @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourcepermission/add-resource-permission": _params}; @@ -39,11 +39,11 @@ - (void)removeResourcePermissionWithGroupId:(long long)groupId companyId:(long l NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"scope": @(scope), - @"primKey": primKey, + @"primKey": [self checkNull: primKey], @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourcepermission/remove-resource-permission": _params}; @@ -55,10 +55,10 @@ - (void)removeResourcePermissionsWithGroupId:(long long)groupId companyId:(long NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"scope": @(scope), @"roleId": @(roleId), - @"actionId": actionId + @"actionId": [self checkNull: actionId] }]; NSDictionary *_command = @{@"/resourcepermission/remove-resource-permissions": _params}; @@ -70,9 +70,9 @@ - (void)setIndividualResourcePermissionsWithGroupId:(long long)groupId companyId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"companyId": @(companyId), - @"name": name, - @"primKey": primKey, - @"roleIdsToActionIds": roleIdsToActionIds + @"name": [self checkNull: name], + @"primKey": [self checkNull: primKey], + @"roleIdsToActionIds": [self checkNull: roleIdsToActionIds] }]; NSDictionary *_command = @{@"/resourcepermission/set-individual-resource-permissions": _params}; @@ -84,10 +84,10 @@ - (void)setIndividualResourcePermissionsWithGroupId:(long long)groupId companyId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"companyId": @(companyId), - @"name": name, - @"primKey": primKey, + @"name": [self checkNull: name], + @"primKey": [self checkNull: primKey], @"roleId": @(roleId), - @"actionIds": actionIds + @"actionIds": [self checkNull: actionIds] }]; NSDictionary *_command = @{@"/resourcepermission/set-individual-resource-permissions": _params}; diff --git a/ios/Source/Service/v62/role/LRRoleService_v62.m b/ios/Source/Service/v62/role/LRRoleService_v62.m index 15e44af1..9a1fb7e3 100644 --- a/ios/Source/Service/v62/role/LRRoleService_v62.m +++ b/ios/Source/Service/v62/role/LRRoleService_v62.m @@ -21,9 +21,9 @@ @implementation LRRoleService_v62 - (NSDictionary *)addRoleWithName:(NSString *)name titleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap type:(int)type error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, + @"name": [self checkNull: name], + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], @"type": @(type) }]; @@ -34,13 +34,13 @@ - (NSDictionary *)addRoleWithName:(NSString *)name titleMap:(NSDictionary *)titl - (NSDictionary *)addRoleWithClassName:(NSString *)className classPK:(long long)classPK name:(NSString *)name titleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap type:(int)type subtype:(NSString *)subtype serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"name": name, - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, + @"name": [self checkNull: name], + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], @"type": @(type), - @"subtype": subtype, + @"subtype": [self checkNull: subtype], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -53,7 +53,7 @@ - (NSDictionary *)addRoleWithClassName:(NSString *)className classPK:(long long) - (void)addUserRolesWithUserId:(long long)userId roleIds:(NSArray *)roleIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"roleIds": roleIds + @"roleIds": [self checkNull: roleIds] }]; NSDictionary *_command = @{@"/role/add-user-roles": _params}; @@ -94,7 +94,7 @@ - (NSDictionary *)getRoleWithRoleId:(long long)roleId error:(NSError **)error { - (NSDictionary *)getRoleWithCompanyId:(long long)companyId name:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/role/get-role": _params}; @@ -127,7 +127,7 @@ - (NSArray *)getUserGroupRolesWithUserId:(long long)userId groupId:(long long)gr - (NSArray *)getUserRelatedRolesWithUserId:(long long)userId groups:(NSArray *)groups error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"groups": groups + @"groups": [self checkNull: groups] }]; NSDictionary *_command = @{@"/role/get-user-related-roles": _params}; @@ -149,7 +149,7 @@ - (BOOL)hasUserRoleWithUserId:(long long)userId companyId:(long long)companyId n NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"inherited": @(inherited) }]; @@ -162,7 +162,7 @@ - (BOOL)hasUserRolesWithUserId:(long long)userId companyId:(long long)companyId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), @"companyId": @(companyId), - @"names": names, + @"names": [self checkNull: names], @"inherited": @(inherited) }]; @@ -174,7 +174,7 @@ - (BOOL)hasUserRolesWithUserId:(long long)userId companyId:(long long)companyId - (void)unsetUserRolesWithUserId:(long long)userId roleIds:(NSArray *)roleIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"roleIds": roleIds + @"roleIds": [self checkNull: roleIds] }]; NSDictionary *_command = @{@"/role/unset-user-roles": _params}; @@ -185,10 +185,10 @@ - (void)unsetUserRolesWithUserId:(long long)userId roleIds:(NSArray *)roleIds er - (NSDictionary *)updateRoleWithRoleId:(long long)roleId name:(NSString *)name titleMap:(NSDictionary *)titleMap descriptionMap:(NSDictionary *)descriptionMap subtype:(NSString *)subtype serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"roleId": @(roleId), - @"name": name, - @"titleMap": titleMap, - @"descriptionMap": descriptionMap, - @"subtype": subtype, + @"name": [self checkNull: name], + @"titleMap": [self checkNull: titleMap], + @"descriptionMap": [self checkNull: descriptionMap], + @"subtype": [self checkNull: subtype], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/scframeworkversion/LRSCFrameworkVersionService_v62.m b/ios/Source/Service/v62/scframeworkversion/LRSCFrameworkVersionService_v62.m index 5bc6fcf3..94bf79db 100644 --- a/ios/Source/Service/v62/scframeworkversion/LRSCFrameworkVersionService_v62.m +++ b/ios/Source/Service/v62/scframeworkversion/LRSCFrameworkVersionService_v62.m @@ -21,8 +21,8 @@ @implementation LRSCFrameworkVersionService_v62 - (NSDictionary *)addFrameworkVersionWithName:(NSString *)name url:(NSString *)url active:(BOOL)active priority:(int)priority serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"url": url, + @"name": [self checkNull: name], + @"url": [self checkNull: url], @"active": @(active), @"priority": @(priority), }]; @@ -81,8 +81,8 @@ - (NSArray *)getFrameworkVersionsWithGroupId:(long long)groupId active:(BOOL)act - (NSDictionary *)updateFrameworkVersionWithFrameworkVersionId:(long long)frameworkVersionId name:(NSString *)name url:(NSString *)url active:(BOOL)active priority:(int)priority error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"frameworkVersionId": @(frameworkVersionId), - @"name": name, - @"url": url, + @"name": [self checkNull: name], + @"url": [self checkNull: url], @"active": @(active), @"priority": @(priority) }]; diff --git a/ios/Source/Service/v62/sclicense/LRSCLicenseService_v62.m b/ios/Source/Service/v62/sclicense/LRSCLicenseService_v62.m index 989429a3..5ecf591a 100644 --- a/ios/Source/Service/v62/sclicense/LRSCLicenseService_v62.m +++ b/ios/Source/Service/v62/sclicense/LRSCLicenseService_v62.m @@ -21,8 +21,8 @@ @implementation LRSCLicenseService_v62 - (NSDictionary *)addLicenseWithName:(NSString *)name url:(NSString *)url openSource:(BOOL)openSource active:(BOOL)active recommended:(BOOL)recommended error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"url": url, + @"name": [self checkNull: name], + @"url": [self checkNull: url], @"openSource": @(openSource), @"active": @(active), @"recommended": @(recommended) @@ -56,8 +56,8 @@ - (NSDictionary *)getLicenseWithLicenseId:(long long)licenseId error:(NSError ** - (NSDictionary *)updateLicenseWithLicenseId:(long long)licenseId name:(NSString *)name url:(NSString *)url openSource:(BOOL)openSource active:(BOOL)active recommended:(BOOL)recommended error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"licenseId": @(licenseId), - @"name": name, - @"url": url, + @"name": [self checkNull: name], + @"url": [self checkNull: url], @"openSource": @(openSource), @"active": @(active), @"recommended": @(recommended) diff --git a/ios/Source/Service/v62/scproductentry/LRSCProductEntryService_v62.m b/ios/Source/Service/v62/scproductentry/LRSCProductEntryService_v62.m index e01bf972..57cbee69 100644 --- a/ios/Source/Service/v62/scproductentry/LRSCProductEntryService_v62.m +++ b/ios/Source/Service/v62/scproductentry/LRSCProductEntryService_v62.m @@ -21,18 +21,18 @@ @implementation LRSCProductEntryService_v62 - (NSDictionary *)addProductEntryWithName:(NSString *)name type:(NSString *)type tags:(NSString *)tags shortDescription:(NSString *)shortDescription longDescription:(NSString *)longDescription pageURL:(NSString *)pageURL author:(NSString *)author repoGroupId:(NSString *)repoGroupId repoArtifactId:(NSString *)repoArtifactId licenseIds:(NSArray *)licenseIds thumbnails:(NSArray *)thumbnails fullImages:(NSArray *)fullImages serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"type": type, - @"tags": tags, - @"shortDescription": shortDescription, - @"longDescription": longDescription, - @"pageURL": pageURL, - @"author": author, - @"repoGroupId": repoGroupId, - @"repoArtifactId": repoArtifactId, - @"licenseIds": licenseIds, - @"thumbnails": thumbnails, - @"fullImages": fullImages, + @"name": [self checkNull: name], + @"type": [self checkNull: type], + @"tags": [self checkNull: tags], + @"shortDescription": [self checkNull: shortDescription], + @"longDescription": [self checkNull: longDescription], + @"pageURL": [self checkNull: pageURL], + @"author": [self checkNull: author], + @"repoGroupId": [self checkNull: repoGroupId], + @"repoArtifactId": [self checkNull: repoArtifactId], + @"licenseIds": [self checkNull: licenseIds], + @"thumbnails": [self checkNull: thumbnails], + @"fullImages": [self checkNull: fullImages], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -65,18 +65,18 @@ - (NSDictionary *)getProductEntryWithProductEntryId:(long long)productEntryId er - (NSDictionary *)updateProductEntryWithProductEntryId:(long long)productEntryId name:(NSString *)name type:(NSString *)type tags:(NSString *)tags shortDescription:(NSString *)shortDescription longDescription:(NSString *)longDescription pageURL:(NSString *)pageURL author:(NSString *)author repoGroupId:(NSString *)repoGroupId repoArtifactId:(NSString *)repoArtifactId licenseIds:(NSArray *)licenseIds thumbnails:(NSArray *)thumbnails fullImages:(NSArray *)fullImages error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"productEntryId": @(productEntryId), - @"name": name, - @"type": type, - @"tags": tags, - @"shortDescription": shortDescription, - @"longDescription": longDescription, - @"pageURL": pageURL, - @"author": author, - @"repoGroupId": repoGroupId, - @"repoArtifactId": repoArtifactId, - @"licenseIds": licenseIds, - @"thumbnails": thumbnails, - @"fullImages": fullImages + @"name": [self checkNull: name], + @"type": [self checkNull: type], + @"tags": [self checkNull: tags], + @"shortDescription": [self checkNull: shortDescription], + @"longDescription": [self checkNull: longDescription], + @"pageURL": [self checkNull: pageURL], + @"author": [self checkNull: author], + @"repoGroupId": [self checkNull: repoGroupId], + @"repoArtifactId": [self checkNull: repoArtifactId], + @"licenseIds": [self checkNull: licenseIds], + @"thumbnails": [self checkNull: thumbnails], + @"fullImages": [self checkNull: fullImages] }]; NSDictionary *_command = @{@"/scproductentry/update-product-entry": _params}; diff --git a/ios/Source/Service/v62/scproductversion/LRSCProductVersionService_v62.m b/ios/Source/Service/v62/scproductversion/LRSCProductVersionService_v62.m index a763d31e..75828fb9 100644 --- a/ios/Source/Service/v62/scproductversion/LRSCProductVersionService_v62.m +++ b/ios/Source/Service/v62/scproductversion/LRSCProductVersionService_v62.m @@ -22,13 +22,13 @@ @implementation LRSCProductVersionService_v62 - (NSDictionary *)addProductVersionWithProductEntryId:(long long)productEntryId version:(NSString *)version changeLog:(NSString *)changeLog downloadPageURL:(NSString *)downloadPageURL directDownloadURL:(NSString *)directDownloadURL testDirectDownloadURL:(BOOL)testDirectDownloadURL repoStoreArtifact:(BOOL)repoStoreArtifact frameworkVersionIds:(NSArray *)frameworkVersionIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"productEntryId": @(productEntryId), - @"version": version, - @"changeLog": changeLog, - @"downloadPageURL": downloadPageURL, - @"directDownloadURL": directDownloadURL, + @"version": [self checkNull: version], + @"changeLog": [self checkNull: changeLog], + @"downloadPageURL": [self checkNull: downloadPageURL], + @"directDownloadURL": [self checkNull: directDownloadURL], @"testDirectDownloadURL": @(testDirectDownloadURL), @"repoStoreArtifact": @(repoStoreArtifact), - @"frameworkVersionIds": frameworkVersionIds, + @"frameworkVersionIds": [self checkNull: frameworkVersionIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -83,13 +83,13 @@ - (NSNumber *)getProductVersionsCountWithProductEntryId:(long long)productEntryI - (NSDictionary *)updateProductVersionWithProductVersionId:(long long)productVersionId version:(NSString *)version changeLog:(NSString *)changeLog downloadPageURL:(NSString *)downloadPageURL directDownloadURL:(NSString *)directDownloadURL testDirectDownloadURL:(BOOL)testDirectDownloadURL repoStoreArtifact:(BOOL)repoStoreArtifact frameworkVersionIds:(NSArray *)frameworkVersionIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"productVersionId": @(productVersionId), - @"version": version, - @"changeLog": changeLog, - @"downloadPageURL": downloadPageURL, - @"directDownloadURL": directDownloadURL, + @"version": [self checkNull: version], + @"changeLog": [self checkNull: changeLog], + @"downloadPageURL": [self checkNull: downloadPageURL], + @"directDownloadURL": [self checkNull: directDownloadURL], @"testDirectDownloadURL": @(testDirectDownloadURL), @"repoStoreArtifact": @(repoStoreArtifact), - @"frameworkVersionIds": frameworkVersionIds + @"frameworkVersionIds": [self checkNull: frameworkVersionIds] }]; NSDictionary *_command = @{@"/scproductversion/update-product-version": _params}; diff --git a/ios/Source/Service/v62/shoppingcategory/LRShoppingCategoryService_v62.m b/ios/Source/Service/v62/shoppingcategory/LRShoppingCategoryService_v62.m index 077e11e9..b82144e0 100644 --- a/ios/Source/Service/v62/shoppingcategory/LRShoppingCategoryService_v62.m +++ b/ios/Source/Service/v62/shoppingcategory/LRShoppingCategoryService_v62.m @@ -22,8 +22,8 @@ @implementation LRShoppingCategoryService_v62 - (NSDictionary *)addCategoryWithParentCategoryId:(long long)parentCategoryId name:(NSString *)name description:(NSString *)description serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"parentCategoryId": @(parentCategoryId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -89,7 +89,7 @@ - (NSDictionary *)getCategoryWithCategoryId:(long long)categoryId error:(NSError - (void)getSubcategoryIdsWithCategoryIds:(NSArray *)categoryIds groupId:(long long)groupId categoryId:(long long)categoryId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"categoryIds": categoryIds, + @"categoryIds": [self checkNull: categoryIds], @"groupId": @(groupId), @"categoryId": @(categoryId) }]; @@ -103,8 +103,8 @@ - (NSDictionary *)updateCategoryWithCategoryId:(long long)categoryId parentCateg NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"categoryId": @(categoryId), @"parentCategoryId": @(parentCategoryId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"mergeWithParentCategory": @(mergeWithParentCategory), }]; diff --git a/ios/Source/Service/v62/shoppingcoupon/LRShoppingCouponService_v62.m b/ios/Source/Service/v62/shoppingcoupon/LRShoppingCouponService_v62.m index b1dc3021..6b2c4820 100644 --- a/ios/Source/Service/v62/shoppingcoupon/LRShoppingCouponService_v62.m +++ b/ios/Source/Service/v62/shoppingcoupon/LRShoppingCouponService_v62.m @@ -21,10 +21,10 @@ @implementation LRShoppingCouponService_v62 - (NSDictionary *)addCouponWithCode:(NSString *)code autoCode:(BOOL)autoCode name:(NSString *)name description:(NSString *)description startDateMonth:(int)startDateMonth startDateDay:(int)startDateDay startDateYear:(int)startDateYear startDateHour:(int)startDateHour startDateMinute:(int)startDateMinute endDateMonth:(int)endDateMonth endDateDay:(int)endDateDay endDateYear:(int)endDateYear endDateHour:(int)endDateHour endDateMinute:(int)endDateMinute neverExpire:(BOOL)neverExpire active:(BOOL)active limitCategories:(NSString *)limitCategories limitSkus:(NSString *)limitSkus minOrder:(double)minOrder discount:(double)discount discountType:(NSString *)discountType serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"code": code, + @"code": [self checkNull: code], @"autoCode": @(autoCode), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"startDateMonth": @(startDateMonth), @"startDateDay": @(startDateDay), @"startDateYear": @(startDateYear), @@ -37,11 +37,11 @@ - (NSDictionary *)addCouponWithCode:(NSString *)code autoCode:(BOOL)autoCode nam @"endDateMinute": @(endDateMinute), @"neverExpire": @(neverExpire), @"active": @(active), - @"limitCategories": limitCategories, - @"limitSkus": limitSkus, + @"limitCategories": [self checkNull: limitCategories], + @"limitSkus": [self checkNull: limitSkus], @"minOrder": @(minOrder), @"discount": @(discount), - @"discountType": discountType, + @"discountType": [self checkNull: discountType], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -77,9 +77,9 @@ - (NSArray *)searchWithGroupId:(long long)groupId companyId:(long long)companyId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"companyId": @(companyId), - @"code": code, + @"code": [self checkNull: code], @"active": @(active), - @"discountType": discountType, + @"discountType": [self checkNull: discountType], @"andOperator": @(andOperator), @"start": @(start), @"end": @(end) @@ -93,8 +93,8 @@ - (NSArray *)searchWithGroupId:(long long)groupId companyId:(long long)companyId - (NSDictionary *)updateCouponWithCouponId:(long long)couponId name:(NSString *)name description:(NSString *)description startDateMonth:(int)startDateMonth startDateDay:(int)startDateDay startDateYear:(int)startDateYear startDateHour:(int)startDateHour startDateMinute:(int)startDateMinute endDateMonth:(int)endDateMonth endDateDay:(int)endDateDay endDateYear:(int)endDateYear endDateHour:(int)endDateHour endDateMinute:(int)endDateMinute neverExpire:(BOOL)neverExpire active:(BOOL)active limitCategories:(NSString *)limitCategories limitSkus:(NSString *)limitSkus minOrder:(double)minOrder discount:(double)discount discountType:(NSString *)discountType serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"couponId": @(couponId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], @"startDateMonth": @(startDateMonth), @"startDateDay": @(startDateDay), @"startDateYear": @(startDateYear), @@ -107,11 +107,11 @@ - (NSDictionary *)updateCouponWithCouponId:(long long)couponId name:(NSString *) @"endDateMinute": @(endDateMinute), @"neverExpire": @(neverExpire), @"active": @(active), - @"limitCategories": limitCategories, - @"limitSkus": limitSkus, + @"limitCategories": [self checkNull: limitCategories], + @"limitSkus": [self checkNull: limitSkus], @"minOrder": @(minOrder), @"discount": @(discount), - @"discountType": discountType, + @"discountType": [self checkNull: discountType], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/shoppingitem/LRShoppingItemService_v62.m b/ios/Source/Service/v62/shoppingitem/LRShoppingItemService_v62.m index 88f3d8c2..01293945 100644 --- a/ios/Source/Service/v62/shoppingitem/LRShoppingItemService_v62.m +++ b/ios/Source/Service/v62/shoppingitem/LRShoppingItemService_v62.m @@ -23,7 +23,7 @@ - (void)addBookItemsWithGroupId:(long long)groupId categoryId:(long long)categor NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"categoryId": @(categoryId), - @"isbns": isbns + @"isbns": [self checkNull: isbns] }]; NSDictionary *_command = @{@"/shoppingitem/add-book-items": _params}; @@ -35,26 +35,26 @@ - (NSOperation *)addItemWithGroupId:(long long)groupId categoryId:(long long)cat NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"categoryId": @(categoryId), - @"sku": sku, - @"name": name, - @"description": description, - @"properties": properties, - @"fieldsQuantities": fieldsQuantities, + @"sku": [self checkNull: sku], + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"properties": [self checkNull: properties], + @"fieldsQuantities": [self checkNull: fieldsQuantities], @"requiresShipping": @(requiresShipping), @"stockQuantity": @(stockQuantity), @"featured": @(featured), @"sale": @(sale), @"smallImage": @(smallImage), - @"smallImageURL": smallImageURL, - @"smallFile": smallFile, + @"smallImageURL": [self checkNull: smallImageURL], + @"smallFile": [self checkNull: smallFile], @"mediumImage": @(mediumImage), - @"mediumImageURL": mediumImageURL, - @"mediumFile": mediumFile, + @"mediumImageURL": [self checkNull: mediumImageURL], + @"mediumFile": [self checkNull: mediumFile], @"largeImage": @(largeImage), - @"largeImageURL": largeImageURL, - @"largeFile": largeFile, - @"itemFields": itemFields, - @"itemPrices": itemPrices, + @"largeImageURL": [self checkNull: largeImageURL], + @"largeFile": [self checkNull: largeFile], + @"itemFields": [self checkNull: itemFields], + @"itemPrices": [self checkNull: itemPrices], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -77,7 +77,7 @@ - (void)deleteItemWithItemId:(long long)itemId error:(NSError **)error { - (NSNumber *)getCategoriesItemsCountWithGroupId:(long long)groupId categoryIds:(NSArray *)categoryIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"categoryIds": categoryIds + @"categoryIds": [self checkNull: categoryIds] }]; NSDictionary *_command = @{@"/shoppingitem/get-categories-items-count": _params}; @@ -149,26 +149,26 @@ - (NSOperation *)updateItemWithItemId:(long long)itemId groupId:(long long)group @"itemId": @(itemId), @"groupId": @(groupId), @"categoryId": @(categoryId), - @"sku": sku, - @"name": name, - @"description": description, - @"properties": properties, - @"fieldsQuantities": fieldsQuantities, + @"sku": [self checkNull: sku], + @"name": [self checkNull: name], + @"description": [self checkNull: description], + @"properties": [self checkNull: properties], + @"fieldsQuantities": [self checkNull: fieldsQuantities], @"requiresShipping": @(requiresShipping), @"stockQuantity": @(stockQuantity), @"featured": @(featured), @"sale": @(sale), @"smallImage": @(smallImage), - @"smallImageURL": smallImageURL, - @"smallFile": smallFile, + @"smallImageURL": [self checkNull: smallImageURL], + @"smallFile": [self checkNull: smallFile], @"mediumImage": @(mediumImage), - @"mediumImageURL": mediumImageURL, - @"mediumFile": mediumFile, + @"mediumImageURL": [self checkNull: mediumImageURL], + @"mediumFile": [self checkNull: mediumFile], @"largeImage": @(largeImage), - @"largeImageURL": largeImageURL, - @"largeFile": largeFile, - @"itemFields": itemFields, - @"itemPrices": itemPrices, + @"largeImageURL": [self checkNull: largeImageURL], + @"largeFile": [self checkNull: largeFile], + @"itemFields": [self checkNull: itemFields], + @"itemPrices": [self checkNull: itemPrices], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/shoppingorder/LRShoppingOrderService_v62.m b/ios/Source/Service/v62/shoppingorder/LRShoppingOrderService_v62.m index 44456be0..2f3fd63c 100644 --- a/ios/Source/Service/v62/shoppingorder/LRShoppingOrderService_v62.m +++ b/ios/Source/Service/v62/shoppingorder/LRShoppingOrderService_v62.m @@ -22,12 +22,12 @@ @implementation LRShoppingOrderService_v62 - (void)completeOrderWithGroupId:(long long)groupId number:(NSString *)number ppTxnId:(NSString *)ppTxnId ppPaymentStatus:(NSString *)ppPaymentStatus ppPaymentGross:(double)ppPaymentGross ppReceiverEmail:(NSString *)ppReceiverEmail ppPayerEmail:(NSString *)ppPayerEmail serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"number": number, - @"ppTxnId": ppTxnId, - @"ppPaymentStatus": ppPaymentStatus, + @"number": [self checkNull: number], + @"ppTxnId": [self checkNull: ppTxnId], + @"ppPaymentStatus": [self checkNull: ppPaymentStatus], @"ppPaymentGross": @(ppPaymentGross), - @"ppReceiverEmail": ppReceiverEmail, - @"ppPayerEmail": ppPayerEmail, + @"ppReceiverEmail": [self checkNull: ppReceiverEmail], + @"ppPayerEmail": [self checkNull: ppPayerEmail], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -63,7 +63,7 @@ - (void)sendEmailWithGroupId:(long long)groupId orderId:(long long)orderId email NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"orderId": @(orderId), - @"emailType": emailType, + @"emailType": [self checkNull: emailType], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -77,34 +77,34 @@ - (NSDictionary *)updateOrderWithGroupId:(long long)groupId orderId:(long long)o NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"orderId": @(orderId), - @"billingFirstName": billingFirstName, - @"billingLastName": billingLastName, - @"billingEmailAddress": billingEmailAddress, - @"billingCompany": billingCompany, - @"billingStreet": billingStreet, - @"billingCity": billingCity, - @"billingState": billingState, - @"billingZip": billingZip, - @"billingCountry": billingCountry, - @"billingPhone": billingPhone, + @"billingFirstName": [self checkNull: billingFirstName], + @"billingLastName": [self checkNull: billingLastName], + @"billingEmailAddress": [self checkNull: billingEmailAddress], + @"billingCompany": [self checkNull: billingCompany], + @"billingStreet": [self checkNull: billingStreet], + @"billingCity": [self checkNull: billingCity], + @"billingState": [self checkNull: billingState], + @"billingZip": [self checkNull: billingZip], + @"billingCountry": [self checkNull: billingCountry], + @"billingPhone": [self checkNull: billingPhone], @"shipToBilling": @(shipToBilling), - @"shippingFirstName": shippingFirstName, - @"shippingLastName": shippingLastName, - @"shippingEmailAddress": shippingEmailAddress, - @"shippingCompany": shippingCompany, - @"shippingStreet": shippingStreet, - @"shippingCity": shippingCity, - @"shippingState": shippingState, - @"shippingZip": shippingZip, - @"shippingCountry": shippingCountry, - @"shippingPhone": shippingPhone, - @"ccName": ccName, - @"ccType": ccType, - @"ccNumber": ccNumber, + @"shippingFirstName": [self checkNull: shippingFirstName], + @"shippingLastName": [self checkNull: shippingLastName], + @"shippingEmailAddress": [self checkNull: shippingEmailAddress], + @"shippingCompany": [self checkNull: shippingCompany], + @"shippingStreet": [self checkNull: shippingStreet], + @"shippingCity": [self checkNull: shippingCity], + @"shippingState": [self checkNull: shippingState], + @"shippingZip": [self checkNull: shippingZip], + @"shippingCountry": [self checkNull: shippingCountry], + @"shippingPhone": [self checkNull: shippingPhone], + @"ccName": [self checkNull: ccName], + @"ccType": [self checkNull: ccType], + @"ccNumber": [self checkNull: ccNumber], @"ccExpMonth": @(ccExpMonth), @"ccExpYear": @(ccExpYear), - @"ccVerNumber": ccVerNumber, - @"comments": comments + @"ccVerNumber": [self checkNull: ccVerNumber], + @"comments": [self checkNull: comments] }]; NSDictionary *_command = @{@"/shoppingorder/update-order": _params}; @@ -116,11 +116,11 @@ - (NSDictionary *)updateOrderWithGroupId:(long long)groupId orderId:(long long)o NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"orderId": @(orderId), - @"ppTxnId": ppTxnId, - @"ppPaymentStatus": ppPaymentStatus, + @"ppTxnId": [self checkNull: ppTxnId], + @"ppPaymentStatus": [self checkNull: ppPaymentStatus], @"ppPaymentGross": @(ppPaymentGross), - @"ppReceiverEmail": ppReceiverEmail, - @"ppPayerEmail": ppPayerEmail + @"ppReceiverEmail": [self checkNull: ppReceiverEmail], + @"ppPayerEmail": [self checkNull: ppPayerEmail] }]; NSDictionary *_command = @{@"/shoppingorder/update-order": _params}; diff --git a/ios/Source/Service/v62/socialactivity/LRSocialActivityService_v62.m b/ios/Source/Service/v62/socialactivity/LRSocialActivityService_v62.m index 4c97ccce..c9dbd94f 100644 --- a/ios/Source/Service/v62/socialactivity/LRSocialActivityService_v62.m +++ b/ios/Source/Service/v62/socialactivity/LRSocialActivityService_v62.m @@ -21,7 +21,7 @@ @implementation LRSocialActivityService_v62 - (NSArray *)getActivitiesWithClassName:(NSString *)className start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"start": @(start), @"end": @(end) }]; @@ -46,7 +46,7 @@ - (NSArray *)getActivitiesWithClassNameId:(long long)classNameId start:(int)star - (NSArray *)getActivitiesWithMirrorActivityId:(long long)mirrorActivityId className:(NSString *)className classPK:(long long)classPK start:(int)start end:(int)end error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"mirrorActivityId": @(mirrorActivityId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), @"start": @(start), @"end": @(end) @@ -73,7 +73,7 @@ - (NSArray *)getActivitiesWithMirrorActivityId:(long long)mirrorActivityId class - (NSNumber *)getActivitiesCountWithClassName:(NSString *)className error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className + @"className": [self checkNull: className] }]; NSDictionary *_command = @{@"/socialactivity/get-activities-count": _params}; @@ -94,7 +94,7 @@ - (NSNumber *)getActivitiesCountWithClassNameId:(long long)classNameId error:(NS - (NSNumber *)getActivitiesCountWithMirrorActivityId:(long long)mirrorActivityId className:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"mirrorActivityId": @(mirrorActivityId), - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; diff --git a/ios/Source/Service/v62/socialactivitysetting/LRSocialActivitySettingService_v62.m b/ios/Source/Service/v62/socialactivitysetting/LRSocialActivitySettingService_v62.m index b49b0e7d..6033428f 100644 --- a/ios/Source/Service/v62/socialactivitysetting/LRSocialActivitySettingService_v62.m +++ b/ios/Source/Service/v62/socialactivitysetting/LRSocialActivitySettingService_v62.m @@ -22,7 +22,7 @@ @implementation LRSocialActivitySettingService_v62 - (NSDictionary *)getActivityDefinitionWithGroupId:(long long)groupId className:(NSString *)className activityType:(int)activityType error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"activityType": @(activityType) }]; @@ -34,7 +34,7 @@ - (NSDictionary *)getActivityDefinitionWithGroupId:(long long)groupId className: - (NSArray *)getActivityDefinitionsWithGroupId:(long long)groupId className:(NSString *)className error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className + @"className": [self checkNull: className] }]; NSDictionary *_command = @{@"/socialactivitysetting/get-activity-definitions": _params}; @@ -55,7 +55,7 @@ - (NSArray *)getActivitySettingsWithGroupId:(long long)groupId error:(NSError ** - (NSArray *)getJsonActivityDefinitionsWithGroupId:(long long)groupId className:(NSString *)className error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className + @"className": [self checkNull: className] }]; NSDictionary *_command = @{@"/socialactivitysetting/get-json-activity-definitions": _params}; @@ -66,7 +66,7 @@ - (NSArray *)getJsonActivityDefinitionsWithGroupId:(long long)groupId className: - (void)updateActivitySettingWithGroupId:(long long)groupId className:(NSString *)className enabled:(BOOL)enabled error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"enabled": @(enabled) }]; @@ -78,7 +78,7 @@ - (void)updateActivitySettingWithGroupId:(long long)groupId className:(NSString - (void)updateActivitySettingWithGroupId:(long long)groupId className:(NSString *)className activityType:(int)activityType activityCounterDefinition:(LRJSONObjectWrapper *)activityCounterDefinition error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"activityType": @(activityType), }]; @@ -92,9 +92,9 @@ - (void)updateActivitySettingWithGroupId:(long long)groupId className:(NSString - (void)updateActivitySettingsWithGroupId:(long long)groupId className:(NSString *)className activityType:(int)activityType activityCounterDefinitions:(NSArray *)activityCounterDefinitions error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"className": className, + @"className": [self checkNull: className], @"activityType": @(activityType), - @"activityCounterDefinitions": activityCounterDefinitions + @"activityCounterDefinitions": [self checkNull: activityCounterDefinitions] }]; NSDictionary *_command = @{@"/socialactivitysetting/update-activity-settings": _params}; diff --git a/ios/Source/Service/v62/staging/LRStagingService_v62.m b/ios/Source/Service/v62/staging/LRStagingService_v62.m index f8afe675..6ceb4fb7 100644 --- a/ios/Source/Service/v62/staging/LRStagingService_v62.m +++ b/ios/Source/Service/v62/staging/LRStagingService_v62.m @@ -32,7 +32,7 @@ - (void)cleanUpStagingRequestWithStagingRequestId:(long long)stagingRequestId er - (NSNumber *)createStagingRequestWithGroupId:(long long)groupId checksum:(NSString *)checksum error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"checksum": checksum + @"checksum": [self checkNull: checksum] }]; NSDictionary *_command = @{@"/staging/create-staging-request": _params}; @@ -44,7 +44,7 @@ - (void)publishStagingRequestWithStagingRequestId:(long long)stagingRequestId pr NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"stagingRequestId": @(stagingRequestId), @"privateLayout": @(privateLayout), - @"parameterMap": parameterMap + @"parameterMap": [self checkNull: parameterMap] }]; NSDictionary *_command = @{@"/staging/publish-staging-request": _params}; @@ -55,7 +55,7 @@ - (void)publishStagingRequestWithStagingRequestId:(long long)stagingRequestId pr - (void)updateStagingRequestWithStagingRequestId:(long long)stagingRequestId fileName:(NSString *)fileName bytes:(NSData *)bytes error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"stagingRequestId": @(stagingRequestId), - @"fileName": fileName, + @"fileName": [self checkNull: fileName], @"bytes": [self toString:bytes] }]; @@ -68,7 +68,7 @@ - (NSDictionary *)validateStagingRequestWithStagingRequestId:(long long)stagingR NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"stagingRequestId": @(stagingRequestId), @"privateLayout": @(privateLayout), - @"parameterMap": parameterMap + @"parameterMap": [self checkNull: parameterMap] }]; NSDictionary *_command = @{@"/staging/validate-staging-request": _params}; diff --git a/ios/Source/Service/v62/team/LRTeamService_v62.m b/ios/Source/Service/v62/team/LRTeamService_v62.m index 40ba3b9a..0238b09f 100644 --- a/ios/Source/Service/v62/team/LRTeamService_v62.m +++ b/ios/Source/Service/v62/team/LRTeamService_v62.m @@ -22,8 +22,8 @@ @implementation LRTeamService_v62 - (NSDictionary *)addTeamWithGroupId:(long long)groupId name:(NSString *)name description:(NSString *)description error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name, - @"description": description + @"name": [self checkNull: name], + @"description": [self checkNull: description] }]; NSDictionary *_command = @{@"/team/add-team": _params}; @@ -64,7 +64,7 @@ - (NSDictionary *)getTeamWithTeamId:(long long)teamId error:(NSError **)error { - (NSDictionary *)getTeamWithGroupId:(long long)groupId name:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/team/get-team": _params}; @@ -107,8 +107,8 @@ - (BOOL)hasUserTeamWithUserId:(long long)userId teamId:(long long)teamId error:( - (NSDictionary *)updateTeamWithTeamId:(long long)teamId name:(NSString *)name description:(NSString *)description error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"teamId": @(teamId), - @"name": name, - @"description": description + @"name": [self checkNull: name], + @"description": [self checkNull: description] }]; NSDictionary *_command = @{@"/team/update-team": _params}; diff --git a/ios/Source/Service/v62/trashentry/LRTrashEntryService_v62.m b/ios/Source/Service/v62/trashentry/LRTrashEntryService_v62.m index c466771c..a8384108 100644 --- a/ios/Source/Service/v62/trashentry/LRTrashEntryService_v62.m +++ b/ios/Source/Service/v62/trashentry/LRTrashEntryService_v62.m @@ -21,7 +21,7 @@ @implementation LRTrashEntryService_v62 - (void)deleteEntriesWithEntryIds:(NSArray *)entryIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"entryIds": entryIds + @"entryIds": [self checkNull: entryIds] }]; NSDictionary *_command = @{@"/trashentry/delete-entries": _params}; @@ -51,7 +51,7 @@ - (void)deleteEntryWithEntryId:(long long)entryId error:(NSError **)error { - (void)deleteEntryWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -86,7 +86,7 @@ - (NSDictionary *)getEntriesWithGroupId:(long long)groupId start:(int)start end: - (void)moveEntryWithClassName:(NSString *)className classPK:(long long)classPK destinationContainerModelId:(long long)destinationContainerModelId serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), @"destinationContainerModelId": @(destinationContainerModelId), }]; @@ -112,7 +112,7 @@ - (NSDictionary *)restoreEntryWithEntryId:(long long)entryId overrideClassPK:(lo NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"entryId": @(entryId), @"overrideClassPK": @(overrideClassPK), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/trashentry/restore-entry": _params}; diff --git a/ios/Source/Service/v62/user/LRUserService_v62.m b/ios/Source/Service/v62/user/LRUserService_v62.m index 3655d434..cc9bcf7d 100644 --- a/ios/Source/Service/v62/user/LRUserService_v62.m +++ b/ios/Source/Service/v62/user/LRUserService_v62.m @@ -22,7 +22,7 @@ @implementation LRUserService_v62 - (void)addGroupUsersWithGroupId:(long long)groupId userIds:(NSArray *)userIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"userIds": userIds, + @"userIds": [self checkNull: userIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -35,7 +35,7 @@ - (void)addGroupUsersWithGroupId:(long long)groupId userIds:(NSArray *)userIds s - (void)addOrganizationUsersWithOrganizationId:(long long)organizationId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"organizationId": @(organizationId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/add-organization-users": _params}; @@ -46,7 +46,7 @@ - (void)addOrganizationUsersWithOrganizationId:(long long)organizationId userIds - (void)addPasswordPolicyUsersWithPasswordPolicyId:(long long)passwordPolicyId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"passwordPolicyId": @(passwordPolicyId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/add-password-policy-users": _params}; @@ -57,7 +57,7 @@ - (void)addPasswordPolicyUsersWithPasswordPolicyId:(long long)passwordPolicyId u - (void)addRoleUsersWithRoleId:(long long)roleId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"roleId": @(roleId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/add-role-users": _params}; @@ -68,7 +68,7 @@ - (void)addRoleUsersWithRoleId:(long long)roleId userIds:(NSArray *)userIds erro - (void)addTeamUsersWithTeamId:(long long)teamId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"teamId": @(teamId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/add-team-users": _params}; @@ -80,28 +80,28 @@ - (NSDictionary *)addUserWithCompanyId:(long long)companyId autoPassword:(BOOL)a NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"autoPassword": @(autoPassword), - @"password1": password1, - @"password2": password2, + @"password1": [self checkNull: password1], + @"password2": [self checkNull: password2], @"autoScreenName": @(autoScreenName), - @"screenName": screenName, - @"emailAddress": emailAddress, + @"screenName": [self checkNull: screenName], + @"emailAddress": [self checkNull: emailAddress], @"facebookId": @(facebookId), - @"openId": openId, - @"locale": locale, - @"firstName": firstName, - @"middleName": middleName, - @"lastName": lastName, + @"openId": [self checkNull: openId], + @"locale": [self checkNull: locale], + @"firstName": [self checkNull: firstName], + @"middleName": [self checkNull: middleName], + @"lastName": [self checkNull: lastName], @"prefixId": @(prefixId), @"suffixId": @(suffixId), @"male": @(male), @"birthdayMonth": @(birthdayMonth), @"birthdayDay": @(birthdayDay), @"birthdayYear": @(birthdayYear), - @"jobTitle": jobTitle, - @"groupIds": groupIds, - @"organizationIds": organizationIds, - @"roleIds": roleIds, - @"userGroupIds": userGroupIds, + @"jobTitle": [self checkNull: jobTitle], + @"groupIds": [self checkNull: groupIds], + @"organizationIds": [self checkNull: organizationIds], + @"roleIds": [self checkNull: roleIds], + @"userGroupIds": [self checkNull: userGroupIds], @"sendEmail": @(sendEmail), }]; @@ -116,33 +116,33 @@ - (NSDictionary *)addUserWithCompanyId:(long long)companyId autoPassword:(BOOL)a NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"autoPassword": @(autoPassword), - @"password1": password1, - @"password2": password2, + @"password1": [self checkNull: password1], + @"password2": [self checkNull: password2], @"autoScreenName": @(autoScreenName), - @"screenName": screenName, - @"emailAddress": emailAddress, + @"screenName": [self checkNull: screenName], + @"emailAddress": [self checkNull: emailAddress], @"facebookId": @(facebookId), - @"openId": openId, - @"locale": locale, - @"firstName": firstName, - @"middleName": middleName, - @"lastName": lastName, + @"openId": [self checkNull: openId], + @"locale": [self checkNull: locale], + @"firstName": [self checkNull: firstName], + @"middleName": [self checkNull: middleName], + @"lastName": [self checkNull: lastName], @"prefixId": @(prefixId), @"suffixId": @(suffixId), @"male": @(male), @"birthdayMonth": @(birthdayMonth), @"birthdayDay": @(birthdayDay), @"birthdayYear": @(birthdayYear), - @"jobTitle": jobTitle, - @"groupIds": groupIds, - @"organizationIds": organizationIds, - @"roleIds": roleIds, - @"userGroupIds": userGroupIds, - @"addresses": addresses, - @"emailAddresses": emailAddresses, - @"phones": phones, - @"websites": websites, - @"announcementsDelivers": announcementsDelivers, + @"jobTitle": [self checkNull: jobTitle], + @"groupIds": [self checkNull: groupIds], + @"organizationIds": [self checkNull: organizationIds], + @"roleIds": [self checkNull: roleIds], + @"userGroupIds": [self checkNull: userGroupIds], + @"addresses": [self checkNull: addresses], + @"emailAddresses": [self checkNull: emailAddresses], + @"phones": [self checkNull: phones], + @"websites": [self checkNull: websites], + @"announcementsDelivers": [self checkNull: announcementsDelivers], @"sendEmail": @(sendEmail), }]; @@ -156,7 +156,7 @@ - (NSDictionary *)addUserWithCompanyId:(long long)companyId autoPassword:(BOOL)a - (void)addUserGroupUsersWithUserGroupId:(long long)userGroupId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userGroupId": @(userGroupId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/add-user-group-users": _params}; @@ -168,28 +168,28 @@ - (NSDictionary *)addUserWithWorkflowWithCompanyId:(long long)companyId autoPass NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"autoPassword": @(autoPassword), - @"password1": password1, - @"password2": password2, + @"password1": [self checkNull: password1], + @"password2": [self checkNull: password2], @"autoScreenName": @(autoScreenName), - @"screenName": screenName, - @"emailAddress": emailAddress, + @"screenName": [self checkNull: screenName], + @"emailAddress": [self checkNull: emailAddress], @"facebookId": @(facebookId), - @"openId": openId, - @"locale": locale, - @"firstName": firstName, - @"middleName": middleName, - @"lastName": lastName, + @"openId": [self checkNull: openId], + @"locale": [self checkNull: locale], + @"firstName": [self checkNull: firstName], + @"middleName": [self checkNull: middleName], + @"lastName": [self checkNull: lastName], @"prefixId": @(prefixId), @"suffixId": @(suffixId), @"male": @(male), @"birthdayMonth": @(birthdayMonth), @"birthdayDay": @(birthdayDay), @"birthdayYear": @(birthdayYear), - @"jobTitle": jobTitle, - @"groupIds": groupIds, - @"organizationIds": organizationIds, - @"roleIds": roleIds, - @"userGroupIds": userGroupIds, + @"jobTitle": [self checkNull: jobTitle], + @"groupIds": [self checkNull: groupIds], + @"organizationIds": [self checkNull: organizationIds], + @"roleIds": [self checkNull: roleIds], + @"userGroupIds": [self checkNull: userGroupIds], @"sendEmail": @(sendEmail), }]; @@ -204,33 +204,33 @@ - (NSDictionary *)addUserWithWorkflowWithCompanyId:(long long)companyId autoPass NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"autoPassword": @(autoPassword), - @"password1": password1, - @"password2": password2, + @"password1": [self checkNull: password1], + @"password2": [self checkNull: password2], @"autoScreenName": @(autoScreenName), - @"screenName": screenName, - @"emailAddress": emailAddress, + @"screenName": [self checkNull: screenName], + @"emailAddress": [self checkNull: emailAddress], @"facebookId": @(facebookId), - @"openId": openId, - @"locale": locale, - @"firstName": firstName, - @"middleName": middleName, - @"lastName": lastName, + @"openId": [self checkNull: openId], + @"locale": [self checkNull: locale], + @"firstName": [self checkNull: firstName], + @"middleName": [self checkNull: middleName], + @"lastName": [self checkNull: lastName], @"prefixId": @(prefixId), @"suffixId": @(suffixId), @"male": @(male), @"birthdayMonth": @(birthdayMonth), @"birthdayDay": @(birthdayDay), @"birthdayYear": @(birthdayYear), - @"jobTitle": jobTitle, - @"groupIds": groupIds, - @"organizationIds": organizationIds, - @"roleIds": roleIds, - @"userGroupIds": userGroupIds, - @"addresses": addresses, - @"emailAddresses": emailAddresses, - @"phones": phones, - @"websites": websites, - @"announcementsDelivers": announcementsDelivers, + @"jobTitle": [self checkNull: jobTitle], + @"groupIds": [self checkNull: groupIds], + @"organizationIds": [self checkNull: organizationIds], + @"roleIds": [self checkNull: roleIds], + @"userGroupIds": [self checkNull: userGroupIds], + @"addresses": [self checkNull: addresses], + @"emailAddresses": [self checkNull: emailAddresses], + @"phones": [self checkNull: phones], + @"websites": [self checkNull: websites], + @"announcementsDelivers": [self checkNull: announcementsDelivers], @"sendEmail": @(sendEmail), }]; @@ -347,7 +347,7 @@ - (NSArray *)getRoleUserIdsWithRoleId:(long long)roleId error:(NSError **)error - (NSDictionary *)getUserByEmailAddressWithCompanyId:(long long)companyId emailAddress:(NSString *)emailAddress error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"emailAddress": emailAddress + @"emailAddress": [self checkNull: emailAddress] }]; NSDictionary *_command = @{@"/user/get-user-by-email-address": _params}; @@ -368,7 +368,7 @@ - (NSDictionary *)getUserByIdWithUserId:(long long)userId error:(NSError **)erro - (NSDictionary *)getUserByScreenNameWithCompanyId:(long long)companyId screenName:(NSString *)screenName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"screenName": screenName + @"screenName": [self checkNull: screenName] }]; NSDictionary *_command = @{@"/user/get-user-by-screen-name": _params}; @@ -389,7 +389,7 @@ - (NSArray *)getUserGroupUsersWithUserGroupId:(long long)userGroupId error:(NSEr - (NSNumber *)getUserIdByEmailAddressWithCompanyId:(long long)companyId emailAddress:(NSString *)emailAddress error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"emailAddress": emailAddress + @"emailAddress": [self checkNull: emailAddress] }]; NSDictionary *_command = @{@"/user/get-user-id-by-email-address": _params}; @@ -400,7 +400,7 @@ - (NSNumber *)getUserIdByEmailAddressWithCompanyId:(long long)companyId emailAdd - (NSNumber *)getUserIdByScreenNameWithCompanyId:(long long)companyId screenName:(NSString *)screenName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"screenName": screenName + @"screenName": [self checkNull: screenName] }]; NSDictionary *_command = @{@"/user/get-user-id-by-screen-name": _params}; @@ -433,7 +433,7 @@ - (BOOL)hasRoleUserWithRoleId:(long long)roleId userId:(long long)userId error:( - (BOOL)hasRoleUserWithCompanyId:(long long)companyId name:(NSString *)name userId:(long long)userId inherited:(BOOL)inherited error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), - @"name": name, + @"name": [self checkNull: name], @"userId": @(userId), @"inherited": @(inherited) }]; @@ -446,7 +446,7 @@ - (BOOL)hasRoleUserWithCompanyId:(long long)companyId name:(NSString *)name user - (void)setRoleUsersWithRoleId:(long long)roleId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"roleId": @(roleId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/set-role-users": _params}; @@ -457,7 +457,7 @@ - (void)setRoleUsersWithRoleId:(long long)roleId userIds:(NSArray *)userIds erro - (void)setUserGroupUsersWithUserGroupId:(long long)userGroupId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userGroupId": @(userGroupId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/set-user-group-users": _params}; @@ -468,7 +468,7 @@ - (void)setUserGroupUsersWithUserGroupId:(long long)userGroupId userIds:(NSArray - (void)unsetGroupTeamsUsersWithGroupId:(long long)groupId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/unset-group-teams-users": _params}; @@ -479,7 +479,7 @@ - (void)unsetGroupTeamsUsersWithGroupId:(long long)groupId userIds:(NSArray *)us - (void)unsetGroupUsersWithGroupId:(long long)groupId userIds:(NSArray *)userIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"userIds": userIds, + @"userIds": [self checkNull: userIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -492,7 +492,7 @@ - (void)unsetGroupUsersWithGroupId:(long long)groupId userIds:(NSArray *)userIds - (void)unsetOrganizationUsersWithOrganizationId:(long long)organizationId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"organizationId": @(organizationId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/unset-organization-users": _params}; @@ -503,7 +503,7 @@ - (void)unsetOrganizationUsersWithOrganizationId:(long long)organizationId userI - (void)unsetPasswordPolicyUsersWithPasswordPolicyId:(long long)passwordPolicyId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"passwordPolicyId": @(passwordPolicyId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/unset-password-policy-users": _params}; @@ -514,7 +514,7 @@ - (void)unsetPasswordPolicyUsersWithPasswordPolicyId:(long long)passwordPolicyId - (void)unsetRoleUsersWithRoleId:(long long)roleId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"roleId": @(roleId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/unset-role-users": _params}; @@ -525,7 +525,7 @@ - (void)unsetRoleUsersWithRoleId:(long long)roleId userIds:(NSArray *)userIds er - (void)unsetTeamUsersWithTeamId:(long long)teamId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"teamId": @(teamId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/unset-team-users": _params}; @@ -536,7 +536,7 @@ - (void)unsetTeamUsersWithTeamId:(long long)teamId userIds:(NSArray *)userIds er - (void)unsetUserGroupUsersWithUserGroupId:(long long)userGroupId userIds:(NSArray *)userIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userGroupId": @(userGroupId), - @"userIds": userIds + @"userIds": [self checkNull: userIds] }]; NSDictionary *_command = @{@"/user/unset-user-group-users": _params}; @@ -558,9 +558,9 @@ - (NSDictionary *)updateAgreedToTermsOfUseWithUserId:(long long)userId agreedToT - (NSDictionary *)updateEmailAddressWithUserId:(long long)userId password:(NSString *)password emailAddress1:(NSString *)emailAddress1 emailAddress2:(NSString *)emailAddress2 serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"password": password, - @"emailAddress1": emailAddress1, - @"emailAddress2": emailAddress2, + @"password": [self checkNull: password], + @"emailAddress1": [self checkNull: emailAddress1], + @"emailAddress2": [self checkNull: emailAddress2], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -574,24 +574,24 @@ - (NSDictionary *)updateIncompleteUserWithCompanyId:(long long)companyId autoPas NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"autoPassword": @(autoPassword), - @"password1": password1, - @"password2": password2, + @"password1": [self checkNull: password1], + @"password2": [self checkNull: password2], @"autoScreenName": @(autoScreenName), - @"screenName": screenName, - @"emailAddress": emailAddress, + @"screenName": [self checkNull: screenName], + @"emailAddress": [self checkNull: emailAddress], @"facebookId": @(facebookId), - @"openId": openId, - @"locale": locale, - @"firstName": firstName, - @"middleName": middleName, - @"lastName": lastName, + @"openId": [self checkNull: openId], + @"locale": [self checkNull: locale], + @"firstName": [self checkNull: firstName], + @"middleName": [self checkNull: middleName], + @"lastName": [self checkNull: lastName], @"prefixId": @(prefixId), @"suffixId": @(suffixId), @"male": @(male), @"birthdayMonth": @(birthdayMonth), @"birthdayDay": @(birthdayDay), @"birthdayYear": @(birthdayYear), - @"jobTitle": jobTitle, + @"jobTitle": [self checkNull: jobTitle], @"updateUserInformation": @(updateUserInformation), @"sendEmail": @(sendEmail), }]; @@ -617,7 +617,7 @@ - (NSDictionary *)updateLockoutByIdWithUserId:(long long)userId lockout:(BOOL)lo - (NSDictionary *)updateOpenIdWithUserId:(long long)userId openId:(NSString *)openId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"openId": openId + @"openId": [self checkNull: openId] }]; NSDictionary *_command = @{@"/user/update-open-id": _params}; @@ -628,7 +628,7 @@ - (NSDictionary *)updateOpenIdWithUserId:(long long)userId openId:(NSString *)op - (void)updateOrganizationsWithUserId:(long long)userId organizationIds:(NSArray *)organizationIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"organizationIds": organizationIds, + @"organizationIds": [self checkNull: organizationIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -641,8 +641,8 @@ - (void)updateOrganizationsWithUserId:(long long)userId organizationIds:(NSArray - (NSDictionary *)updatePasswordWithUserId:(long long)userId password1:(NSString *)password1 password2:(NSString *)password2 passwordReset:(BOOL)passwordReset error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"password1": password1, - @"password2": password2, + @"password1": [self checkNull: password1], + @"password2": [self checkNull: password2], @"passwordReset": @(passwordReset) }]; @@ -665,8 +665,8 @@ - (NSDictionary *)updatePortraitWithUserId:(long long)userId bytes:(NSData *)byt - (NSDictionary *)updateReminderQueryWithUserId:(long long)userId question:(NSString *)question answer:(NSString *)answer error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"question": question, - @"answer": answer + @"question": [self checkNull: question], + @"answer": [self checkNull: answer] }]; NSDictionary *_command = @{@"/user/update-reminder-query": _params}; @@ -677,7 +677,7 @@ - (NSDictionary *)updateReminderQueryWithUserId:(long long)userId question:(NSSt - (NSDictionary *)updateScreenNameWithUserId:(long long)userId screenName:(NSString *)screenName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"screenName": screenName + @"screenName": [self checkNull: screenName] }]; NSDictionary *_command = @{@"/user/update-screen-name": _params}; @@ -699,45 +699,45 @@ - (NSDictionary *)updateStatusWithUserId:(long long)userId status:(int)status er - (NSDictionary *)updateUserWithUserId:(long long)userId oldPassword:(NSString *)oldPassword newPassword1:(NSString *)newPassword1 newPassword2:(NSString *)newPassword2 passwordReset:(BOOL)passwordReset reminderQueryQuestion:(NSString *)reminderQueryQuestion reminderQueryAnswer:(NSString *)reminderQueryAnswer screenName:(NSString *)screenName emailAddress:(NSString *)emailAddress facebookId:(long long)facebookId openId:(NSString *)openId languageId:(NSString *)languageId timeZoneId:(NSString *)timeZoneId greeting:(NSString *)greeting comments:(NSString *)comments firstName:(NSString *)firstName middleName:(NSString *)middleName lastName:(NSString *)lastName prefixId:(int)prefixId suffixId:(int)suffixId male:(BOOL)male birthdayMonth:(int)birthdayMonth birthdayDay:(int)birthdayDay birthdayYear:(int)birthdayYear smsSn:(NSString *)smsSn aimSn:(NSString *)aimSn facebookSn:(NSString *)facebookSn icqSn:(NSString *)icqSn jabberSn:(NSString *)jabberSn msnSn:(NSString *)msnSn mySpaceSn:(NSString *)mySpaceSn skypeSn:(NSString *)skypeSn twitterSn:(NSString *)twitterSn ymSn:(NSString *)ymSn jobTitle:(NSString *)jobTitle groupIds:(NSArray *)groupIds organizationIds:(NSArray *)organizationIds roleIds:(NSArray *)roleIds userGroupRoles:(NSArray *)userGroupRoles userGroupIds:(NSArray *)userGroupIds serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"oldPassword": oldPassword, - @"newPassword1": newPassword1, - @"newPassword2": newPassword2, + @"oldPassword": [self checkNull: oldPassword], + @"newPassword1": [self checkNull: newPassword1], + @"newPassword2": [self checkNull: newPassword2], @"passwordReset": @(passwordReset), - @"reminderQueryQuestion": reminderQueryQuestion, - @"reminderQueryAnswer": reminderQueryAnswer, - @"screenName": screenName, - @"emailAddress": emailAddress, + @"reminderQueryQuestion": [self checkNull: reminderQueryQuestion], + @"reminderQueryAnswer": [self checkNull: reminderQueryAnswer], + @"screenName": [self checkNull: screenName], + @"emailAddress": [self checkNull: emailAddress], @"facebookId": @(facebookId), - @"openId": openId, - @"languageId": languageId, - @"timeZoneId": timeZoneId, - @"greeting": greeting, - @"comments": comments, - @"firstName": firstName, - @"middleName": middleName, - @"lastName": lastName, + @"openId": [self checkNull: openId], + @"languageId": [self checkNull: languageId], + @"timeZoneId": [self checkNull: timeZoneId], + @"greeting": [self checkNull: greeting], + @"comments": [self checkNull: comments], + @"firstName": [self checkNull: firstName], + @"middleName": [self checkNull: middleName], + @"lastName": [self checkNull: lastName], @"prefixId": @(prefixId), @"suffixId": @(suffixId), @"male": @(male), @"birthdayMonth": @(birthdayMonth), @"birthdayDay": @(birthdayDay), @"birthdayYear": @(birthdayYear), - @"smsSn": smsSn, - @"aimSn": aimSn, - @"facebookSn": facebookSn, - @"icqSn": icqSn, - @"jabberSn": jabberSn, - @"msnSn": msnSn, - @"mySpaceSn": mySpaceSn, - @"skypeSn": skypeSn, - @"twitterSn": twitterSn, - @"ymSn": ymSn, - @"jobTitle": jobTitle, - @"groupIds": groupIds, - @"organizationIds": organizationIds, - @"roleIds": roleIds, - @"userGroupRoles": userGroupRoles, - @"userGroupIds": userGroupIds, + @"smsSn": [self checkNull: smsSn], + @"aimSn": [self checkNull: aimSn], + @"facebookSn": [self checkNull: facebookSn], + @"icqSn": [self checkNull: icqSn], + @"jabberSn": [self checkNull: jabberSn], + @"msnSn": [self checkNull: msnSn], + @"mySpaceSn": [self checkNull: mySpaceSn], + @"skypeSn": [self checkNull: skypeSn], + @"twitterSn": [self checkNull: twitterSn], + @"ymSn": [self checkNull: ymSn], + @"jobTitle": [self checkNull: jobTitle], + @"groupIds": [self checkNull: groupIds], + @"organizationIds": [self checkNull: organizationIds], + @"roleIds": [self checkNull: roleIds], + @"userGroupRoles": [self checkNull: userGroupRoles], + @"userGroupIds": [self checkNull: userGroupIds], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -750,50 +750,50 @@ - (NSDictionary *)updateUserWithUserId:(long long)userId oldPassword:(NSString * - (NSDictionary *)updateUserWithUserId:(long long)userId oldPassword:(NSString *)oldPassword newPassword1:(NSString *)newPassword1 newPassword2:(NSString *)newPassword2 passwordReset:(BOOL)passwordReset reminderQueryQuestion:(NSString *)reminderQueryQuestion reminderQueryAnswer:(NSString *)reminderQueryAnswer screenName:(NSString *)screenName emailAddress:(NSString *)emailAddress facebookId:(long long)facebookId openId:(NSString *)openId languageId:(NSString *)languageId timeZoneId:(NSString *)timeZoneId greeting:(NSString *)greeting comments:(NSString *)comments firstName:(NSString *)firstName middleName:(NSString *)middleName lastName:(NSString *)lastName prefixId:(int)prefixId suffixId:(int)suffixId male:(BOOL)male birthdayMonth:(int)birthdayMonth birthdayDay:(int)birthdayDay birthdayYear:(int)birthdayYear smsSn:(NSString *)smsSn aimSn:(NSString *)aimSn facebookSn:(NSString *)facebookSn icqSn:(NSString *)icqSn jabberSn:(NSString *)jabberSn msnSn:(NSString *)msnSn mySpaceSn:(NSString *)mySpaceSn skypeSn:(NSString *)skypeSn twitterSn:(NSString *)twitterSn ymSn:(NSString *)ymSn jobTitle:(NSString *)jobTitle groupIds:(NSArray *)groupIds organizationIds:(NSArray *)organizationIds roleIds:(NSArray *)roleIds userGroupRoles:(NSArray *)userGroupRoles userGroupIds:(NSArray *)userGroupIds addresses:(NSArray *)addresses emailAddresses:(NSArray *)emailAddresses phones:(NSArray *)phones websites:(NSArray *)websites announcementsDelivers:(NSArray *)announcementsDelivers serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), - @"oldPassword": oldPassword, - @"newPassword1": newPassword1, - @"newPassword2": newPassword2, + @"oldPassword": [self checkNull: oldPassword], + @"newPassword1": [self checkNull: newPassword1], + @"newPassword2": [self checkNull: newPassword2], @"passwordReset": @(passwordReset), - @"reminderQueryQuestion": reminderQueryQuestion, - @"reminderQueryAnswer": reminderQueryAnswer, - @"screenName": screenName, - @"emailAddress": emailAddress, + @"reminderQueryQuestion": [self checkNull: reminderQueryQuestion], + @"reminderQueryAnswer": [self checkNull: reminderQueryAnswer], + @"screenName": [self checkNull: screenName], + @"emailAddress": [self checkNull: emailAddress], @"facebookId": @(facebookId), - @"openId": openId, - @"languageId": languageId, - @"timeZoneId": timeZoneId, - @"greeting": greeting, - @"comments": comments, - @"firstName": firstName, - @"middleName": middleName, - @"lastName": lastName, + @"openId": [self checkNull: openId], + @"languageId": [self checkNull: languageId], + @"timeZoneId": [self checkNull: timeZoneId], + @"greeting": [self checkNull: greeting], + @"comments": [self checkNull: comments], + @"firstName": [self checkNull: firstName], + @"middleName": [self checkNull: middleName], + @"lastName": [self checkNull: lastName], @"prefixId": @(prefixId), @"suffixId": @(suffixId), @"male": @(male), @"birthdayMonth": @(birthdayMonth), @"birthdayDay": @(birthdayDay), @"birthdayYear": @(birthdayYear), - @"smsSn": smsSn, - @"aimSn": aimSn, - @"facebookSn": facebookSn, - @"icqSn": icqSn, - @"jabberSn": jabberSn, - @"msnSn": msnSn, - @"mySpaceSn": mySpaceSn, - @"skypeSn": skypeSn, - @"twitterSn": twitterSn, - @"ymSn": ymSn, - @"jobTitle": jobTitle, - @"groupIds": groupIds, - @"organizationIds": organizationIds, - @"roleIds": roleIds, - @"userGroupRoles": userGroupRoles, - @"userGroupIds": userGroupIds, - @"addresses": addresses, - @"emailAddresses": emailAddresses, - @"phones": phones, - @"websites": websites, - @"announcementsDelivers": announcementsDelivers, + @"smsSn": [self checkNull: smsSn], + @"aimSn": [self checkNull: aimSn], + @"facebookSn": [self checkNull: facebookSn], + @"icqSn": [self checkNull: icqSn], + @"jabberSn": [self checkNull: jabberSn], + @"msnSn": [self checkNull: msnSn], + @"mySpaceSn": [self checkNull: mySpaceSn], + @"skypeSn": [self checkNull: skypeSn], + @"twitterSn": [self checkNull: twitterSn], + @"ymSn": [self checkNull: ymSn], + @"jobTitle": [self checkNull: jobTitle], + @"groupIds": [self checkNull: groupIds], + @"organizationIds": [self checkNull: organizationIds], + @"roleIds": [self checkNull: roleIds], + @"userGroupRoles": [self checkNull: userGroupRoles], + @"userGroupIds": [self checkNull: userGroupIds], + @"addresses": [self checkNull: addresses], + @"emailAddresses": [self checkNull: emailAddresses], + @"phones": [self checkNull: phones], + @"websites": [self checkNull: websites], + @"announcementsDelivers": [self checkNull: announcementsDelivers], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/usergroup/LRUserGroupService_v62.m b/ios/Source/Service/v62/usergroup/LRUserGroupService_v62.m index 87891a15..98c44a56 100644 --- a/ios/Source/Service/v62/usergroup/LRUserGroupService_v62.m +++ b/ios/Source/Service/v62/usergroup/LRUserGroupService_v62.m @@ -22,7 +22,7 @@ @implementation LRUserGroupService_v62 - (void)addGroupUserGroupsWithGroupId:(long long)groupId userGroupIds:(NSArray *)userGroupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"userGroupIds": userGroupIds + @"userGroupIds": [self checkNull: userGroupIds] }]; NSDictionary *_command = @{@"/usergroup/add-group-user-groups": _params}; @@ -33,7 +33,7 @@ - (void)addGroupUserGroupsWithGroupId:(long long)groupId userGroupIds:(NSArray * - (void)addTeamUserGroupsWithTeamId:(long long)teamId userGroupIds:(NSArray *)userGroupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"teamId": @(teamId), - @"userGroupIds": userGroupIds + @"userGroupIds": [self checkNull: userGroupIds] }]; NSDictionary *_command = @{@"/usergroup/add-team-user-groups": _params}; @@ -43,8 +43,8 @@ - (void)addTeamUserGroupsWithTeamId:(long long)teamId userGroupIds:(NSArray *)us - (NSDictionary *)addUserGroupWithName:(NSString *)name description:(NSString *)description error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"description": description + @"name": [self checkNull: name], + @"description": [self checkNull: description] }]; NSDictionary *_command = @{@"/usergroup/add-user-group": _params}; @@ -54,8 +54,8 @@ - (NSDictionary *)addUserGroupWithName:(NSString *)name description:(NSString *) - (NSDictionary *)addUserGroupWithName:(NSString *)name description:(NSString *)description serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -77,7 +77,7 @@ - (void)deleteUserGroupWithUserGroupId:(long long)userGroupId error:(NSError **) - (NSDictionary *)getUserGroupWithName:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/usergroup/get-user-group": _params}; @@ -108,7 +108,7 @@ - (NSArray *)getUserUserGroupsWithUserId:(long long)userId error:(NSError **)err - (void)unsetGroupUserGroupsWithGroupId:(long long)groupId userGroupIds:(NSArray *)userGroupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"userGroupIds": userGroupIds + @"userGroupIds": [self checkNull: userGroupIds] }]; NSDictionary *_command = @{@"/usergroup/unset-group-user-groups": _params}; @@ -119,7 +119,7 @@ - (void)unsetGroupUserGroupsWithGroupId:(long long)groupId userGroupIds:(NSArray - (void)unsetTeamUserGroupsWithTeamId:(long long)teamId userGroupIds:(NSArray *)userGroupIds error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"teamId": @(teamId), - @"userGroupIds": userGroupIds + @"userGroupIds": [self checkNull: userGroupIds] }]; NSDictionary *_command = @{@"/usergroup/unset-team-user-groups": _params}; @@ -130,8 +130,8 @@ - (void)unsetTeamUserGroupsWithTeamId:(long long)teamId userGroupIds:(NSArray *) - (NSDictionary *)updateUserGroupWithUserGroupId:(long long)userGroupId name:(NSString *)name description:(NSString *)description error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userGroupId": @(userGroupId), - @"name": name, - @"description": description + @"name": [self checkNull: name], + @"description": [self checkNull: description] }]; NSDictionary *_command = @{@"/usergroup/update-user-group": _params}; @@ -142,8 +142,8 @@ - (NSDictionary *)updateUserGroupWithUserGroupId:(long long)userGroupId name:(NS - (NSDictionary *)updateUserGroupWithUserGroupId:(long long)userGroupId name:(NSString *)name description:(NSString *)description serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userGroupId": @(userGroupId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/usergroupgrouprole/LRUserGroupGroupRoleService_v62.m b/ios/Source/Service/v62/usergroupgrouprole/LRUserGroupGroupRoleService_v62.m index ea5dc106..83514d7d 100644 --- a/ios/Source/Service/v62/usergroupgrouprole/LRUserGroupGroupRoleService_v62.m +++ b/ios/Source/Service/v62/usergroupgrouprole/LRUserGroupGroupRoleService_v62.m @@ -23,7 +23,7 @@ - (void)addUserGroupGroupRolesWithUserGroupId:(long long)userGroupId groupId:(lo NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userGroupId": @(userGroupId), @"groupId": @(groupId), - @"roleIds": roleIds + @"roleIds": [self checkNull: roleIds] }]; NSDictionary *_command = @{@"/usergroupgrouprole/add-user-group-group-roles": _params}; @@ -33,7 +33,7 @@ - (void)addUserGroupGroupRolesWithUserGroupId:(long long)userGroupId groupId:(lo - (void)addUserGroupGroupRolesWithUserGroupIds:(NSArray *)userGroupIds groupId:(long long)groupId roleId:(long long)roleId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"userGroupIds": userGroupIds, + @"userGroupIds": [self checkNull: userGroupIds], @"groupId": @(groupId), @"roleId": @(roleId) }]; @@ -47,7 +47,7 @@ - (void)deleteUserGroupGroupRolesWithUserGroupId:(long long)userGroupId groupId: NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userGroupId": @(userGroupId), @"groupId": @(groupId), - @"roleIds": roleIds + @"roleIds": [self checkNull: roleIds] }]; NSDictionary *_command = @{@"/usergroupgrouprole/delete-user-group-group-roles": _params}; @@ -57,7 +57,7 @@ - (void)deleteUserGroupGroupRolesWithUserGroupId:(long long)userGroupId groupId: - (void)deleteUserGroupGroupRolesWithUserGroupIds:(NSArray *)userGroupIds groupId:(long long)groupId roleId:(long long)roleId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"userGroupIds": userGroupIds, + @"userGroupIds": [self checkNull: userGroupIds], @"groupId": @(groupId), @"roleId": @(roleId) }]; diff --git a/ios/Source/Service/v62/usergrouprole/LRUserGroupRoleService_v62.m b/ios/Source/Service/v62/usergrouprole/LRUserGroupRoleService_v62.m index 2f299286..964f838f 100644 --- a/ios/Source/Service/v62/usergrouprole/LRUserGroupRoleService_v62.m +++ b/ios/Source/Service/v62/usergrouprole/LRUserGroupRoleService_v62.m @@ -23,7 +23,7 @@ - (void)addUserGroupRolesWithUserId:(long long)userId groupId:(long long)groupId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), @"groupId": @(groupId), - @"roleIds": roleIds + @"roleIds": [self checkNull: roleIds] }]; NSDictionary *_command = @{@"/usergrouprole/add-user-group-roles": _params}; @@ -33,7 +33,7 @@ - (void)addUserGroupRolesWithUserId:(long long)userId groupId:(long long)groupId - (void)addUserGroupRolesWithUserIds:(NSArray *)userIds groupId:(long long)groupId roleId:(long long)roleId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"userIds": userIds, + @"userIds": [self checkNull: userIds], @"groupId": @(groupId), @"roleId": @(roleId) }]; @@ -47,7 +47,7 @@ - (void)deleteUserGroupRolesWithUserId:(long long)userId groupId:(long long)grou NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"userId": @(userId), @"groupId": @(groupId), - @"roleIds": roleIds + @"roleIds": [self checkNull: roleIds] }]; NSDictionary *_command = @{@"/usergrouprole/delete-user-group-roles": _params}; @@ -57,7 +57,7 @@ - (void)deleteUserGroupRolesWithUserId:(long long)userId groupId:(long long)grou - (void)deleteUserGroupRolesWithUserIds:(NSArray *)userIds groupId:(long long)groupId roleId:(long long)roleId error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"userIds": userIds, + @"userIds": [self checkNull: userIds], @"groupId": @(groupId), @"roleId": @(roleId) }]; diff --git a/ios/Source/Service/v62/website/LRWebsiteService_v62.m b/ios/Source/Service/v62/website/LRWebsiteService_v62.m index 33e3ff6a..2874de54 100644 --- a/ios/Source/Service/v62/website/LRWebsiteService_v62.m +++ b/ios/Source/Service/v62/website/LRWebsiteService_v62.m @@ -21,9 +21,9 @@ @implementation LRWebsiteService_v62 - (NSDictionary *)addWebsiteWithClassName:(NSString *)className classPK:(long long)classPK url:(NSString *)url typeId:(int)typeId primary:(BOOL)primary error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"url": url, + @"url": [self checkNull: url], @"typeId": @(typeId), @"primary": @(primary) }]; @@ -35,9 +35,9 @@ - (NSDictionary *)addWebsiteWithClassName:(NSString *)className classPK:(long lo - (NSDictionary *)addWebsiteWithClassName:(NSString *)className classPK:(long long)classPK url:(NSString *)url typeId:(int)typeId primary:(BOOL)primary serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK), - @"url": url, + @"url": [self checkNull: url], @"typeId": @(typeId), @"primary": @(primary), }]; @@ -71,7 +71,7 @@ - (NSDictionary *)getWebsiteWithWebsiteId:(long long)websiteId error:(NSError ** - (NSArray *)getWebsitesWithClassName:(NSString *)className classPK:(long long)classPK error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"className": className, + @"className": [self checkNull: className], @"classPK": @(classPK) }]; @@ -83,7 +83,7 @@ - (NSArray *)getWebsitesWithClassName:(NSString *)className classPK:(long long)c - (NSDictionary *)updateWebsiteWithWebsiteId:(long long)websiteId url:(NSString *)url typeId:(int)typeId primary:(BOOL)primary error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"websiteId": @(websiteId), - @"url": url, + @"url": [self checkNull: url], @"typeId": @(typeId), @"primary": @(primary) }]; diff --git a/ios/Source/Service/v62/wikinode/LRWikiNodeService_v62.m b/ios/Source/Service/v62/wikinode/LRWikiNodeService_v62.m index 9524ba94..be57fa8a 100644 --- a/ios/Source/Service/v62/wikinode/LRWikiNodeService_v62.m +++ b/ios/Source/Service/v62/wikinode/LRWikiNodeService_v62.m @@ -21,8 +21,8 @@ @implementation LRWikiNodeService_v62 - (NSDictionary *)addNodeWithName:(NSString *)name description:(NSString *)description serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -55,7 +55,7 @@ - (NSDictionary *)getNodeWithNodeId:(long long)nodeId error:(NSError **)error { - (NSDictionary *)getNodeWithGroupId:(long long)groupId name:(NSString *)name error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), - @"name": name + @"name": [self checkNull: name] }]; NSDictionary *_command = @{@"/wikinode/get-node": _params}; @@ -173,8 +173,8 @@ - (void)unsubscribeNodeWithNodeId:(long long)nodeId error:(NSError **)error { - (NSDictionary *)updateNodeWithNodeId:(long long)nodeId name:(NSString *)name description:(NSString *)description serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"name": name, - @"description": description, + @"name": [self checkNull: name], + @"description": [self checkNull: description], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; diff --git a/ios/Source/Service/v62/wikipage/LRWikiPageService_v62.m b/ios/Source/Service/v62/wikipage/LRWikiPageService_v62.m index 61869a84..2b37d25b 100644 --- a/ios/Source/Service/v62/wikipage/LRWikiPageService_v62.m +++ b/ios/Source/Service/v62/wikipage/LRWikiPageService_v62.m @@ -22,9 +22,9 @@ @implementation LRWikiPageService_v62 - (NSDictionary *)addPageWithNodeId:(long long)nodeId title:(NSString *)title content:(NSString *)content summary:(NSString *)summary minorEdit:(BOOL)minorEdit serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"content": content, - @"summary": summary, + @"title": [self checkNull: title], + @"content": [self checkNull: content], + @"summary": [self checkNull: summary], @"minorEdit": @(minorEdit), }]; @@ -38,13 +38,13 @@ - (NSDictionary *)addPageWithNodeId:(long long)nodeId title:(NSString *)title co - (NSDictionary *)addPageWithNodeId:(long long)nodeId title:(NSString *)title content:(NSString *)content summary:(NSString *)summary minorEdit:(BOOL)minorEdit format:(NSString *)format parentTitle:(NSString *)parentTitle redirectTitle:(NSString *)redirectTitle serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"content": content, - @"summary": summary, + @"title": [self checkNull: title], + @"content": [self checkNull: content], + @"summary": [self checkNull: summary], @"minorEdit": @(minorEdit), - @"format": format, - @"parentTitle": parentTitle, - @"redirectTitle": redirectTitle, + @"format": [self checkNull: format], + @"parentTitle": [self checkNull: parentTitle], + @"redirectTitle": [self checkNull: redirectTitle], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -57,10 +57,10 @@ - (NSDictionary *)addPageWithNodeId:(long long)nodeId title:(NSString *)title co - (NSOperation *)addPageAttachmentWithNodeId:(long long)nodeId title:(NSString *)title fileName:(NSString *)fileName file:(LRUploadData *)file mimeType:(NSString *)mimeType error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"fileName": fileName, - @"file": file, - @"mimeType": mimeType + @"title": [self checkNull: title], + @"fileName": [self checkNull: fileName], + @"file": [self checkNull: file], + @"mimeType": [self checkNull: mimeType] }]; NSDictionary *_command = @{@"/wikipage/add-page-attachment": _params}; @@ -71,8 +71,8 @@ - (NSOperation *)addPageAttachmentWithNodeId:(long long)nodeId title:(NSString * - (void)addPageAttachmentsWithNodeId:(long long)nodeId title:(NSString *)title inputStreamOVPs:(NSArray *)inputStreamOVPs error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"inputStreamOVPs": inputStreamOVPs + @"title": [self checkNull: title], + @"inputStreamOVPs": [self checkNull: inputStreamOVPs] }]; NSDictionary *_command = @{@"/wikipage/add-page-attachments": _params}; @@ -83,8 +83,8 @@ - (void)addPageAttachmentsWithNodeId:(long long)nodeId title:(NSString *)title i - (void)changeParentWithNodeId:(long long)nodeId title:(NSString *)title newParentTitle:(NSString *)newParentTitle serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"newParentTitle": newParentTitle, + @"title": [self checkNull: title], + @"newParentTitle": [self checkNull: newParentTitle], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -97,9 +97,9 @@ - (void)changeParentWithNodeId:(long long)nodeId title:(NSString *)title newPare - (void)copyPageAttachmentsWithTemplateNodeId:(long long)templateNodeId templateTitle:(NSString *)templateTitle nodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"templateNodeId": @(templateNodeId), - @"templateTitle": templateTitle, + @"templateTitle": [self checkNull: templateTitle], @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/copy-page-attachments": _params}; @@ -110,7 +110,7 @@ - (void)copyPageAttachmentsWithTemplateNodeId:(long long)templateNodeId template - (void)deletePageWithNodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/delete-page": _params}; @@ -121,7 +121,7 @@ - (void)deletePageWithNodeId:(long long)nodeId title:(NSString *)title error:(NS - (void)deletePageWithNodeId:(long long)nodeId title:(NSString *)title version:(double)version error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"version": @(version) }]; @@ -133,8 +133,8 @@ - (void)deletePageWithNodeId:(long long)nodeId title:(NSString *)title version:( - (void)deletePageAttachmentWithNodeId:(long long)nodeId title:(NSString *)title fileName:(NSString *)fileName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"fileName": fileName + @"title": [self checkNull: title], + @"fileName": [self checkNull: fileName] }]; NSDictionary *_command = @{@"/wikipage/delete-page-attachment": _params}; @@ -145,7 +145,7 @@ - (void)deletePageAttachmentWithNodeId:(long long)nodeId title:(NSString *)title - (void)deletePageAttachmentsWithNodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/delete-page-attachments": _params}; @@ -156,8 +156,8 @@ - (void)deletePageAttachmentsWithNodeId:(long long)nodeId title:(NSString *)titl - (void)deleteTempPageAttachmentWithNodeId:(long long)nodeId fileName:(NSString *)fileName tempFolderName:(NSString *)tempFolderName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"fileName": fileName, - @"tempFolderName": tempFolderName + @"fileName": [self checkNull: fileName], + @"tempFolderName": [self checkNull: tempFolderName] }]; NSDictionary *_command = @{@"/wikipage/delete-temp-page-attachment": _params}; @@ -168,7 +168,7 @@ - (void)deleteTempPageAttachmentWithNodeId:(long long)nodeId fileName:(NSString - (void)deleteTrashPageAttachmentsWithNodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/delete-trash-page-attachments": _params}; @@ -179,7 +179,7 @@ - (void)deleteTrashPageAttachmentsWithNodeId:(long long)nodeId title:(NSString * - (void)discardDraftWithNodeId:(long long)nodeId title:(NSString *)title version:(double)version error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"version": @(version) }]; @@ -193,7 +193,7 @@ - (NSArray *)getChildrenWithGroupId:(long long)groupId nodeId:(long long)nodeId @"groupId": @(groupId), @"nodeId": @(nodeId), @"head": @(head), - @"parentTitle": parentTitle + @"parentTitle": [self checkNull: parentTitle] }]; NSDictionary *_command = @{@"/wikipage/get-children": _params}; @@ -204,7 +204,7 @@ - (NSArray *)getChildrenWithGroupId:(long long)groupId nodeId:(long long)nodeId - (NSDictionary *)getDraftPageWithNodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/get-draft-page": _params}; @@ -227,11 +227,11 @@ - (NSString *)getNodePagesRssWithNodeId:(long long)nodeId max:(int)max type:(NSS NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL] }]; NSDictionary *_command = @{@"/wikipage/get-node-pages-rss": _params}; @@ -243,12 +243,12 @@ - (NSString *)getNodePagesRssWithNodeId:(long long)nodeId max:(int)max type:(NSS NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, - @"attachmentURLPrefix": attachmentURLPrefix + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], + @"attachmentURLPrefix": [self checkNull: attachmentURLPrefix] }]; NSDictionary *_command = @{@"/wikipage/get-node-pages-rss": _params}; @@ -270,7 +270,7 @@ - (NSArray *)getOrphansWithGroupId:(long long)groupId nodeId:(long long)nodeId e - (NSDictionary *)getPageWithNodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/get-page": _params}; @@ -282,7 +282,7 @@ - (NSDictionary *)getPageWithGroupId:(long long)groupId nodeId:(long long)nodeId NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"groupId": @(groupId), @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/get-page": _params}; @@ -293,7 +293,7 @@ - (NSDictionary *)getPageWithGroupId:(long long)groupId nodeId:(long long)nodeId - (NSDictionary *)getPageWithNodeId:(long long)nodeId title:(NSString *)title head:(BOOL)head error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"head": @(head) }]; @@ -305,7 +305,7 @@ - (NSDictionary *)getPageWithNodeId:(long long)nodeId title:(NSString *)title he - (NSDictionary *)getPageWithNodeId:(long long)nodeId title:(NSString *)title version:(double)version error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"version": @(version) }]; @@ -375,14 +375,14 @@ - (NSString *)getPagesRssWithCompanyId:(long long)companyId nodeId:(long long)no NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, - @"locale": locale + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], + @"locale": [self checkNull: locale] }]; NSDictionary *_command = @{@"/wikipage/get-pages-rss": _params}; @@ -394,15 +394,15 @@ - (NSString *)getPagesRssWithCompanyId:(long long)companyId nodeId:(long long)no NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"companyId": @(companyId), @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"max": @(max), - @"type": type, + @"type": [self checkNull: type], @"version": @(version), - @"displayStyle": displayStyle, - @"feedURL": feedURL, - @"entryURL": entryURL, - @"attachmentURLPrefix": attachmentURLPrefix, - @"locale": locale + @"displayStyle": [self checkNull: displayStyle], + @"feedURL": [self checkNull: feedURL], + @"entryURL": [self checkNull: entryURL], + @"attachmentURLPrefix": [self checkNull: attachmentURLPrefix], + @"locale": [self checkNull: locale] }]; NSDictionary *_command = @{@"/wikipage/get-pages-rss": _params}; @@ -437,7 +437,7 @@ - (NSNumber *)getRecentChangesCountWithGroupId:(long long)groupId nodeId:(long l - (NSArray *)getTempPageAttachmentNamesWithNodeId:(long long)nodeId tempFolderName:(NSString *)tempFolderName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"tempFolderName": tempFolderName + @"tempFolderName": [self checkNull: tempFolderName] }]; NSDictionary *_command = @{@"/wikipage/get-temp-page-attachment-names": _params}; @@ -448,8 +448,8 @@ - (NSArray *)getTempPageAttachmentNamesWithNodeId:(long long)nodeId tempFolderNa - (void)movePageWithNodeId:(long long)nodeId title:(NSString *)title newTitle:(NSString *)newTitle serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"newTitle": newTitle, + @"title": [self checkNull: title], + @"newTitle": [self checkNull: newTitle], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext]; @@ -462,8 +462,8 @@ - (void)movePageWithNodeId:(long long)nodeId title:(NSString *)title newTitle:(N - (NSDictionary *)movePageAttachmentToTrashWithNodeId:(long long)nodeId title:(NSString *)title fileName:(NSString *)fileName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"fileName": fileName + @"title": [self checkNull: title], + @"fileName": [self checkNull: fileName] }]; NSDictionary *_command = @{@"/wikipage/move-page-attachment-to-trash": _params}; @@ -474,7 +474,7 @@ - (NSDictionary *)movePageAttachmentToTrashWithNodeId:(long long)nodeId title:(N - (NSDictionary *)movePageToTrashWithNodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/move-page-to-trash": _params}; @@ -485,7 +485,7 @@ - (NSDictionary *)movePageToTrashWithNodeId:(long long)nodeId title:(NSString *) - (NSDictionary *)movePageToTrashWithNodeId:(long long)nodeId title:(NSString *)title version:(double)version error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"version": @(version) }]; @@ -497,8 +497,8 @@ - (NSDictionary *)movePageToTrashWithNodeId:(long long)nodeId title:(NSString *) - (void)restorePageAttachmentFromTrashWithNodeId:(long long)nodeId title:(NSString *)title fileName:(NSString *)fileName error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, - @"fileName": fileName + @"title": [self checkNull: title], + @"fileName": [self checkNull: fileName] }]; NSDictionary *_command = @{@"/wikipage/restore-page-attachment-from-trash": _params}; @@ -519,7 +519,7 @@ - (void)restorePageFromTrashWithResourcePrimKey:(long long)resourcePrimKey error - (NSDictionary *)revertPageWithNodeId:(long long)nodeId title:(NSString *)title version:(double)version serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"version": @(version), }]; @@ -533,7 +533,7 @@ - (NSDictionary *)revertPageWithNodeId:(long long)nodeId title:(NSString *)title - (void)subscribePageWithNodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/subscribe-page": _params}; @@ -544,7 +544,7 @@ - (void)subscribePageWithNodeId:(long long)nodeId title:(NSString *)title error: - (void)unsubscribePageWithNodeId:(long long)nodeId title:(NSString *)title error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title + @"title": [self checkNull: title] }]; NSDictionary *_command = @{@"/wikipage/unsubscribe-page": _params}; @@ -555,14 +555,14 @@ - (void)unsubscribePageWithNodeId:(long long)nodeId title:(NSString *)title erro - (NSDictionary *)updatePageWithNodeId:(long long)nodeId title:(NSString *)title version:(double)version content:(NSString *)content summary:(NSString *)summary minorEdit:(BOOL)minorEdit format:(NSString *)format parentTitle:(NSString *)parentTitle redirectTitle:(NSString *)redirectTitle serviceContext:(LRJSONObjectWrapper *)serviceContext error:(NSError **)error { NSMutableDictionary *_params = [NSMutableDictionary dictionaryWithDictionary:@{ @"nodeId": @(nodeId), - @"title": title, + @"title": [self checkNull: title], @"version": @(version), - @"content": content, - @"summary": summary, + @"content": [self checkNull: content], + @"summary": [self checkNull: summary], @"minorEdit": @(minorEdit), - @"format": format, - @"parentTitle": parentTitle, - @"redirectTitle": redirectTitle, + @"format": [self checkNull: format], + @"parentTitle": [self checkNull: parentTitle], + @"redirectTitle": [self checkNull: redirectTitle], }]; [self mangleWrapperWithParams:_params name:@"serviceContext" className:@"com.liferay.portal.service.ServiceContext" wrapper:serviceContext];