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 2013/08/23 10:53:50 UTC
svn commit: r1516753 [1/8] - in
/chemistry/opencmis/trunk/chemistry-opencmis-server:
chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/
chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis...
Author: jens
Date: Fri Aug 23 08:53:49 2013
New Revision: 1516753
URL: http://svn.apache.org/r1516753
Log:
InMemory: code formatter, some minor fixes
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/FilterParser.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AbstractServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ExtensionSample.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryAbstractServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryPolicyServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRelationshipServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRepositoryServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceContext.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Children.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Folder.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/MultiFiling.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/ObjectStore.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Policy.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Relationship.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/TypeManagerCreatable.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ContentStreamDataImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ImageThumbnailGenerator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAce.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ItemImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/Permission.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerFactory.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoredObjectImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclPermissionsTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/FolderTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/PolicyTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RelationshipServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceMutabilityTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/UnitTestTypeSystemCreator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersionTestTypeSystemCreator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/AbstractQueryConditionProcessor.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/AbstractQueryTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/EvalQueryTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/ProcessQueryTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryConditionProcessor.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryTestDataCreator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryTypesTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeManager.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/PredicateWalker.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/PredicateWalkerBase.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilBase.java
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java Fri Aug 23 08:53:49 2013
@@ -42,12 +42,12 @@ public final class ConfigConstants {
public static final String FILLER_DOCUMENT_PROPERTY = "RepositoryFiller.DocumentProperty.";
public static final String FILLER_FOLDER_PROPERTY = "RepositoryFiller.FolderProperty.";
public static final String CONTENT_KIND = "RepositoryFiller.ContentKind";
-
+
// runtime configuration values
public static final String MAX_CONTENT_SIZE_KB = "InMemoryServer.MaxContentSizeKB";
public static final String CLEAN_REPOSITORY_INTERVAL = "InMemoryServer.CleanIntervalMinutes";
public static final String DEPLOYMENT_TIME = "InMemoryServer.DeploymentTime";
-
+
private ConfigConstants() {
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java Fri Aug 23 08:53:49 2013
@@ -91,7 +91,7 @@ public final class DataObjectCreator {
AllowableActionsImpl allowableActions = new AllowableActionsImpl();
Set<Action> set = allowableActions.getAllowableActions();
-
+
if (!isRootFolder) {
set.add(Action.CAN_DELETE_OBJECT);
set.add(Action.CAN_UPDATE_PROPERTIES);
@@ -195,8 +195,8 @@ public final class DataObjectCreator {
return changeEventInfo;
}
- public static List<ObjectData> getRelationships(TypeManager tm, ObjectStore objStore, IncludeRelationships includeRelationships,
- StoredObject spo, String user) {
+ public static List<ObjectData> getRelationships(TypeManager tm, ObjectStore objStore,
+ IncludeRelationships includeRelationships, StoredObject spo, String user) {
if (includeRelationships != IncludeRelationships.NONE) {
RelationshipDirection relationshipDirection = RelationshipDirection.SOURCE;
// source is default
@@ -205,8 +205,8 @@ public final class DataObjectCreator {
} else if (includeRelationships == IncludeRelationships.BOTH) {
relationshipDirection = RelationshipDirection.EITHER;
}
-
- List<StoredObject> relationships = objStore.getRelationships(spo.getId(), null, relationshipDirection);
+
+ List<StoredObject> relationships = objStore.getRelationships(spo.getId(), null, relationshipDirection);
List<ObjectData> res = new ArrayList<ObjectData>(relationships.size());
for (StoredObject so : relationships) {
ObjectData od = PropertyCreationHelper.getObjectData(tm, objStore, so, null, user, false,
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/FilterParser.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/FilterParser.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/FilterParser.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/FilterParser.java Fri Aug 23 08:53:49 2013
@@ -18,7 +18,6 @@
*/
package org.apache.chemistry.opencmis.inmemory;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -52,7 +51,9 @@ public final class FilterParser {
// add object id because this is always needed in AtomPub binding:
if (!(requestedIds.contains(PropertyIds.OBJECT_ID))) {
- requestedIds = new ArrayList<String>(requestedIds); // copy immutable list
+ requestedIds = new ArrayList<String>(requestedIds); // copy
+ // immutable
+ // list
requestedIds.add(PropertyIds.OBJECT_ID);
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java Fri Aug 23 08:53:49 2013
@@ -31,7 +31,7 @@ public final class NameValidator {
/**
* check whether id contains only valid characters Allowed are 'a'..'z',
* 'A'..'Z', '0'..'9', '.', '-', ' ', '_';
- *
+ *
* @param s
* string to verify
*/
@@ -55,9 +55,9 @@ public final class NameValidator {
}
/**
- * check whether id contains only valid characters. Not allowed are '/',
+ * check whether id contains only valid characters. Not allowed are '/',
* '\\', ':', '\"', '*'. '?', '<','>', '|'"
- *
+ *
* @param s
* string to verify
*/
@@ -67,8 +67,8 @@ public final class NameValidator {
}
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
- if (c == '\\' || c == '/' || c == '\"' || c == ':' || c == '*' ||
- c == '?' || c == '<' || c == '>' && c == '|') {
+ if (c == '\\' || c == '/' || c == '\"' || c == ':' || c == '*' || c == '?' || c == '<' || c == '>'
+ && c == '|') {
return false;
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AbstractServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AbstractServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AbstractServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AbstractServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -33,9 +33,9 @@ import org.apache.chemistry.opencmis.inm
/**
* Common functionality for all service implementations
- *
+ *
* @author Jens
- *
+ *
*/
public class AbstractServiceImpl {
@@ -49,7 +49,7 @@ public class AbstractServiceImpl {
* check if repository is known and that object exists. To avoid later calls
* to again retrieve the object from the id return the retrieved object for
* later use.
- *
+ *
* @param repositoryId
* repository id
* @param objectId
@@ -111,7 +111,7 @@ public class AbstractServiceImpl {
* We allow checkin, cancel, checkout operations on a single version as well
* as on a version series This method returns the versioned document
* (version series) in each case
- *
+ *
* @param value
* version or version series id of a document
* @return version series id
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java Fri Aug 23 08:53:49 2013
@@ -49,9 +49,9 @@ import org.apache.chemistry.opencmis.ser
* For the Atom binding more information might be required than the result of a
* service call provides (mainly to fill all the links). This class fills the
* objectInfoHolder that was introduced for this purpose
- *
+ *
* @author Jens
- *
+ *
*/
public class AtomLinkInfoProvider {
@@ -64,7 +64,7 @@ public class AtomLinkInfoProvider {
/**
* FillObjectInfoHolder object with required information needed for Atom
* binding for a single object
- *
+ *
* @param repositoryId
* id of repository
* @param objectId
@@ -96,8 +96,8 @@ public class AtomLinkInfoProvider {
objInfo.setIsCurrentVersion(ver == ver.getParentDocument().getLatestVersion(false));
objInfo.setVersionSeriesId(ver.getParentDocument().getId());
objInfo.setWorkingCopyId(pwc == null ? null : pwc.getId());
- objInfo.setWorkingCopyOriginalId(pwc == ver && ver.getParentDocument().getLatestVersion(false) != null ?
- ver.getParentDocument().getLatestVersion(false).getId()
+ objInfo.setWorkingCopyOriginalId(pwc == ver && ver.getParentDocument().getLatestVersion(false) != null ? ver
+ .getParentDocument().getLatestVersion(false).getId()
: null);
} else if (so instanceof VersionedDocument) {
VersionedDocument doc = (VersionedDocument) so;
@@ -156,7 +156,7 @@ public class AtomLinkInfoProvider {
for (StoredObject rel : rels) {
srcIds.add(rel.getId());
}
-
+
rels = objStore.getRelationships(so.getId(), null, RelationshipDirection.TARGET);
List<String> targetIds = new ArrayList<String>(rels.size());
for (StoredObject rel : rels) {
@@ -185,7 +185,7 @@ public class AtomLinkInfoProvider {
/**
* FillObjectInfoHolder object with required information needed for Atom
* binding for a single object
- *
+ *
* @param repositoryId
* id of repository
* @param objectId
@@ -193,7 +193,7 @@ public class AtomLinkInfoProvider {
* @param objectInfos
* Holder to fill with information
*/
- public void fillInformationForAtomLinks(String repositoryId, String objectId, ObjectInfoImpl objectInfo) {
+ public void fillInformationForAtomLinks(String repositoryId, String objectId, ObjectInfoImpl objectInfo) {
if (null == objectInfo || null == objectId) {
return;
}
@@ -203,11 +203,10 @@ public class AtomLinkInfoProvider {
fillInformationForAtomLinks(repositoryId, so, objectInfo);
}
-
/**
* FillObjectInfoHolder object with required information needed for Atom
* binding after a getChildren() call in navigation service
- *
+ *
* @param repositoryId
* id of repository
* @param objectId
@@ -224,7 +223,6 @@ public class AtomLinkInfoProvider {
return;
}
-
// Fill object information for requested object
ObjectInfoImpl objectInfo = new ObjectInfoImpl();
fillInformationForAtomLinks(repositoryId, objectId, objectInfo);
@@ -241,7 +239,7 @@ public class AtomLinkInfoProvider {
/**
* FillObjectInfoHolder object with required information needed for Atom
* binding for an object list
- *
+ *
* @param repositoryId
* id of repository
* @param objectId
@@ -276,13 +274,13 @@ public class AtomLinkInfoProvider {
}
private void fillInformationForAtomLinks(ObjectData od, ObjectInfoImpl objectInfo) {
- objectInfo.setObject(od);
+ objectInfo.setObject(od);
}
/**
* FillObjectInfoHolder object with required information needed for Atom
* binding for an ObjectInFolderContainer
- *
+ *
* @param repositoryId
* id of repository
* @param objectId
@@ -315,7 +313,7 @@ public class AtomLinkInfoProvider {
/**
* FillObjectInfoHolder object with required information needed for Atom
* binding for a list with ObjectInFolderContainers
- *
+ *
* @param repositoryId
* id of repository
* @param objectId
@@ -353,7 +351,7 @@ public class AtomLinkInfoProvider {
/**
* FillObjectInfoHolder object with required information needed for Atom
* binding for a list with ObjectParentData objects
- *
+ *
* @param repositoryId
* id of repository
* @param objectId
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ExtensionSample.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ExtensionSample.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ExtensionSample.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ExtensionSample.java Fri Aug 23 08:53:49 2013
@@ -20,25 +20,23 @@ package org.apache.chemistry.opencmis.in
import javax.xml.bind.annotation.XmlType;
-@XmlType(name = "cmisExtensionType", propOrder = {
- "s", "i", "f"
-})
+@XmlType(name = "cmisExtensionType", propOrder = { "s", "i", "f" })
public class ExtensionSample {
private static final int MAGIC_NUMBER = 42;
private final String s;
private final int i;
private final double f;
-
+
public ExtensionSample() {
s = "This is an example for a CMIS extension.";
i = MAGIC_NUMBER;
- f = Math.PI;
+ f = Math.PI;
}
-
+
public String getString() {
return s;
}
-
+
public int getInt() {
return i;
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryAbstractServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryAbstractServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryAbstractServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryAbstractServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -36,9 +36,9 @@ import org.apache.chemistry.opencmis.inm
/**
* Common functionality for all service implementations
- *
+ *
* @author Jens
- *
+ *
*/
public class InMemoryAbstractServiceImpl {
@@ -62,7 +62,7 @@ public class InMemoryAbstractServiceImpl
if (null == properties) {
return null;
}
-
+
String typeId = (String) properties.getProperties().get(PropertyIds.OBJECT_TYPE_ID).getFirstValue();
TypeDefinitionContainer typeDefC = fStoreManager.getTypeById(repositoryId, typeId);
if (typeDefC == null) {
@@ -76,7 +76,7 @@ public class InMemoryAbstractServiceImpl
if (null == typeIds || typeIds.isEmpty()) {
return null;
}
-
+
List<TypeDefinition> result = new ArrayList<TypeDefinition>(typeIds.size());
for (String typeId : typeIds) {
TypeDefinitionContainer typeDefC = fStoreManager.getTypeById(repositoryId, typeId);
@@ -99,7 +99,7 @@ public class InMemoryAbstractServiceImpl
* We allow checkin, cancel, checkout operations on a single version as well
* as on a version series This method returns the versioned document
* (version series) in each case
- *
+ *
* @param value
* version or version series id of a document
* @return version series id
@@ -155,8 +155,7 @@ public class InMemoryAbstractServiceImpl
protected void testCheckedOutByCurrentUser(String user, VersionedDocument verDoc) {
if (!user.equals(verDoc.getCheckedOutBy())) {
- throw new CmisUpdateConflictException("User " + verDoc.getCheckedOutBy()
- + " has checked out the document.");
+ throw new CmisUpdateConflictException("User " + verDoc.getCheckedOutBy() + " has checked out the document.");
}
}
@@ -165,7 +164,7 @@ public class InMemoryAbstractServiceImpl
throw new CmisUpdateConflictException("Document " + verDoc.getId() + " is not checked out.");
}
}
-
+
protected boolean isCheckedOut(StoredObject so, String user) {
if (so instanceof VersionedDocument || so instanceof DocumentVersion) {
VersionedDocument verDoc = getVersionedDocumentOfObjectId(so);
@@ -173,7 +172,6 @@ public class InMemoryAbstractServiceImpl
} else {
return false;
}
-
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -47,8 +47,8 @@ import org.apache.chemistry.opencmis.inm
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class InMemoryDiscoveryServiceImpl extends InMemoryAbstractServiceImpl{
-
+public class InMemoryDiscoveryServiceImpl extends InMemoryAbstractServiceImpl {
+
private static final Logger LOG = LoggerFactory.getLogger(InMemoryDiscoveryServiceImpl.class);
public InMemoryDiscoveryServiceImpl(StoreManager storeManager) {
@@ -85,7 +85,7 @@ public class InMemoryDiscoveryServiceImp
objList.setObjects(lod);
objList.setNumItems(BigInteger.valueOf(lod.size()));
-
+
String changeToken = Long.valueOf(new Date().getTime()).toString();
changeLogToken.setValue(changeToken);
@@ -113,16 +113,16 @@ public class InMemoryDiscoveryServiceImp
}
}
- public ObjectList query(CallContext context, String repositoryId, String statement, Boolean searchAllVersions,
+ public ObjectList query(CallContext context, String repositoryId, String statement, Boolean searchAllVersions,
Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
LOG.debug("start query()");
validator.query(context, repositoryId, extension);
-
+
String user = context.getUsername();
ObjectList res;
-
+
res = fStoreManager.query(user, repositoryId, statement, searchAllVersions, includeAllowableActions,
includeRelationships, renditionFilter, maxItems, skipCount);
LOG.debug("stop query()");
Modified: 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/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -52,7 +52,8 @@ public class InMemoryMultiFilingServiceI
"Cannot add object to folder, version specific filing is not supported.");
}
ObjectStore objStore = fStoreManager.getObjectStore(repositoryId);
- StoredObject[] sos = validator.addObjectToFolder(context, repositoryId, objectId, folderId, allVersions, extension);
+ StoredObject[] sos = validator.addObjectToFolder(context, repositoryId, objectId, folderId, allVersions,
+ extension);
StoredObject so = sos[0];
StoredObject folder = sos[1];
@@ -70,8 +71,8 @@ public class InMemoryMultiFilingServiceI
LOG.debug("End addObjectToFolder()");
}
- public void removeObjectFromFolder(CallContext context, String repositoryId, String objectId,
- String folderId, ExtensionsData extension, ObjectInfoHandler objectInfos) {
+ public void removeObjectFromFolder(CallContext context, String repositoryId, String objectId, String folderId,
+ ExtensionsData extension, ObjectInfoHandler objectInfos) {
LOG.debug("Begin removeObjectFromFolder()");
@@ -95,8 +96,8 @@ public class InMemoryMultiFilingServiceI
}
} else {
checkObjects(repositoryId, so, null);
- List<String> parentIds = objStore.getParentIds(so, context.getUsername());
- for (String parentId: parentIds) {
+ List<String> parentIds = objStore.getParentIds(so, context.getUsername());
+ for (String parentId : parentIds) {
Folder parent = (Folder) objStore.getObjectById(parentId);
objStore.removeParent(so, parent);
}
@@ -109,7 +110,7 @@ public class InMemoryMultiFilingServiceI
objectInfos.addObjectInfo(objectInfo);
}
}
-
+
LOG.debug("End removeObjectFromFolder()");
}
@@ -122,7 +123,7 @@ public class InMemoryMultiFilingServiceI
if (folder != null && !(folder instanceof Folder)) {
throw new CmisConstraintException("Cannot add object to folder, folder id " + folder.getId()
+ " does not refer to a folder.");
- }
+ }
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -285,9 +285,8 @@ public class InMemoryNavigationServiceIm
return null; // it is a document and has no children
}
- ObjectStore.ChildrenResult children = folderOnly ? objStore.getFolderChildren((Folder) so,
- maxItems, skipCount, user) : objStore.getChildren((Folder) so, maxItems, skipCount, user,
- includePwc);
+ ObjectStore.ChildrenResult children = folderOnly ? objStore.getFolderChildren((Folder) so, maxItems, skipCount,
+ user) : objStore.getChildren((Folder) so, maxItems, skipCount, user, includePwc);
for (Fileable child : children.getChildren()) {
@@ -374,7 +373,7 @@ public class InMemoryNavigationServiceIm
includeAllowableActions, includeRelationships, renditionFilter, false, true, null);
parentData.setObject(objData);
if (null != includeRelativePathSegment && includeRelativePathSegment && so instanceof Fileable) {
- parentData.setRelativePathSegment(((Fileable)so).getPathSegment());
+ parentData.setRelativePathSegment(((Fileable) so).getPathSegment());
}
result.add(parentData);
if (objectInfos != null) {
Modified: 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/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -129,7 +129,8 @@ public class InMemoryObjectServiceImpl e
// build properties collection
List<String> requestedIds = FilterParser.getRequestedIdsFromFilter("*");
TypeManager tm = fStoreManager.getTypeManager(repositoryId);
- Properties existingProps = PropertyCreationHelper.getPropertiesFromObject(so, objectStore, tm, requestedIds, true);
+ Properties existingProps = PropertyCreationHelper.getPropertiesFromObject(so, objectStore, tm, requestedIds,
+ true);
PropertiesImpl newPD = new PropertiesImpl();
// copy all existing properties
@@ -284,8 +285,8 @@ public class InMemoryObjectServiceImpl e
LOG.debug("stop deleteObject()");
}
- public FailedToDeleteData deleteTree(CallContext context, String repositoryId, String folderId,
- Boolean allVers, UnfileObject unfile, Boolean continueOnFail, ExtensionsData extension) {
+ public FailedToDeleteData deleteTree(CallContext context, String repositoryId, String folderId, Boolean allVers,
+ UnfileObject unfile, Boolean continueOnFail, ExtensionsData extension) {
LOG.debug("start deleteTree()");
boolean allVersions = (null == allVers ? true : allVers);
@@ -294,7 +295,7 @@ public class InMemoryObjectServiceImpl e
StoredObject so = validator.deleteTree(context, repositoryId, folderId, allVersions, unfileObjects, extension);
List<String> failedToDeleteIds = new ArrayList<String>();
FailedToDeleteDataImpl result = new FailedToDeleteDataImpl();
-
+
ObjectStore objectStore = fStoreManager.getObjectStore(repositoryId);
if (null == so) {
@@ -534,8 +535,8 @@ public class InMemoryObjectServiceImpl e
LOG.debug("stop moveObject()");
TypeManager tm = fStoreManager.getTypeManager(repositoryId);
- ObjectData od = PropertyCreationHelper.getObjectData(tm, objectStore, so, null, user, false, IncludeRelationships.NONE,
- null, false, false, extension);
+ ObjectData od = PropertyCreationHelper.getObjectData(tm, objectStore, so, null, user, false,
+ IncludeRelationships.NONE, null, false, false, extension);
// To be able to provide all Atom links in the response we need
// additional information:
@@ -548,8 +549,8 @@ public class InMemoryObjectServiceImpl e
return od;
}
- public void setContentStream(CallContext context, String repositoryId, Holder<String> objectId,
- Boolean overwrite, Holder<String> changeToken, ContentStream contentStream, ExtensionsData extension) {
+ public void setContentStream(CallContext context, String repositoryId, Holder<String> objectId, Boolean overwrite,
+ Holder<String> changeToken, ContentStream contentStream, ExtensionsData extension) {
LOG.debug("start setContentStream()");
boolean overwriteFlag = (overwrite == null ? true : overwrite);
@@ -602,7 +603,8 @@ public class InMemoryObjectServiceImpl e
LOG.debug("start updateProperties()");
if (properties == null) {
- throw new CmisRuntimeException("update properties: no properties given for object id: " + objectId.getValue());
+ throw new CmisRuntimeException("update properties: no properties given for object id: "
+ + objectId.getValue());
}
StoredObject so = validator.updateProperties(context, repositoryId, objectId, extension);
String user = context.getUsername();
@@ -663,15 +665,14 @@ public class InMemoryObjectServiceImpl e
if (cmis11 && null == propDef) {
TypeDefinition typeDefSecondary = getSecondaryTypeDefinition(repositoryId, secondaryTypeIds, key);
if (null == typeDefSecondary) {
- throw new CmisInvalidArgumentException("Cannot update property " + key
- + ": not contained in type");
+ throw new CmisInvalidArgumentException("Cannot update property " + key + ": not contained in type");
}
propDef = typeDefSecondary.getPropertyDefinitions().get(key);
}
if (null == propDef) {
throw new CmisInvalidArgumentException("Unknown property " + key
- + ": not contained in type (or any secondary type)");
+ + ": not contained in type (or any secondary type)");
}
if (value.getValues() == null || value.getFirstValue() == null) {
@@ -716,8 +717,9 @@ public class InMemoryObjectServiceImpl e
if (!NameValidator.isValidName(newName)) {
throw new CmisInvalidArgumentException(NameValidator.ERROR_ILLEGAL_NAME);
}
- // Note: the test for duplicated name in folder is left to the object store
- objStore.rename((Fileable)so, (String) pd.getFirstValue());
+ // Note: the test for duplicated name in folder is left to the
+ // object store
+ objStore.rename((Fileable) so, (String) pd.getFirstValue());
hasUpdatedProp = true;
}
@@ -745,8 +747,8 @@ public class InMemoryObjectServiceImpl e
}
TypeManager tm = fStoreManager.getTypeManager(repositoryId);
- ObjectData od = PropertyCreationHelper.getObjectData(tm, objStore, so, null, user, false, IncludeRelationships.NONE,
- null, false, false, extension);
+ ObjectData od = PropertyCreationHelper.getObjectData(tm, objStore, so, null, user, false,
+ IncludeRelationships.NONE, null, false, false, extension);
// To be able to provide all Atom links in the response we need
// additional information:
@@ -798,7 +800,8 @@ public class InMemoryObjectServiceImpl e
}
content.appendContent(contentStream);
- so.updateSystemBasePropertiesWhenModified(null, context.getUsername()); }
+ so.updateSystemBasePropertiesWhenModified(null, context.getUsername());
+ }
public List<BulkUpdateObjectIdAndChangeToken> bulkUpdateProperties(CallContext context, String repositoryId,
List<BulkUpdateObjectIdAndChangeToken> objectIdAndChangeToken, Properties properties,
@@ -826,7 +829,8 @@ public class InMemoryObjectServiceImpl e
String folderId, ContentStream contentStream, VersioningState versioningState, List<String> policies,
Acl addACEs, Acl removeACEs, ExtensionsData extension) {
- Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(), addACEs);
+ Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
+ addACEs);
Acl aclRemove = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
removeACEs);
@@ -938,11 +942,12 @@ public class InMemoryObjectServiceImpl e
private Folder createFolderIntern(CallContext context, String repositoryId, Properties properties, String folderId,
List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension) {
- Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(), addAces);
+ Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
+ addAces);
Acl aclRemove = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
removeAces);
Properties propertiesNew = properties;
-
+
validator.createFolder(context, repositoryId, folderId, policies, extension);
TypeValidator.validateRequiredSystemProperties(properties);
String user = context.getUsername();
@@ -1013,7 +1018,7 @@ public class InMemoryObjectServiceImpl e
Acl aclAdd = addAces;
Acl aclRemove = removeAces;
-
+
validator.createPolicy(context, repositoryId, folderId, aclAdd, aclRemove, policies, extension);
aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(), aclAdd);
@@ -1041,7 +1046,8 @@ public class InMemoryObjectServiceImpl e
String user = context.getUsername();
- Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(), addAces);
+ Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
+ addAces);
Acl aclRemove = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
removeAces);
@@ -1099,8 +1105,8 @@ public class InMemoryObjectServiceImpl e
pd = propMap.get(PropertyIds.NAME);
String name = (String) pd.getFirstValue();
- StoredObject storedObject = objStore.createRelationship(name, relationObjects[0], relationObjects[1], propMapNew,
- user, aclAdd, aclRemove);
+ StoredObject storedObject = objStore.createRelationship(name, relationObjects[0], relationObjects[1],
+ propMapNew, user, aclAdd, aclRemove);
return storedObject;
}
@@ -1109,7 +1115,8 @@ public class InMemoryObjectServiceImpl e
validator.createItem(context, repositoryId, properties, folderId, policies, addAces, removeAces, extension);
- Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(), addAces);
+ Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
+ addAces);
Acl aclRemove = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
removeAces);
@@ -1183,14 +1190,14 @@ public class InMemoryObjectServiceImpl e
private boolean hasDescendant(String user, ObjectStore objStore, Folder sourceFolder, Folder targetFolder) {
String sourceId = sourceFolder.getId();
String targetId = targetFolder.getId();
-
+
Folder folder = targetFolder;
while (targetId != null) {
if (targetId.equals(sourceId)) {
return true;
}
- List<String>parentIds = objStore.getParentIds(folder, user);
- targetId = parentIds == null || parentIds.isEmpty() ? null : parentIds.get(0);
+ List<String> parentIds = objStore.getParentIds(folder, user);
+ targetId = parentIds == null || parentIds.isEmpty() ? null : parentIds.get(0);
if (null != targetId) {
folder = (Folder) objStore.getObjectById(targetId);
}
@@ -1212,7 +1219,7 @@ public class InMemoryObjectServiceImpl e
*/
private boolean deleteRecursive(ObjectStore objStore, Folder parentFolder, boolean continueOnFailure,
boolean allVersions, List<String> failedToDeleteIds, String user) {
-
+
ObjectStore.ChildrenResult childrenResult = objStore.getChildren(parentFolder, -1, -1, "Admin", true);
List<Fileable> children = childrenResult.getChildren();
@@ -1266,7 +1273,7 @@ public class InMemoryObjectServiceImpl e
if (defaultVal != null && null == properties.get(propId)) {
if (!hasCopied) {
// copy because it is an unmodified collection
- propertiesReturn = new HashMap<String, PropertyData<?>>(properties);
+ propertiesReturn = new HashMap<String, PropertyData<?>>(properties);
hasCopied = true;
}
Object value = propDef.getCardinality() == Cardinality.SINGLE ? defaultVal.get(0) : defaultVal;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryPolicyServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryPolicyServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryPolicyServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryPolicyServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -83,7 +83,7 @@ public class InMemoryPolicyServiceImpl e
ExtensionsData extension) {
StoredObject[] sos = validator.applyPolicy(context, repositoryId, policyId, objectId, extension);
StoredObject so = sos[1];
-
+
List<String> polIds = so.getAppliedPolicies();
if (null != polIds && polIds.contains(policyId)) {
throw new CmisInvalidArgumentException("Policy id " + policyId
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRelationshipServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRelationshipServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRelationshipServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRelationshipServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -42,16 +42,18 @@ import org.apache.chemistry.opencmis.ser
public class InMemoryRelationshipServiceImpl extends InMemoryAbstractServiceImpl {
private InMemoryRepositoryServiceImpl repSvc;
+
protected InMemoryRelationshipServiceImpl(StoreManager storeManager, InMemoryRepositoryServiceImpl repSvc) {
super(storeManager);
this.repSvc = repSvc;
}
- public ObjectList getObjectRelationships(CallContext context, String repositoryId, String objectId, Boolean includeSubRelationshipTypes,
- RelationshipDirection relationshipDirection, String typeId, String filter, Boolean includeAllowableActions,
- BigInteger maxItems, BigInteger skipCount, ExtensionsData extension, ObjectInfoHandler objectInfos) {
+ public ObjectList getObjectRelationships(CallContext context, String repositoryId, String objectId,
+ Boolean includeSubRelationshipTypes, RelationshipDirection relationshipDirection, String typeId,
+ String filter, Boolean includeAllowableActions, BigInteger maxItems, BigInteger skipCount,
+ ExtensionsData extension, ObjectInfoHandler objectInfos) {
- int skip = null == skipCount ? 0: skipCount.intValue();
+ int skip = null == skipCount ? 0 : skipCount.intValue();
ObjectStore objStore = fStoreManager.getObjectStore(repositoryId);
StoredObject so = validator.getObjectRelationships(context, repositoryId, objectId, relationshipDirection,
@@ -68,7 +70,8 @@ public class InMemoryRelationshipService
typeIds = new ArrayList<String>();
typeIds.add(typeId);
if (includeSubRelationshipTypes) {
- List<TypeDefinitionContainer> typeDescs = repSvc.getTypeDescendants(context, repositoryId, typeId, null, true, null);
+ List<TypeDefinitionContainer> typeDescs = repSvc.getTypeDescendants(context, repositoryId, typeId,
+ null, true, null);
if (null != typeDescs) {
for (TypeDefinitionContainer t : typeDescs) {
typeIds.add(t.getTypeDefinition().getId());
@@ -81,8 +84,8 @@ public class InMemoryRelationshipService
List<ObjectData> odList = new ArrayList<ObjectData>();
for (StoredObject rel : rels) {
- ObjectData od = PropertyCreationHelper.getObjectData(tm, objStore, rel, filter, user, includeAllowableActions,
- IncludeRelationships.NONE, null, false, false, extension);
+ ObjectData od = PropertyCreationHelper.getObjectData(tm, objStore, rel, filter, user,
+ includeAllowableActions, IncludeRelationships.NONE, null, false, false, extension);
odList.add(od);
}
if (context.isObjectInfoRequired()) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRepositoryServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRepositoryServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryRepositoryServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -83,8 +83,7 @@ public class InMemoryRepositoryServiceIm
// spec says that base types must be returned in this case
children = fStoreManager.getRootTypes(repositoryId, inclPropDefs);
} else {
- children = getTypeDescendants(context, repositoryId, typeId, BigInteger.valueOf(1),
- inclPropDefs, null);
+ children = getTypeDescendants(context, repositoryId, typeId, BigInteger.valueOf(1), inclPropDefs, null);
}
result.setNumItems(BigInteger.valueOf(children.size()));
result.setHasMoreItems(children.size() > max - skip);
@@ -128,8 +127,7 @@ public class InMemoryRepositoryServiceIm
List<TypeDefinitionContainer> result = null;
if (typeId == null) {
// spec says that depth must be ignored in this case
- Collection<TypeDefinitionContainer> tmp = fStoreManager.getTypeDefinitionList(repositoryId,
- inclPropDefs);
+ Collection<TypeDefinitionContainer> tmp = fStoreManager.getTypeDefinitionList(repositoryId, inclPropDefs);
result = new ArrayList<TypeDefinitionContainer>(tmp);
} else {
TypeDefinitionContainer tc = fStoreManager.getTypeById(repositoryId, typeId, inclPropDefs,
@@ -154,7 +152,7 @@ public class InMemoryRepositoryServiceIm
if (null == typeManager) {
throw new CmisInvalidArgumentException("Unknown repository " + repositoryId);
}
-
+
AbstractTypeDefinition newType = TypeValidator.completeType(type);
TypeValidator.adjustTypeNamesAndId(newType);
TypeValidator.checkType(typeManager, newType);
@@ -168,7 +166,7 @@ public class InMemoryRepositoryServiceIm
if (null == typeManager) {
throw new CmisInvalidArgumentException("Unknown repository " + repositoryId);
}
-
+
TypeDefinitionContainer typeDefC = typeManager.getTypeById(typeId);
if (null == typeDefC) {
throw new CmisInvalidArgumentException("Cannot update type unknown type id: " + typeId);
@@ -179,12 +177,12 @@ public class InMemoryRepositoryServiceIm
}
public void deleteType(String repositoryId, String typeId, ExtensionsData extension) {
-
+
TypeManagerCreatable typeManager = fStoreManager.getTypeManager(repositoryId);
if (null == typeManager) {
throw new CmisInvalidArgumentException("Unknown repository " + repositoryId);
}
-
+
TypeDefinitionContainer typeDefC = typeManager.getTypeById(typeId);
if (null == typeDefC) {
throw new CmisInvalidArgumentException("Cannot delete type unknown type id: " + typeId);
@@ -192,12 +190,12 @@ public class InMemoryRepositoryServiceIm
ObjectStore objectStore = fStoreManager.getObjectStore(repositoryId);
if (objectStore.isTypeInUse(typeId)) {
- throw new CmisInvalidArgumentException("type definition " + typeId + " cannot be deleted, type is in use.");
+ throw new CmisInvalidArgumentException("type definition " + typeId + " cannot be deleted, type is in use.");
}
-
- typeManager.deleteTypeDefinition(typeId);
+
+ typeManager.deleteTypeDefinition(typeId);
}
-
+
private RepositoryInfo getRepositoryInfoFromStoreManager(String repositoryId) {
RepositoryInfo repoInfo = fStoreManager.getRepositoryInfo(repositoryId);
if (null == repoInfo || !repoInfo.getId().equals(repositoryId)) {
Modified: 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/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java Fri Aug 23 08:53:49 2013
@@ -117,7 +117,6 @@ public class InMemoryService extends Abs
return fRepSvc.getTypeDefinition(getCallContext(), repositoryId, typeId, extension);
}
-
@Override
public TypeDefinition createType(String repositoryId, TypeDefinition type, ExtensionsData extension) {
return fRepSvc.createType(repositoryId, type, extension);
@@ -238,7 +237,8 @@ public class InMemoryService extends Abs
@Override
public String createItem(String repositoryId, Properties properties, String folderId, List<String> policies,
Acl addAces, Acl removeAces, ExtensionsData extension) {
- return fObjSvc.createItem(getCallContext(), repositoryId, properties, folderId, policies, addAces, removeAces, extension);
+ return fObjSvc.createItem(getCallContext(), repositoryId, properties, folderId, policies, addAces, removeAces,
+ extension);
}
@Override
@@ -365,23 +365,23 @@ public class InMemoryService extends Abs
public ObjectData getObjectOfLatestVersion(String repositoryId, String objectId, String versionSeriesId,
Boolean major, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, ExtensionsData extension) {
- return fVerSvc.getObjectOfLatestVersion(getCallContext(), repositoryId, objectId, versionSeriesId, major, filter,
- includeAllowableActions, includeRelationships, renditionFilter, includePolicyIds, includeAcl,
+ return fVerSvc.getObjectOfLatestVersion(getCallContext(), repositoryId, objectId, versionSeriesId, major,
+ filter, includeAllowableActions, includeRelationships, renditionFilter, includePolicyIds, includeAcl,
extension, this);
}
@Override
public Properties getPropertiesOfLatestVersion(String repositoryId, String objectId, String versionSeriesId,
Boolean major, String filter, ExtensionsData extension) {
- return fVerSvc.getPropertiesOfLatestVersion(getCallContext(), repositoryId, objectId, versionSeriesId, major, filter,
- extension);
+ return fVerSvc.getPropertiesOfLatestVersion(getCallContext(), repositoryId, objectId, versionSeriesId, major,
+ filter, extension);
}
@Override
public List<ObjectData> getAllVersions(String repositoryId, String objectId, String versionSeriesId, String filter,
Boolean includeAllowableActions, ExtensionsData extension) {
- return fVerSvc.getAllVersions(getCallContext(), repositoryId, objectId, versionSeriesId,
- filter, includeAllowableActions, extension, this);
+ return fVerSvc.getAllVersions(getCallContext(), repositoryId, objectId, versionSeriesId, filter,
+ includeAllowableActions, extension, this);
}
// --- discovery service ---
@@ -389,8 +389,8 @@ public class InMemoryService extends Abs
@Override
public ObjectList getContentChanges(String repositoryId, Holder<String> changeLogToken, Boolean includeProperties,
String filter, Boolean includePolicyIds, Boolean includeAcl, BigInteger maxItems, ExtensionsData extension) {
- return fDisSvc.getContentChanges(getCallContext(), repositoryId, changeLogToken, includeProperties, filter, includePolicyIds,
- includeAcl, maxItems, extension, this);
+ return fDisSvc.getContentChanges(getCallContext(), repositoryId, changeLogToken, includeProperties, filter,
+ includePolicyIds, includeAcl, maxItems, extension, this);
}
@Override
@@ -434,7 +434,8 @@ public class InMemoryService extends Abs
@Override
public Acl applyAcl(String repositoryId, String objectId, Acl addAces, Acl removeAces,
AclPropagation aclPropagation, ExtensionsData extension) {
- return fAclSvc.applyAcl(getCallContext(), repositoryId, objectId, addAces, removeAces, aclPropagation, extension, this);
+ return fAclSvc.applyAcl(getCallContext(), repositoryId, objectId, addAces, removeAces, aclPropagation,
+ extension, this);
}
@Override
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceContext.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceContext.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceContext.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceContext.java Fri Aug 23 08:53:49 2013
@@ -23,10 +23,10 @@ import org.apache.chemistry.opencmis.ser
/**
* Helper class to associate context information with each incoming call
- *
+ *
*/
public final class InMemoryServiceContext {
-
+
private static final class ContextHolder {
private CmisServiceWrapper<InMemoryService> wrapper;
private CallContext callContext;
@@ -38,29 +38,29 @@ public final class InMemoryServiceContex
public CmisServiceWrapper<InMemoryService> getServiceWrapper() {
return wrapper;
}
-
+
public void setCallContext(CallContext context) {
this.callContext = context;
}
-
+
public CallContext getCallContext() {
return callContext;
}
}
-
+
private static ThreadLocal<ContextHolder> threadLocalService = new ThreadLocal<ContextHolder>();
-
+
private InMemoryServiceContext() {
}
-
+
public static synchronized void setWrapperService(CmisServiceWrapper<InMemoryService> wrapperService) {
threadLocalService.remove();
if (null != wrapperService) {
ContextHolder holder = new ContextHolder(wrapperService);
- threadLocalService.set(holder);
+ threadLocalService.set(holder);
}
}
-
+
public static synchronized InMemoryService getCmisService() {
ContextHolder holder = threadLocalService.get();
if (null == holder) {
@@ -68,21 +68,21 @@ public final class InMemoryServiceContex
} else {
CmisServiceWrapper<InMemoryService> wrapperService = holder.getServiceWrapper();
return wrapperService == null ? null : wrapperService.getWrappedService();
- }
+ }
}
-
- public static synchronized void setCallContext(CallContext context) {
+
+ public static synchronized void setCallContext(CallContext context) {
ContextHolder holder = threadLocalService.get();
if (null == holder) {
throw new IllegalStateException("Cannot store call context, no service wrapper set.");
} else {
holder.setCallContext(context);
- }
+ }
}
-
+
public static CallContext getCallContext() {
ContextHolder holder = threadLocalService.get();
- return null == holder ? null : holder.getCallContext();
+ return null == holder ? null : holder.getCallContext();
}
-
+
}
Modified: 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/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java Fri Aug 23 08:53:49 2013
@@ -49,7 +49,7 @@ import org.apache.chemistry.opencmis.ser
public class InMemoryVersioningServiceImpl extends InMemoryAbstractServiceImpl {
- private InMemoryObjectServiceImpl fObjectService;
+ private InMemoryObjectServiceImpl fObjectService;
private AtomLinkInfoProvider fAtomLinkProvider;
public InMemoryVersioningServiceImpl(StoreManager storeManager, InMemoryObjectServiceImpl objectService) {
@@ -78,7 +78,8 @@ public class InMemoryVersioningServiceIm
Properties properties, ContentStream contentStreamParam, String checkinComment, List<String> policies,
Acl addAces, Acl removeAces, ExtensionsData extension, ObjectInfoHandler objectInfos) {
- Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(), addAces);
+ Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
+ addAces);
Acl aclRemove = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
removeAces);
@@ -95,7 +96,7 @@ public class InMemoryVersioningServiceIm
}
boolean major = (null == majorParam ? true : majorParam);
-
+
verDoc.checkIn(major, properties, contentStream, checkinComment, policies, user);
verDoc.updateSystemBasePropertiesWhenModified(null, context.getUsername());
// To be able to provide all Atom links in the response we need
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Children.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Children.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Children.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Children.java Fri Aug 23 08:53:49 2013
@@ -27,20 +27,20 @@ import java.util.List;
* @author Jens
*/
public interface Children {
-
+
class ChildrenResult {
private int noItems;
private List<? extends StoredObject> children;
-
+
public ChildrenResult(List<? extends StoredObject> children, int noItems) {
this.children = children;
this.noItems = noItems;
}
-
+
public int getNoItems() {
return noItems;
}
-
+
public List<? extends StoredObject> getChildren() {
return children;
}
@@ -54,15 +54,16 @@ public interface Children {
* max. number of items to return
* @param skipCount
* initial offset where to start fetching
- * @param user
- * user to determine visible children
- * @param usePwc
- * if true return private working copy otherwise return latest version;
+ * @param user
+ * user to determine visible children
+ * @param usePwc
+ * if true return private working copy otherwise return latest
+ * version;
*
* @return list of children objects
*/
ChildrenResult getChildren(int maxItems, int skipCount, String user, boolean usePwc);
-
+
/**
* get all the children of this folder which are folders. To support paging
* an initial offset and a maximum number of children to retrieve can be
@@ -72,7 +73,7 @@ public interface Children {
* max. number of items to return
* @param skipCount
* initial offset where to start fetching
- * @param user
+ * @param user
* @return list of children folders
*/
ChildrenResult getFolderChildren(int maxItems, int skipCount, String user);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java Fri Aug 23 08:53:49 2013
@@ -50,8 +50,8 @@ public interface Content {
void setContent(ContentStream content, boolean mustPersist);
/**
- * Append content to an existing content stream. The
- * document is persisted in the new state.
+ * Append content to an existing content stream. The document is persisted
+ * in the new state.
*
* @param content
* content to be assigned to the document.
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Folder.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Folder.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Folder.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Folder.java Fri Aug 23 08:53:49 2013
@@ -33,18 +33,19 @@ public interface Folder extends Fileable
/**
* get parent if of this folder
- * @return
- * parent id of this folder
+ *
+ * @return parent id of this folder
*/
String getParentId();
-
+
/**
* set the parent id of a folder
+ *
* @param parentId
- * parent id of this folder
+ * parent id of this folder
*/
void setParentId(String parentId);
-
+
/**
* return a list of allowed types of children in this folder
*
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/MultiFiling.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/MultiFiling.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/MultiFiling.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/MultiFiling.java Fri Aug 23 08:53:49 2013
@@ -18,7 +18,6 @@
*/
package org.apache.chemistry.opencmis.inmemory.storedobj.api;
-
/**
* Documents can have in the CMIS specification multiple parents. This interface
* describes the behavior of objects with multiple parent objects.
@@ -32,7 +31,7 @@ public interface MultiFiling extends Fil
* Add parent folder to this document
*
* @param parentId
- * id of parent folder to be added.
+ * id of parent folder to be added.
*/
void addParentId(String parentId);
@@ -40,7 +39,7 @@ public interface MultiFiling extends Fil
* Remove parent from this object
*
* @param parentId
- * id of parent folder to be removed.
+ * id of parent folder to be removed.
*/
void removeParentId(String parentId);
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/ObjectStore.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/ObjectStore.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/ObjectStore.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/ObjectStore.java Fri Aug 23 08:53:49 2013
@@ -415,7 +415,6 @@ public interface ObjectStore {
*/
Acl getAcl(int aclId);
-
// Multifiling methods:
/**
* get all parent ids of this object visible for a user
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Policy.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Policy.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Policy.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Policy.java Fri Aug 23 08:53:49 2013
@@ -21,5 +21,5 @@ package org.apache.chemistry.opencmis.in
public interface Policy {
String getPolicyText();
-
+
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Relationship.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Relationship.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Relationship.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Relationship.java Fri Aug 23 08:53:49 2013
@@ -18,10 +18,9 @@
*/
package org.apache.chemistry.opencmis.inmemory.storedobj.api;
-
public interface Relationship {
-
+
String getSourceObjectId();
-
+
String getTargetObjectId();
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java Fri Aug 23 08:53:49 2013
@@ -69,11 +69,10 @@ public interface StoreManager {
/**
* get a permission and parameter validating instance
*
- * @return
- * validator and permission checker
+ * @return validator and permission checker
*/
CmisServiceValidator getServiceValidator();
-
+
/**
* create a new repository with the given id. Create the repository,
* initiate the type system and initialize it so that it is ready for use
@@ -141,7 +140,7 @@ public interface StoreManager {
*
* @param repositoryId
* id of repository
- * @param inclPropDefs
+ * @param inclPropDefs
* @return list of root types
*/
List<TypeDefinitionContainer> getRootTypes(String repositoryId, boolean inclPropDefs);
@@ -154,23 +153,23 @@ public interface StoreManager {
* @return repository information
*/
RepositoryInfo getRepositoryInfo(String repositoryId);
-
+
/**
* retrieve the type manager for a given repository
+ *
* @param repositoryId
- * id of repository
- * @return
- * type manager for this repository or null if repository is unknown
+ * id of repository
+ * @return type manager for this repository or null if repository is unknown
*/
TypeManagerCreatable getTypeManager(String repositoryId);
-
+
boolean supportsSingleFiling(String repositoryId);
-
+
boolean supportsMultiFilings(String repositoryId);
-
+
/**
- * Execute a query against the repository (same parameter as the discovery service
- * query method
+ * Execute a query against the repository (same parameter as the discovery
+ * service query method
*
* @param user
* @param repositoryId
@@ -186,7 +185,5 @@ public interface StoreManager {
ObjectList query(String user, String repositoryId, String statement, Boolean searchAllVersions,
Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
BigInteger maxItems, BigInteger skipCount);
-
-
-
- }
\ No newline at end of file
+
+}
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/TypeManagerCreatable.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/TypeManagerCreatable.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/TypeManagerCreatable.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/TypeManagerCreatable.java Fri Aug 23 08:53:49 2013
@@ -22,7 +22,6 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.server.support.TypeManager;
public interface TypeManagerCreatable extends TypeManager {
-
/**
* Add a type to the type system. Add all properties from inherited types,
@@ -34,18 +33,18 @@ public interface TypeManagerCreatable ex
* add properties from supertype to type definition
*/
void addTypeDefinition(TypeDefinition typeDefinition, boolean addInheritedProperties);
-
+
/**
* Modify an existing type definition
*
* @param typeDefinition
- * type to be modified
- */
+ * type to be modified
+ */
void updateTypeDefinition(TypeDefinition typeDefinition);
- /**
- * Delete a type from the type system. Delete will succeed only if type is not in use.
- * Otherwise an exception is thrown
+ /**
+ * Delete a type from the type system. Delete will succeed only if type is
+ * not in use. Otherwise an exception is thrown
*
* @param cmisType
* type to delete