Refactor to use ServiceLocator instead of Seam's Component class.

zanata · May 9, 2014 · 9de82c9 · 9de82c9
1 parent 1d0bb02
commit 9de82c9
Show file tree

Hide file tree

Showing 49 changed files with 164 additions and 188 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java b/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
@@ -43,6 +43,7 @@
 import org.zanata.security.openid.OpenIdAuthenticationResult;
 import org.zanata.security.openid.OpenIdProviderType;
 import org.zanata.service.RegisterService;
+import org.zanata.util.ServiceLocator;
 
 /**
  * @author Carlos Munoz <a
@@ -140,7 +141,7 @@ private static class AccountMergeAuthCallback implements
         public void afterOpenIdAuth(OpenIdAuthenticationResult result) {
             if (result.isAuthenticated()) {
                 AccountDAO accountDAO =
-                        (AccountDAO) Component.getInstance(AccountDAO.class);
+                        ServiceLocator.instance().getInstance(AccountDAO.class);
                 HAccount account =
                         accountDAO.getByCredentialsId(result
                                 .getAuthenticatedId());

diff --git a/zanata-war/src/main/java/org/zanata/action/DashboardAction.java b/zanata-war/src/main/java/org/zanata/action/DashboardAction.java
@@ -30,7 +30,6 @@
 import com.google.common.collect.Collections2;
 import lombok.NonNull;
 import org.apache.commons.lang.StringUtils;
-import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;

diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java b/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
@@ -23,10 +23,9 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.jboss.seam.Component;
-import org.jboss.seam.ScopeType;
 import org.zanata.dao.ProjectDAO;
 import org.zanata.model.HProject;
+import org.zanata.util.ServiceLocator;
 
 public class ProjectPagedListDataModel extends PagedListDataModel<HProject>
         implements Serializable {
@@ -46,8 +45,7 @@ public ProjectPagedListDataModel(boolean filterActive,
     @Override
     public DataPage<HProject> fetchPage(int startRow, int pageSize) {
         ProjectDAO projectDAO =
-                (ProjectDAO) Component.getInstance(ProjectDAO.class,
-                        ScopeType.STATELESS);
+                ServiceLocator.instance().getInstance(ProjectDAO.class);
         List<HProject> proj =
                 projectDAO.getOffsetListOrderByName(startRow, pageSize,
                         filterActive, filterReadOnly, filterObsolete);

diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java b/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
@@ -12,7 +12,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.lucene.queryParser.ParseException;
-import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.In;
@@ -24,6 +23,7 @@
 
 import com.google.common.collect.Lists;
 import org.zanata.ui.AbstractAutocomplete;
+import org.zanata.util.ServiceLocator;
 
 @Name("projectSearch")
 @Scope(ScopeType.CONVERSATION)
@@ -74,8 +74,8 @@ public boolean isProjectNull() {
     private class ProjectAutocomplete extends
             AbstractAutocomplete<SearchResult> {
 
-        private ProjectDAO projectDAO = (ProjectDAO) Component
-                .getInstance(ProjectDAO.class);
+        private ProjectDAO projectDAO =
+                ServiceLocator.instance().getInstance(ProjectDAO.class);
 
         /**
          * Return results on search

diff --git a/zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java b/zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
@@ -25,13 +25,12 @@
 import java.util.List;
 
 import org.apache.lucene.queryParser.ParseException;
-import org.jboss.seam.Component;
-import org.jboss.seam.ScopeType;
 import org.zanata.dao.ProjectDAO;
 import org.zanata.model.HProject;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.zanata.util.ServiceLocator;
 
 /**
  * @see org.zanata.action.EntityPagedListDataModel
@@ -54,8 +53,7 @@ public QueryProjectPagedListDataModel(int pageSize) {
     @Override
     public DataPage<HProject> fetchPage(int startRow, int pageSize) {
         ProjectDAO projectDAO =
-                (ProjectDAO) Component.getInstance(ProjectDAO.class,
-                        ScopeType.STATELESS);
+                ServiceLocator.instance().getInstance(ProjectDAO.class);
 
         try {
             List<HProject> proj =

diff --git a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
@@ -32,7 +32,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
@@ -49,6 +48,7 @@
 import org.zanata.rest.service.TranslationMemoryResourceService;
 import org.zanata.service.AsyncTaskManagerService;
 import org.zanata.service.SlugEntityService;
+import org.zanata.util.ServiceLocator;
 
 /**
  * Controller class for the Translation Memory UI.
@@ -113,8 +113,9 @@ public void clearTransMemory(final String transMemorySlug) {
             @Override
             public Void call() throws Exception {
                 TranslationMemoryResourceService tmResource =
-                        (TranslationMemoryResourceService) Component
-                                .getInstance("translationMemoryResource");
+                        ServiceLocator.instance().getInstance(
+                                "translationMemoryService",
+                                TranslationMemoryResourceService.class);
                 String msg =
                         tmResource.deleteTranslationUnitsUnguarded(
                                 transMemorySlug).toString();

diff --git a/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java b/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
@@ -39,7 +39,6 @@
 
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotEmpty;
-import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.In;
@@ -73,6 +72,7 @@
 
 import com.google.common.collect.Lists;
 import org.zanata.util.ComparatorUtil;
+import org.zanata.util.ServiceLocator;
 import org.zanata.util.ZanataMessages;
 
 /**
@@ -371,10 +371,10 @@ public void afterOpenIdAuth(OpenIdAuthenticationResult result) {
                 this.newCredentials.setEmail(result.getEmail());
                 // NB: Seam component injection won't work on callbacks
                 EntityManager em =
-                        (EntityManager) Component.getInstance("entityManager");
+                        ServiceLocator.instance().getEntityManager();
                 CredentialsDAO credentialsDAO =
-                        (CredentialsDAO) Component
-                                .getInstance(CredentialsDAO.class);
+                        ServiceLocator.instance().getInstance(
+                                CredentialsDAO.class);
 
                 Conversation.instance().begin(true, false); // (To retain
                 // messages)

diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
@@ -32,7 +32,6 @@
 import org.hibernate.Session;
 import org.hibernate.criterion.NaturalIdentifier;
 import org.hibernate.criterion.Restrictions;
-import org.jboss.seam.Component;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.security.Restrict;
@@ -56,6 +55,7 @@
 import org.zanata.ui.autocomplete.LocaleAutocomplete;
 import org.zanata.ui.autocomplete.MaintainerAutocomplete;
 import org.zanata.util.ComparatorUtil;
+import org.zanata.util.ServiceLocator;
 import org.zanata.util.ZanataMessages;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
@@ -288,13 +288,11 @@ public void onSelectItemAction() {
 
     private class VersionAutocomplete extends
             AbstractAutocomplete<HProjectIteration> {
-        private ProjectIterationDAO projectIterationDAO =
-                (ProjectIterationDAO) Component
-                        .getInstance(ProjectIterationDAO.class);
+        private ProjectIterationDAO projectIterationDAO = ServiceLocator
+                .instance().getInstance(ProjectIterationDAO.class);
 
-        private VersionGroupService versionGroupServiceImpl =
-                (VersionGroupService) Component
-                        .getInstance(VersionGroupServiceImpl.class);
+        private VersionGroupService versionGroupServiceImpl = ServiceLocator
+                .instance().getInstance(VersionGroupServiceImpl.class);
 
         @Override
         public List<HProjectIteration> suggest() {

diff --git a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
@@ -37,7 +37,6 @@
 import javax.validation.ConstraintViolationException;
 
 import org.apache.commons.lang.StringUtils;
-import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
@@ -81,6 +80,7 @@
 import org.zanata.ui.InMemoryListFilter;
 import org.zanata.ui.model.statistic.WordStatistic;
 import org.zanata.util.DateUtil;
+import org.zanata.util.ServiceLocator;
 import org.zanata.util.StatisticsUtil;
 import org.zanata.util.ZanataMessages;
 import org.zanata.webtrans.shared.model.DocumentStatus;
@@ -850,8 +850,8 @@ public void uploadTranslationFile(HLocale hLocale) {
     }
 
     private class DocumentFilter extends InMemoryListFilter<HDocument> {
-        private DocumentDAO documentDAO = (DocumentDAO) Component
-                .getInstance(DocumentDAO.class);
+        private DocumentDAO documentDAO =
+                ServiceLocator.instance().getInstance(DocumentDAO.class);
 
         @Override
         protected List<HDocument> fetchAll() {
@@ -866,7 +866,7 @@ protected boolean include(HDocument elem, String filter) {
     };
 
     private class SourceDocumentFilter extends InMemoryListFilter<HDocument> {
-        private DocumentDAO documentDAO = (DocumentDAO) Component
+        private DocumentDAO documentDAO = ServiceLocator.instance()
                 .getInstance(DocumentDAO.class);
 
         @Override

diff --git a/zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java b/zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
@@ -25,9 +25,8 @@
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.jboss.seam.Component;
-import org.jboss.seam.ScopeType;
 import org.zanata.dao.PersonDAO;
+import org.zanata.util.ServiceLocator;
 
 public class DuplicateEmailValidator implements
         ConstraintValidator<NotDuplicateEmail, String>, Serializable {
@@ -40,8 +39,7 @@ public boolean isValid(String string, ConstraintValidatorContext context) {
         if (string.length() == 0)
             return true;
         PersonDAO personDAO =
-                (PersonDAO) Component.getInstance(PersonDAO.class,
-                        ScopeType.STATELESS);
+                ServiceLocator.instance().getInstance(PersonDAO.class);
         return personDAO.findByEmail(string) == null;
     }
 

diff --git a/zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java b/zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
@@ -24,7 +24,6 @@
 
 import javax.security.auth.Subject;
 
-import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.Name;
@@ -37,6 +36,7 @@
 import org.zanata.dao.AccountDAO;
 import org.zanata.model.HAccount;
 import org.zanata.security.ZanataJpaIdentityStore;
+import org.zanata.util.ServiceLocator;
 
 /**
  * This class executes a Runnable Process asynchronously. Do not use this class
@@ -110,13 +110,13 @@ private static void prepareSecurityContext(String username) {
             // Only if it's an authenticated task should it try and do this
             // injection
             AccountDAO accountDAO =
-                (AccountDAO) Component.getInstance(AccountDAO.class);
+                    ServiceLocator.instance().getInstance(AccountDAO.class);
             ZanataJpaIdentityStore idStore =
-                    (ZanataJpaIdentityStore) Component
-                            .getInstance(ZanataJpaIdentityStore.class);
+                    ServiceLocator.instance().getInstance(
+                            ZanataJpaIdentityStore.class);
             AuthenticationEvents authEvts =
-                (AuthenticationEvents) Component
-                    .getInstance(AuthenticationEvents.class);
+                    ServiceLocator.instance().getInstance(
+                            AuthenticationEvents.class);
             HAccount authenticatedAccount = accountDAO.getByUsername(username);
             authEvts.injectAuthenticatedPersonIntoWorkingMemory(authenticatedAccount);
             idStore.setAuthenticateUser(authenticatedAccount);

diff --git a/zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java b/zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
@@ -22,14 +22,14 @@
 
 import java.util.List;
 
-import org.jboss.seam.Component;
 import org.zanata.model.HCopyTransOptions;
 import org.zanata.model.HDocument;
 import org.zanata.model.HLocale;
 import org.zanata.service.CopyTransService;
 import org.zanata.service.LocaleService;
 import org.zanata.service.impl.CopyTransServiceImpl;
 import org.zanata.service.impl.LocaleServiceImpl;
+import org.zanata.util.ServiceLocator;
 
 /**
  * Copy Trans task that runs copy trans on a single document and all languages
@@ -50,7 +50,7 @@ public DocumentCopyTransTask(HDocument document,
     @Override
     protected int getMaxProgress() {
         LocaleService localeService =
-                (LocaleService) Component.getInstance(LocaleServiceImpl.class);
+                ServiceLocator.instance().getInstance(LocaleServiceImpl.class);
         List<HLocale> localeList =
                 localeService.getSupportedLanguageByProjectIteration(document
                         .getProjectIteration().getProject().getSlug(), document
@@ -62,8 +62,8 @@ protected int getMaxProgress() {
     @Override
     protected void callCopyTrans() {
         CopyTransService copyTransServiceImpl =
-                (CopyTransService) Component
-                        .getInstance(CopyTransServiceImpl.class);
+                ServiceLocator.instance().getInstance(
+                        CopyTransServiceImpl.class);
         copyTransServiceImpl.copyTransForDocument(document, copyTransOptions);
     }
 }
diff --git a/zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java b/zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
@@ -22,14 +22,14 @@
 
 import java.util.List;
 
-import org.jboss.seam.Component;
 import org.zanata.model.HCopyTransOptions;
 import org.zanata.model.HLocale;
 import org.zanata.model.HProjectIteration;
 import org.zanata.service.CopyTransService;
 import org.zanata.service.LocaleService;
 import org.zanata.service.impl.CopyTransServiceImpl;
 import org.zanata.service.impl.LocaleServiceImpl;
+import org.zanata.util.ServiceLocator;
 
 /**
  * Copy Trans task that runs copy trans for a whole project iteration and all
@@ -50,7 +50,7 @@ public IterationCopyTransTask(HProjectIteration projectIteration,
     @Override
     protected int getMaxProgress() {
         LocaleService localeService =
-                (LocaleService) Component.getInstance(LocaleServiceImpl.class);
+                ServiceLocator.instance().getInstance(LocaleServiceImpl.class);
         List<HLocale> localeList =
                 localeService.getSupportedLanguageByProjectIteration(
                         projectIteration.getProject().getSlug(),
@@ -62,8 +62,8 @@ protected int getMaxProgress() {
     @Override
     protected void callCopyTrans() {
         CopyTransService copyTransServiceImpl =
-                (CopyTransService) Component
-                        .getInstance(CopyTransServiceImpl.class);
+                ServiceLocator.instance().getInstance(
+                        CopyTransServiceImpl.class);
         copyTransServiceImpl.copyTransForIteration(projectIteration,
                 copyTransOptions);
     }