Author: jens
Date: Sun Dec 9 20:55:14 2012
New Revision: 1419160
URL: http://svn.apache.org/viewvc?rev=1419160&view=rev
Log:
InMemory: some code cleanup
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/BaseServiceValidatorImpl.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/InMemoryRepositoryServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAcl.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/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.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/TypeManagerImpl.java?rev=1419160&r1=1419159&r2=1419160&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java
Sun Dec 9 20:55:14 2012
@@ -20,6 +20,7 @@ package org.apache.chemistry.opencmis.in
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,15 +29,11 @@ import java.util.Map.Entry;
import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition;
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import
org.apache.chemistry.opencmis.commons.definitions.TypeDefinitionContainer;
-import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
-import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
-import
org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
import
org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
import org.apache.chemistry.opencmis.commons.impl.Converter;
import
org.apache.chemistry.opencmis.commons.impl.dataobjects.AbstractPropertyDefinition;
import
org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionContainerImpl;
import
org.apache.chemistry.opencmis.commons.impl.jaxb.CmisPropertyDefinitionType;
-import org.apache.chemistry.opencmis.inmemory.server.InMemoryServiceContext;
import
org.apache.chemistry.opencmis.inmemory.storedobj.api.TypeManagerCreatable;
import org.apache.chemistry.opencmis.inmemory.types.DocumentTypeCreationHelper;
import
org.apache.chemistry.opencmis.inmemory.types.InMemoryDocumentTypeDefinition;
@@ -85,24 +82,8 @@ public class TypeManagerImpl implements
/* (non-Javadoc)
* @see
org.apache.chemistry.opencmis.inmemory.TypeManager#getTypeDefinitionList()
*/
- public synchronized Collection<TypeDefinitionContainer>
getTypeDefinitionList() {
-
- List<TypeDefinitionContainer> typeRoots = new
ArrayList<TypeDefinitionContainer>();
- boolean cmis11 =
InMemoryServiceContext.getCallContext().getCmisVersion() !=
CmisVersion.CMIS_1_0;
-
- // iterate types map and return a list collecting the root types:
- for (TypeDefinitionContainer typeDef : fTypesMap.values()) {
- if (typeDef.getTypeDefinition().getParentTypeId() == null) {
- if (cmis11) {
- typeRoots.add(typeDef);
- } else if
(!typeDef.getTypeDefinition().getId().equals(BaseTypeId.CMIS_ITEM.value()) &&
- !
typeDef.getTypeDefinition().getId().equals(BaseTypeId.CMIS_SECONDARY.value())) {
- typeRoots.add(typeDef);
- }
- }
- }
-
- return typeRoots;
+ public Collection<TypeDefinitionContainer> getTypeDefinitionList() {
+ return Collections.unmodifiableCollection(fTypesMap.values());
}
/* (non-Javadoc)
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/BaseServiceValidatorImpl.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/BaseServiceValidatorImpl.java?rev=1419160&r1=1419159&r2=1419160&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/BaseServiceValidatorImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/BaseServiceValidatorImpl.java
Sun Dec 9 20:55:14 2012
@@ -270,7 +270,6 @@ public class BaseServiceValidatorImpl im
public StoredObject getObject(CallContext context, String repositoryId,
String objectId, ExtensionsData extension) {
- String principalId = context.getUsername();
StoredObject so = checkStandardParameters(repositoryId, objectId);
return so;
}
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=1419160&r1=1419159&r2=1419160&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
Sun Dec 9 20:55:14 2012
@@ -26,7 +26,6 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.server.ObjectInfoHandler;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.Folder;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.MultiFiling;
-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.StoredObject;
import org.slf4j.Logger;
@@ -80,7 +79,6 @@ public class InMemoryMultiFilingServiceI
StoredObject[] sos = validator.removeObjectFromFolder(context,
repositoryId, objectId, folderId, extension);
StoredObject so = sos[0];
- ObjectStore objectStore = fStoreManager.getObjectStore(repositoryId);
StoredObject folder = sos[1];
checkObjects(so, 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=1419160&r1=1419159&r2=1419160&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
Sun Dec 9 20:55:14 2012
@@ -35,7 +35,6 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.data.Properties;
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
-import
org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
import
org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import
org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.ObjectDataImpl;
@@ -58,7 +57,6 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.inmemory.storedobj.api.SingleFiling;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoreManager;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoredObject;
-import org.apache.chemistry.opencmis.inmemory.storedobj.api.VersionedDocument;
import org.apache.chemistry.opencmis.inmemory.types.PropertyCreationHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1419160&r1=1419159&r2=1419160&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
Sun Dec 9 20:55:14 2012
@@ -33,7 +33,6 @@ import org.apache.chemistry.opencmis.com
import
org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
import
org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionListImpl;
import org.apache.chemistry.opencmis.commons.server.CallContext;
-import org.apache.chemistry.opencmis.commons.spi.Holder;
import org.apache.chemistry.opencmis.inmemory.TypeValidator;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.ObjectStore;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoreManager;
@@ -184,8 +183,6 @@ public class InMemoryRepositoryServiceIm
if (null == typeDefC)
throw new CmisInvalidArgumentException("Cannot delete type unknown
type id: " + typeId);
- TypeDefinition typeDef = typeDefC.getTypeDefinition();
-
ObjectStore objectStore = fStoreManager.getObjectStore(repositoryId);
if (objectStore.isTypeInUse(typeId)) {
throw new CmisInvalidArgumentException("type definition " + typeId
+ " cannot be deleted, type is in use.");
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAcl.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/InMemoryAcl.java?rev=1419160&r1=1419159&r2=1419160&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAcl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/InMemoryAcl.java
Sun Dec 9 20:55:14 2012
@@ -1,5 +1,5 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
+x * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
@@ -31,6 +31,7 @@ public class InMemoryAcl implements Clon
private List<InMemoryAce> acl;
private int id;
+ @SuppressWarnings("serial")
private static InMemoryAcl DEFAULT_ACL = new InMemoryAcl(new
ArrayList<InMemoryAce>() {{ add(InMemoryAce.getDefaultAce()); }} );
private static class AceComparator<T extends InMemoryAce> implements
Comparator<T> {
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=1419160&r1=1419159&r2=1419160&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
Sun Dec 9 20:55:14 2012
@@ -198,7 +198,7 @@ public class StoreManagerImpl implements
if (null == typeManager) {
throw new CmisInvalidArgumentException("Unknown repository " +
repositoryId);
}
- Collection<TypeDefinitionContainer> typeColl =
typeManager.getTypeDefinitionList();
+ Collection<TypeDefinitionContainer> typeColl =
getRootTypes(repositoryId);
if (includePropertyDefinitions) {
result = typeColl;
} else {
@@ -215,10 +215,6 @@ public class StoreManagerImpl implements
return result;
}
- public Map<String, TypeDefinitionContainer> getTypeDefinitionMap(String
repositoryId) {
- return null;
- }
-
public List<TypeDefinitionContainer> getRootTypes(String repositoryId) {
TypeManager typeManager =
fMapRepositoryToTypeManager.get(repositoryId);
if (null == typeManager) {
@@ -347,6 +343,7 @@ public class StoreManagerImpl implements
typeManager.initTypeSystem(typeDefs);
}
+ @SuppressWarnings("serial")
private RepositoryInfo createRepositoryInfo(String repositoryId) {
ObjectStore objStore = getObjectStore(repositoryId);
String rootFolderId = objStore.getRootFolder().getId();
@@ -364,7 +361,7 @@ public class StoreManagerImpl implements
repoInfo.setChangesOnType(null);
repoInfo.setLatestChangeLogToken(Long.valueOf(new
Date(0).getTime()).toString());
repoInfo.setVendorName("Apache Chemistry");
- repoInfo.setProductName("OpenCMIS InMemory-Server");
+ repoInfo.setProductName(OPENCMIS_SERVER);
repoInfo.setProductVersion(OPENCMIS_VERSION);
// set capabilities
@@ -451,8 +448,8 @@ public class StoreManagerImpl implements
List<BaseTypeId> changesOnType = new ArrayList<BaseTypeId>() {{
add(BaseTypeId.CMIS_DOCUMENT);
add(BaseTypeId.CMIS_FOLDER);
-// add(BaseTypeId.CMIS_ITEM);
-// add(BaseTypeId.CMIS_SECONDARY);
+ add(BaseTypeId.CMIS_ITEM);
+ add(BaseTypeId.CMIS_SECONDARY);
}};
repoInfo.setChangesOnType(changesOnType);
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=1419160&r1=1419159&r2=1419160&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
Sun Dec 9 20:55:14 2012
@@ -273,6 +273,7 @@ public class StoredObjectImpl implements
* CMIS_LAST_MODIFICATION_DATE, CMIS_CHANGE_TOKEN system properties to the
* list of properties with current values
*/
+ @SuppressWarnings("unchecked")
private void addSystemBaseProperties(Map<String, PropertyData<?>>
properties, String user, boolean isCreated) {
if (user == null) {
user = "unknown";
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.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/RepositoryServiceTest.java?rev=1419160&r1=1419159&r2=1419160&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java
Sun Dec 9 20:55:14 2012
@@ -40,11 +40,11 @@ import org.apache.chemistry.opencmis.com
import
org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import
org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
import org.apache.chemistry.opencmis.inmemory.types.DocumentTypeCreationHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Jens
@@ -54,9 +54,6 @@ public class RepositoryServiceTest exten
// private CmisProvider fProvider;
private static final Logger log =
LoggerFactory.getLogger(RepositoryServiceTest.class);
- private static final String REPOSITORY_ID = "UnitTestRepository";
- private static final String TYPE_ID_MUTABILITY = "BookTypeAddedLater";
-
@Override
@Before
@@ -114,10 +111,7 @@ public class RepositoryServiceTest exten
String repositoryId = getRepositoryId();
// get types
- List<TypeDefinitionContainer> types =
fRepSvc.getTypeDescendants(repositoryId, null/*
-
* all
-
* types
-
*/, BigInteger.valueOf(-1),
+ List<TypeDefinitionContainer> types =
fRepSvc.getTypeDescendants(repositoryId, null, BigInteger.valueOf(-1),
Boolean.TRUE, null);
assertNotNull(types);
