From a7c7eb3d787f0099b2b483dfe32c263a2aa636f3 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Fri, 26 Jun 2015 14:12:03 +1000
Subject: [PATCH] Remove explicit use of ScopeType

---
 zanata-model/src/main/java/org/zanata/model/HDocument.java     | 3 +--
 zanata-war/src/main/java/org/zanata/action/UserAction.java     | 3 +--
 .../src/main/java/org/zanata/security/SecurityFunctions.java   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/zanata-model/src/main/java/org/zanata/model/HDocument.java b/zanata-model/src/main/java/org/zanata/model/HDocument.java
index af3a3ddfa1..c31dc2e5ba 100644
--- a/zanata-model/src/main/java/org/zanata/model/HDocument.java
+++ b/zanata-model/src/main/java/org/zanata/model/HDocument.java
@@ -313,8 +313,7 @@ private void onUpdate(HDocument doc) {
             if (Contexts.isSessionContextActive()) {
                 HAccount account =
                         (HAccount) Component.getInstance(
-                                JpaIdentityStore.AUTHENTICATED_USER,
-                                ScopeType.SESSION);
+                                JpaIdentityStore.AUTHENTICATED_USER);
                 // TODO In some cases there is no session ( such as when pushing
                 // async )
                 if (account != null) {
diff --git a/zanata-war/src/main/java/org/zanata/action/UserAction.java b/zanata-war/src/main/java/org/zanata/action/UserAction.java
index d5d630ba80..cb78733e37 100644
--- a/zanata-war/src/main/java/org/zanata/action/UserAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/UserAction.java
@@ -98,8 +98,7 @@ public class UserAction extends
     private AbstractListFilter<String> userFilter =
             new AbstractListFilter<String>() {
                 AccountDAO accountDAO =
-                        (AccountDAO) Component.getInstance(AccountDAO.class,
-                                ScopeType.STATELESS);
+                        (AccountDAO) Component.getInstance(AccountDAO.class);
 
                 @Override
                 protected List<String> fetchRecords(int start, int max,
diff --git a/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java b/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
index 853af01ee2..f7219156db 100644
--- a/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
+++ b/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
@@ -382,8 +382,7 @@ private static final ZanataIdentity getIdentity() {
 
     private static final Optional<HAccount> getAuthenticatedAccount() {
         return Optional.fromNullable(ServiceLocator.instance().getInstance(
-                JpaIdentityStore.AUTHENTICATED_USER, ScopeType.SESSION,
-                HAccount.class));
+                JpaIdentityStore.AUTHENTICATED_USER, HAccount.class));
     }
 
     private static final <T> T extractTarget(Object[] array, Class<T> type) {