Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

63647: Fixed ACE-290: ServiceRegistry.getRetryingTransactionHelper has been deprecated, with no public alternative
    - Removed final bits of deprecation required for ACE-290
    - Added test to ensure that ALF-18718 does not regress (need new instances of RetryingTransactionHelper)
    - Cleaned up pointless 'Non-Javadoc', added @Override, etc


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

source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -102,91 +102,75 @@ public class ServiceDescriptorRegistry
     private BeanFactory beanFactory = null;
 
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
-     */
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException
     {
         this.beanFactory = beanFactory;
     }
 
-    /* (non-Javadoc)
+    /**
-     * @see org.alfresco.repo.service.ServiceRegistry#getServices()
+     * @throws UnsupportedOperationException always
      */
+    @Override
     public Collection<QName> getServices()
     {
         // TODO: Implement
         throw new UnsupportedOperationException();
     }
 
-    /* (non-Javadoc)
+    /**
-     * @see org.alfresco.repo.service.ServiceRegistry#isServiceProvided(org.alfresco.repo.ref.QName)
+     * @throws UnsupportedOperationException always
      */
+    @Override
     public boolean isServiceProvided(QName service)
     {
         // TODO: Implement
         throw new UnsupportedOperationException();
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.repo.service.ServiceRegistry#getService(org.alfresco.repo.ref.QName)
-     */
     public Object getService(QName service)
     {
         return beanFactory.getBean(service.getLocalName());
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getDescriptorService()
-     */
     public DescriptorService getDescriptorService()
     {
         return (DescriptorService)getService(DESCRIPTOR_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.repo.service.ServiceRegistry#getNodeService()
-     */
     public NodeService getNodeService()
     {
         return (NodeService)getService(NODE_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.repo.service.ServiceRegistry#getNodeService()
-     */
     public MutableAuthenticationService getAuthenticationService()
     {
         return (MutableAuthenticationService)getService(AUTHENTICATION_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.repo.service.ServiceRegistry#getContentService()
-     */
     public ContentService getContentService()
     {
         return (ContentService)getService(CONTENT_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getMimetypeService()
-     */
     public MimetypeService getMimetypeService()
     {
         return (MimetypeService)getService(MIMETYPE_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.repo.service.ServiceRegistry#getVersionService()
-     */
     public VersionService getVersionService()
     {
         return (VersionService)getService(VERSION_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.repo.service.ServiceRegistry#getLockService()
-     */
     public LockService getLockService()
     {
         return (LockService)getService(LOCK_SERVICE);
@@ -197,165 +181,122 @@ public class ServiceDescriptorRegistry
         return (JobLockService)getService(JOB_LOCK_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.repo.service.ServiceRegistry#getDictionaryService()
-     */
     public DictionaryService getDictionaryService()
     {
         return (DictionaryService)getService(DICTIONARY_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getSearchService()
-     */
     public SearchService getSearchService()
     {
         return (SearchService)getService(SEARCH_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getTransactionService()
-     */
     public TransactionService getTransactionService()
     {
         return (TransactionService)getService(TRANSACTION_SERVICE);
     }
 
-    /**
+    @Override
-     * @deprecated Use {@link TransactionService#getRetryingTransactionHelper()}: ALF-18718
-     */
-    @Deprecated
     public RetryingTransactionHelper getRetryingTransactionHelper()
     {
         TransactionService txnService = (TransactionService) getService(TRANSACTION_SERVICE);
         return txnService.getRetryingTransactionHelper();
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getCopyService()
-     */
     public CopyService getCopyService()
     {
         return (CopyService)getService(COPY_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getCheckOutCheckInService()
-     */
     public CheckOutCheckInService getCheckOutCheckInService()
     {
         return (CheckOutCheckInService)getService(COCI_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getCategoryService()
-     */
     public CategoryService getCategoryService()
     {
         return (CategoryService)getService(CATEGORY_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getNamespaceService()
-     */
     public NamespaceService getNamespaceService()
     {
         return (NamespaceService)getService(NAMESPACE_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getImporterService()
-     */
     public ImporterService getImporterService()
     {
         return (ImporterService)getService(IMPORTER_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getExporterService()
-     */
     public ExporterService getExporterService()
     {
         return (ExporterService)getService(EXPORTER_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getRuleService()
-     */
     public RuleService getRuleService()
     {
         return (RuleService)getService(RULE_SERVICE);
     }
 
-    /*
+    @Override
-     *  (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getActionService()
-     */
     public ActionService getActionService()
     {
         return (ActionService)getService(ACTION_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getPermissionService()
-     */
     public PermissionService getPermissionService()
     {
         return (PermissionService)getService(PERMISSIONS_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getAuthorityService()
-     */
     public AuthorityService getAuthorityService()
     {
         return (AuthorityService)getService(AUTHORITY_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getTemplateService()
-     */
     public TemplateService getTemplateService()
     {
         return (TemplateService)getService(TEMPLATE_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getTemplateService()
-     */
     public FileFolderService getFileFolderService()
     {
         return (FileFolderService)getService(FILE_FOLDER_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getScriptService()
-     */
     public ScriptService getScriptService()
     {
         return (ScriptService)getService(SCRIPT_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getWorkflowService()
-     */
     public WorkflowService getWorkflowService()
     {
         return (WorkflowService)getService(WORKFLOW_SERVICE);
     }
     
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getNotificationService()
-     */
     public NotificationService getNotificationService()
     {
         return (NotificationService)getService(NOTIFICATION_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getWorkflowService()
-     */
     public AuditService getAuditService()
     {
         return (AuditService)getService(AUDIT_SERVICE);
@@ -365,6 +306,7 @@ public class ServiceDescriptorRegistry
      * Get the AVMService.
      * @return The AVMService or null if there is none.
      */
+    @Override
     public AVMService getAVMService()
     {
         return (AVMService)getService(AVM_SERVICE);
@@ -374,6 +316,7 @@ public class ServiceDescriptorRegistry
      * Get the AVMService.
      * @return The AVMService or null if there is none.
      */
+    @Override
     public AVMService getAVMLockingAwareService()
     {
         return (AVMService)getService(AVM_LOCKING_AWARE_SERVICE);
@@ -383,246 +326,181 @@ public class ServiceDescriptorRegistry
      * Get the AVM Sync Service.
      * @return The AVM Sync Service.
      */
+    @Override
     public AVMSyncService getAVMSyncService()
     {
         return (AVMSyncService)getService(AVM_SYNC_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getOwnableService()
-     */
     public OwnableService getOwnableService()
     {
         return (OwnableService)getService(OWNABLE_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getPersonService()
-     */
     public PersonService getPersonService()
     {
         return (PersonService)getService(PERSON_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getSiteService()
-     */
     public SiteService getSiteService()
     {
         return (SiteService) getService(SITE_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getCrossRepositoryCopyService()
-     */
     public CrossRepositoryCopyService getCrossRepositoryCopyService()
     {
         return (CrossRepositoryCopyService)getService(CROSS_REPO_COPY_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getAttributeService()
-     */
     public AttributeService getAttributeService()
     {
         return (AttributeService)getService(ATTRIBUTE_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getContentFilterLanguagesService()
+    public ContentFilterLanguagesService getContentFilterLanguagesService()
-     */
+    {
-     public ContentFilterLanguagesService getContentFilterLanguagesService()
+        return (ContentFilterLanguagesService) getService(CONTENT_FILTER_LANGUAGES_SERVICE);
-     {
+    }
-     return (ContentFilterLanguagesService) getService(CONTENT_FILTER_LANGUAGES_SERVICE);
-     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getAVMLockingService()
-     */
     public AVMLockingService getAVMLockingService()
     {
         return (AVMLockingService)getService(AVM_LOCKING_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getVirtServerRegistry()
-     */
     public VirtServerRegistry getVirtServerRegistry()
     {
         return (VirtServerRegistry)getService(VIRT_SERVER_REGISTRY);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getEditionService()
-     */
     public EditionService getEditionService()
     {
         return (EditionService) getService(EDITION_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getMultilingualContentService()
-     */
     public MultilingualContentService getMultilingualContentService()
     {
         return (MultilingualContentService) getService(MULTILINGUAL_CONTENT_SERVICE);
     }
     
-    /**
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getThumbnailService()
-     */
     public ThumbnailService getThumbnailService()
     {
         return (ThumbnailService)getService(THUMBNAIL_SERVICE);
     }
 
-    /**
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getTaggingService()
-     */
     public TaggingService getTaggingService()
     {
         return (TaggingService)getService(TAGGING_SERVICE);
     }
     
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getDeploymentService()
-     */
     public DeploymentService getDeploymentService() 
     {
         return (DeploymentService) getService(DEPLOYMENT_SERVICE);
     }
     
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getWebProjectService()
-     */
     public WebProjectService getWebProjectService()
     {
         return (WebProjectService)getService(WEBPROJECT_SERVICE);
     }
     
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getSandboxService()
-     */
     public SandboxService getSandboxService()
     {
         return (SandboxService)getService(SANDBOX_SERVICE);
     }
     
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getAssetService()
-     */
     public AssetService getAssetService()
     {
         return (AssetService)getService(ASSET_SERVICE);
     }
     
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getPreviewURIService()
-     */
     public PreviewURIService getPreviewURIService()
     {
         return (PreviewURIService)getService(PREVIEW_URI_SERVICE);
     }
     
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getFormService()
-     */
     public FormService getFormService() 
     {
         return (FormService)getService(FORM_SERVICE);
     }
     
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getRenditionService()
-     */
     public RenditionService getRenditionService() 
     {
         return (RenditionService)getService(RENDITION_SERVICE);
     }
     
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getRatingService()
-     */
     public RatingService getRatingService() 
     {
         return (RatingService)getService(RATING_SERVICE);
     }
     
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getNodeLocatorService()
-     */
     public NodeLocatorService getNodeLocatorService() 
     {
         return (NodeLocatorService)getService(NODE_LOCATOR_SERVICE);
     }
     
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getBlogService()
-     */
     public BlogService getBlogService() 
     {
         return (BlogService)getService(BLOG_SERVICE);
     }
     
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getCalendarService()
-     */
     public CalendarService getCalendarService() 
     {
         return (CalendarService)getService(CALENDAR_SERVICE);
     }
     
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getInvitationService()
-     */
     public InvitationService getInvitationService() 
     {
          return (InvitationService)getService(INVITATION_SERVICE);
     }
 
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getCMISService()
-     */
     public CMISServices getCMISService() 
     {
          return (CMISServices)getService(CMIS_SERVICE);
     }
 
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getCMISDictionaryService()
-     */
     public CMISDictionaryService getCMISDictionaryService() 
     {
          return (CMISDictionaryService)getService(CMIS_DICTIONARY_SERVICE);
     }
 
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getCMISQueryService()
-     */
     public CMISQueryService getCMISQueryService() 
     {
          return (CMISQueryService)getService(CMIS_QUERY_SERVICE);
     }
 
-    /*
+    @Override
-     * (non-Javadoc)
-     * @see org.alfresco.service.ServiceRegistry#getCMISQueryService()
-     */
     public ImapService getImapService() 
     {
         return (ImapService)getService(IMAP_SERVICE);
     }
 
-    /* (non-Javadoc)
+    @Override
-     * @see org.alfresco.service.ServiceRegistry#getPublicServiceAccessService()
-     */
     public PublicServiceAccessService getPublicServiceAccessService()
     {
         return (PublicServiceAccessService)getService(PUBLIC_SERVICE_ACCESS_SERVICE);

source/java/org/alfresco/service/ServiceRegistry.java

@@ -210,7 +210,7 @@ public interface ServiceRegistry
     TransactionService getTransactionService();
 
     /**
-     * @deprecated Since 4.2. Use {@link TransactionService#getRetryingTransactionHelper()}: ALF-18718
+     * @return a new instance of the {@link RetryingTransactionHelper}
      */
     @NotAuditable
     RetryingTransactionHelper getRetryingTransactionHelper();

source/test-java/org/alfresco/repo/transaction/TransactionServiceImplTest.java

@@ -29,6 +29,7 @@ import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
@@ -258,8 +259,13 @@ public class TransactionServiceImplTest extends TestCase
             }
         };
         
+        // Ensure that we always get a new instance of the RetryingTransactionHelper
         assertFalse("Retriers must be new instances",
                 transactionService.getRetryingTransactionHelper() == transactionService.getRetryingTransactionHelper());
+        // The same must apply when using the ServiceRegistry (ALF-18718)
+        ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
+        assertFalse("Retriers must be new instance when retrieved from ServiceRegistry",
+                serviceRegistry.getRetryingTransactionHelper() == serviceRegistry.getRetryingTransactionHelper());
         
         transactionService.setAllowWrite(true, vetoName);
         transactionService.getRetryingTransactionHelper().doInTransaction(callback, true);