From 2185679687f39d39db224d53ae4e52720ec8fcc9 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Thu, 22 Aug 2013 13:11:09 +1000 Subject: [PATCH 1/2] Fix unexpected error when requesting to join group: https://bugzilla.redhat.com/show_bug.cgi?id=998724 --- .../org/zanata/action/VersionGroupAction.java | 2 +- .../zanata/action/VersionGroupJoinAction.java | 42 +++++-------------- .../zanata/service/VersionGroupService.java | 2 +- .../service/impl/VersionGroupServiceImpl.java | 3 +- 4 files changed, 14 insertions(+), 35 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java index 9b3f31cb18..718df1ace0 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java @@ -159,7 +159,7 @@ public List getSearchResults() public boolean isVersionInGroup(Long projectIterationId) { - return versionGroupServiceImpl.isVersionInGroup(group, projectIterationId); + return versionGroupServiceImpl.isVersionInGroup(group.getSlug(), projectIterationId); } @Transactional diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java index 8e2a2c68f2..7f4b14b28f 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java @@ -25,8 +25,10 @@ import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import lombok.Getter; +import lombok.Setter; +import org.apache.commons.lang.StringUtils; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Logger; @@ -69,10 +71,16 @@ public class VersionGroupJoinAction implements Serializable private HIterationGroup group; + @Getter + @Setter private String slug; + @Getter + @Setter private String iterationSlug; + @Getter + @Setter private String projectSlug; public void searchMaintainedProjectVersion() @@ -111,7 +119,7 @@ public List getProjectVersions() public boolean isVersionInGroup(Long projectIterationId) { - return versionGroupServiceImpl.isVersionInGroup(group, projectIterationId); + return versionGroupServiceImpl.isVersionInGroup(slug, projectIterationId); } public String cancel() @@ -155,36 +163,6 @@ public HIterationGroup getGroup() return group; } - public String getSlug() - { - return slug; - } - - public void setSlug(String slug) - { - this.slug = slug; - } - - public String getIterationSlug() - { - return iterationSlug; - } - - public void setIterationSlug(String iterationSlug) - { - this.iterationSlug = iterationSlug; - } - - public String getProjectSlug() - { - return projectSlug; - } - - public void setProjectSlug(String projectSlug) - { - this.projectSlug = projectSlug; - } - public String getQuery() { StringBuilder queryBuilder = new StringBuilder(); diff --git a/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java b/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java index 2ac1e2cd13..cf5e9564f9 100644 --- a/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java +++ b/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java @@ -51,7 +51,7 @@ public interface VersionGroupService HProjectIteration getProjectIterationBySlug(String projectSlug, String iterationSlug); - boolean isVersionInGroup(HIterationGroup group, Long projectIterationId); + boolean isVersionInGroup(String groupSlug, Long projectIterationId); boolean isGroupInVersion(String groupSlug, Long id); diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java index 9ba3c7d2b4..99425b1b08 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java @@ -157,8 +157,9 @@ public boolean leaveVersionGroup(String slug, Long projectIterationId) } @Override - public boolean isVersionInGroup(HIterationGroup group, Long projectIterationId) + public boolean isVersionInGroup(String groupSlug, Long projectIterationId) { + HIterationGroup group = getBySlug(groupSlug); if (group != null && projectIterationId != null) { for (HProjectIteration iteration : group.getProjectIterations()) From 09d65daf0b05a5b2c584f873172e895447842bf5 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Thu, 22 Aug 2013 13:41:56 +1000 Subject: [PATCH 2/2] Apply coding format to changed file --- .../org/zanata/action/VersionGroupAction.java | 5 +++-- .../zanata/action/VersionGroupJoinAction.java | 16 ++++++++-------- .../service/impl/VersionGroupServiceImpl.java | 1 - 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java index 718df1ace0..9e7770c7dd 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java @@ -123,7 +123,8 @@ public void executePreSearch() if (paramSet.length == 2) { - HProjectIteration projectVersion = versionGroupServiceImpl.getProjectIterationBySlug(paramSet[0], paramSet[1]); + HProjectIteration projectVersion = versionGroupServiceImpl.getProjectIterationBySlug(paramSet[0], + paramSet[1]); if (projectVersion != null) { getSearchResults().add(new SelectableHProject(projectVersion, true)); @@ -225,7 +226,7 @@ public List getAllVersionGroups() List result = new ArrayList(); for (HIterationGroup group : allVersionGroups) { - if(filterGroupByStatus(group)) + if (filterGroupByStatus(group)) { result.add(group); } diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java index 7f4b14b28f..1c967854f7 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java @@ -58,14 +58,14 @@ public class VersionGroupJoinAction implements Serializable @In private ProjectIterationDAO projectIterationDAO; - @In(create=true) + @In(create = true) private SendEmailAction sendEmail; @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) - HAccount authenticatedAccount; + private HAccount authenticatedAccount; @Logger - Log log; + private Log log; private List projectVersions; @@ -97,13 +97,13 @@ public void searchMaintainedProjectVersion() public void searchProjectVersion() { - if(StringUtils.isNotEmpty(iterationSlug) && StringUtils.isNotEmpty(projectSlug)) + if (StringUtils.isNotEmpty(iterationSlug) && StringUtils.isNotEmpty(projectSlug)) { - HProjectIteration projectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug); - if(projectIteration != null) - { + HProjectIteration projectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug); + if (projectIteration != null) + { getProjectVersions().add(new SelectableHProject(projectIteration, true)); - } + } } } diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java index 99425b1b08..3e32ee5ef6 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name;