rhbz1066756 - Code base cleanup.

Remove a few unnecessary classes. Repurpose other classes to avoid duplication. All this in order to get code coverage up.
zanata · Apr 13, 2014 · 7e74ba0 · 7e74ba0
1 parent 6eb1871
commit 7e74ba0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 49 deletions.
diff --git a/...in/java/org/zanata/action/PersonHome.java → ...nata/action/AuthenticatedAccountHome.java b/...in/java/org/zanata/action/PersonHome.java → ...nata/action/AuthenticatedAccountHome.java
@@ -28,14 +28,16 @@
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.framework.EntityHome;
 import org.jboss.seam.security.management.JpaIdentityStore;
-import org.zanata.dao.AccountDAO;
 import org.zanata.model.HAccount;
 import org.zanata.model.HPerson;
 
-@Name("personHome")
+/**
+ * A simple bean to hold the currently authenticated account.
+ */
+@Name("authenticatedAccountHome")
 @Scope(ScopeType.CONVERSATION)
 @Slf4j
-public class PersonHome extends EntityHome<HPerson> {
+public class AuthenticatedAccountHome extends EntityHome<HAccount> {
 
     /**
     *
@@ -45,16 +47,15 @@ public class PersonHome extends EntityHome<HPerson> {
     @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER)
     HAccount authenticatedAccount;
 
-    @In
-    AccountDAO accountDAO;
-
     @Override
     public Object getId() {
-        Object id = super.getId();
-        if (id == null && authenticatedAccount != null
-                && authenticatedAccount.getPerson() != null) {
-            return authenticatedAccount.getPerson().getId();
+        if( authenticatedAccount == null ) {
+            return null;
         }
-        return id;
+        return authenticatedAccount.getId();
+    }
+
+    public HPerson getAuthenticatedPerson() {
+        return getInstance().getPerson();
     }
 }
diff --git a/zanata-war/src/main/java/org/zanata/action/ProfileAction.java b/zanata-war/src/main/java/org/zanata/action/ProfileAction.java
@@ -58,39 +58,4 @@ public void onCreate() {
         authenticatedAccount.getPerson().setName(this.name);
         authenticatedAccount.getPerson().setEmail(this.email);
     }
-
-    @Transactional
-    public void edit() {
-        this.valid = true;
-        validateEmail(this.email);
-        validateUsername(username);
-
-        if (!this.isValid()) {
-            return;
-        }
-
-        if (authenticatedAccount != null) {
-            HPerson person =
-                    personDAO.findById(
-                            authenticatedAccount.getPerson().getId(), true);
-            person.setName(this.name);
-            personDAO.makePersistent(person);
-            personDAO.flush();
-            authenticatedAccount.getPerson().setName(this.name);
-            log.debug("updated successfully");
-            if (!authenticatedAccount.getPerson().getEmail().equals(this.email)) {
-                String activationKey =
-                        emailChangeService.generateActivationKey(person,
-                                this.email);
-                setActivationKey(activationKey);
-                renderer.render("/WEB-INF/facelets/email/email_validation.xhtml");
-                FacesMessages
-                        .instance()
-                        .add("You will soon receive an email with a link to activate your email account change.");
-            }
-        }
-    }
-
-    public void cancel() {
-    }
 }
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
@@ -98,15 +98,15 @@
   </nav>
 
   <s:fragment
-    rendered="#{identity.loggedIn and personHome.instance.account.enabled}">
+    rendered="#{identity.loggedIn and authenticatedAccountHome.instance.enabled}">
     <nav class="header__user-nav js-dropdown">
       <a href="#nav-user" class="header__user-nav__toggle js-dropdown__toggle"
         id="user--avatar"
-        title="#{personHome.instance.account.username}">
+        title="#{authenticatedAccountHome.instance.username}">
         <div class="badge__container">
           <div class="bx--round header__avatar">
             <img src="#{gravatarServiceImpl.getUserImageUrl(72)}"
-              alt="#{personHome.instance.name}"/>
+              alt="#{authenticatedAccountHome.instance.person.name}"/>
           </div>
         </div>
       </a>