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 [2/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...
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ContentStreamDataImpl.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/impl/ContentStreamDataImpl.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/impl/ContentStreamDataImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ContentStreamDataImpl.java Fri Aug 23 08:53:49 2013
@@ -63,19 +63,19 @@ public class ContentStreamDataImpl imple
private final long sizeLimitKB;
- private static synchronized long getTotalLength () {
+ private static synchronized long getTotalLength() {
return totalLength;
}
private static synchronized void increaseTotalLength(int length) {
totalLength += length;
}
-
+
private static synchronized void decreaseTotalLength(int length) {
totalLength -= length;
}
-
- private static synchronized long getTotalCalls () {
+
+ private static synchronized long getTotalCalls() {
return totalCalls;
}
@@ -83,7 +83,6 @@ public class ContentStreamDataImpl imple
totalCalls++;
}
-
public ContentStreamDataImpl(long maxAllowedContentSizeKB) {
sizeLimitKB = maxAllowedContentSizeKB;
fLength = 0;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ImageThumbnailGenerator.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/impl/ImageThumbnailGenerator.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/impl/ImageThumbnailGenerator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ImageThumbnailGenerator.java Fri Aug 23 08:53:49 2013
@@ -41,15 +41,15 @@ public class ImageThumbnailGenerator {
private InputStream image;
private int thumbWidth;
private int thumbHeight;
-
+
public ImageThumbnailGenerator(InputStream imageContent) {
this.image = imageContent;
}
-
+
public int getWidth() {
return thumbWidth;
}
-
+
public int getHeight() {
return thumbHeight;
}
@@ -69,9 +69,8 @@ public class ImageThumbnailGenerator {
}
}
-
private byte[] scaleImage(InputStream stream, int width, int height) throws IOException {
-
+
BufferedImage resizedImage;
BufferedImage originalImage = ImageIO.read(stream);
@@ -82,21 +81,21 @@ public class ImageThumbnailGenerator {
} else {
resizedImage = scaleImage(originalImage, width, height);
}
-
+
thumbWidth = resizedImage.getWidth();
thumbHeight = resizedImage.getHeight();
-
+
return storeImageinByteArray(resizedImage);
}
-
+
private BufferedImage scaleLongerSideTo(BufferedImage bi, int longerSideLengthParam) throws IOException {
int width, height;
int longerSideLength = longerSideLengthParam;
-
+
if (longerSideLength <= 0) {
longerSideLength = DEFAULT_LENGTH;
}
-
+
if (bi.getWidth() > bi.getHeight()) {
width = longerSideLength;
height = bi.getHeight() * longerSideLength / bi.getWidth();
@@ -104,29 +103,29 @@ public class ImageThumbnailGenerator {
height = longerSideLength;
width = bi.getWidth() * longerSideLength / bi.getHeight();
}
-
+
BufferedImage resizedImage = scaleImage(bi, width, height);
return resizedImage;
}
-
+
private BufferedImage scaleImage(BufferedImage originalImage, int width, int height) {
-
- BufferedImage resizedImage = new BufferedImage(width, height, originalImage.getType());
+
+ BufferedImage resizedImage = new BufferedImage(width, height, originalImage.getType());
Graphics2D g = resizedImage.createGraphics();
g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-
+
g.drawImage(originalImage, 0, 0, width, height, null);
- g.dispose();
+ g.dispose();
g.setComposite(AlphaComposite.Src);
-
+
return resizedImage;
}
-
+
private byte[] storeImageinByteArray(BufferedImage bi) throws IOException {
-
+
ByteArrayOutputStream os = new ByteArrayOutputStream();
boolean ok = ImageIO.write(bi, "JPG", os);
if (ok) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAce.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/impl/InMemoryAce.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/impl/InMemoryAce.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAce.java Fri Aug 23 08:53:49 2013
@@ -25,15 +25,14 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlEntryImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlPrincipalDataImpl;
-
public class InMemoryAce {
private static final String ANONYMOUS = "anonymous";
private static final String ANYONE = "anyone";
- private final String principalId;
+ private final String principalId;
private Permission permission;
private static final InMemoryAce DEFAULT_ACE = new InMemoryAce(InMemoryAce.getAnyoneUser(), Permission.ALL);
-
+
public static final String getAnyoneUser() {
return ANYONE;
}
@@ -41,11 +40,11 @@ public class InMemoryAce {
public static final String getAnonymousUser() {
return ANONYMOUS;
}
-
+
public static final InMemoryAce getDefaultAce() {
return DEFAULT_ACE;
}
-
+
public InMemoryAce(Ace commonsAce) {
if (null == commonsAce || null == commonsAce.getPrincipalId() || null == commonsAce.getPermissions()) {
throw new IllegalArgumentException("Cannot create InMemoryAce with null value");
@@ -56,26 +55,26 @@ public class InMemoryAce {
}
String perm = perms.get(0);
this.principalId = commonsAce.getPrincipalId();
- this.permission = Permission.fromCmisString(perm);
+ this.permission = Permission.fromCmisString(perm);
}
public InMemoryAce(String prinicpalId, Permission permission) {
if (null == prinicpalId || null == permission) {
throw new IllegalArgumentException("Cannot create InMemoryAce with null value");
}
-
+
this.principalId = prinicpalId;
- this.permission = permission;
+ this.permission = permission;
}
-
+
public String getPrincipalId() {
return principalId;
}
-
+
public Permission getPermission() {
return permission;
}
-
+
public void setPermission(Permission newPermission) {
permission = newPermission;
}
@@ -124,8 +123,8 @@ public class InMemoryAce {
}
public Ace toCommonsAce() {
- return new AccessControlEntryImpl(new AccessControlPrincipalDataImpl(principalId),
- Collections.singletonList(permission.toCmisString()));
+ return new AccessControlEntryImpl(new AccessControlPrincipalDataImpl(principalId),
+ Collections.singletonList(permission.toCmisString()));
}
-
+
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ItemImpl.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/impl/ItemImpl.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/impl/ItemImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ItemImpl.java Fri Aug 23 08:53:49 2013
@@ -22,8 +22,9 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.inmemory.storedobj.api.Item;
/**
- * itemImpl is used for CMIS:item objects. Items are fileable but do not have content
- *
+ * itemImpl is used for CMIS:item objects. Items are fileable but do not have
+ * content
+ *
*/
public class ItemImpl extends FilingImpl implements Item, Filing {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.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/impl/ObjectStoreImpl.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/impl/ObjectStoreImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java Fri Aug 23 08:53:49 2013
@@ -157,9 +157,10 @@ public class ObjectStoreImpl implements
+ child.getName();
if (path.startsWith(foundPath)) {
Fileable found = findObjectWithPathInDescendents(path, user, foundPath, child);
- if (null != found)
- {
- return found; // note that there can be multiple folders with the same prefix like folder1, folder10
+ if (null != found) {
+ return found; // note that there can be multiple folders
+ // with the same prefix like folder1,
+ // folder10
}
}
}
@@ -179,7 +180,8 @@ public class ObjectStoreImpl implements
StoredObject obj = fStoredObjectMap.get(objectId);
if (null == obj) {
- throw new CmisObjectNotFoundException("Cannot delete object with id " + objectId + ". Object does not exist.");
+ throw new CmisObjectNotFoundException("Cannot delete object with id " + objectId
+ + ". Object does not exist.");
}
if (obj instanceof FolderImpl) {
@@ -353,9 +355,10 @@ public class ObjectStoreImpl implements
List<String> policies, Acl addACEs, Acl removeACEs) {
if (null == parent) {
- throw new CmisInvalidArgumentException("Cannot create root folder.");
+ throw new CmisInvalidArgumentException("Cannot create root folder.");
} else if (hasChild(parent, name)) {
- throw new CmisNameConstraintViolationException("Cannot create folder, this name already exists in parent folder.");
+ throw new CmisNameConstraintViolationException(
+ "Cannot create folder, this name already exists in parent folder.");
}
FolderImpl folder = new FolderImpl(name, parent.getId());
if (null != propMap) {
@@ -383,7 +386,8 @@ public class ObjectStoreImpl implements
}
@Override
- public StoredObject createPolicy(String name, String policyText, Map<String, PropertyData<?>> propMap, String user, Acl addACEs, Acl removeACEs) {
+ public StoredObject createPolicy(String name, String policyText, Map<String, PropertyData<?>> propMap, String user,
+ Acl addACEs, Acl removeACEs) {
PolicyImpl policy = new PolicyImpl();
policy.createSystemBasePropertiesWhenCreated(propMap, user);
policy.setCustomProperties(propMap);
@@ -422,7 +426,7 @@ public class ObjectStoreImpl implements
String id = storeObject(version);
version.setId(id);
}
-
+
@Override
public void deleteVersion(DocumentVersion version) {
StoredObject found = fStoredObjectMap.remove(version.getId());
@@ -485,9 +489,9 @@ public class ObjectStoreImpl implements
public String getFolderPath(String folderId) {
StringBuffer sb = new StringBuffer();
insertPathSegment(sb, folderId);
- return sb.toString();
+ return sb.toString();
}
-
+
private void insertPathSegment(StringBuffer sb, String folderId) {
Folder folder = (Folder) getObjectById(folderId);
if (null == folder.getParentId()) {
@@ -501,7 +505,6 @@ public class ObjectStoreImpl implements
}
}
-
@Override
public Acl applyAcl(StoredObject so, Acl addAces, Acl removeAces, AclPropagation aclPropagation, String principalId) {
if (aclPropagation == AclPropagation.OBJECTONLY || !(so instanceof Folder)) {
@@ -530,7 +533,6 @@ public class ObjectStoreImpl implements
return acls;
}
-
@Override
public Acl getAcl(int aclId) {
InMemoryAcl acl = getInMemoryAcl(aclId);
@@ -569,8 +571,7 @@ public class ObjectStoreImpl implements
}
}
- if (so != null && 0 == aclId && !removeDefaultAcl)
- {
+ if (so != null && 0 == aclId && !removeDefaultAcl) {
return 0; // if object grants full access to everyone and it will
// not be removed we do nothing
}
@@ -579,11 +580,10 @@ public class ObjectStoreImpl implements
if (null != addACEs) {
for (Ace ace : addACEs.getAces()) {
InMemoryAce inMemAce = new InMemoryAce(ace);
- if (inMemAce.equals(InMemoryAce.getDefaultAce()))
- {
+ if (inMemAce.equals(InMemoryAce.getDefaultAce())) {
return 0; // if everyone has full access there is no need to
}
- // add additional ACLs.
+ // add additional ACLs.
newAcl.addAce(inMemAce);
}
}
@@ -630,7 +630,7 @@ public class ObjectStoreImpl implements
int maxItems = maxItemsParam < 0 ? children.size() : maxItemsParam;
int skipCount = skipCountParam < 0 ? 0 : skipCountParam;
-
+
int from = Math.min(skipCount, children.size());
int to = Math.min(maxItems + from, children.size());
int noItems = children.size();
@@ -651,7 +651,7 @@ public class ObjectStoreImpl implements
Fileable pathObj = (Fileable) obj;
if ((null == user || hasReadAccess(user, obj)) && pathObj.getParentIds().contains(folder.getId())) {
if (pathObj instanceof VersionedDocument) {
- DocumentVersion ver;
+ DocumentVersion ver;
if (usePwc) {
ver = ((VersionedDocument) pathObj).getPwc();
if (null == ver) {
@@ -660,12 +660,12 @@ public class ObjectStoreImpl implements
} else {
ver = ((VersionedDocument) pathObj).getLatestVersion(false);
}
- children.add(ver);
+ children.add(ver);
} else if (!(pathObj instanceof DocumentVersion)) { // ignore
// DocumentVersion
children.add(pathObj);
}
-
+
}
}
}
@@ -679,7 +679,7 @@ public class ObjectStoreImpl implements
StoredObject obj = getObject(id);
if (hasReadAccess(user, obj) && obj instanceof Folder) {
Folder childFolder = (Folder) obj;
- if (childFolder.getParentIds().contains(folder.getId()) ) {
+ if (childFolder.getParentIds().contains(folder.getId())) {
folderChildren.add(childFolder);
}
}
@@ -752,7 +752,7 @@ public class ObjectStoreImpl implements
}
Filing fileable = (Fileable) so;
List<String> parents = fileable.getParentIds();
- for (String id: parents) {
+ for (String id : parents) {
StoredObject parent = getObjectById(id);
if (hasReadAccess(user, parent)) {
visibleParents.add(id);
@@ -956,7 +956,7 @@ public class ObjectStoreImpl implements
} else {
throw new IllegalArgumentException("Object " + so.getId() + "is not fileable");
}
-
+
addParentIntern(mfi, parent);
} finally {
unlock();
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/Permission.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/impl/Permission.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/impl/Permission.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/Permission.java Fri Aug 23 08:53:49 2013
@@ -20,18 +20,12 @@ package org.apache.chemistry.opencmis.in
import org.apache.chemistry.opencmis.commons.BasicPermissions;
-
public enum Permission {
- NONE("none"),
- READ("read"),
- WRITE("write"),
- ALL("all");
-
+ NONE("none"), READ("read"), WRITE("write"), ALL("all");
+
private enum EnumBasicPermissions {
- CMIS_READ(BasicPermissions.READ),
- CMIS_WRITE(BasicPermissions.WRITE),
- CMIS_ALL(BasicPermissions.ALL);
+ CMIS_READ(BasicPermissions.READ), CMIS_WRITE(BasicPermissions.WRITE), CMIS_ALL(BasicPermissions.ALL);
private final String value;
EnumBasicPermissions(String v) {
@@ -43,7 +37,7 @@ public enum Permission {
}
public static EnumBasicPermissions fromValue(String v) {
- for (EnumBasicPermissions c: EnumBasicPermissions.values()) {
+ for (EnumBasicPermissions c : EnumBasicPermissions.values()) {
if (c.value.equals(v)) {
return c;
}
@@ -53,7 +47,7 @@ public enum Permission {
}
private final String value;
-
+
Permission(String v) {
value = v;
}
@@ -70,7 +64,7 @@ public enum Permission {
}
throw new IllegalArgumentException(v);
}
-
+
public static Permission fromCmisString(String strPerm) {
Permission permission;
if (strPerm.equals(EnumBasicPermissions.CMIS_READ.value())) {
@@ -83,7 +77,7 @@ public enum Permission {
throw new IllegalArgumentException("InMemory only supports CMIS basic permissions read, write, all.");
}
return permission;
- }
+ }
public String toCmisString() {
if (this.equals(READ)) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerFactory.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/impl/StoreManagerFactory.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/impl/StoreManagerFactory.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerFactory.java Fri Aug 23 08:53:49 2013
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
/**
* create objects that are stored in a persistent store
- *
+ *
* @author Jens
*/
public final class StoreManagerFactory {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.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/impl/StoreManagerImpl.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/impl/StoreManagerImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java Fri Aug 23 08:53:49 2013
@@ -33,6 +33,7 @@ import java.util.Set;
import org.apache.chemistry.opencmis.commons.data.ObjectList;
import org.apache.chemistry.opencmis.commons.data.PermissionMapping;
import org.apache.chemistry.opencmis.commons.data.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.definitions.MutableTypeDefinition;
import org.apache.chemistry.opencmis.commons.definitions.PermissionDefinition;
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinitionContainer;
@@ -71,6 +72,7 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.inmemory.storedobj.api.ObjectStore;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoreManager;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.TypeManagerCreatable;
+import org.apache.chemistry.opencmis.server.support.TypeDefinitionFactory;
import org.apache.chemistry.opencmis.server.support.TypeManager;
/**
@@ -86,7 +88,7 @@ public class StoreManagerImpl implements
private static final String CMIS_ALL = "cmis:all";
private final BindingsObjectFactory fObjectFactory;
-
+ private final TypeDefinitionFactory typeFactory = TypeDefinitionFactory.newInstance();
private static final String OPENCMIS_VERSION;
private static final String OPENCMIS_SERVER;
@@ -261,8 +263,10 @@ public class StoreManagerImpl implements
for (TypeDefinitionContainer c : rootTypes) {
AbstractTypeDefinition td = ((AbstractTypeDefinition) c.getTypeDefinition()).clone();
TypeDefinitionContainerImpl tdc = new TypeDefinitionContainerImpl(td);
- tdc.setChildren(c.getChildren());
td.setPropertyDefinitions(null);
+// MutableTypeDefinition td = typeFactory.copy(c.getTypeDefinition(), includePropertyDefinitions);
+// TypeDefinitionContainerImpl tdc = new TypeDefinitionContainerImpl(td);
+ tdc.setChildren(c.getChildren());
result.add(tdc);
}
}
@@ -528,6 +532,8 @@ public class StoreManagerImpl implements
public static TypeDefinitionContainer cloneTypeList(int depth, boolean includePropertyDefinitions,
TypeDefinitionContainer tdc, TypeDefinitionContainer parent) {
+// final TypeDefinitionFactory typeFactory = TypeDefinitionFactory.newInstance();
+// MutableTypeDefinition tdClone = typeFactory.copy(tdc.getTypeDefinition(), includePropertyDefinitions);
AbstractTypeDefinition tdClone = ((AbstractTypeDefinition) tdc.getTypeDefinition()).clone();
if (!includePropertyDefinitions) {
tdClone.setPropertyDefinitions(null);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoredObjectImpl.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/impl/StoredObjectImpl.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/impl/StoredObjectImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoredObjectImpl.java Fri Aug 23 08:53:49 2013
@@ -264,7 +264,8 @@ public class StoredObjectImpl implements
properties.put(PropertyIds.OBJECT_TYPE_ID,
objFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, getTypeId()));
}
- // set the base type id PropertyIds.CMIS_BASE_TYPE_ID outside because it requires the type definition
+ // set the base type id PropertyIds.CMIS_BASE_TYPE_ID outside because it
+ // requires the type definition
if (FilterParser.isContainedInFilter(PropertyIds.CREATED_BY, requestedIds)) {
properties.put(PropertyIds.CREATED_BY,
objFactory.createPropertyStringData(PropertyIds.CREATED_BY, getCreatedBy()));
@@ -313,7 +314,7 @@ public class StoredObjectImpl implements
@Override
public void setCustomProperties(Map<String, PropertyData<?>> properties) {
- Map<String, PropertyData<?>> propertiesNew = new HashMap<String, PropertyData<?>>(properties);
+ Map<String, PropertyData<?>> propertiesNew = new HashMap<String, PropertyData<?>>(properties);
// get a writablecollection
removeAllSystemProperties(propertiesNew);
setProperties(propertiesNew);
@@ -339,17 +340,16 @@ public class StoredObjectImpl implements
// constructor.
setModifiedBy(user);
if (null != properties) {
- if (null != properties.get(PropertyIds.DESCRIPTION)) {
- setDescription((String) properties.get(PropertyIds.DESCRIPTION)
- .getFirstValue());
- }
+ if (null != properties.get(PropertyIds.DESCRIPTION)) {
+ setDescription((String) properties.get(PropertyIds.DESCRIPTION).getFirstValue());
+ }
- if (null != properties.get(PropertyIds.SECONDARY_OBJECT_TYPE_IDS)) {
- secondaryTypeIds.clear();
- secondaryTypeIds.addAll((List<String>) properties.get(
- PropertyIds.SECONDARY_OBJECT_TYPE_IDS).getValues());
- }
- }
+ if (null != properties.get(PropertyIds.SECONDARY_OBJECT_TYPE_IDS)) {
+ secondaryTypeIds.clear();
+ secondaryTypeIds.addAll((List<String>) properties.get(PropertyIds.SECONDARY_OBJECT_TYPE_IDS)
+ .getValues());
+ }
+ }
if (isCreated) {
setCreatedBy(user);
setName((String) properties.get(PropertyIds.NAME).getFirstValue());
@@ -533,7 +533,7 @@ public class StoredObjectImpl implements
IOUtils.closeQuietly(ba);
IOUtils.closeQuietly(imageStream);
}
-
+
ContentStreamDataImpl content = new ContentStreamDataImpl(0);
content.setFileName(name);
content.setMimeType("image/png");
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.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/types/DocumentTypeCreationHelper.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/types/DocumentTypeCreationHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.java Fri Aug 23 08:53:49 2013
@@ -60,7 +60,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.server.support.TypeDefinitionFactory;
public final class DocumentTypeCreationHelper {
-
+
public static class InMemoryDocumentType extends DocumentTypeDefinitionImpl {
private static final long serialVersionUID = 1L;
@@ -69,7 +69,7 @@ public final class DocumentTypeCreationH
public void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) {
DocumentTypeCreationHelper.addPropertyDefinition(propertyDefinition);
super.addPropertyDefinition(propertyDefinition);
- }
+ }
@Override
public void setId(String id) {
@@ -87,7 +87,7 @@ public final class DocumentTypeCreationH
public void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) {
DocumentTypeCreationHelper.addPropertyDefinition(propertyDefinition);
super.addPropertyDefinition(propertyDefinition);
- }
+ }
@Override
public void setId(String id) {
@@ -105,7 +105,7 @@ public final class DocumentTypeCreationH
public void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) {
DocumentTypeCreationHelper.addPropertyDefinition(propertyDefinition);
super.addPropertyDefinition(propertyDefinition);
- }
+ }
@Override
public void setId(String id) {
@@ -114,7 +114,7 @@ public final class DocumentTypeCreationH
super.setQueryName(DocumentTypeCreationHelper.getQueryName(id));
}
}
-
+
public static class InMemoryPolicyType extends PolicyTypeDefinitionImpl {
private static final long serialVersionUID = 1L;
@@ -123,7 +123,7 @@ public final class DocumentTypeCreationH
public void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) {
DocumentTypeCreationHelper.addPropertyDefinition(propertyDefinition);
super.addPropertyDefinition(propertyDefinition);
- }
+ }
@Override
public void setId(String id) {
@@ -141,7 +141,7 @@ public final class DocumentTypeCreationH
public void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) {
DocumentTypeCreationHelper.addPropertyDefinition(propertyDefinition);
super.addPropertyDefinition(propertyDefinition);
- }
+ }
@Override
public void setId(String id) {
@@ -159,7 +159,7 @@ public final class DocumentTypeCreationH
public void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) {
DocumentTypeCreationHelper.addPropertyDefinition(propertyDefinition);
super.addPropertyDefinition(propertyDefinition);
- }
+ }
@Override
public void setId(String id) {
@@ -177,15 +177,15 @@ public final class DocumentTypeCreationH
private static MutablePolicyTypeDefinition cmisTypePolicy;
private static MutableItemTypeDefinition cmisTypeItem;
private static MutableSecondaryTypeDefinition cmisTypeSecondary;
-
+
public static DocumentTypeDefinition getCmisDocumentType() {
return cmisTypeDoc;
}
-
+
public static FolderTypeDefinition getCmisFolderType() {
return cmisTypeFolder;
}
-
+
public static RelationshipTypeDefinition getCmisRelationshipType() {
return cmisTypeRel;
}
@@ -193,15 +193,15 @@ public final class DocumentTypeCreationH
public static PolicyTypeDefinition getCmisPolicyType() {
return cmisTypePolicy;
}
-
+
public static ItemTypeDefinition getCmisItemType() {
return cmisTypeItem;
}
-
+
public static SecondaryTypeDefinition getCmisSecondaryType() {
return cmisTypeSecondary;
}
-
+
private static void initType(MutableTypeDefinition type, TypeDefinition parentTypeDefinition) {
type.setBaseTypeId(parentTypeDefinition.getBaseTypeId());
type.setParentTypeId(parentTypeDefinition.getId());
@@ -223,11 +223,11 @@ public final class DocumentTypeCreationH
/**
* Creates a new mutable document type definition, which is a child of the
- * provided type definition. Property definitions are not added which is useful
- * for creating additional types at runtime
+ * provided type definition. Property definitions are not added which is
+ * useful for creating additional types at runtime
*/
- public static MutableDocumentTypeDefinition createDocumentTypeDefinitionWithoutBaseProperties(DocumentTypeDefinition parentTypeDefinition)
- throws InstantiationException, IllegalAccessException {
+ public static MutableDocumentTypeDefinition createDocumentTypeDefinitionWithoutBaseProperties(
+ DocumentTypeDefinition parentTypeDefinition) throws InstantiationException, IllegalAccessException {
MutableDocumentTypeDefinition documentType = new InMemoryDocumentType();
initType(documentType, parentTypeDefinition);
@@ -248,21 +248,21 @@ public final class DocumentTypeCreationH
public static final List<TypeDefinition> getDefaultTypes() {
return DEFAULT_TYPES;
}
-
- private static void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) {
+
+ private static void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) {
if (propertyDefinition.getId().equals(PropertyIds.SECONDARY_OBJECT_TYPE_IDS)) {
MutablePropertyDefinition<?> propDef = (MutablePropertyDefinition<?>) propertyDefinition;
propDef.setUpdatability(Updatability.READWRITE);
- }
+ }
}
private static String getQueryName(String id) {
if (null == id) {
return null;
}
-
+
StringBuffer sb = new StringBuffer(id);
- for (int i=0; i<sb.length(); i++) {
+ for (int i = 0; i < sb.length(); i++) {
char c = sb.charAt(i);
if (c == '.' || c == ' ') {
sb.setCharAt(i, '_');
@@ -270,13 +270,13 @@ public final class DocumentTypeCreationH
}
return sb.toString();
}
-
+
public static void setDefaultTypeCapabilities(MutableTypeDefinition cmisType) {
cmisType.setIsCreatable(true);
cmisType.setIsFileable(true);
cmisType.setIsFulltextIndexed(false);
}
-
+
static TypeMutabilityImpl getBaseTypeMutability() {
TypeMutabilityImpl typeMutability = new TypeMutabilityImpl();
typeMutability.setCanCreate(true);
@@ -284,10 +284,10 @@ public final class DocumentTypeCreationH
typeMutability.setCanDelete(false);
return typeMutability;
}
-
+
private static List<TypeDefinition> createCmisDefaultTypes() {
TypeDefinitionFactory typeFactoryLocal = getTypeDefinitionFactory();
-
+
List<TypeDefinition> typesList = new LinkedList<TypeDefinition>();
// create root types:
@@ -303,7 +303,7 @@ public final class DocumentTypeCreationH
setDefaultTypeCapabilities(cmisTypeFolder);
cmisTypeFolder.setTypeMutability(getBaseTypeMutability());
typesList.add(cmisTypeFolder);
-
+
cmisTypeRel = typeFactoryLocal.createRelationshipTypeDefinition(CmisVersion.CMIS_1_1, null);
setDefaultTypeCapabilities(cmisTypeRel);
cmisTypeRel.setTypeMutability(getBaseTypeMutability());
@@ -315,18 +315,18 @@ public final class DocumentTypeCreationH
cmisTypePolicy.setTypeMutability(getBaseTypeMutability());
cmisTypePolicy.setIsFileable(false);
typesList.add(cmisTypePolicy);
-
+
cmisTypeItem = typeFactoryLocal.createItemTypeDefinition(CmisVersion.CMIS_1_1, null);
setDefaultTypeCapabilities(cmisTypeItem);
cmisTypeItem.setTypeMutability(getBaseTypeMutability());
cmisTypeItem.setIsFileable(true);
typesList.add(cmisTypeItem);
-
+
cmisTypeSecondary = typeFactoryLocal.createSecondaryTypeDefinition(CmisVersion.CMIS_1_1, null);
setDefaultTypeCapabilities(cmisTypeSecondary);
cmisTypeSecondary.setTypeMutability(getBaseTypeMutability());
cmisTypeSecondary.setIsFileable(false);
- typesList.add(cmisTypeSecondary);
+ typesList.add(cmisTypeSecondary);
} catch (Exception e) {
throw new CmisRuntimeException("Error when creating base types. ", e);
}
@@ -359,7 +359,7 @@ public final class DocumentTypeCreationH
/**
* create root types and a collection of sample types
- *
+ *
* @return typesMap map filled with created types
*/
public static List<TypeDefinition> createDefaultTypes() {
@@ -370,46 +370,51 @@ public final class DocumentTypeCreationH
public static void setBasicPropertyDefinitions(Map<String, PropertyDefinition<?>> propertyDefinitions) {
- PropertyStringDefinitionImpl propS = PropertyCreationHelper.createStringDefinition(PropertyIds.NAME,
- "Name", Updatability.READWRITE);
+ PropertyStringDefinitionImpl propS = PropertyCreationHelper.createStringDefinition(PropertyIds.NAME, "Name",
+ Updatability.READWRITE);
propS.setIsRequired(true);
propertyDefinitions.put(propS.getId(), propS);
- PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(PropertyIds.OBJECT_ID,
- "Object Id", Updatability.READONLY);
+ PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(PropertyIds.OBJECT_ID, "Object Id",
+ Updatability.READONLY);
propertyDefinitions.put(propId.getId(), propId);
- propId = PropertyCreationHelper.createIdDefinition(PropertyIds.OBJECT_TYPE_ID, "Type-Id", Updatability.ONCREATE);
+ propId = PropertyCreationHelper
+ .createIdDefinition(PropertyIds.OBJECT_TYPE_ID, "Type-Id", Updatability.ONCREATE);
propId.setIsRequired(true);
propertyDefinitions.put(propId.getId(), propId);
- propId = PropertyCreationHelper.createIdDefinition(PropertyIds.BASE_TYPE_ID, "Base-Type-Id", Updatability.READONLY);
+ propId = PropertyCreationHelper.createIdDefinition(PropertyIds.BASE_TYPE_ID, "Base-Type-Id",
+ Updatability.READONLY);
propertyDefinitions.put(propId.getId(), propId);
- propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CREATED_BY, "Created By", Updatability.READONLY);
+ propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CREATED_BY, "Created By",
+ Updatability.READONLY);
propertyDefinitions.put(propS.getId(), propS);
PropertyDateTimeDefinitionImpl propD = PropertyCreationHelper.createDateTimeDefinition(
PropertyIds.CREATION_DATE, "Creation Date", Updatability.READONLY);
propertyDefinitions.put(propD.getId(), propD);
- propS = PropertyCreationHelper.createStringDefinition(PropertyIds.LAST_MODIFIED_BY,
- "Modified By", Updatability.READONLY);
+ propS = PropertyCreationHelper.createStringDefinition(PropertyIds.LAST_MODIFIED_BY, "Modified By",
+ Updatability.READONLY);
propertyDefinitions.put(propS.getId(), propS);
propD = PropertyCreationHelper.createDateTimeDefinition(PropertyIds.LAST_MODIFICATION_DATE,
"Modification Date", Updatability.READONLY);
propertyDefinitions.put(propD.getId(), propD);
- propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CHANGE_TOKEN, "Change Token", Updatability.READONLY);
+ propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CHANGE_TOKEN, "Change Token",
+ Updatability.READONLY);
propertyDefinitions.put(propS.getId(), propS);
// CMIS 1.1:
- propS = PropertyCreationHelper.createStringDefinition(PropertyIds.DESCRIPTION, "Description", Updatability.READWRITE);
+ propS = PropertyCreationHelper.createStringDefinition(PropertyIds.DESCRIPTION, "Description",
+ Updatability.READWRITE);
propertyDefinitions.put(propS.getId(), propS);
- propId = PropertyCreationHelper.createIdMultiDefinition(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, "Secondary Type Ids",
- Updatability.READWRITE);
+ propId = PropertyCreationHelper.createIdMultiDefinition(PropertyIds.SECONDARY_OBJECT_TYPE_IDS,
+ "Secondary Type Ids", Updatability.READWRITE);
propertyDefinitions.put(propId.getId(), propId);
}
@@ -420,12 +425,12 @@ public final class DocumentTypeCreationH
"Immutable", Updatability.READONLY);
propertyDefinitions.put(propB.getId(), propB);
- propB = PropertyCreationHelper.createBooleanDefinition(PropertyIds.IS_LATEST_VERSION,
- "Is Latest Version", Updatability.READONLY);
+ propB = PropertyCreationHelper.createBooleanDefinition(PropertyIds.IS_LATEST_VERSION, "Is Latest Version",
+ Updatability.READONLY);
propertyDefinitions.put(propB.getId(), propB);
- propB = PropertyCreationHelper.createBooleanDefinition(PropertyIds.IS_MAJOR_VERSION,
- "Is Major Version", Updatability.READONLY);
+ propB = PropertyCreationHelper.createBooleanDefinition(PropertyIds.IS_MAJOR_VERSION, "Is Major Version",
+ Updatability.READONLY);
propertyDefinitions.put(propB.getId(), propB);
propB = PropertyCreationHelper.createBooleanDefinition(PropertyIds.IS_LATEST_MAJOR_VERSION,
@@ -449,12 +454,12 @@ public final class DocumentTypeCreationH
"Checked Out By", Updatability.READONLY);
propertyDefinitions.put(propS.getId(), propS);
- propId = PropertyCreationHelper.createIdDefinition(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID,
- "Checked Out Id", Updatability.READONLY);
+ propId = PropertyCreationHelper.createIdDefinition(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID, "Checked Out Id",
+ Updatability.READONLY);
propertyDefinitions.put(propId.getId(), propId);
- propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CHECKIN_COMMENT,
- "Checkin Comment", Updatability.READONLY);
+ propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CHECKIN_COMMENT, "Checkin Comment",
+ Updatability.READONLY);
// read-only, because
// not set as property
propertyDefinitions.put(propS.getId(), propS);
@@ -463,20 +468,21 @@ public final class DocumentTypeCreationH
PropertyIds.CONTENT_STREAM_LENGTH, "Content Length", Updatability.READONLY);
propertyDefinitions.put(propI.getId(), propI);
- propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CONTENT_STREAM_MIME_TYPE,
- "Mime Type", Updatability.READONLY);
+ propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CONTENT_STREAM_MIME_TYPE, "Mime Type",
+ Updatability.READONLY);
propertyDefinitions.put(propS.getId(), propS);
- propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CONTENT_STREAM_FILE_NAME,
- "File Name", Updatability.READONLY);
+ propS = PropertyCreationHelper.createStringDefinition(PropertyIds.CONTENT_STREAM_FILE_NAME, "File Name",
+ Updatability.READONLY);
propertyDefinitions.put(propS.getId(), propS);
- propId = PropertyCreationHelper.createIdDefinition(PropertyIds.CONTENT_STREAM_ID, "Stream Id", Updatability.READONLY);
+ propId = PropertyCreationHelper.createIdDefinition(PropertyIds.CONTENT_STREAM_ID, "Stream Id",
+ Updatability.READONLY);
propertyDefinitions.put(propId.getId(), propId);
// CMIS 1.1:
- propB = PropertyCreationHelper.createBooleanDefinition(PropertyIds.IS_PRIVATE_WORKING_COPY, "Private Working Copy",
- Updatability.READONLY);
+ propB = PropertyCreationHelper.createBooleanDefinition(PropertyIds.IS_PRIVATE_WORKING_COPY,
+ "Private Working Copy", Updatability.READONLY);
propertyDefinitions.put(propB.getId(), propB);
propertyDefinitions.put(propS.getId(), propS);
@@ -485,16 +491,16 @@ public final class DocumentTypeCreationH
public static void setBasicFolderPropertyDefinitions(Map<String, PropertyDefinition<?>> propertyDefinitions) {
setBasicPropertyDefinitions(propertyDefinitions);
- PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(PropertyIds.PARENT_ID,
- "Parent Id", Updatability.READONLY);
+ PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(PropertyIds.PARENT_ID, "Parent Id",
+ Updatability.READONLY);
propertyDefinitions.put(propId.getId(), propId);
propId = PropertyCreationHelper.createIdMultiDefinition(PropertyIds.ALLOWED_CHILD_OBJECT_TYPE_IDS,
"Allowed Child Types", Updatability.READONLY);
propertyDefinitions.put(propId.getId(), propId);
- PropertyStringDefinitionImpl propS = PropertyCreationHelper.createStringDefinition(PropertyIds.PATH,
- "Path", Updatability.READONLY);
+ PropertyStringDefinitionImpl propS = PropertyCreationHelper.createStringDefinition(PropertyIds.PATH, "Path",
+ Updatability.READONLY);
propertyDefinitions.put(propS.getId(), propS);
}
@@ -510,8 +516,8 @@ public final class DocumentTypeCreationH
public static void setBasicRelationshipPropertyDefinitions(Map<String, PropertyDefinition<?>> propertyDefinitions) {
setBasicPropertyDefinitions(propertyDefinitions);
- PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(PropertyIds.SOURCE_ID,
- "Source Id", Updatability.READWRITE);
+ PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(PropertyIds.SOURCE_ID, "Source Id",
+ Updatability.READWRITE);
propId.setIsRequired(true);
propertyDefinitions.put(propId.getId(), propId);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTest.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTest.java Fri Aug 23 08:53:49 2013
@@ -87,7 +87,6 @@ public class AbstractServiceTest {
private String fTypeCreatorClassName;
private CmisBinding binding;
-
public AbstractServiceTest() {
// The in-memory server unit tests can either be run directly against
// the
@@ -118,7 +117,8 @@ public class AbstractServiceTest {
parameters.put(ConfigConstants.TYPE_CREATOR_CLASS, fTypeCreatorClassName);
parameters.put(ConfigConstants.REPOSITORY_ID, REPOSITORY_ID);
- // give subclasses a chance to provide additional parameters for special tests
+ // give subclasses a chance to provide additional parameters for special
+ // tests
addParameters(parameters);
fTestCallContext = new DummyCallContext();
@@ -207,7 +207,7 @@ public class AbstractServiceTest {
boolean withContent) {
String id = null;
try {
- id = createDocumentNoCatch(name , folderId, typeId, versioningState, withContent);
+ id = createDocumentNoCatch(name, folderId, typeId, versioningState, withContent);
if (null == id) {
fail("createDocument failed.");
}
@@ -249,7 +249,7 @@ public class AbstractServiceTest {
protected ContentStream createContent(int sizeInKB, long maxSizeInKB, String mimeType) {
ContentStreamDataImpl content = new ContentStreamDataImpl(maxSizeInKB);
content.setFileName("data.txt");
-
+
if (null == mimeType) {
content.setMimeType("text/plain");
} else {
@@ -296,7 +296,7 @@ public class AbstractServiceTest {
protected void verifyContentResult(ContentStream sd) {
verifyContentResult(sd, 32);
}
-
+
protected void verifyContentResult(ContentStream sd, int sizeInK) {
assertEquals("text/plain", sd.getMimeType());
assertEquals("data.txt", sd.getFileName());
@@ -393,9 +393,9 @@ public class AbstractServiceTest {
assertEquals(objectId, pd.getFirstValue());
}
- /**
+ /**
* Instantiates the services by using the client provider interface.
- *
+ *
* @param parameters
* configuration parameters for client provider interface and
* in-memory provider
@@ -427,13 +427,12 @@ public class AbstractServiceTest {
}
protected String getStringProperty(ObjectData objData, String propertyKey) {
- PropertyData<? extends Object> pd = objData.getProperties().getProperties()
- .get(PropertyIds.PATH);
+ PropertyData<? extends Object> pd = objData.getProperties().getProperties().get(PropertyIds.PATH);
assertNotNull(pd.getFirstValue());
assertTrue(pd.getFirstValue() instanceof String);
return (String) pd.getFirstValue();
}
-
+
protected void deleteDocument(String docId) {
fObjSvc.deleteObject(fRepositoryId, docId, true, null);
}