RepoAdminServiceImplTest: test/build fixes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java

@@ -42,17 +42,20 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.springframework.extensions.surf.util.ParameterCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.dao.ConcurrencyFailureException;
+import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
  * Repository Admin Service Implementation.
@@ -154,17 +157,25 @@ public class RepoAdminServiceImpl implements RepoAdminService
                 String modelFileName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
                 String repoVersion = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
                 
-                String modelName = null;
-                    
-                ContentReader cr = contentService.getReader(nodeRef, ContentModel.TYPE_CONTENT);
-                InputStream is = cr.getContentInputStream();
-                
                 try
                 {
-                    M2Model model = M2Model.createModel(is);
+                    String modelName = null;
-                    is.close();
                     
-                    modelName = model.getName();
+                    ContentReader cr = contentService.getReader(nodeRef, ContentModel.TYPE_CONTENT);
+                    
+                    if (cr != null)
+                    {
+                        InputStream is = cr.getContentInputStream();
+                        try
+                        {
+                            M2Model model = M2Model.createModel(is);
+                            modelName = model.getName();
+                        }
+                        finally
+                        {
+                            is.close();
+                        }
+                    }
                     
                     // check against models loaded in dictionary and give warning if not found
                     if (dictionaryModels.contains(modelName))
@@ -233,14 +244,24 @@ public class RepoAdminServiceImpl implements RepoAdminService
             {
                 // deploy new model to the repository
                 
-                // note: dictionary model type has associated policies that will be invoked
+                try
-                ChildAssociationRef association = nodeService.createNode(customModelsSpaceNodeRef, 
+                {
-                        ContentModel.ASSOC_CONTAINS, 
+                    // note: dictionary model type has associated policies that will be invoked
-                        QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, modelFileName), 
+                    ChildAssociationRef association = nodeService.createNode(customModelsSpaceNodeRef,
-                        ContentModel.TYPE_DICTIONARY_MODEL,
+                            ContentModel.ASSOC_CONTAINS,
-                        contentProps); // also invokes policies for DictionaryModelType - e.g. onUpdateProperties
+                            QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, modelFileName),
+                            ContentModel.TYPE_DICTIONARY_MODEL,
+                            contentProps); // also invokes policies for DictionaryModelType - e.g. onUpdateProperties
                                 
-                modelNodeRef = association.getChildRef();
+                    modelNodeRef = association.getChildRef();
+                }
+                catch (DuplicateChildNodeNameException dcnne)
+                {
+                    String msg = "Model already exists: "+modelFileName+" - "+dcnne;
+                    logger.warn(msg);
+                    // for now, assume concurrency failure
+                    throw new ConcurrencyFailureException(msg);
+                }
                 
                 // add titled aspect (for Web Client display)
                 Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>();
@@ -421,7 +442,18 @@ public class RepoAdminServiceImpl implements RepoAdminService
             StoreRef storeRef = repoModelsLocation.getStoreRef();
             NodeRef rootNode = nodeService.getRootNode(storeRef);
             
-            List<NodeRef> nodeRefs = searchService.selectNodes(rootNode, repoModelsLocation.getPath()+"//.[@cm:name='"+modelFileName+"' and "+defaultSubtypeOfDictionaryModel+"]", null, namespaceService, false);
+            List<NodeRef> nodeRefs = null;
+            try
+            {
+                nodeRefs = searchService.selectNodes(rootNode, repoModelsLocation.getPath()+"//.[@cm:name='"+modelFileName+"' and "+defaultSubtypeOfDictionaryModel+"]", null, namespaceService, false);
+            }
+            catch (InvalidNodeRefException inre)
+            {
+                String msg = "Model no longer exists: "+modelFileName+" - "+inre;
+                logger.warn(msg);
+                // for now, assume concurrency failure
+                throw new ConcurrencyFailureException(msg);
+            }
             
             if (nodeRefs.size() == 0)
             {
@@ -467,7 +499,18 @@ public class RepoAdminServiceImpl implements RepoAdminService
         	
             // permanently remove model from repository
             nodeService.addAspect(modelNodeRef, ContentModel.ASPECT_TEMPORARY, null);
-            nodeService.deleteNode(modelNodeRef);
+            
+            try
+            {
+                nodeService.deleteNode(modelNodeRef);
+            }
+            catch (DictionaryException de)
+            {
+                String msg = "Model undeployment failed: "+modelFileName+" - "+de;
+                logger.warn(msg);
+                // for now, assume concurrency failure
+                throw new ConcurrencyFailureException(msg);
+            }
             
             // note: deleted model will be unloaded as part of DictionaryModelType.beforeCommit()
         }

source/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java

@@ -40,6 +40,7 @@ import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.service.cmr.admin.RepoAdminService;
 import org.alfresco.service.cmr.dictionary.ClassDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -51,6 +52,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -69,6 +71,7 @@ public class RepoAdminServiceImplTest extends TestCase
     
     private RepoAdminService repoAdminService;
     private DictionaryService dictionaryService;
+    private TransactionService transactionService;
     private NodeService nodeService;
     private ContentService contentService;
     private SearchService searchService;
