You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by pw...@apache.org on 2013/02/12 17:00:07 UTC
svn commit: r1445217 [1/3] - in /chemistry/objectivecmis/trunk:
ObjectiveCMIS.xcodeproj/ ObjectiveCMIS/Bindings/
ObjectiveCMIS/Bindings/AtomPub/
ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/ ObjectiveCMIS/Client/
ObjectiveCMIS/Common/ ObjectiveCMIS/Uti...
Author: pweschmidt
Date: Tue Feb 12 16:00:06 2013
New Revision: 1445217
URL: http://svn.apache.org/r1445217
Log:
updated method signatures for ObjectiveCMIS library acc to decision at last Dev Group meeting. I.e. convert parameters like "withMimeType" into "mimeType"
Modified:
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISDiscoveryService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISNavigationService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISObjectService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISRepositoryService.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFileableObject.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISNetworkProvider.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISDefaultNetworkProvider.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISObjectConverter.m
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.m
chemistry/objectivecmis/trunk/ObjectiveCMISTests/CMISBaseTest.m
chemistry/objectivecmis/trunk/ObjectiveCMISTests/ObjectiveCMISTests.m
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj Tue Feb 12 16:00:06 2013
@@ -560,8 +560,8 @@
752067F4156AC06300231A5D /* CMISExtensionData.m */,
752067F8156AC0FE00231A5D /* CMISExtensionElement.h */,
752067F9156AC0FE00231A5D /* CMISExtensionElement.m */,
- 828072F61515404F00EF635C /* CMISObjectData.h */,
4E3E14B116AFFB190057CE22 /* CMISNetworkProvider.h */,
+ 828072F61515404F00EF635C /* CMISObjectData.h */,
828072F71515404F00EF635C /* CMISObjectData.m */,
828072F81515404F00EF635C /* CMISProperties.h */,
828072F91515404F00EF635C /* CMISProperties.m */,
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomEntryParser.m Tue Feb 12 16:00:06 2013
@@ -186,7 +186,7 @@
{
if ([elementName isEqualToString:kCMISAtomEntryValue]) {
- [CMISAtomParserUtil parsePropertyValue:self.string withPropertyType:self.currentPropertyType addToArray:self.propertyValues];
+ [CMISAtomParserUtil parsePropertyValue:self.string propertyType:self.currentPropertyType addToArray:self.propertyValues];
} else if (self.currentRendition != nil) {
if ([elementName isEqualToString:kCMISCoreStreamId]) {
self.currentRendition.streamId = self.string;
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.h Tue Feb 12 16:00:06 2013
@@ -35,6 +35,6 @@
/**
* parses the property value and adds it to an array
*/
-+ (void)parsePropertyValue:(NSString *)stringValue withPropertyType:(NSString *)propertyType addToArray:(NSMutableArray*)array;
++ (void)parsePropertyValue:(NSString *)stringValue propertyType:(NSString *)propertyType addToArray:(NSMutableArray*)array;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomParserUtil.m Tue Feb 12 16:00:06 2013
@@ -51,7 +51,7 @@
}
}
-+ (void)parsePropertyValue:(NSString *)stringValue withPropertyType:(NSString *)propertyType addToArray:(NSMutableArray*)array
++ (void)parsePropertyValue:(NSString *)stringValue propertyType:(NSString *)propertyType addToArray:(NSMutableArray*)array
{
if ([propertyType isEqualToString:kCMISAtomEntryPropertyString] ||
[propertyType isEqualToString:kCMISAtomEntryPropertyId] ||
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService%2BProtected.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h Tue Feb 12 16:00:06 2013
@@ -36,25 +36,25 @@
* completionBlock returns CMISObjectData instance or nil if unsuccessul
*/
- (void)retrieveObjectInternal:(NSString *)objectId
- withReturnVersion:(CMISReturnVersion)cmisReturnVersion
- withFilter:(NSString *)filter
- andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
- andIncludePolicyIds:(BOOL)includePolicyIds
- andRenditionFilder:(NSString *)renditionFilter
- andIncludeACL:(BOOL)includeACL
- andIncludeAllowableActions:(BOOL)includeAllowableActions
+ returnVersion:(CMISReturnVersion)cmisReturnVersion
+ filter:(NSString *)filter
+ relationShips:(CMISIncludeRelationship)includeRelationship
+ includePolicyIds:(BOOL)includePolicyIds
+ renditionFilder:(NSString *)renditionFilter
+ includeACL:(BOOL)includeACL
+ includeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
/** retrieve object for a given path name
* completionBlock returns CMISObjectData instance or nil if unsuccessul
*/
- (void)retrieveObjectByPathInternal:(NSString *)path
- withFilter:(NSString *)filter
- andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
- andIncludePolicyIds:(BOOL)includePolicyIds
- andRenditionFilder:(NSString *)renditionFilter
- andIncludeACL:(BOOL)includeACL
- andIncludeAllowableActions:(BOOL)includeAllowableActions
+ filter:(NSString *)filter
+ relationShips:(CMISIncludeRelationship)includeRelationship
+ includePolicyIds:(BOOL)includePolicyIds
+ renditionFilder:(NSString *)renditionFilter
+ includeACL:(BOOL)includeACL
+ includeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
/** retrieve object from cache
@@ -66,14 +66,14 @@
///load the link for a given object Id
///completionBlock returns the link as NSString or nil if unsuccessful
- (void)loadLinkForObjectId:(NSString *)objectId
- andRelation:(NSString *)rel
+ relation:(NSString *)rel
completionBlock:(void (^)(NSString *link, NSError *error))completionBlock;
///load the link for a given object Id
///completionBlock returns the link as NSString or nil if unsuccessful
- (void)loadLinkForObjectId:(NSString *)objectId
- andRelation:(NSString *)rel
- andType:(NSString *)type
+ relation:(NSString *)rel
+ type:(NSString *)type
completionBlock:(void (^)(NSString *link, NSError *error))completionBlock;
@end
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m Tue Feb 12 16:00:06 2013
@@ -107,7 +107,7 @@
log(@"No matching repository found for repository id %@", self.bindingSession.repositoryId);
// TODO: populate error properly
NSString *detailedDescription = [NSString stringWithFormat:@"No matching repository found for repository id %@", self.bindingSession.repositoryId];
- error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeNoRepositoryFound withDetailedDescription:detailedDescription];
+ error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeNoRepositoryFound detailedDescription:detailedDescription];
}
}
completionBlock(error);
@@ -120,7 +120,7 @@
completionBlock([self.bindingSession objectForKey:kCMISSessionKeyWorkspaces], nil);
} else {
[self.bindingSession.networkProvider invokeGET:self.atomPubUrl
- withSession:self.bindingSession
+ session:self.bindingSession
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
NSData *data = httpResponse.data;
@@ -148,20 +148,26 @@
- (void)retrieveObjectInternal:(NSString *)objectId completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock
{
- [self retrieveObjectInternal:objectId withReturnVersion:NOT_PROVIDED withFilter:@"" andIncludeRelationShips:CMISIncludeRelationshipNone
- andIncludePolicyIds:NO andRenditionFilder:nil andIncludeACL:NO
- andIncludeAllowableActions:YES completionBlock:completionBlock];
+ [self retrieveObjectInternal:objectId
+ returnVersion:NOT_PROVIDED
+ filter:@""
+ relationShips:CMISIncludeRelationshipNone
+ includePolicyIds:NO
+ renditionFilder:nil
+ includeACL:NO
+ includeAllowableActions:YES
+ completionBlock:completionBlock];
}
- (void)retrieveObjectInternal:(NSString *)objectId
- withReturnVersion:(CMISReturnVersion)returnVersion
- withFilter:(NSString *)filter
- andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
- andIncludePolicyIds:(BOOL)includePolicyIds
- andRenditionFilder:(NSString *)renditionFilter
- andIncludeACL:(BOOL)includeACL
- andIncludeAllowableActions:(BOOL)includeAllowableActions
+ returnVersion:(CMISReturnVersion)returnVersion
+ filter:(NSString *)filter
+ relationShips:(CMISIncludeRelationship)includeRelationship
+ includePolicyIds:(BOOL)includePolicyIds
+ renditionFilder:(NSString *)renditionFilter
+ includeACL:(BOOL)includeACL
+ includeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock
{
[self retrieveFromCache:kCMISBindingSessionKeyObjectByIdUriBuilder completionBlock:^(id object, NSError *error) {
@@ -178,7 +184,7 @@
// Execute actual call
[self.bindingSession.networkProvider invokeGET:objectIdUrl
- withSession:self.bindingSession
+ session:self.bindingSession
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
if (httpResponse.statusCode == 200 && httpResponse.data) {
@@ -190,7 +196,7 @@
// Add links to link cache
CMISLinkCache *linkCache = [self linkCache];
- [linkCache addLinks:objectData.linkRelations forObjectId:objectData.identifier];
+ [linkCache addLinks:objectData.linkRelations objectId:objectData.identifier];
}
completionBlock(objectData, error);
}
@@ -202,12 +208,12 @@
}
- (void)retrieveObjectByPathInternal:(NSString *)path
- withFilter:(NSString *)filter
- andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
- andIncludePolicyIds:(BOOL)includePolicyIds
- andRenditionFilder:(NSString *)renditionFilter
- andIncludeACL:(BOOL)includeACL
- andIncludeAllowableActions:(BOOL)includeAllowableActions
+ filter:(NSString *)filter
+ relationShips:(CMISIncludeRelationship)includeRelationship
+ includePolicyIds:(BOOL)includePolicyIds
+ renditionFilder:(NSString *)renditionFilter
+ includeACL:(BOOL)includeACL
+ includeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock
{
[self retrieveFromCache:kCMISBindingSessionKeyObjectByPathUriBuilder completionBlock:^(id object, NSError *error) {
@@ -222,7 +228,7 @@
// Execute actual call
[self.bindingSession.networkProvider invokeGET:[objectByPathUriBuilder buildUrl]
- withSession:self.bindingSession
+ session:self.bindingSession
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
if (httpResponse.statusCode == 200 && httpResponse.data != nil) {
@@ -234,7 +240,7 @@
// Add links to link cache
CMISLinkCache *linkCache = [self linkCache];
- [linkCache addLinks:objectData.linkRelations forObjectId:objectData.identifier];
+ [linkCache addLinks:objectData.linkRelations objectId:objectData.identifier];
}
completionBlock(objectData, error);
}
@@ -264,19 +270,22 @@
- (void)loadLinkForObjectId:(NSString *)objectId
- andRelation:(NSString *)rel
+ relation:(NSString *)rel
completionBlock:(void (^)(NSString *link, NSError *error))completionBlock
{
- [self loadLinkForObjectId:objectId andRelation:rel andType:nil completionBlock:completionBlock];
+ [self loadLinkForObjectId:objectId relation:rel type:nil completionBlock:completionBlock];
}
-- (void)loadLinkForObjectId:(NSString *)objectId andRelation:(NSString *)rel andType:(NSString *)type completionBlock:(void (^)(NSString *link, NSError *error))completionBlock
+- (void)loadLinkForObjectId:(NSString *)objectId
+ relation:(NSString *)rel
+ type:(NSString *)type
+ completionBlock:(void (^)(NSString *link, NSError *error))completionBlock
{
CMISLinkCache *linkCache = [self linkCache];
// Fetch link from cache
- NSString *link = [linkCache linkForObjectId:objectId andRelation:rel andType:type];
+ NSString *link = [linkCache linkForObjectId:objectId relation:rel type:type];
if (link) {
completionBlock(link, nil);
} else {
@@ -284,12 +293,12 @@
[self retrieveObjectInternal:objectId completionBlock:^(CMISObjectData *objectData, NSError *error) {
if (error) {
log(@"Could not retrieve object with id %@", objectId);
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
} else {
- NSString *link = [linkCache linkForObjectId:objectId andRelation:rel andType:type];
+ NSString *link = [linkCache linkForObjectId:objectId relation:rel type:type];
if (link == nil) {
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound
- withDetailedDescription:[NSString stringWithFormat:@"Could not find link '%@' for object with id %@", rel, objectId]]);
+ detailedDescription:[NSString stringWithFormat:@"Could not find link '%@' for object with id %@", rel, objectId]]);
} else {
completionBlock(link, nil);
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m Tue Feb 12 16:00:06 2013
@@ -29,17 +29,17 @@
- (void)query:(NSString *)statement searchAllVersions:(BOOL)searchAllVersions
- includeRelationShips:(CMISIncludeRelationship)includeRelationships
+ relationShips:(CMISIncludeRelationship)includeRelationships
renditionFilter:(NSString *)renditionFilter
- includeAllowableActions:(BOOL)includeAllowableActions
- maxItems:(NSNumber *)maxItems
- skipCount:(NSNumber *)skipCount
- completionBlock:(void (^)(CMISObjectList *objectList, NSError *error))completionBlock;
+ includeAllowableActions:(BOOL)includeAllowableActions
+ maxItems:(NSNumber *)maxItems
+ skipCount:(NSNumber *)skipCount
+ completionBlock:(void (^)(CMISObjectList *objectList, NSError *error))completionBlock;
{
// Validate params
if (statement == nil) {
log(@"Must provide 'statement' parameter when executing a cmis query");
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:nil]);
return;
}
@@ -47,7 +47,7 @@
NSString *queryUrlString = [self.bindingSession objectForKey:kCMISBindingSessionKeyQueryCollection];
if (queryUrlString == nil) {
log(@"Unknown repository or query not supported!");
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound detailedDescription:nil]);
return;
}
@@ -64,7 +64,7 @@
// Execute HTTP call
[self.bindingSession.networkProvider invokePOST:queryURL
- withSession:self.bindingSession
+ session:self.bindingSession
body:[[atomEntryWriter generateAtomEntryXML] dataUsingEncoding:NSUTF8StringEncoding]
headers:[NSDictionary dictionaryWithObject:kCMISMediaTypeQuery forKey:@"Content-type"]
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
@@ -80,10 +80,10 @@
objectList.objects = feedParser.entries;
completionBlock(objectList, nil);
} else {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
}
} else {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeConnection]);
}
}];
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m Tue Feb 12 16:00:06 2013
@@ -28,16 +28,20 @@
@implementation CMISAtomPubNavigationService
-- (void)retrieveChildren:(NSString *)objectId orderBy:(NSString *)orderBy
- filter:(NSString *)filter includeRelationShips:(CMISIncludeRelationship)includeRelationship
- renditionFilter:(NSString *)renditionFilter includeAllowableActions:(BOOL)includeAllowableActions
- includePathSegment:(BOOL)includePathSegment skipCount:(NSNumber *)skipCount
+- (void)retrieveChildren:(NSString *)objectId
+ orderBy:(NSString *)orderBy
+ filter:(NSString *)filter
+ relationShips:(CMISIncludeRelationship)includeRelationship
+ renditionFilter:(NSString *)renditionFilter
+ includeAllowableActions:(BOOL)includeAllowableActions
+ includePathSegment:(BOOL)includePathSegment
+ skipCount:(NSNumber *)skipCount
maxItems:(NSNumber *)maxItems
completionBlock:(void (^)(CMISObjectList *objectList, NSError *error))completionBlock
{
// Get Down link
- [self loadLinkForObjectId:objectId andRelation:kCMISLinkRelationDown
- andType:kCMISMediaTypeChildren completionBlock:^(NSString *downLink, NSError *error) {
+ [self loadLinkForObjectId:objectId relation:kCMISLinkRelationDown
+ type:kCMISMediaTypeChildren completionBlock:^(NSString *downLink, NSError *error) {
if (error) {
log(@"Could not retrieve down link: %@", error.description);
completionBlock(nil, error);
@@ -45,22 +49,23 @@
}
// Add optional params (CMISUrlUtil will not append if the param name or value is nil)
- downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterFilter withValue:filter toUrlString:downLink];
- downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterOrderBy withValue:orderBy toUrlString:downLink];
- downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeAllowableActions withValue:(includeAllowableActions ? @"true" : @"false") toUrlString:downLink];
- downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeRelationships withValue:[CMISEnums stringForIncludeRelationShip:includeRelationship] toUrlString:downLink];
- downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterRenditionFilter withValue:renditionFilter toUrlString:downLink];
- downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludePathSegment withValue:(includePathSegment ? @"true" : @"false") toUrlString:downLink];
- downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterMaxItems withValue:[maxItems stringValue] toUrlString:downLink];
- downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterSkipCount withValue:[skipCount stringValue] toUrlString:downLink];
+ downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterFilter value:filter urlString:downLink];
+ downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterOrderBy value:orderBy urlString:downLink];
+ downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeAllowableActions value:(includeAllowableActions ? @"true" : @"false") urlString:downLink];
+ downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeRelationships value:[CMISEnums stringForIncludeRelationShip:includeRelationship] urlString:downLink];
+ downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterRenditionFilter value:renditionFilter urlString:downLink];
+ downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludePathSegment value:(includePathSegment ? @"true" : @"false") urlString:downLink];
+ downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterMaxItems value:[maxItems stringValue] urlString:downLink];
+ downLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterSkipCount value:[skipCount stringValue] urlString:downLink];
// execute the request
[self.bindingSession.networkProvider invokeGET:[NSURL URLWithString:downLink]
- withSession:self.bindingSession
- completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
+ session:self.bindingSession
+ completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
if (httpResponse.data == nil) {
- NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeConnection withDetailedDescription:nil];
+ NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeConnection
+ detailedDescription:nil];
completionBlock(nil, error);
return;
}
@@ -77,7 +82,7 @@
objectList.objects = parser.entries;
completionBlock(objectList, nil);
} else {
- NSError *error = [CMISErrors cmisError:internalError withCMISErrorCode:kCMISErrorCodeRuntime];
+ NSError *error = [CMISErrors cmisError:internalError cmisErrorCode:kCMISErrorCodeRuntime];
completionBlock(nil, error);
}
} else {
@@ -88,15 +93,17 @@
}
- (void)retrieveParentsForObject:(NSString *)objectId
- withFilter:(NSString *)filter
- withIncludeRelationships:(CMISIncludeRelationship)includeRelationship
- withRenditionFilter:(NSString *)renditionFilter
- withIncludeAllowableActions:(BOOL)includeAllowableActions
- withIncludeRelativePathSegment:(BOOL)includeRelativePathSegment
- completionBlock:(void (^)(NSArray *parents, NSError *error))completionBlock
+ filter:(NSString *)filter
+ relationships:(CMISIncludeRelationship)includeRelationship
+ renditionFilter:(NSString *)renditionFilter
+ includeAllowableActions:(BOOL)includeAllowableActions
+ includeRelativePathSegment:(BOOL)includeRelativePathSegment
+ completionBlock:(void (^)(NSArray *parents, NSError *error))completionBlock
{
// Get up link
- [self loadLinkForObjectId:objectId andRelation:kCMISLinkRelationUp completionBlock:^(NSString *upLink, NSError *error) {
+ [self loadLinkForObjectId:objectId
+ relation:kCMISLinkRelationUp
+ completionBlock:^(NSString *upLink, NSError *error) {
if (upLink == nil) {
log(@"Failing because the NSString upLink is nil");
completionBlock([NSArray array], nil); // TODO: shouldn't this return an error if the log talks about 'failing'?
@@ -105,25 +112,25 @@
// Add optional parameters
if (filter != nil) {
- upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterFilter withValue:filter toUrlString:upLink];
+ upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterFilter value:filter urlString:upLink];
}
- upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeAllowableActions withValue:(includeAllowableActions ? @"true" : @"false") toUrlString:upLink];
- upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeRelationships withValue:[CMISEnums stringForIncludeRelationShip:includeRelationship] toUrlString:upLink];
+ upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeAllowableActions value:(includeAllowableActions ? @"true" : @"false") urlString:upLink];
+ upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeRelationships value:[CMISEnums stringForIncludeRelationShip:includeRelationship] urlString:upLink];
if (renditionFilter != nil) {
- upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterRenditionFilter withValue:renditionFilter toUrlString:upLink];
+ upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterRenditionFilter value:renditionFilter urlString:upLink];
}
- upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterRelativePathSegment withValue:(includeRelativePathSegment ? @"true" : @"false") toUrlString:upLink];
+ upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterRelativePathSegment value:(includeRelativePathSegment ? @"true" : @"false") urlString:upLink];
[self.bindingSession.networkProvider invokeGET:[NSURL URLWithString:upLink]
- withSession:self.bindingSession
+ session:self.bindingSession
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
CMISAtomFeedParser *parser = [[CMISAtomFeedParser alloc] initWithData:httpResponse.data];
NSError *internalError;
if (![parser parseAndReturnError:&internalError]) {
- NSError *error = [CMISErrors cmisError:internalError withCMISErrorCode:kCMISErrorCodeRuntime];
+ NSError *error = [CMISErrors cmisError:internalError cmisErrorCode:kCMISErrorCodeRuntime];
log(@"Failing because parsing the Atom Feed XML returns an error");
completionBlock([NSArray array], error);
} else {
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m Tue Feb 12 16:00:06 2013
@@ -32,25 +32,25 @@
@implementation CMISAtomPubObjectService
- (void)retrieveObject:(NSString *)objectId
- withFilter:(NSString *)filter
-andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
- andIncludePolicyIds:(BOOL)includePolicyIds
- andRenditionFilder:(NSString *)renditionFilter
- andIncludeACL:(BOOL)includeACL
-andIncludeAllowableActions:(BOOL)includeAllowableActions
+ filter:(NSString *)filter
+ relationShips:(CMISIncludeRelationship)includeRelationship
+ includePolicyIds:(BOOL)includePolicyIds
+ renditionFilder:(NSString *)renditionFilter
+ includeACL:(BOOL)includeACL
+ includeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock
{
[self retrieveObjectInternal:objectId
- withReturnVersion:NOT_PROVIDED
- withFilter:filter
- andIncludeRelationShips:includeRelationship
- andIncludePolicyIds:includePolicyIds
- andRenditionFilder:renditionFilter
- andIncludeACL:includeACL
- andIncludeAllowableActions:includeAllowableActions
+ returnVersion:NOT_PROVIDED
+ filter:filter
+ relationShips:includeRelationship
+ includePolicyIds:includePolicyIds
+ renditionFilder:renditionFilter
+ includeACL:includeACL
+ includeAllowableActions:includeAllowableActions
completionBlock:^(CMISObjectData *objectData, NSError *error) {
if (error) {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
} else {
completionBlock(objectData, nil);
}
@@ -58,40 +58,40 @@ andIncludeAllowableActions:(BOOL)include
}
- (void)retrieveObjectByPath:(NSString *)path
- withFilter:(NSString *)filter
- andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
- andIncludePolicyIds:(BOOL)includePolicyIds
- andRenditionFilder:(NSString *)renditionFilter
- andIncludeACL:(BOOL)includeACL
- andIncludeAllowableActions:(BOOL)includeAllowableActions
+ filter:(NSString *)filter
+ relationShips:(CMISIncludeRelationship)includeRelationship
+ includePolicyIds:(BOOL)includePolicyIds
+ renditionFilder:(NSString *)renditionFilter
+ includeACL:(BOOL)includeACL
+ includeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock
{
[self retrieveObjectByPathInternal:path
- withFilter:filter
- andIncludeRelationShips:includeRelationship
- andIncludePolicyIds:includePolicyIds
- andRenditionFilder:renditionFilter
- andIncludeACL:includeACL
- andIncludeAllowableActions:includeAllowableActions
+ filter:filter
+ relationShips:includeRelationship
+ includePolicyIds:includePolicyIds
+ renditionFilder:renditionFilter
+ includeACL:includeACL
+ includeAllowableActions:includeAllowableActions
completionBlock:completionBlock];
}
- (CMISRequest*)downloadContentOfObject:(NSString *)objectId
- withStreamId:(NSString *)streamId
+ streamId:(NSString *)streamId
toFile:(NSString *)filePath
completionBlock:(void (^)(NSError *error))completionBlock
progressBlock:(void (^)(unsigned long long bytesDownloaded, unsigned long long bytesTotal))progressBlock;
{
NSOutputStream *outputStream = [NSOutputStream outputStreamToFileAtPath:filePath append:NO];
return [self downloadContentOfObject:objectId
- withStreamId:streamId
+ streamId:streamId
toOutputStream:outputStream
completionBlock:completionBlock
progressBlock:progressBlock];
}
- (CMISRequest*)downloadContentOfObject:(NSString *)objectId
- withStreamId:(NSString *)streamId
+ streamId:(NSString *)streamId
toOutputStream:(NSOutputStream *)outputStream
completionBlock:(void (^)(NSError *error))completionBlock
progressBlock:(void (^)(unsigned long long bytesDownloaded, unsigned long long bytesTotal))progressBlock;
@@ -102,7 +102,7 @@ andIncludeAllowableActions:(BOOL)include
if (error) {
log(@"Error while retrieving CMIS object for object id '%@' : %@", objectId, error.description);
if (completionBlock) {
- completionBlock([CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+ completionBlock([CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
}
} else {
NSURL *contentUrl = objectData.contentUrl;
@@ -110,14 +110,14 @@ andIncludeAllowableActions:(BOOL)include
if (contentUrl) {
// This is not spec-compliant!! Took me half a day to find this in opencmis ...
if (streamId != nil) {
- contentUrl = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterStreamId withValue:streamId toUrl:contentUrl];
+ contentUrl = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterStreamId value:streamId url:contentUrl];
}
unsigned long long streamLength = [[[objectData.properties.propertiesDictionary objectForKey:kCMISPropertyContentStreamLength] firstValue] unsignedLongLongValue];
[self.bindingSession.networkProvider invoke:contentUrl
- withHttpMethod:HTTP_GET
- withSession:self.bindingSession
+ httpMethod:HTTP_GET
+ session:self.bindingSession
outputStream:outputStream
bytesExpected:streamLength
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error)
@@ -139,7 +139,7 @@ andIncludeAllowableActions:(BOOL)include
}
- (void)deleteContentOfObject:(CMISStringInOutParameter *)objectIdParam
- withChangeToken:(CMISStringInOutParameter *)changeTokenParam
+ changeToken:(CMISStringInOutParameter *)changeTokenParam
completionBlock:(void (^)(NSError *error))completionBlock
{
// Validate object id param
@@ -150,7 +150,7 @@ andIncludeAllowableActions:(BOOL)include
}
// Get edit media link
- [self loadLinkForObjectId:objectIdParam.inParameter andRelation:kCMISLinkEditMedia completionBlock:^(NSString *editMediaLink, NSError *error) {
+ [self loadLinkForObjectId:objectIdParam.inParameter relation:kCMISLinkEditMedia completionBlock:^(NSString *editMediaLink, NSError *error) {
if (editMediaLink == nil){
log(@"Could not retrieve %@ link for object '%@'", kCMISLinkEditMedia, objectIdParam.inParameter);
completionBlock(error);
@@ -160,11 +160,11 @@ andIncludeAllowableActions:(BOOL)include
// Append optional change token parameters
if (changeTokenParam != nil && changeTokenParam.inParameter != nil) {
editMediaLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterChangeToken
- withValue:changeTokenParam.inParameter toUrlString:editMediaLink];
+ value:changeTokenParam.inParameter urlString:editMediaLink];
}
[self.bindingSession.networkProvider invokeDELETE:[NSURL URLWithString:editMediaLink]
- withSession:self.bindingSession
+ session:self.bindingSession
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
// Atompub DOES NOT SUPPORT returning the new object id and change token
@@ -181,8 +181,8 @@ andIncludeAllowableActions:(BOOL)include
- (CMISRequest*)changeContentOfObject:(CMISStringInOutParameter *)objectIdParam
toContentOfFile:(NSString *)filePath
- withOverwriteExisting:(BOOL)overwrite
- withChangeToken:(CMISStringInOutParameter *)changeTokenParam
+ overwriteExisting:(BOOL)overwrite
+ changeToken:(CMISStringInOutParameter *)changeTokenParam
completionBlock:(void (^)(NSError *error))completionBlock
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
{
@@ -190,7 +190,7 @@ andIncludeAllowableActions:(BOOL)include
if (inputStream == nil) {
log(@"Could not find file %@", filePath);
if (completionBlock) {
- completionBlock([CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
+ completionBlock([CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:nil]);
}
return nil;
}
@@ -204,9 +204,9 @@ andIncludeAllowableActions:(BOOL)include
return [self changeContentOfObject:objectIdParam
toContentOfInputStream:inputStream
bytesExpected:fileSize
- withFilename:[filePath lastPathComponent]
- withOverwriteExisting:overwrite
- withChangeToken:changeTokenParam
+ filename:[filePath lastPathComponent]
+ overwriteExisting:overwrite
+ changeToken:changeTokenParam
completionBlock:completionBlock
progressBlock:progressBlock];
}
@@ -214,9 +214,9 @@ andIncludeAllowableActions:(BOOL)include
- (CMISRequest*)changeContentOfObject:(CMISStringInOutParameter *)objectIdParam
toContentOfInputStream:(NSInputStream *)inputStream
bytesExpected:(unsigned long long)bytesExpected
- withFilename:(NSString*)filename
- withOverwriteExisting:(BOOL)overwrite
- withChangeToken:(CMISStringInOutParameter *)changeTokenParam
+ filename:(NSString*)filename
+ overwriteExisting:(BOOL)overwrite
+ changeToken:(CMISStringInOutParameter *)changeTokenParam
completionBlock:(void (^)(NSError *error))completionBlock
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
{
@@ -224,7 +224,7 @@ andIncludeAllowableActions:(BOOL)include
if (objectIdParam == nil || objectIdParam.inParameter == nil) {
log(@"Object id is nil or inParameter of objectId is nil");
if (completionBlock) {
- completionBlock([CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:@"Must provide object id"]);
+ completionBlock([CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:@"Must provide object id"]);
}
return nil;
}
@@ -232,7 +232,7 @@ andIncludeAllowableActions:(BOOL)include
if (inputStream == nil) {
log(@"Invalid input stream");
if (completionBlock) {
- completionBlock([CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:@"Invalid input stream"]);
+ completionBlock([CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:@"Invalid input stream"]);
}
return nil;
}
@@ -244,11 +244,11 @@ andIncludeAllowableActions:(BOOL)include
CMISRequest *request = [[CMISRequest alloc] init];
// Get edit media link
- [self loadLinkForObjectId:objectIdParam.inParameter andRelation:kCMISLinkEditMedia completionBlock:^(NSString *editMediaLink, NSError *error) {
+ [self loadLinkForObjectId:objectIdParam.inParameter relation:kCMISLinkEditMedia completionBlock:^(NSString *editMediaLink, NSError *error) {
if (editMediaLink == nil){
log(@"Could not retrieve %@ link for object '%@'", kCMISLinkEditMedia, objectIdParam.inParameter);
if (completionBlock) {
- completionBlock([CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+ completionBlock([CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
}
return;
}
@@ -256,24 +256,24 @@ andIncludeAllowableActions:(BOOL)include
// Append optional change token parameters
if (changeTokenParam != nil && changeTokenParam.inParameter != nil) {
editMediaLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterChangeToken
- withValue:changeTokenParam.inParameter toUrlString:editMediaLink];
+ value:changeTokenParam.inParameter urlString:editMediaLink];
}
// Append overwrite flag
editMediaLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterOverwriteFlag
- withValue:(overwrite ? @"true" : @"false") toUrlString:editMediaLink];
+ value:(overwrite ? @"true" : @"false") urlString:editMediaLink];
// Execute HTTP call on edit media link, passing the a stream to the file
NSDictionary *additionalHeader = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"attachment; filename=%@",
filename] forKey:@"Content-Disposition"];
[self.bindingSession.networkProvider invoke:[NSURL URLWithString:editMediaLink]
- withHttpMethod:HTTP_PUT
- withSession:self.bindingSession
- inputStream:inputStream
- headers:additionalHeader
- bytesExpected:bytesExpected
- completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
+ httpMethod:HTTP_PUT
+ session:self.bindingSession
+ inputStream:inputStream
+ headers:additionalHeader
+ bytesExpected:bytesExpected
+ completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
// Check response status
if (httpResponse) {
if (httpResponse.statusCode == 200 || httpResponse.statusCode == 201 || httpResponse.statusCode == 204) {
@@ -281,7 +281,7 @@ andIncludeAllowableActions:(BOOL)include
} else {
log(@"Invalid http response status code when updating content: %d", httpResponse.statusCode);
error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeRuntime
- withDetailedDescription:[NSString stringWithFormat:@"Could not update content: http status code %d", httpResponse.statusCode]];
+ detailedDescription:[NSString stringWithFormat:@"Could not update content: http status code %d", httpResponse.statusCode]];
}
}
if (completionBlock) {
@@ -297,8 +297,8 @@ andIncludeAllowableActions:(BOOL)include
- (CMISRequest*)createDocumentFromFilePath:(NSString *)filePath
- withMimeType:(NSString *)mimeType
- withProperties:(CMISProperties *)properties
+ mimeType:(NSString *)mimeType
+ properties:(CMISProperties *)properties
inFolder:(NSString *)folderObjectId
completionBlock:(void (^)(NSString *objectId, NSError *Error))completionBlock
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
@@ -307,7 +307,8 @@ andIncludeAllowableActions:(BOOL)include
if (inputStream == nil) {
log(@"Could not find file %@", filePath);
if (completionBlock) {
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:@"Invalid file"]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument
+ detailedDescription:@"Invalid file"]);
}
return nil;
}
@@ -319,7 +320,8 @@ andIncludeAllowableActions:(BOOL)include
}
return [self createDocumentFromInputStream:inputStream
- withMimeType:mimeType withProperties:properties
+ mimeType:mimeType
+ properties:properties
inFolder:folderObjectId
bytesExpected:bytesExpected
completionBlock:completionBlock
@@ -327,8 +329,8 @@ andIncludeAllowableActions:(BOOL)include
}
- (CMISRequest*)createDocumentFromInputStream:(NSInputStream *)inputStream // may be nil if you do not want to set content
- withMimeType:(NSString *)mimeType
- withProperties:(CMISProperties *)properties
+ mimeType:(NSString *)mimeType
+ properties:(CMISProperties *)properties
inFolder:(NSString *)folderObjectId
bytesExpected:(unsigned long long)bytesExpected // optional
completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
@@ -338,7 +340,7 @@ andIncludeAllowableActions:(BOOL)include
if ([properties propertyValueForId:kCMISPropertyName] == nil || [properties propertyValueForId:kCMISPropertyObjectTypeId] == nil) {
log(@"Must provide %@ and %@ as properties", kCMISPropertyName, kCMISPropertyObjectTypeId);
if (completionBlock) {
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:nil]);
}
return nil;
}
@@ -347,28 +349,30 @@ andIncludeAllowableActions:(BOOL)include
if (inputStream && !mimeType) {
log(@"Must provide a mimetype when creating a cmis document");
if (completionBlock) {
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:nil]);
}
return nil;
}
CMISRequest *request = [[CMISRequest alloc] init];
// Get Down link
- [self loadLinkForObjectId:folderObjectId andRelation:kCMISLinkRelationDown
- andType:kCMISMediaTypeChildren completionBlock:^(NSString *downLink, NSError *error) {
+ [self loadLinkForObjectId:folderObjectId
+ relation:kCMISLinkRelationDown
+ type:kCMISMediaTypeChildren
+ completionBlock:^(NSString *downLink, NSError *error) {
if (error) {
log(@"Could not retrieve down link: %@", error.description);
if (completionBlock) {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
}
} else {
}
[self sendAtomEntryXmlToLink:downLink
- withHttpRequestMethod:HTTP_POST
- withProperties:properties
- withContentInputStream:inputStream
- withContentMimeType:mimeType
+ httpRequestMethod:HTTP_POST
+ properties:properties
+ contentInputStream:inputStream
+ contentMimeType:mimeType
bytesExpected:bytesExpected
completionBlock:completionBlock
progressBlock:progressBlock
@@ -378,51 +382,57 @@ andIncludeAllowableActions:(BOOL)include
}
-- (void)deleteObject:(NSString *)objectId allVersions:(BOOL)allVersions completionBlock:(void (^)(BOOL objectDeleted, NSError *error))completionBlock
+- (void)deleteObject:(NSString *)objectId
+ allVersions:(BOOL)allVersions
+ completionBlock:(void (^)(BOOL objectDeleted, NSError *error))completionBlock
{
- [self loadLinkForObjectId:objectId andRelation:kCMISLinkRelationSelf completionBlock:^(NSString *selfLink, NSError *error) {
+ [self loadLinkForObjectId:objectId relation:kCMISLinkRelationSelf completionBlock:^(NSString *selfLink, NSError *error) {
if (!selfLink) {
- completionBlock(NO, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
+ completionBlock(NO, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:nil]);
} else {
NSURL *selfUrl = [NSURL URLWithString:selfLink];
[self.bindingSession.networkProvider invokeDELETE:selfUrl
- withSession:self.bindingSession
- completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
+ session:self.bindingSession
+ completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
completionBlock(YES, nil);
} else {
- completionBlock(NO, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeUpdateConflict]);
+ completionBlock(NO, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeUpdateConflict]);
}
}];
}
}];
}
-- (void)createFolderInParentFolder:(NSString *)folderObjectId withProperties:(CMISProperties *)properties completionBlock:(void (^)(NSString *, NSError *))completionBlock
+- (void)createFolderInParentFolder:(NSString *)folderObjectId
+ properties:(CMISProperties *)properties
+ completionBlock:(void (^)(NSString *, NSError *))completionBlock
{
if ([properties propertyValueForId:kCMISPropertyName] == nil || [properties propertyValueForId:kCMISPropertyObjectTypeId] == nil) {
log(@"Must provide %@ and %@ as properties", kCMISPropertyName, kCMISPropertyObjectTypeId);
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:nil]);
return;
}
// Validate parent folder id
if (!folderObjectId) {
log(@"Must provide a parent folder object id when creating a new folder");
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound detailedDescription:nil]);
return;
}
// Get Down link
- [self loadLinkForObjectId:folderObjectId andRelation:kCMISLinkRelationDown
- andType:kCMISMediaTypeChildren completionBlock:^(NSString *downLink, NSError *error) {
+ [self loadLinkForObjectId:folderObjectId
+ relation:kCMISLinkRelationDown
+ type:kCMISMediaTypeChildren
+ completionBlock:^(NSString *downLink, NSError *error) {
if (error) {
log(@"Could not retrieve down link: %@", error.description);
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeConnection]);
} else {
[self sendAtomEntryXmlToLink:downLink
- withHttpRequestMethod:HTTP_POST
- withProperties:properties
+ httpRequestMethod:HTTP_POST
+ properties:properties
completionBlock:^(CMISObjectData *objectData, NSError *error) {
completionBlock(objectData.identifier, error);
}];
@@ -439,42 +449,47 @@ andIncludeAllowableActions:(BOOL)include
// Validate params
if (!folderObjectId) {
log(@"Must provide a folder object id when deleting a folder tree");
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound detailedDescription:nil]);
return;
}
- [self loadLinkForObjectId:folderObjectId andRelation:kCMISLinkRelationDown andType:kCMISMediaTypeDescendants completionBlock:^(NSString *link, NSError *error) {
+ [self loadLinkForObjectId:folderObjectId
+ relation:kCMISLinkRelationDown
+ type:kCMISMediaTypeDescendants
+ completionBlock:^(NSString *link, NSError *error) {
if (error) {
log(@"Error while fetching %@ link : %@", kCMISLinkRelationDown, error.description);
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
return;
}
void (^continueWithLink)(NSString *) = ^(NSString *link) {
- link = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterAllVersions withValue:(allVersions ? @"true" : @"false") toUrlString:link];
- link = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterUnfileObjects withValue:[CMISEnums stringForUnfileObject:unfileObjects] toUrlString:link];
- link = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterContinueOnFailure withValue:(continueOnFailure ? @"true" : @"false") toUrlString:link];
+ link = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterAllVersions value:(allVersions ? @"true" : @"false") urlString:link];
+ link = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterUnfileObjects value:[CMISEnums stringForUnfileObject:unfileObjects] urlString:link];
+ link = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterContinueOnFailure value:(continueOnFailure ? @"true" : @"false") urlString:link];
[self.bindingSession.networkProvider invokeDELETE:[NSURL URLWithString:link]
- withSession:self.bindingSession
+ session:self.bindingSession
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
// TODO: retrieve failed folders and files and return
completionBlock([NSArray array], nil);
} else {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeConnection]);
}
}];
};
if (link == nil) {
- [self loadLinkForObjectId:folderObjectId andRelation:kCMISLinkRelationFolderTree completionBlock:^(NSString *link, NSError *error) {
+ [self loadLinkForObjectId:folderObjectId
+ relation:kCMISLinkRelationFolderTree
+ completionBlock:^(NSString *link, NSError *error) {
if (error) {
log(@"Error while fetching %@ link : %@", kCMISLinkRelationFolderTree, error.description);
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
} else if (link == nil) {
log(@"Could not retrieve %@ nor %@ link", kCMISLinkRelationDown, kCMISLinkRelationFolderTree);
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
} else {
continueWithLink(link);
}
@@ -486,8 +501,8 @@ andIncludeAllowableActions:(BOOL)include
}
- (void)updatePropertiesForObject:(CMISStringInOutParameter *)objectIdParam
- withProperties:(CMISProperties *)properties
- withChangeToken:(CMISStringInOutParameter *)changeTokenParam
+ properties:(CMISProperties *)properties
+ changeToken:(CMISStringInOutParameter *)changeTokenParam
completionBlock:(void (^)(NSError *error))completionBlock
{
// Validate params
@@ -498,23 +513,25 @@ andIncludeAllowableActions:(BOOL)include
}
// Get self link
- [self loadLinkForObjectId:objectIdParam.inParameter andRelation:kCMISLinkRelationSelf completionBlock:^(NSString *selfLink, NSError *error) {
+ [self loadLinkForObjectId:objectIdParam.inParameter
+ relation:kCMISLinkRelationSelf
+ completionBlock:^(NSString *selfLink, NSError *error) {
if (selfLink == nil) {
log(@"Could not retrieve %@ link", kCMISLinkRelationSelf);
- completionBlock([CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
+ completionBlock([CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeConnection]);
return;
}
// Append optional params
if (changeTokenParam != nil && changeTokenParam.inParameter != nil) {
selfLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterChangeToken
- withValue:changeTokenParam.inParameter toUrlString:selfLink];
+ value:changeTokenParam.inParameter urlString:selfLink];
}
// Execute request
[self sendAtomEntryXmlToLink:selfLink
- withHttpRequestMethod:HTTP_PUT
- withProperties:properties
+ httpRequestMethod:HTTP_PUT
+ properties:properties
completionBlock:^(CMISObjectData *objectData, NSError *error) {
// Create XML needed as body of html
@@ -523,7 +540,7 @@ andIncludeAllowableActions:(BOOL)include
xmlWriter.generateXmlInMemory = YES;
[self.bindingSession.networkProvider invokePUT:[NSURL URLWithString:selfLink]
- withSession:self.bindingSession
+ session:self.bindingSession
body:[xmlWriter.generateAtomEntryXml dataUsingEncoding:NSUTF8StringEncoding]
headers:[NSDictionary dictionaryWithObject:kCMISMediaTypeEntry forKey:@"Content-type"]
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
@@ -540,7 +557,7 @@ andIncludeAllowableActions:(BOOL)include
}
completionBlock(nil);
} else {
- completionBlock([CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
+ completionBlock([CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeConnection]);
}
}];
}];
@@ -548,17 +565,19 @@ andIncludeAllowableActions:(BOOL)include
}
-- (void)retrieveRenditions:(NSString *)objectId withRenditionFilter:(NSString *)renditionFilter
- withMaxItems:(NSNumber *)maxItems withSkipCount:(NSNumber *)skipCount
+- (void)retrieveRenditions:(NSString *)objectId
+ renditionFilter:(NSString *)renditionFilter
+ maxItems:(NSNumber *)maxItems
+ skipCount:(NSNumber *)skipCount
completionBlock:(void (^)(NSArray *renditions, NSError *error))completionBlock
{
// Only fetching the bare minimum
- [self retrieveObjectInternal:objectId withReturnVersion:LATEST withFilter:kCMISPropertyObjectId
- andIncludeRelationShips:CMISIncludeRelationshipNone andIncludePolicyIds:NO
- andRenditionFilder:renditionFilter andIncludeACL:NO andIncludeAllowableActions:NO
+ [self retrieveObjectInternal:objectId returnVersion:LATEST filter:kCMISPropertyObjectId
+ relationShips:CMISIncludeRelationshipNone includePolicyIds:NO
+ renditionFilder:renditionFilter includeACL:NO includeAllowableActions:NO
completionBlock:^(CMISObjectData *objectData, NSError *error) {
if (error) {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
} else {
completionBlock(objectData.renditions, nil);
}
@@ -568,15 +587,15 @@ andIncludeAllowableActions:(BOOL)include
#pragma mark Helper methods
- (void)sendAtomEntryXmlToLink:(NSString *)link
- withHttpRequestMethod:(CMISHttpRequestMethod)httpRequestMethod
- withProperties:(CMISProperties *)properties
+ httpRequestMethod:(CMISHttpRequestMethod)httpRequestMethod
+ properties:(CMISProperties *)properties
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock
{
// Validate params
if (link == nil) {
log(@"Could not retrieve link from object to do creation or update");
if (completionBlock) {
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:nil]);
}
return;
}
@@ -589,11 +608,11 @@ andIncludeAllowableActions:(BOOL)include
// Execute call
[self.bindingSession.networkProvider invoke:[NSURL URLWithString:link]
- withHttpMethod:httpRequestMethod
- withSession:self.bindingSession
- body:[writeResult dataUsingEncoding:NSUTF8StringEncoding]
- headers:[NSDictionary dictionaryWithObject:kCMISMediaTypeEntry forKey:@"Content-type"]
- completionBlock:^(CMISHttpResponse *response, NSError *error) {
+ httpMethod:httpRequestMethod
+ session:self.bindingSession
+ body:[writeResult dataUsingEncoding:NSUTF8StringEncoding]
+ headers:[NSDictionary dictionaryWithObject:kCMISMediaTypeEntry forKey:@"Content-type"]
+ completionBlock:^(CMISHttpResponse *response, NSError *error) {
if (error) {
log(@"HTTP error when creating/uploading content: %@", error);
if (completionBlock) {
@@ -608,14 +627,14 @@ andIncludeAllowableActions:(BOOL)include
completionBlock(atomEntryParser.objectData, nil);
} else {
log(@"Error while parsing response: %@", [parseError description]);
- completionBlock(nil, [CMISErrors cmisError:parseError withCMISErrorCode:kCMISErrorCodeUpdateConflict]);
+ completionBlock(nil, [CMISErrors cmisError:parseError cmisErrorCode:kCMISErrorCodeUpdateConflict]);
}
}
} else {
log(@"Invalid http response status code when creating/uploading content: %d", response.statusCode);
log(@"Error content: %@", [[NSString alloc] initWithData:response.data encoding:NSUTF8StringEncoding]);
if (completionBlock) {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeConnection]);
}
}
}];
@@ -623,10 +642,10 @@ andIncludeAllowableActions:(BOOL)include
- (void)sendAtomEntryXmlToLink:(NSString *)link
- withHttpRequestMethod:(CMISHttpRequestMethod)httpRequestMethod
- withProperties:(CMISProperties *)properties
- withContentInputStream:(NSInputStream *)contentInputStream
- withContentMimeType:(NSString *)contentMimeType
+ httpRequestMethod:(CMISHttpRequestMethod)httpRequestMethod
+ properties:(CMISProperties *)properties
+ contentInputStream:(NSInputStream *)contentInputStream
+ contentMimeType:(NSString *)contentMimeType
bytesExpected:(unsigned long long)bytesExpected
completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
@@ -636,7 +655,7 @@ andIncludeAllowableActions:(BOOL)include
if (link == nil) {
log(@"Could not retrieve link from object to do creation or update");
if (completionBlock) {
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:nil]);
}
return;
}
@@ -657,12 +676,12 @@ andIncludeAllowableActions:(BOOL)include
}
[self.bindingSession.networkProvider invoke:[NSURL URLWithString:link]
- withHttpMethod:HTTP_POST
- withSession:self.bindingSession
- inputStream:inputStream
- headers:[NSDictionary dictionaryWithObject:kCMISMediaTypeEntry forKey:@"Content-type"]
- bytesExpected:fileSize
- completionBlock:^(CMISHttpResponse *response, NSError *error) {
+ httpMethod:HTTP_POST
+ session:self.bindingSession
+ inputStream:inputStream
+ headers:[NSDictionary dictionaryWithObject:kCMISMediaTypeEntry forKey:@"Content-type"]
+ bytesExpected:fileSize
+ completionBlock:^(CMISHttpResponse *response, NSError *error) {
// close stream to and delete temporary file
[inputStream close];
NSError *fileError = nil;
@@ -686,7 +705,7 @@ andIncludeAllowableActions:(BOOL)include
completionBlock(atomEntryParser.objectData.identifier, nil);
} else {
log(@"Error while parsing response: %@", [parseError description]);
- completionBlock(nil, [CMISErrors cmisError:parseError withCMISErrorCode:kCMISErrorCodeUpdateConflict]);
+ completionBlock(nil, [CMISErrors cmisError:parseError cmisErrorCode:kCMISErrorCodeUpdateConflict]);
}
}
} else {
@@ -694,7 +713,7 @@ andIncludeAllowableActions:(BOOL)include
log(@"Error content: %@", [[NSString alloc] initWithData:response.data encoding:NSUTF8StringEncoding]);
if (completionBlock) {
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeRuntime
- withDetailedDescription:[NSString stringWithFormat:@"Could not create content: http status code %d", response.statusCode]]);
+ detailedDescription:[NSString stringWithFormat:@"Could not create content: http status code %d", response.statusCode]]);
}
}
}
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m Tue Feb 12 16:00:06 2013
@@ -41,7 +41,7 @@
{
[self internalRetrieveRepositoriesWithCompletionBlock:^(NSError *error) {
if (error) {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
} else {
completionBlock([self.repositories allValues], nil);
}
@@ -52,7 +52,7 @@
{
[self internalRetrieveRepositoriesWithCompletionBlock:^(NSError *error) {
if (error) {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeInvalidArgument]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeInvalidArgument]);
} else {
completionBlock([self.repositories objectForKey:repositoryId], nil);
}
@@ -85,7 +85,7 @@
CMISTypeByIdUriBuilder *typeByIdUriBuilder = object;
typeByIdUriBuilder.id = typeId;
- [self.bindingSession.networkProvider invokeGET:[typeByIdUriBuilder buildUrl] withSession:self.bindingSession completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
+ [self.bindingSession.networkProvider invokeGET:[typeByIdUriBuilder buildUrl] session:self.bindingSession completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
if (httpResponse.data != nil) {
CMISTypeDefinitionAtomEntryParser *parser = [[CMISTypeDefinitionAtomEntryParser alloc] initWithData:httpResponse.data];
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m Tue Feb 12 16:00:06 2013
@@ -37,10 +37,14 @@
includeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock
{
- [self retrieveObjectInternal:objectId withReturnVersion:(major ? LATEST_MAJOR : LATEST)
- withFilter:filter andIncludeRelationShips:includeRelationships
- andIncludePolicyIds:includePolicyIds andRenditionFilder:renditionFilter
- andIncludeACL:includeACL andIncludeAllowableActions:includeAllowableActions
+ [self retrieveObjectInternal:objectId
+ returnVersion:(major ? LATEST_MAJOR : LATEST)
+ filter:filter
+ relationShips:includeRelationships
+ includePolicyIds:includePolicyIds
+ renditionFilder:renditionFilter
+ includeACL:includeACL
+ includeAllowableActions:includeAllowableActions
completionBlock:^(CMISObjectData *objectData, NSError *error) {
completionBlock(objectData, error);
}];
@@ -54,38 +58,40 @@
// Validate params
if (!objectId) {
log(@"Must provide an objectId when retrieving all versions");
- completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound withDetailedDescription:nil]);
+ completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound detailedDescription:nil]);
return;
}
// Fetch version history link
- [self loadLinkForObjectId:objectId andRelation:kCMISLinkVersionHistory completionBlock:^(NSString *versionHistoryLink, NSError *error) {
+ [self loadLinkForObjectId:objectId
+ relation:kCMISLinkVersionHistory
+ completionBlock:^(NSString *versionHistoryLink, NSError *error) {
if (error) {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
return;
}
if (filter) {
- versionHistoryLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterFilter withValue:filter toUrlString:versionHistoryLink];
+ versionHistoryLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterFilter value:filter urlString:versionHistoryLink];
}
versionHistoryLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeAllowableActions
- withValue:(includeAllowableActions ? @"true" : @"false") toUrlString:versionHistoryLink];
+ value:(includeAllowableActions ? @"true" : @"false") urlString:versionHistoryLink];
// Execute call
[self.bindingSession.networkProvider invokeGET:[NSURL URLWithString:versionHistoryLink]
- withSession:self.bindingSession
+ session:self.bindingSession
completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) {
if (httpResponse) {
NSData *data = httpResponse.data;
CMISAtomFeedParser *feedParser = [[CMISAtomFeedParser alloc] initWithData:data];
NSError *error;
if (![feedParser parseAndReturnError:&error]) {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeVersioning]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeVersioning]);
} else {
completionBlock(feedParser.entries, nil);
}
} else {
- completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
+ completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeConnection]);
}
}];
}];
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.h Tue Feb 12 16:00:06 2013
@@ -44,7 +44,7 @@ extern NSString * const kCMISBindingSess
/// @name Object storage methods
- (NSArray *)allKeys;
- (id)objectForKey:(id)key;
-- (id)objectForKey:(id)key withDefaultValue:(id)defaultValue;
+- (id)objectForKey:(id)key defaultValue:(id)defaultValue;
- (void)setObject:(id)object forKey:(id)key;
- (void)addEntriesFromDictionary:(NSDictionary *)dictionary;
- (void)removeKey:(id)key;
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISBindingSession.m Tue Feb 12 16:00:06 2013
@@ -73,7 +73,7 @@ NSString * const kCMISBindingSessionKeyL
return [self.sessionData objectForKey:key];
}
-- (id)objectForKey:(id)key withDefaultValue:(id)defaultValue
+- (id)objectForKey:(id)key defaultValue:(id)defaultValue
{
NSObject *value = [self.sessionData objectForKey:key];
return value != nil ? value : defaultValue;