You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2010/06/23 17:39:54 UTC
svn commit: r957252 -
/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/
Author: jens
Date: Wed Jun 23 15:39:54 2010
New Revision: 957252
URL: http://svn.apache.org/viewvc?rev=957252&view=rev
Log:
Remove some return codes that have become obsolete
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java?rev=957252&r1=957251&r2=957252&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java Wed Jun 23 15:39:54 2010
@@ -47,7 +47,7 @@ public class InMemoryMultiFilingServiceI
fAtomLinkProvider = new AtomLinkInfoProvider(storeMgr);
}
- public ObjectData addObjectToFolder(CallContext context, String repositoryId, String objectId, String folderId,
+ public void addObjectToFolder(CallContext context, String repositoryId, String objectId, String folderId,
Boolean allVersions, ExtensionsData extension, ObjectInfoHandler objectInfos) {
LOG.debug("Begin addObjectToFolder()");
@@ -71,16 +71,10 @@ public class InMemoryMultiFilingServiceI
objectInfos.addObjectInfo(objectInfo);
}
- TypeDefinition td = fStoreManager.getTypeById(repositoryId, so.getTypeId()).getTypeDefinition();
- String user = context.getUsername();
- ObjectData od = PropertyCreationHelper.getObjectData(td, so, null, user, false,
- IncludeRelationships.NONE, null, false, false, extension);
-
LOG.debug("End addObjectToFolder()");
- return od;
}
- public ObjectData removeObjectFromFolder(CallContext context, String repositoryId, String objectId,
+ public void removeObjectFromFolder(CallContext context, String repositoryId, String objectId,
String folderId, ExtensionsData extension, ObjectInfoHandler objectInfos) {
LOG.debug("Begin removeObjectFromFolder()");
@@ -103,14 +97,7 @@ public class InMemoryMultiFilingServiceI
objectInfos.addObjectInfo(objectInfo);
}
- String user = context.getUsername();
- TypeDefinition td = fStoreManager.getTypeById(repositoryId, so.getTypeId()).getTypeDefinition();
- ObjectData od = PropertyCreationHelper.getObjectData(td, so, null, user, false,
- IncludeRelationships.NONE, null, false, false, extension);
-
LOG.debug("End removeObjectFromFolder()");
-
- return od;
}
private StoredObject[] checkParams(String repositoryId, String objectId, String folderId) {
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java?rev=957252&r1=957251&r2=957252&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java Wed Jun 23 15:39:54 2010
@@ -193,7 +193,7 @@ public class InMemoryObjectServiceImpl e
* Also the ObjectInfoHandler needs to be filled.
*/
@SuppressWarnings("unchecked")
- public ObjectData create(CallContext context, String repositoryId, Properties properties, String folderId,
+ public String create(CallContext context, String repositoryId, Properties properties, String folderId,
ContentStream contentStream, VersioningState versioningState, List<String> policies,
ExtensionsData extension, ObjectInfoHandler objectInfos) {
@@ -238,7 +238,7 @@ public class InMemoryObjectServiceImpl e
fAtomLinkProvider.fillInformationForAtomLinks(repositoryId, so, od, objectInfo);
objectInfos.addObjectInfo(objectInfo);
}
- return od;
+ return so.getId();
}
public void deleteContentStream(CallContext context, String repositoryId, Holder<String> objectId,
@@ -536,7 +536,7 @@ public class InMemoryObjectServiceImpl e
LOG.debug("stop setContentStream()");
}
- public ObjectData updateProperties(CallContext context, String repositoryId, Holder<String> objectId,
+ public void updateProperties(CallContext context, String repositoryId, Holder<String> objectId,
Holder<String> changeToken, Properties properties, Acl acl, ExtensionsData extension,
ObjectInfoHandler objectInfos) {
@@ -655,8 +655,6 @@ public class InMemoryObjectServiceImpl e
}
LOG.debug("stop updateProperties()");
-
- return od;
}
// ///////////////////////////////////////////////////////
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java?rev=957252&r1=957251&r2=957252&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java Wed Jun 23 15:39:54 2010
@@ -159,9 +159,9 @@ public class InMemoryService extends Abs
public String create(String repositoryId, Properties properties, String folderId, ContentStream contentStream,
VersioningState versioningState, List<String> policies, ExtensionsData extension) {
- ObjectData od = fObjSvc.create(getCallContext(), repositoryId, properties, folderId, contentStream,
+ String id = fObjSvc.create(getCallContext(), repositoryId, properties, folderId, contentStream,
versioningState, policies, extension, this);
- return od.getId();
+ return id;
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java?rev=957252&r1=957251&r2=957252&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java Wed Jun 23 15:39:54 2010
@@ -69,7 +69,7 @@ public class InMemoryVersioningServiceIm
verDoc.cancelCheckOut(user);
}
- public ObjectData checkIn(CallContext context, String repositoryId, Holder<String> objectId, Boolean major,
+ public void checkIn(CallContext context, String repositoryId, Holder<String> objectId, Boolean major,
Properties properties, ContentStream contentStream, String checkinComment, List<String> policies,
Acl addAces, Acl removeAces, ExtensionsData extension, ObjectInfoHandler objectInfos) {
@@ -94,12 +94,6 @@ public class InMemoryVersioningServiceIm
fAtomLinkProvider.fillInformationForAtomLinks(repositoryId, so, objectInfo);
objectInfos.addObjectInfo(objectInfo);
}
-
- TypeDefinition td = fStoreManager.getTypeById(repositoryId, so.getTypeId()).getTypeDefinition();
- ObjectData od = PropertyCreationHelper.getObjectData(td, so, null, user, false,
- IncludeRelationships.NONE, null, false, false, extension);
-
- return od;
}
public void checkOut(CallContext context, String repositoryId, Holder<String> objectId,
@@ -141,10 +135,6 @@ public class InMemoryVersioningServiceIm
fAtomLinkProvider.fillInformationForAtomLinks(repositoryId, pwc, objectInfo);
objectInfos.addObjectInfo(objectInfo);
}
-
- TypeDefinition td = fStoreManager.getTypeById(repositoryId, so.getTypeId()).getTypeDefinition();
- ObjectData od = PropertyCreationHelper.getObjectData(td, so, null, user, false,
- IncludeRelationships.NONE, null, false, false, extension);
}
public List<ObjectData> getAllVersions(CallContext context, String repositoryId, String versionSeriesId,