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/11 10:28:01 UTC
svn commit: r1444689 [2/4] - in /chemistry/objectivecmis/branches/mdm:
ObjectiveCMIS.xcodeproj/ ObjectiveCMIS/Bindings/
ObjectiveCMIS/Bindings/AtomPub/ ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/
ObjectiveCMIS/Bindings/AtomPub/Objects/ ObjectiveCMIS/...
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService%2BProtected.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService+Protected.h Mon Feb 11 09:27:59 2013
@@ -32,7 +32,9 @@
/** Convenience method with all the defaults for the retrieval parameters */
- (void)retrieveObjectInternal:(NSString *)objectId completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
-/** Full-blown object retrieval version */
+/** Full-blown object retrieval version
+ * completionBlock returns CMISObjectData instance or nil if unsuccessul
+ */
- (void)retrieveObjectInternal:(NSString *)objectId
withReturnVersion:(CMISReturnVersion)cmisReturnVersion
withFilter:(NSString *)filter
@@ -43,6 +45,9 @@
andIncludeAllowableActions:(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
@@ -52,13 +57,20 @@
andIncludeAllowableActions:(BOOL)includeAllowableActions
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
+/** retrieve object from cache
+ * completionBlock returns the object (as id) or nil if unsuccessul
+ */
- (void)retrieveFromCache:(NSString *)cacheKey
completionBlock:(void (^)(id object, 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
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
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBaseService.m Mon Feb 11 09:27:59 2013
@@ -38,14 +38,11 @@
@implementation CMISAtomPubBaseService
-@synthesize bindingSession = _bindingSession;
-@synthesize atomPubUrl = _atomPubUrl;
- (id)initWithBindingSession:(CMISBindingSession *)session
{
self = [super init];
- if (self)
- {
+ if (self) {
self.bindingSession = session;
self.atomPubUrl = [session objectForKey:kCMISBindingSessionKeyAtomPubUrl];
}
@@ -250,8 +247,7 @@
- (CMISLinkCache *)linkCache{
CMISLinkCache *linkCache = [self.bindingSession objectForKey:kCMISBindingSessionKeyLinkCache];
- if (linkCache == nil)
- {
+ if (linkCache == nil) {
linkCache = [[CMISLinkCache alloc] initWithBindingSession:self.bindingSession];
[self.bindingSession setObject:linkCache forKey:kCMISBindingSessionKeyLinkCache];
}
@@ -261,8 +257,7 @@
- (void)clearCacheFromService
{
CMISLinkCache *linkCache = [self.bindingSession objectForKey:kCMISBindingSessionKeyLinkCache];
- if (linkCache != nil)
- {
+ if (linkCache != nil) {
[linkCache removeAllLinks];
}
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBinding.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBinding.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBinding.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubBinding.m Mon Feb 11 09:27:59 2013
@@ -42,22 +42,10 @@
@implementation CMISAtomPubBinding
-@synthesize session = _session;
-@synthesize aclService = _aclService;
-@synthesize discoveryService = _discoveryService;
-@synthesize multiFilingService = _multiFilingService;
-@synthesize objectService = _objectService;
-@synthesize policyService = _policyService;
-@synthesize relationshipService = _relationshipService;
-@synthesize repositoryService = _repositoryService;
-@synthesize navigationService = _navigationService;
-@synthesize versioningService = _versioningService;
-
- (id)initWithSessionParameters:(CMISSessionParameters *)sessionParameters
{
self = [super init];
- if (self)
- {
+ if (self) {
self.session = [[CMISBindingSession alloc] initWithSessionParameters:sessionParameters];
self.repositoryService = [[CMISAtomPubRepositoryService alloc] initWithBindingSession:self.session];
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubDiscoveryService.m Mon Feb 11 09:27:59 2013
@@ -37,8 +37,7 @@
completionBlock:(void (^)(CMISObjectList *objectList, NSError *error))completionBlock;
{
// Validate params
- if (statement == nil)
- {
+ if (statement == nil) {
log(@"Must provide 'statement' parameter when executing a cmis query");
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
return;
@@ -46,8 +45,7 @@
// Validate query uri
NSString *queryUrlString = [self.bindingSession objectForKey:kCMISBindingSessionKeyQueryCollection];
- if (queryUrlString == nil)
- {
+ if (queryUrlString == nil) {
log(@"Unknown repository or query not supported!");
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound withDetailedDescription:nil]);
return;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubNavigationService.m Mon Feb 11 09:27:59 2013
@@ -38,8 +38,7 @@
// Get Down link
[self loadLinkForObjectId:objectId andRelation:kCMISLinkRelationDown
andType:kCMISMediaTypeChildren completionBlock:^(NSString *downLink, NSError *error) {
- if (error)
- {
+ if (error) {
log(@"Could not retrieve down link: %@", error.description);
completionBlock(nil, error);
return;
@@ -69,8 +68,7 @@
// Parse the feed (containing entries for the children) you get back
CMISAtomFeedParser *parser = [[CMISAtomFeedParser alloc] initWithData:httpResponse.data];
NSError *internalError = nil;
- if ([parser parseAndReturnError:&internalError])
- {
+ if ([parser parseAndReturnError:&internalError]) {
NSString *nextLink = [parser.linkRelations linkHrefForRel:kCMISLinkRelationNext];
CMISObjectList *objectList = [[CMISObjectList alloc] init];
@@ -78,9 +76,7 @@
objectList.numItems = parser.numItems;
objectList.objects = parser.entries;
completionBlock(objectList, nil);
- }
- else
- {
+ } else {
NSError *error = [CMISErrors cmisError:internalError withCMISErrorCode:kCMISErrorCodeRuntime];
completionBlock(nil, error);
}
@@ -108,15 +104,13 @@
}
// Add optional parameters
- if (filter != nil)
- {
+ if (filter != nil) {
upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterFilter withValue:filter toUrlString:upLink];
}
upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeAllowableActions withValue:(includeAllowableActions ? @"true" : @"false") toUrlString:upLink];
upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterIncludeRelationships withValue:[CMISEnums stringForIncludeRelationShip:includeRelationship] toUrlString:upLink];
- if (renditionFilter != nil)
- {
+ if (renditionFilter != nil) {
upLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterRenditionFilter withValue:renditionFilter toUrlString:upLink];
}
@@ -128,8 +122,7 @@
if (httpResponse) {
CMISAtomFeedParser *parser = [[CMISAtomFeedParser alloc] initWithData:httpResponse.data];
NSError *internalError;
- if (![parser parseAndReturnError:&internalError])
- {
+ if (![parser parseAndReturnError:&internalError]) {
NSError *error = [CMISErrors cmisError:internalError withCMISErrorCode:kCMISErrorCodeRuntime];
log(@"Failing because parsing the Atom Feed XML returns an error");
completionBlock([NSArray array], error);
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubObjectService.m Mon Feb 11 09:27:59 2013
@@ -143,8 +143,7 @@ andIncludeAllowableActions:(BOOL)include
completionBlock:(void (^)(NSError *error))completionBlock
{
// Validate object id param
- if (objectIdParam == nil || objectIdParam.inParameter == nil)
- {
+ if (objectIdParam == nil || objectIdParam.inParameter == nil) {
log(@"Object id is nil or inParameter of objectId is nil");
completionBlock([[NSError alloc] init]); // TODO: properly init error (CmisInvalidArgumentException)
return;
@@ -222,8 +221,7 @@ andIncludeAllowableActions:(BOOL)include
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
{
// Validate object id param
- if (objectIdParam == nil || objectIdParam.inParameter == nil)
- {
+ 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"]);
@@ -337,8 +335,7 @@ andIncludeAllowableActions:(BOOL)include
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
{
// Validate properties
- if ([properties propertyValueForId:kCMISPropertyName] == nil || [properties propertyValueForId:kCMISPropertyObjectTypeId] == nil)
- {
+ 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]);
@@ -347,8 +344,7 @@ andIncludeAllowableActions:(BOOL)include
}
// Validate mimetype
- if (inputStream && !mimeType)
- {
+ if (inputStream && !mimeType) {
log(@"Must provide a mimetype when creating a cmis document");
if (completionBlock) {
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
@@ -404,16 +400,14 @@ andIncludeAllowableActions:(BOOL)include
- (void)createFolderInParentFolder:(NSString *)folderObjectId withProperties:(CMISProperties *)properties completionBlock:(void (^)(NSString *, NSError *))completionBlock
{
- if ([properties propertyValueForId:kCMISPropertyName] == nil || [properties propertyValueForId:kCMISPropertyObjectTypeId] == nil)
- {
+ if ([properties propertyValueForId:kCMISPropertyName] == nil || [properties propertyValueForId:kCMISPropertyObjectTypeId] == nil) {
log(@"Must provide %@ and %@ as properties", kCMISPropertyName, kCMISPropertyObjectTypeId);
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:nil]);
return;
}
// Validate parent folder id
- if (!folderObjectId)
- {
+ if (!folderObjectId) {
log(@"Must provide a parent folder object id when creating a new folder");
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound withDetailedDescription:nil]);
return;
@@ -443,8 +437,7 @@ andIncludeAllowableActions:(BOOL)include
completionBlock:(void (^)(NSArray *failedObjects, NSError *error))completionBlock
{
// Validate params
- if (!folderObjectId)
- {
+ if (!folderObjectId) {
log(@"Must provide a folder object id when deleting a folder tree");
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound withDetailedDescription:nil]);
return;
@@ -498,8 +491,7 @@ andIncludeAllowableActions:(BOOL)include
completionBlock:(void (^)(NSError *error))completionBlock
{
// Validate params
- if (objectIdParam == nil || objectIdParam.inParameter == nil)
- {
+ if (objectIdParam == nil || objectIdParam.inParameter == nil) {
log(@"Object id is nil or inParameter of objectId is nil");
completionBlock([[NSError alloc] init]); // TODO: properly init error (CmisInvalidArgumentException)
return;
@@ -507,16 +499,14 @@ andIncludeAllowableActions:(BOOL)include
// Get self link
[self loadLinkForObjectId:objectIdParam.inParameter andRelation:kCMISLinkRelationSelf completionBlock:^(NSString *selfLink, NSError *error) {
- if (selfLink == nil)
- {
+ if (selfLink == nil) {
log(@"Could not retrieve %@ link", kCMISLinkRelationSelf);
completionBlock([CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
return;
}
// Append optional params
- if (changeTokenParam != nil && changeTokenParam.inParameter != nil)
- {
+ if (changeTokenParam != nil && changeTokenParam.inParameter != nil) {
selfLink = [CMISURLUtil urlStringByAppendingParameter:kCMISParameterChangeToken
withValue:changeTokenParam.inParameter toUrlString:selfLink];
}
@@ -541,12 +531,10 @@ andIncludeAllowableActions:(BOOL)include
// Object id and changeToken might have changed because of this operation
CMISAtomEntryParser *atomEntryParser = [[CMISAtomEntryParser alloc] initWithData:httpResponse.data];
NSError *error = nil;
- if ([atomEntryParser parseAndReturnError:&error])
- {
+ if ([atomEntryParser parseAndReturnError:&error]) {
objectIdParam.outParameter = [[atomEntryParser.objectData.properties propertyForId:kCMISPropertyObjectId] firstValue];
- if (changeTokenParam != nil)
- {
+ if (changeTokenParam != nil) {
changeTokenParam.outParameter = [[atomEntryParser.objectData.properties propertyForId:kCMISPropertyChangeToken] firstValue];
}
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubRepositoryService.m Mon Feb 11 09:27:59 2013
@@ -36,7 +36,6 @@
@implementation CMISAtomPubRepositoryService
-@synthesize repositories = _repositories;
- (void)retrieveRepositoriesWithCompletionBlock:(void (^)(NSArray *repositories, NSError *error))completionBlock
{
@@ -64,10 +63,8 @@
{
self.repositories = [NSMutableDictionary dictionary];
[self retrieveCMISWorkspacesWithCompletionBlock:^(NSArray *cmisWorkSpaces, NSError *error) {
- if (cmisWorkSpaces != nil)
- {
- for (CMISWorkspace *workspace in cmisWorkSpaces)
- {
+ if (cmisWorkSpaces != nil) {
+ for (CMISWorkspace *workspace in cmisWorkSpaces) {
[self.repositories setObject:workspace.repositoryInfo forKey:workspace.repositoryInfo.identifier];
}
}
@@ -77,8 +74,7 @@
- (void)retrieveTypeDefinition:(NSString *)typeId completionBlock:(void (^)(CMISTypeDefinition *typeDefinition, NSError *error))completionBlock
{
- if (typeId == nil)
- {
+ if (typeId == nil) {
log(@"Parameter typeId is required");
NSError *error = [[NSError alloc] init]; // TODO: proper error init
completionBlock(nil, error);
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISAtomPubVersioningService.m Mon Feb 11 09:27:59 2013
@@ -52,8 +52,7 @@
completionBlock:(void (^)(NSArray *objects, NSError *error))completionBlock
{
// Validate params
- if (!objectId)
- {
+ if (!objectId) {
log(@"Must provide an objectId when retrieving all versions");
completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound withDetailedDescription:nil]);
return;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.h Mon Feb 11 09:27:59 2013
@@ -41,7 +41,13 @@ typedef enum
@property (nonatomic, strong) NSString *renditionFilter;
@property CMISReturnVersion returnVersion;
+/**
+ * initialise with the template URL string
+ */
- (id)initWithTemplateUrl:(NSString *)templateUrl;
+/**
+ * returns the URL
+ */
- (NSURL *)buildUrl;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByIdUriBuilder.m Mon Feb 11 09:27:59 2013
@@ -27,21 +27,11 @@
@implementation CMISObjectByIdUriBuilder
-@synthesize templateUrl = _templateUrl;
-@synthesize objectId = _objectId;
-@synthesize filter = _filter;
-@synthesize includeAllowableActions = _includeAllowableActions;
-@synthesize includePolicyIds = _includePolicyIds;
-@synthesize includeRelationships = _includeRelationships;
-@synthesize includeACL = _includeACL;
-@synthesize renditionFilter = _renditionFilter;
-@synthesize returnVersion = _returnVersion;
- (id)initWithTemplateUrl:(NSString *)templateUrl
{
self = [super init];
- if (self)
- {
+ if (self) {
self.templateUrl = templateUrl;
// Defaults
@@ -66,19 +56,13 @@
urlString = [urlString stringByReplacingOccurrencesOfString:@"{includeACL}" withString:(self.includeACL ? @"true" : @"false")];
urlString = [urlString stringByReplacingOccurrencesOfString:@"{renditionFilter}" withString:(self.renditionFilter != nil ? self.renditionFilter : @"")];
- if (self.returnVersion != NOT_PROVIDED)
- {
+ if (self.returnVersion != NOT_PROVIDED) {
NSString *returnVersionParam = nil;
- if (self.returnVersion == THIS)
- {
+ if (self.returnVersion == THIS) {
returnVersionParam = @"this";
- }
- else if (self.returnVersion == LATEST)
- {
+ } else if (self.returnVersion == LATEST) {
returnVersionParam = @"latest";
- }
- else
- {
+ } else {
returnVersionParam = @"latestmajor";
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.h Mon Feb 11 09:27:59 2013
@@ -31,7 +31,13 @@
@property BOOL includeACL;
@property (nonatomic, strong) NSString *renditionFilter;
+/**
+ * init the template URL with URL string
+ */
- (id)initWithTemplateUrl:(NSString *)templateUrl;
+/**
+ * return the full URL
+ */
- (NSURL *)buildUrl;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISObjectByPathUriBuilder.m Mon Feb 11 09:27:59 2013
@@ -28,20 +28,11 @@
@implementation CMISObjectByPathUriBuilder
-@synthesize templateUrl = _templateUrl;
-@synthesize path = _path;
-@synthesize filter = _filter;
-@synthesize includeAllowableActions = _includeAllowableActions;
-@synthesize includePolicyIds = _includePolicyIds;
-@synthesize includeRelationships = _includeRelationships;
-@synthesize includeACL = _includeACL;
-@synthesize renditionFilter = _renditionFilter;
- (id)initWithTemplateUrl:(NSString *)templateUrl
{
self = [super init];
- if (self)
- {
+ if (self) {
self.templateUrl = templateUrl;
}
return self;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.h Mon Feb 11 09:27:59 2013
@@ -31,6 +31,9 @@
@property (nonatomic, strong) NSNumber * skipCount;
@property (nonatomic, strong) NSNumber * maxItems;
+/**
+ @return the XML query as string
+ */
- (NSString *)generateAtomEntryXML;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISQueryAtomEntryWriter.m Mon Feb 11 09:27:59 2013
@@ -22,20 +22,12 @@
@implementation CMISQueryAtomEntryWriter
-@synthesize statement = _statement;
-@synthesize searchAllVersions = _searchAllVersions;
-@synthesize includeRelationships = _includeRelationships;
-@synthesize renditionFilter = _renditionFilter;
-@synthesize includeAllowableActions = _includeAllowableActions;
-@synthesize skipCount = _skipCount;
-@synthesize maxItems = _maxItems;
- (id)init
{
self = [super init];
- if (self)
- {
+ if (self) {
self.includeRelationships = CMISIncludeRelationshipNone;
}
return self;
@@ -59,13 +51,11 @@
[xml appendFormat:@"<cmis:includeRelationships>%@</cmis:includeRelationships>", [CMISEnums stringForIncludeRelationShip:self.includeRelationships]];
[xml appendFormat:@"<cmis:renditionFilter>%@</cmis:renditionFilter>", self.renditionFilter != nil ? self.renditionFilter : @"*"];
- if (self.maxItems != nil)
- {
+ if (self.maxItems != nil) {
[xml appendFormat:@"<cmis:maxItems>%d</cmis:maxItems>", self.maxItems.intValue];
}
- if (self.skipCount != nil)
- {
+ if (self.skipCount != nil) {
[xml appendFormat:@"<cmis:skipCount>%d</cmis:skipCount>", self.skipCount.intValue];
}
[xml appendString:@"</cmis:query>"];
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.h Mon Feb 11 09:27:59 2013
@@ -24,7 +24,13 @@
@property (nonatomic, strong) NSString *id;
+/**
+ * init the template URL with URL string
+ */
- (id)initWithTemplateUrl:(NSString *)templateUrl;
+/**
+ * @return the ready to use Url
+ */
- (NSURL *)buildUrl;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/CMISTypeByIdUriBuilder.m Mon Feb 11 09:27:59 2013
@@ -28,14 +28,11 @@
@implementation CMISTypeByIdUriBuilder
-@synthesize id = _id;
-@synthesize templateUrl = _templateUrl;
- (id)initWithTemplateUrl:(NSString *)templateUrl
{
self = [super init];
- if (self)
- {
+ if (self) {
self.templateUrl = templateUrl;
}
return self;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomCollection.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomCollection.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomCollection.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomCollection.m Mon Feb 11 09:27:59 2013
@@ -22,9 +22,5 @@
@implementation CMISAtomCollection
-@synthesize href = _href;
-@synthesize title = _title;
-@synthesize accept = _accept;
-@synthesize type = _type;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomLink.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomLink.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomLink.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISAtomLink.m Mon Feb 11 09:27:59 2013
@@ -21,15 +21,11 @@
@implementation CMISAtomLink
-@synthesize rel = _rel;
-@synthesize type = _type;
-@synthesize href = _href;
- (id)initWithRelation:(NSString *)rel type:(NSString *)type href:(NSString *)href
{
self = [super init];
- if (self)
- {
+ if (self) {
self.rel = rel;
self.type = type;
self.href = href;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISLinkRelations.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISLinkRelations.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISLinkRelations.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISLinkRelations.m Mon Feb 11 09:27:59 2013
@@ -25,13 +25,11 @@
@implementation CMISLinkRelations
-@synthesize linkRelationSet = _linkRelationSet;
- (id)initWithLinkRelationSet:(NSSet *)linkRelationSet
{
self = [super init];
- if (self)
- {
+ if (self) {
self.linkRelationSet = linkRelationSet;
}
return self;
@@ -47,20 +45,16 @@
NSArray *predicateArgsArray = nil;
NSString *predicateFormat = @"(rel == %@)";
- if (type != nil && type.length > 0)
- {
+ if (type != nil && type.length > 0) {
predicateFormat = [predicateFormat stringByAppendingString:@"&& (type == %@)"];
predicateArgsArray = [NSArray arrayWithObjects:rel, type, nil];
- }
- else
- {
+ } else {
predicateArgsArray = [NSArray arrayWithObject:rel];
}
NSPredicate *predicate = [NSPredicate predicateWithFormat:predicateFormat argumentArray:predicateArgsArray];
NSSet *filteredSet = [self.linkRelationSet filteredSetUsingPredicate:predicate];
- if ([filteredSet count] == 1)
- {
+ if ([filteredSet count] == 1) {
return [filteredSet.anyObject valueForKey:@"href"];
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISWorkspace.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISWorkspace.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISWorkspace.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/AtomPub/Objects/CMISWorkspace.m Mon Feb 11 09:27:59 2013
@@ -24,25 +24,12 @@
@implementation CMISWorkspace
-@synthesize sessionParameters = _sessionParameters;
-@synthesize repositoryInfo = _repositoryInfo;
-
-@synthesize collections = _collections;
-@synthesize linkRelations = _linkRelations;
-
-@synthesize objectByIdUriTemplate = _objectByIdUriTemplate;
-@synthesize queryUriTemplate = _queryUriTemplate;
-@synthesize typeByIdUriTemplate = _typeByIdUriTemplate;
-@synthesize objectByPathUriTemplate = _objectByPathUriTemplate;
- (NSString *)collectionHrefForCollectionType:(NSString *)collectionType
{
- if (self.collections != nil)
- {
- for (CMISAtomCollection *collection in self.collections)
- {
- if ([collection.type isEqualToString:collectionType])
- {
+ if (self.collections != nil) {
+ for (CMISAtomCollection *collection in self.collections) {
+ if ([collection.type isEqualToString:collectionType]) {
return collection.href;
}
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBinding.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBinding.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBinding.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBinding.h Mon Feb 11 09:27:59 2013
@@ -57,13 +57,22 @@
// The versioning service object for the binding
@property (nonatomic, strong, readonly) id<CMISVersioningService> versioningService;
-
+/**
+ closes the session
+ */
- (void)close;
@optional
+/**
+ clears the cache from the session
+ */
- (void)clearAllCaches;
+/**
+ clears the repository cache from the session
+ @param repositoryId
+ */
- (void)clearCacheForRepositoryId:(NSString*)repositoryId;
@end
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingFactory.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingFactory.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingFactory.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingFactory.h Mon Feb 11 09:27:59 2013
@@ -22,7 +22,7 @@
@interface CMISBindingFactory : NSObject
-// Returns an instance of a CMISBinding using the given session parameters
+/// Returns an instance of a CMISBinding using the given session parameters
- (id<CMISBinding>)bindingWithParameters:(CMISSessionParameters *)sessionParameters;
@end
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingFactory.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingFactory.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingFactory.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingFactory.m Mon Feb 11 09:27:59 2013
@@ -29,8 +29,7 @@
// TODO: Allow for the creation of custom binding implementations using NSClassFromString.
id<CMISBinding> binding = nil;
- if (sessionParameters.bindingType == CMISBindingTypeAtomPub)
- {
+ if (sessionParameters.bindingType == CMISBindingTypeAtomPub) {
binding = [[CMISAtomPubBinding alloc] initWithSessionParameters:sessionParameters];
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingSession.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingSession.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingSession.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingSession.h Mon Feb 11 09:27:59 2013
@@ -41,7 +41,7 @@ extern NSString * const kCMISBindingSess
- (id)initWithSessionParameters:(CMISSessionParameters *)sessionParameters;
-// Object storage methods
+/// @name Object storage methods
- (NSArray *)allKeys;
- (id)objectForKey:(id)key;
- (id)objectForKey:(id)key withDefaultValue:(id)defaultValue;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingSession.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingSession.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingSession.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISBindingSession.m Mon Feb 11 09:27:59 2013
@@ -39,17 +39,11 @@ NSString * const kCMISBindingSessionKeyL
@implementation CMISBindingSession
-@synthesize username = _username;
-@synthesize repositoryId = _repositoryId;
-@synthesize authenticationProvider = _authenticationProvider;
-@synthesize sessionData = _sessionData;
-@synthesize networkProvider = _networkProvider;
- (id)initWithSessionParameters:(CMISSessionParameters *)sessionParameters
{
self = [super init];
- if (self)
- {
+ if (self) {
self.sessionData = [[NSMutableDictionary alloc] init];
// grab common data from session parameters
@@ -61,8 +55,7 @@ NSString * const kCMISBindingSessionKeyL
// store all other data in the dictionary
[self.sessionData setObject:sessionParameters.atomPubUrl forKey:kCMISBindingSessionKeyAtomPubUrl];
- for (id key in sessionParameters.allKeys)
- {
+ for (id key in sessionParameters.allKeys) {
[self.sessionData setObject:[sessionParameters objectForKey:key] forKey:key];
}
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISDiscoveryService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISDiscoveryService.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISDiscoveryService.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISDiscoveryService.h Mon Feb 11 09:27:59 2013
@@ -30,7 +30,9 @@
(optional) Integer skipCount: This is the number of potential results that the repository MUST skip/page over
before returning any results. Defaults to 0.
*/
-// TODO: add all params which are required by spec
+/** launches a query on the server with the parameters specified
+ * completionBlock returns the found object list or nil if unsuccessful
+ */
- (void)query:(NSString *)statement searchAllVersions:(BOOL)searchAllVersions
includeRelationShips:(CMISIncludeRelationship)includeRelationships
renditionFilter:(NSString *)renditionFilter
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISLinkCache.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISLinkCache.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISLinkCache.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISLinkCache.h Mon Feb 11 09:27:59 2013
@@ -25,16 +25,24 @@
@interface CMISLinkCache : NSObject
+/// initialise with CMISBindingSession instance
- (id)initWithBindingSession:(CMISBindingSession *)bindingSession;
+/// retrieves the link for a given object Id/relationship
- (NSString *)linkForObjectId:(NSString *)objectId andRelation:(NSString *)rel;
+/// retrieves the link for a given objectId, relationship and type
- (NSString *)linkForObjectId:(NSString *)objectId andRelation:(NSString *)rel andType:(NSString *)type;
+/// adds a link for object Id
- (void)addLinks:(CMISLinkRelations *)links forObjectId:(NSString *)objectId;
+/// removes link for object Id
- (void)removeLinksForObjectId:(NSString *)objectId;
+/**
+ * removes all links
+ */
- (void)removeAllLinks;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISLinkCache.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISLinkCache.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISLinkCache.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISLinkCache.m Mon Feb 11 09:27:59 2013
@@ -35,13 +35,11 @@
@implementation CMISLinkCache
-@synthesize linkCache = _linkCache;
- (id)initWithBindingSession:(CMISBindingSession *)bindingSession
{
self = [super init];
- if (self)
- {
+ if (self) {
[self setupLinkCache:bindingSession];
}
@@ -53,20 +51,15 @@
self.linkCache = [[NSCache alloc] init];
id linkCacheSize = [bindingSession objectForKey:kCMISSessionParameterLinkCacheSize];
- if (linkCacheSize != nil)
- {
- if ([[linkCacheSize class] isEqual:[NSNumber class]])
- {
+ if (linkCacheSize != nil) {
+ if ([[linkCacheSize class] isEqual:[NSNumber class]]) {
self.linkCache.countLimit = [(NSNumber *) linkCacheSize unsignedIntValue];
- }
- else
- {
+ } else {
log(@"Invalid object set for %@ session parameter. Ignoring and using default instead", kCMISSessionParameterLinkCacheSize);
}
}
- if (self.linkCache.countLimit <= 0)
- {
+ if (self.linkCache.countLimit <= 0) {
self.linkCache.countLimit = DEFAULT_LINK_CACHE_SIZE;
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISNavigationService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISNavigationService.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISNavigationService.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISNavigationService.h Mon Feb 11 09:27:59 2013
@@ -25,8 +25,9 @@
@protocol CMISNavigationService <NSObject>
-/*
+/**
* Retrieves the children for the given object identifier.
+ * completionBlock returns object list or nil if unsuccessful
*/
- (void)retrieveChildren:(NSString *)objectId orderBy:(NSString *)orderBy
filter:(NSString *)filter includeRelationShips:(CMISIncludeRelationship)includeRelationship
@@ -36,11 +37,12 @@
completionBlock:(void (^)(CMISObjectList *objectList, NSError *error))completionBlock;
/**
-* Retrieves the parent of a given object.
-* Returns a list of CMISObjectData objects
-*
-* TODO: OpenCMIS returns an ObjectParentData object .... is this necessary?
-*/
+ * Retrieves the parent of a given object.
+ * Returns a list of CMISObjectData objects
+ *
+ * TODO: OpenCMIS returns an ObjectParentData object .... is this necessary?
+ * completionBlock returns array of parents or nil if unsuccessful
+ */
- (void)retrieveParentsForObject:(NSString *)objectId
withFilter:(NSString *)filter
withIncludeRelationships:(CMISIncludeRelationship)includeRelationship
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISObjectList.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISObjectList.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISObjectList.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISObjectList.m Mon Feb 11 09:27:59 2013
@@ -22,15 +22,11 @@
@implementation CMISObjectList
-@synthesize objects = _objects;
-@synthesize hasMoreItems = _hasMoreItems;
-@synthesize numItems = _numItems;
- (id)init
{
self = [super init];
- if (self)
- {
+ if (self) {
self.objects = [NSArray array];
self.numItems = 0;
self.hasMoreItems = NO;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISObjectService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISObjectService.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISObjectService.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISObjectService.h Mon Feb 11 09:27:59 2013
@@ -27,8 +27,8 @@
@protocol CMISObjectService <NSObject>
/**
- *Retrieves the object with the given object identifier.
- *
+ * Retrieves the object with the given object identifier.
+ * completionBlock returns objectData for object or nil if unsuccessful
*/
- (void)retrieveObject:(NSString *)objectId
withFilter:(NSString *)filter
@@ -40,8 +40,8 @@ andIncludeAllowableActions:(BOOL)include
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
/**
- *Retrieves an object using its path.
- *
+ * Retrieves an object using its path.
+ * completionBlock returns objectData for object or nil if unsuccessful
*/
- (void)retrieveObjectByPath:(NSString *)path
withFilter:(NSString *)filter
@@ -53,10 +53,11 @@ andIncludeAllowableActions:(BOOL)include
completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
/**
-* Gets the content stream for the specified Document object, or gets a rendition stream for a specified
-* rendition of a document or folder object. Downloads the content to a local file.
-*
-*/
+ * Gets the content stream for the specified Document object, or gets a rendition stream for a specified
+ * rendition of a document or folder object. Downloads the content to a local file.
+ * completionBlock returns objectData for object or nil if unsuccessful
+ *
+ */
- (CMISRequest*)downloadContentOfObject:(NSString *)objectId
withStreamId:(NSString *)streamId
toFile:(NSString *)filePath
@@ -66,6 +67,7 @@ andIncludeAllowableActions:(BOOL)include
/**
* Gets the content stream for the specified Document object, or gets a rendition stream for a specified
* rendition of a document or folder object. Downloads the content to an output stream.
+ * completionBlock returns objectData for object or nil if unsuccessful
*
*/
- (CMISRequest*)downloadContentOfObject:(NSString *)objectId
@@ -76,12 +78,13 @@ andIncludeAllowableActions:(BOOL)include
/**
* Deletes the content stream for the specified document object.
- *
- * A Repository MAY automatically create new Document versions as part of this service method.
- * Therefore, the objectId output NEED NOT be identical to the objectId input
- *
- * NOTE for atom pub binding: deleteContentStream: This does not return the new object id and change token as specified by the domain model.
- * This is not possible without introducing a new HTTP header.
+ *
+ * A Repository MAY automatically create new Document versions as part of this service method.
+ * Therefore, the objectId output NEED NOT be identical to the objectId input
+ *
+ * NOTE for atom pub binding: deleteContentStream: This does not return the new object id and change token as specified by the domain model.
+ * This is not possible without introducing a new HTTP header.
+ * completionBlock - returns NSError nil if successful
*/
- (void)deleteContentOfObject:(CMISStringInOutParameter *)objectIdParam
withChangeToken:(CMISStringInOutParameter *)changeTokenParam
@@ -96,6 +99,7 @@ andIncludeAllowableActions:(BOOL)include
*
* NOTE for atom pub binding: This does not return the new object id and change token as specified by the domain model.
* (This is not possible without introducing a new HTTP header).
+ * completionBlock - returns NSError nil if successful
*/
- (CMISRequest*)changeContentOfObject:(CMISStringInOutParameter *)objectIdParam
toContentOfFile:(NSString *)filePath
@@ -113,6 +117,7 @@ andIncludeAllowableActions:(BOOL)include
*
* NOTE for atom pub binding: This does not return the new object id and change token as specified by the domain model.
* (This is not possible without introducing a new HTTP header).
+ * completionBlock - returns NSError nil if successful
*/
- (CMISRequest*)changeContentOfObject:(CMISStringInOutParameter *)objectId
toContentOfInputStream:(NSInputStream *)inputStream
@@ -124,8 +129,9 @@ andIncludeAllowableActions:(BOOL)include
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
/**
-* uploads the file from the given path to the given folder.
-*
+ * uploads the file from the given path to the given folder.
+ *
+ * completionBlock - returns NSError nil if successful
*/
- (CMISRequest*)createDocumentFromFilePath:(NSString *)filePath
withMimeType:(NSString *)mimeType
@@ -137,6 +143,7 @@ andIncludeAllowableActions:(BOOL)include
/**
* uploads the file from the given input stream to the given folder.
*
+ * completionBlock - returns NSError nil if successful
*/
- (CMISRequest*)createDocumentFromInputStream:(NSInputStream *)inputStream
withMimeType:(NSString *)mimeType
@@ -147,15 +154,17 @@ andIncludeAllowableActions:(BOOL)include
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
/**
-* Deletes the given object.
-*
-* The allVersions parameter is currently ignored.
-*/
+ * Deletes the given object.
+ *
+ * The allVersions parameter is currently ignored.
+ * completionBlock returns true if successful
+ */
- (void)deleteObject:(NSString *)objectId allVersions:(BOOL)allVersions completionBlock:(void (^)(BOOL objectDeleted, NSError *error))completionBlock;
/**
-* Creates a new folder with given properties under the provided parent folder.
-*/
+ * Creates a new folder with given properties under the provided parent folder.
+ * completionBlock returns objectId for the newly created folder or nil if unsuccessful
+ */
- (void)createFolderInParentFolder:(NSString *)folderObjectId
withProperties:(CMISProperties *)properties
completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock;
@@ -164,6 +173,7 @@ andIncludeAllowableActions:(BOOL)include
* Deletes the given folder and all of its subfolder and files
*
* Returns a list of objects which failed to be deleted.
+ * completionBlock returns array of failed objects if any. NSError will be nil if successful
*
*/
- (void)deleteTree:(NSString *)folderObjectId
@@ -174,6 +184,7 @@ andIncludeAllowableActions:(BOOL)include
/**
* Updates the properties of the given object.
+ * completionBlock returns NSError nil if successful
*/
- (void)updatePropertiesForObject:(CMISStringInOutParameter *)objectIdParam
withProperties:(CMISProperties *)properties
@@ -186,6 +197,7 @@ andIncludeAllowableActions:(BOOL)include
*
* Note: the paging parameters (maxItems and skipCount) are not used in the atom pub binding.
* Ie. the whole set is <b>always</b> returned.
+ * completionBlock returns array of associated renditions or nil if unsuccessful
*/
- (void)retrieveRenditions:(NSString *)objectId
withRenditionFilter:(NSString *)renditionFilter
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISPropertyDefinition.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISPropertyDefinition.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISPropertyDefinition.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISPropertyDefinition.m Mon Feb 11 09:27:59 2013
@@ -22,21 +22,4 @@
@implementation CMISPropertyDefinition
-@synthesize id = _id;
-@synthesize localName = _localName;
-@synthesize localNamespace = _localNamespace;
-@synthesize displayName = _displayName;
-@synthesize queryName = _queryName;
-@synthesize description = _description;
-@synthesize propertyType = _propertyType;
-@synthesize cardinality = _cardinality;
-@synthesize updatability = _updatability;
-@synthesize inherited = _inherited;
-@synthesize required = _required;
-@synthesize queryable = _queryable;
-@synthesize orderable = _orderable;
-@synthesize openChoice = _openChoice;
-@synthesize defaultValues = _defaultValues;
-@synthesize choices = _choices;
-
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISQueryResult.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISQueryResult.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISQueryResult.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISQueryResult.h Mon Feb 11 09:27:59 2013
@@ -28,57 +28,54 @@
@interface CMISQueryResult : NSObject
-/**
-* Returns a list of all properties (objects of type CMISPropertyData) in this query result.
-*/
@property(nonatomic, strong, readonly) CMISProperties *properties;
@property(nonatomic, strong, readonly) CMISAllowableActions *allowableActions;
@property(nonatomic, strong, readonly) NSArray *renditions; // Array of CMISRenditions
/**
-* Initializes this query result.
-*/
+ * Initializes this query result.
+ */
- (id)initWithCmisObjectData:(CMISObjectData *)cmisObjectData andWithSession:(CMISSession *)session;
/**
-* Convience method for the initializer.
-*/
+ * Convience method for the initializer.
+ */
+ (CMISQueryResult *)queryResultUsingCmisObjectData:(CMISObjectData *)cmisObjectData andWithSession:(CMISSession *)session;
/**
-* Returns a property by id.
-* <p>
-* Since repositories are not obligated to add property ids to their query
-* result properties, this method might not always work as expected with
-* some repositories. Use {@link #getPropertyByQueryName(String)} instead.
-*/
+ * Returns a property by id.
+ * <p>
+ * Since repositories are not obligated to add property ids to their query
+ * result properties, this method might not always work as expected with
+ * some repositories. Use {@link #getPropertyByQueryName(String)} instead.
+ */
- (CMISPropertyData *)propertyForId:(NSString *)id;
/**
-* Returns a property by query name or alias.
-*/
-- (CMISPropertyData *)properyForQueryName:(NSString *)queryName;
+ * Returns a property by query name or alias.
+ */
+- (CMISPropertyData *)propertyForQueryName:(NSString *)queryName;
/**
-* Returns a property (single) value by id.
-*/
-- (id)properyValueForId:(NSString *)propertyId;
+ * Returns a property (single) value by id.
+ */
+- (id)propertyValueForId:(NSString *)propertyId;
/**
-* Returns a property (single) value by query name or alias.
-*
-* @see #getPropertyByQueryName(String)
-*/
+ * Returns a property (single) value by query name or alias.
+ *
+ * @see #getPropertyByQueryName(String)
+ */
- (id)propertyValueForQueryName:(NSString *)queryName;
/**
-* Returns a property multi-value by id.
-*/
+ * Returns a property multi-value by id.
+ */
- (NSArray *)propertyMultiValueById:(NSString *)id;
/**
-* Returns a property multi-value by query name or alias.
-*/
+ * Returns a property multi-value by query name or alias.
+ */
- (NSArray *)propertyMultiValueByQueryName:(NSString *)queryName;
// TODO: implement following methods found in openCMIS
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISQueryResult.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISQueryResult.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISQueryResult.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISQueryResult.m Mon Feb 11 09:27:59 2013
@@ -35,24 +35,18 @@
@implementation CMISQueryResult
-@synthesize properties = _properties;
-@synthesize allowableActions = _allowableActions;
-@synthesize renditions = _renditions;
- (id)initWithCmisObjectData:(CMISObjectData *)cmisObjectData andWithSession:(CMISSession *)session
{
self = [super init];
- if (self)
- {
+ if (self) {
self.properties = cmisObjectData.properties;
self.allowableActions = cmisObjectData.allowableActions;
- if (cmisObjectData.renditions != nil)
- {
+ if (cmisObjectData.renditions != nil) {
NSMutableArray *renditions = [NSMutableArray array];
- for (CMISRenditionData *renditionData in cmisObjectData.renditions)
- {
+ for (CMISRenditionData *renditionData in cmisObjectData.renditions) {
[renditions addObject:[[CMISRendition alloc] initWithRenditionData:renditionData andObjectId:cmisObjectData.identifier andSession:session]];
}
self.renditions = renditions;
@@ -72,12 +66,12 @@
return [self.properties propertyForId:id];
}
-- (CMISPropertyData *)properyForQueryName:(NSString *)queryName
+- (CMISPropertyData *)propertyForQueryName:(NSString *)queryName
{
return [self.properties propertyForQueryName:queryName];
}
-- (id)properyValueForId:(NSString *)propertyId
+- (id)propertyValueForId:(NSString *)propertyId
{
return [self.properties propertyValueForId:propertyId];
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRenditionData.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRenditionData.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRenditionData.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRenditionData.h Mon Feb 11 09:27:59 2013
@@ -44,11 +44,11 @@
@property (nonatomic, strong) NSNumber *width;
/**
-* If specified, then the rendition can also be accessed as a document object in the CMIS services.
-* If not set, then the rendition can only be accessed via the rendition services. Referential integrity of this ID is repository-specific.
-*
-* TODO: needs to be changed to more generic 'ObjectId'
-*/
+ * If specified, then the rendition can also be accessed as a document object in the CMIS services.
+ * If not set, then the rendition can only be accessed via the rendition services. Referential integrity of this ID is repository-specific.
+ *
+ * TODO: needs to be changed to more generic 'ObjectId'
+ */
@property (nonatomic, strong) NSString *renditionDocumentId;
- (id)initWithRenditionData:(CMISRenditionData *)renditionData;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRenditionData.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRenditionData.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRenditionData.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRenditionData.m Mon Feb 11 09:27:59 2013
@@ -22,20 +22,11 @@
@implementation CMISRenditionData
-@synthesize streamId = _streamId;
-@synthesize mimeType = _mimeType;
-@synthesize title = _title;
-@synthesize kind = _kind;
-@synthesize length = _length;
-@synthesize height = _height;
-@synthesize width = _width;
-@synthesize renditionDocumentId = _renditionDocumentId;
- (id)initWithRenditionData:(CMISRenditionData *)renditionData
{
self = [super init];
- if (self)
- {
+ if (self) {
self.streamId = renditionData.streamId;
self.mimeType = renditionData.mimeType;
self.title = renditionData.title;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRepositoryService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRepositoryService.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRepositoryService.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISRepositoryService.h Mon Feb 11 09:27:59 2013
@@ -25,15 +25,21 @@
@protocol CMISRepositoryService <NSObject>
/**
-* Returns an array of CMISRepositoryInfo objects representing the repositories available at the endpoint.
-*/
+ * Returns an array of CMISRepositoryInfo objects representing the repositories available at the endpoint.
+ * completionBlock returns array of repositories or nil if unsuccessful
+ */
- (void)retrieveRepositoriesWithCompletionBlock:(void (^)(NSArray *repositories, NSError *error))completionBlock;
/**
-* Returns the repository info for the repository with the given id
-*/
+ * Returns the repository info for the repository with the given id
+ * completionBlock returns repository or nil if unsuccessful
+ */
- (void)retrieveRepositoryInfoForId:(NSString *)repositoryId completionBlock:(void (^)(CMISRepositoryInfo *repositoryInfo, NSError *error))completionBlock;
+/**
+ * Returns the type definitions
+ * completionBlock returns type definition or nil if unsuccessful
+ */
- (void)retrieveTypeDefinition:(NSString *)typeId completionBlock:(void (^)(CMISTypeDefinition *typeDefinition, NSError *error))completionBlock;
@end
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISTypeDefinition.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISTypeDefinition.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISTypeDefinition.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISTypeDefinition.h Mon Feb 11 09:27:59 2013
@@ -41,10 +41,14 @@
@property (nonatomic, assign, getter = isControllablePolicy) BOOL controllablePolicy;
@property (nonatomic, assign, getter = isControllableAcl) BOOL controllableAcl;
-// Mapping of property id <-> CMISPropertyDefinition
+/// Mapping of property id <-> CMISPropertyDefinition
@property (nonatomic, strong, readonly) NSDictionary *propertyDefinitions;
+/// add property definition
- (void)addPropertyDefinition:(CMISPropertyDefinition *)propertyDefinition;
+
+
+/// retrieve property definition for given property Id
- (CMISPropertyDefinition *)propertyDefinitionForId:(NSString *)propertyId;
@end
\ No newline at end of file
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISTypeDefinition.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISTypeDefinition.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISTypeDefinition.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISTypeDefinition.m Mon Feb 11 09:27:59 2013
@@ -29,23 +29,6 @@
@implementation CMISTypeDefinition
-@synthesize id = _id;
-@synthesize localName = _localName;
-@synthesize localNameSpace = _localNameSpace;
-@synthesize displayName = _displayName;
-@synthesize queryName = _queryName;
-@synthesize description = _description;
-@synthesize baseTypeId = _baseTypeId;
-@synthesize creatable = _creatable;
-@synthesize fileable = _fileable;
-@synthesize queryable = _queryable;
-@synthesize fullTextIndexed = _fullTextIndexed;
-@synthesize includedInSupertypeQuery = _includedInSupertypeQuery;
-@synthesize controllablePolicy = _controllablePolicy;
-@synthesize controllableAcl = _controllableAcl;
-@synthesize propertyDefinitions = _propertyDefinitions;
-@synthesize internalPropertyDefinitions = _internalPropertyDefinitions;
-
- (NSDictionary *)propertyDefinitions
{
return self.internalPropertyDefinitions;
@@ -53,8 +36,7 @@
- (void)addPropertyDefinition:(CMISPropertyDefinition *)propertyDefinition
{
- if (self.internalPropertyDefinitions == nil)
- {
+ if (self.internalPropertyDefinitions == nil) {
self.internalPropertyDefinitions = [[NSMutableDictionary alloc] init];
}
[self.internalPropertyDefinitions setObject:propertyDefinition forKey:propertyDefinition.id];
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISVersioningService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISVersioningService.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISVersioningService.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Bindings/CMISVersioningService.h Mon Feb 11 09:27:59 2013
@@ -28,6 +28,15 @@
/**
* Get a the latest Document object in the Version Series.
+ * @param objectId
+ * @param major
+ * @param filter
+ * @param includeRelationships
+ * @param includePolicyIds
+ * @param renditionFilter
+ * @param includeACL
+ * @param includeAllowableActions
+ * @param completionBlock returns object data if found or nil otherwise
*/
- (void)retrieveObjectOfLatestVersion:(NSString *)objectId
major:(BOOL)major
@@ -41,6 +50,10 @@
/*
* Returns the list of all Document Object in the given version series, sorted by creationDate descending (ie youngest first)
+ * @param objectId
+ * @param filter
+ * @param includeAllowableActions
+ * @param completionBlock returns array of all versioned objects or nil otherwise
*/
- (void)retrieveAllVersions:(NSString *)objectId
filter:(NSString *)filter
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISCollection.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISCollection.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISCollection.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISCollection.h Mon Feb 11 09:27:59 2013
@@ -18,6 +18,9 @@
@property (nonatomic, strong, readonly)NSArray *items;
+/*
+ initialises CMISCollection with an array
+ */
- (id)initWithItems:(NSArray *)items;
@end
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISCollection.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISCollection.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISCollection.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISCollection.m Mon Feb 11 09:27:59 2013
@@ -25,12 +25,9 @@
@implementation CMISCollection
-@synthesize items = _items;
-
- (id)initWithItems:(NSArray *)items
{
- if (self = [super init])
- {
+ if (self = [super init]){
self.items = items;
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISDocument.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISDocument.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISDocument.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISDocument.h Mon Feb 11 09:27:59 2013
@@ -36,31 +36,35 @@
@property (nonatomic, strong, readonly) NSString *versionSeriesId;
/**
-* Retrieves a collection of all versions of this document.
-*/
+ * Retrieves a collection of all versions of this document.
+ * The completionBlock returns collection of all documents or nil if unsuccessful
+ */
- (void)retrieveAllVersionsWithCompletionBlock:(void (^)(CMISCollection *allVersionsOfDocument, NSError *error))completionBlock;
/**
-* Retrieves a collection of all versions of this document.
-*/
+ * Retrieves a collection of all versions of this document with paging options.
+ * The completionBlock returns collection of all documents or nil if unsuccessful
+ */
- (void)retrieveAllVersionsWithOperationContext:(CMISOperationContext *)operationContext completionBlock:(void (^)(CMISCollection *collection, NSError *error))completionBlock;
/**
-* Retrieves the lastest version of this document.
-*/
+ * Retrieves the lastest version of this document.
+ * The completionBlock returns the CMIS document or nil if unsuccessful
+ */
- (void)retrieveObjectOfLatestVersionWithMajorVersion:(BOOL)major completionBlock:(void (^)(CMISDocument *document, NSError *error))completionBlock;
/**
-* Retrieves the lastest version of this document.
-*/
+ * Retrieves the lastest version of this document with paging options.
+ * The completionBlock returns the CMIS document or nil if unsuccessful
+ */
- (void)retrieveObjectOfLatestVersionWithMajorVersion:(BOOL)major
withOperationContext:(CMISOperationContext *)operationContext
completionBlock:(void (^)(CMISDocument *document, NSError *error))completionBlock;
/**
-* Downloads the content to a local file and returns the filepath.
-* This is a synchronous call and will not return until the file is written to the given path.
-*/
+ * Downloads the content to a local file and returns the filepath.
+ * completionBlock will return NSError nil if successful
+ */
- (CMISRequest*)downloadContentToFile:(NSString *)filePath
completionBlock:(void (^)(NSError *error))completionBlock
progressBlock:(void (^)(unsigned long long bytesDownloaded, unsigned long long bytesTotal))progressBlock;
@@ -68,6 +72,7 @@
/**
* Downloads the content to an outputstream and returns the handle to the http request in order to allow cancellation.
+ * completionBlock will return NSError nil if successful
*/
- (CMISRequest*)downloadContentToOutputStream:(NSOutputStream *)outputStream
completionBlock:(void (^)(NSError *error))completionBlock
@@ -79,6 +84,7 @@
* Optional overwrite flag: If TRUE (default), then the Repository MUST replace the existing content stream for the
* object (if any) with the input contentStream. If FALSE, then the Repository MUST only set the input
* contentStream for the object if the object currently does not have a content-stream.
+ * completionBlock will return NSError nil if successful
*/
- (CMISRequest*)changeContentToContentOfFile:(NSString *)filePath
withOverwriteExisting:(BOOL)overwrite
@@ -91,6 +97,7 @@
* Optional overwrite flag: If TRUE (default), then the Repository MUST replace the existing content stream for the
* object (if any) with the input contentStream. If FALSE, then the Repository MUST only set the input
* contentStream for the object if the object currently does not have a content-stream.
+ * completionBlock will return NSError nil if successful
*/
- (CMISRequest*)changeContentToContentOfInputStream:(NSInputStream *)inputStream
bytesExpected:(unsigned long long)bytesExpected
@@ -101,12 +108,14 @@
/**
* Deletes the content of this document.
+ * completionBlock will return NSError nil if successful
*/
- (void)deleteContentWithCompletionBlock:(void (^)(NSError *error))completionBlock;
/**
-* Deletes the document from the document store.
-*/
+ * Deletes the document from the document store.
+ * completionBlock return true if successful
+ */
- (void)deleteAllVersionsWithCompletionBlock:(void (^)(BOOL documentDeleted, NSError *error))completionBlock;
@end
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISDocument.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISDocument.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISDocument.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISDocument.m Mon Feb 11 09:27:59 2013
@@ -44,21 +44,10 @@
@implementation CMISDocument
-@synthesize contentStreamId = _contentStreamId;
-@synthesize contentStreamFileName = _contentStreamFileName;
-@synthesize contentStreamMediaType = _contentStreamMediaType;
-@synthesize contentStreamLength = _contentStreamLength;
-@synthesize versionLabel = _versionLabel;
-@synthesize latestVersion = _latestVersion;
-@synthesize majorVersion = _majorVersion;
-@synthesize versionSeriesId = _versionSeriesId;
-@synthesize latestMajorVersion = _latestMajorVersion;
-
- (id)initWithObjectData:(CMISObjectData *)objectData withSession:(CMISSession *)session
{
self = [super initWithObjectData:objectData withSession:session];
- if (self)
- {
+ if (self){
self.contentStreamId = [[objectData.properties.propertiesDictionary objectForKey:kCMISProperyContentStreamId] firstValue];
self.contentStreamMediaType = [[objectData.properties.propertiesDictionary objectForKey:kCMISPropertyContentStreamMediaType] firstValue];
self.contentStreamLength = [[[objectData.properties.propertiesDictionary objectForKey:kCMISPropertyContentStreamLength] firstValue] unsignedLongLongValue];
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFileableObject.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFileableObject.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFileableObject.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFileableObject.h Mon Feb 11 09:27:59 2013
@@ -24,17 +24,17 @@
@interface CMISFileableObject : CMISObject
/**
-* Returns all the parents of this object as an array of CMISFolder objects.
-*
-* Will be nil for root folder and non-fileable objects.
-*/
+ * Returns all the parents of this object as an array of CMISFolder objects.
+ * CompletionBlock will return array or nil if unsuccessful
+ * CompletionBlock will return nil for root folder and non-fileable objects.
+ */
- (void)retrieveParentsWithCompletionBlock:(void (^)(NSArray *parentFolders, NSError *error))completionBlock;
/**
-* Returns all the parents of this object as an array of CMISFolder objects.
-*
-* Will be nil for root folder and non-fileable objects.
-*/
+ * Returns all the parents of this object as an array of CMISFolder objects with paging options
+ * CompletionBlock will return array or nil if unsuccessful
+ * CompletionBlock will return nil for root folder and non-fileable objects.
+ */
- (void)retrieveParentsWithOperationContext:(CMISOperationContext *)operationContext
completionBlock:(void (^)(NSArray *parentFolders, NSError *error))completionBlock;
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFileableObject.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFileableObject.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFileableObject.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFileableObject.m Mon Feb 11 09:27:59 2013
@@ -41,8 +41,7 @@
withIncludeRelativePathSegment:operationContext.includePathSegments
completionBlock:^(NSArray *parentObjectDataArray, NSError *error) {
NSMutableArray *parentFolders = [NSMutableArray array];
- for (CMISObjectData *parentObjectData in parentObjectDataArray)
- {
+ for (CMISObjectData *parentObjectData in parentObjectDataArray){
[parentFolders addObject:[self.session.objectConverter convertObject:parentObjectData]];
}
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFolder.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFolder.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFolder.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFolder.h Mon Feb 11 09:27:59 2013
@@ -32,7 +32,7 @@
/**
* Retrieves the children of this folder as a paged result.
*
- * The returned objects will be instances of CMISObject.
+ * The completionBlock will return paged results with instances of CMISObject or nil if unsuccessful.
*/
- (void)retrieveChildrenWithCompletionBlock:(void (^)(CMISPagedResult *result, NSError *error))completionBlock;
@@ -43,24 +43,37 @@
/**
* Gets the parent folder object.
+ * The completionBlock will return CMISFolder object or nil if unsuccessful.
*/
- (void)retrieveFolderParentWithCompletionBlock:(void (^)(CMISFolder *folder, NSError *error))completionBlock;
/**
* Retrieves the children of this folder as a paged result using the provided operation context.
*
- * The returned objects will be instances of CMISObject.
+ * The completionBlock will return paged results with instances of CMISObject or nil if unsuccessful.
*/
- (void)retrieveChildrenWithOperationContext:(CMISOperationContext *)operationContext completionBlock:(void (^)(CMISPagedResult *result, NSError *error))completionBlock;
+/**
+ * creates a folder with sepcified properties
+ * completionBlock returns object Id of newly created folder or nil if not successful
+ */
- (void)createFolder:(NSDictionary *)properties completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock;
+/**
+ * creates a document with sepcified properties, mime Type
+ * completionBlock returns object Id of newly created document or nil if not successful
+ */
- (void)createDocumentFromFilePath:(NSString *)filePath
withMimeType:(NSString *)mimeType
withProperties:(NSDictionary *)properties
completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
+/**
+ * creates a document with sepcified properties, mime Type
+ * completionBlock returns object Id of newly created document or nil if not successful
+ */
- (void)createDocumentFromInputStream:(NSInputStream *)inputStream
withMimeType:(NSString *)mimeType
withProperties:(NSDictionary *)properties
@@ -69,6 +82,10 @@
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
+/**
+ * creates a document with sepcified properties, mime Type
+ * completionBlock returns list of failed objects (if any)
+ */
- (void)deleteTreeWithDeleteAllVersions:(BOOL)deleteAllversions
withUnfileObjects:(CMISUnfileObject)unfileObjects
withContinueOnFailure:(BOOL)continueOnFailure
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFolder.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFolder.m?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFolder.m (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISFolder.m Mon Feb 11 09:27:59 2013
@@ -34,14 +34,11 @@
@implementation CMISFolder
-@synthesize path = _path;
-@synthesize children = _children;
- (id)initWithObjectData:(CMISObjectData *)objectData withSession:(CMISSession *)session
{
self = [super initWithObjectData:objectData withSession:session];
- if (self)
- {
+ if (self){
self.path = [[objectData.properties propertyForId:kCMISPropertyPath] firstValue];
}
return self;
@@ -163,16 +160,12 @@
progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
{
[self.session.objectConverter convertProperties:properties forObjectTypeId:kCMISPropertyObjectTypeIdValueDocument completionBlock:^(CMISProperties *convertedProperties, NSError *error){
- if (nil == convertedProperties)
- {
+ if (nil == convertedProperties){
log(@"Could not convert properties: %@", error.description);
- if (completionBlock)
- {
+ if (completionBlock) {
completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
}
- }
- else
- {
+ } else {
[self.binding.objectService createDocumentFromInputStream:inputStream
withMimeType:mimeType
withProperties:convertedProperties
Modified: chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISObject.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISObject.h?rev=1444689&r1=1444688&r2=1444689&view=diff
==============================================================================
--- chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISObject.h (original)
+++ chemistry/objectivecmis/branches/mdm/ObjectiveCMIS/Client/CMISObject.h Mon Feb 11 09:27:59 2013
@@ -44,22 +44,19 @@
@property (nonatomic, strong, readonly) CMISProperties *properties;
+/**
+ * initialise CMISObject with data and session
+ */
- (id)initWithObjectData:(CMISObjectData *)objectData withSession:(CMISSession *)session;
/**
* Updates the properties that are provided.
- *
- * @param properties The properties to update. The key should be the property id.
- * The value can be an instance of CMISPropertyData, or a regular string.
- * If it is a string, a conversion to the CMISPropertyData will be done for you,
- * but keep in mind that this can trigger another remote call to the server to fetch the type info.
- *
- * @return the updated object (a repository might have created a new version of the object)
-*/
+ * completionBlock returns the updated CMISObject instance or nil if unsuccessful
+ */
- (void)updateProperties:(NSDictionary *)properties completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock;
/**
- * Returns the extensions for the given level as an array of CMISExtensionElement
+ * Returns the extensions for the given level as an array
*/
- (NSArray *)extensionsForExtensionLevel:(CMISExtensionLevel)extensionLevel;