@@ -118,6 +121,7 @@ public class RepoAdminServiceImplTest extends TestCase
         
         repoAdminService = (RepoAdminService) ctx.getBean("RepoAdminService");
         dictionaryService = (DictionaryService) ctx.getBean("DictionaryService");
+        transactionService = (TransactionService) ctx.getBean("TransactionService");
         nodeService = (NodeService) ctx.getBean("NodeService");
         contentService = (ContentService) ctx.getBean("ContentService");
         searchService = (SearchService) ctx.getBean("SearchService");
@@ -137,6 +141,21 @@ public class RepoAdminServiceImplTest extends TestCase
         // NOOP
     }
     
+    public void xtestRepeat() throws Exception
+    {
+        int cnt = 10;
+        
+        for (int i = 1; i <= cnt; i++)
+        {
+            System.out.println("Itr: "+i+" out of "+cnt);
+            
+            testSimpleDynamicModelViaNodeService();
+            testSimpleDynamicModelViaRepoAdminService();
+            testConcurrentDynamicModelCreate();
+            testConcurrentDynamicModelDelete();
+        }
+    }
+    
     //
     // Test custom model management
     //
@@ -258,7 +277,6 @@ public class RepoAdminServiceImplTest extends TestCase
             
             // restore model
             nodeService.restoreNode(archiveModel1, null, null, null);
-            
             assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
             assertNotNull(dictionaryService.getClass(typeName));
             
@@ -477,34 +495,46 @@ public class RepoAdminServiceImplTest extends TestCase
     
     public void testConcurrentDynamicModelCreate() throws Exception
     {
-        final int n = 5;
+        final int n = 2;
         
         undeployModels(n);
         
         int deployedModelCount = repoAdminService.getModels().size();
-        logger.info("Existing deployed custom model count: "+deployedModelCount);
+        logger.info("Before deploy: deployed custom model count: "+deployedModelCount);
         
         int dictModelCount = getModelCount();
-        logger.info("Existing dictionary model count: "+dictModelCount);
+        logger.info("Before deploy: dictionary model count: "+dictModelCount);
         
         // concurrently deploy N models
         runConcurrentOps(n, 1); 
         
-        assertEquals(deployedModelCount+n, repoAdminService.getModels().size());
+        int newDeployedModelCount = repoAdminService.getModels().size();
+        logger.info("After deploy: deployed custom model count: "+newDeployedModelCount);
+        assertEquals(deployedModelCount+n, newDeployedModelCount);
         
         for (int i = 1; i <= n; i++)
         {
             assertTrue(isModelDeployed(modelPrefix+i));
         }
         
-        assertEquals(dictModelCount+n, getModelCount());
+        int newDictModelCount = getModelCount();
+        logger.info("After deploy: dictionary model count: "+newDictModelCount);
+        assertEquals(dictModelCount+n, newDictModelCount);
         
         undeployModels(n);
+        
+        newDeployedModelCount = repoAdminService.getModels().size();
+        logger.info("After undeploy: deployed custom model count: "+newDeployedModelCount);
+        assertEquals(deployedModelCount, newDeployedModelCount);
+        
+        newDictModelCount = getModelCount();
+        logger.info("After undeploy: dictionary model count: "+newDictModelCount);
+        assertEquals(dictModelCount, newDictModelCount);
     }
     
     public void testConcurrentDynamicModelDelete() throws Exception
     {
-        final int n = 5;
+        final int n = 2;
         
         undeployModels(n);
         
@@ -591,22 +621,30 @@ public class RepoAdminServiceImplTest extends TestCase
             {
                 AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
                 
-                if (opType == 1)
+                transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
                 {
-                    // Deploy model
+                    public Object execute() throws Throwable
-                    String model = MODEL_MKR_XML.replace(MKR, i+"");
+                    {
-                    InputStream modelStream = new ByteArrayInputStream(model.getBytes("UTF-8"));
+                        if (opType == 1)
-                    repoAdminService.deployModel(modelStream, modelPrefix+i);
+                        {
+                            // Deploy model
+                            String model = MODEL_MKR_XML.replace(MKR, i+"");
+                            InputStream modelStream = new ByteArrayInputStream(model.getBytes("UTF-8"));
+                            repoAdminService.deployModel(modelStream, modelPrefix+i);
                             
-                    logger.info("["+i+"] Deploying - test model: "+modelPrefix+i);
+                            logger.info("["+i+"] Deploying - test model: "+modelPrefix+i);
-                }
+                        }
-                else if (opType == 2)
+                        else if (opType == 2)
-                {
+                        {
-                    // Undeploy model
+                            // Undeploy model
-                    repoAdminService.undeployModel(modelPrefix+i);
+                            repoAdminService.undeployModel(modelPrefix+i);
                             
-                    logger.info("["+i+"] Undeployed - test model: "+modelPrefix+i);
+                            logger.info("["+i+"] Undeployed - test model: "+modelPrefix+i);
-                }
+                        }
+                        
+                        return null;
+                    }
+                });
             }
             catch (Throwable t)
             {