August 2012 - Pollen-commits - mailman.cloud.codelutin.com

r3609 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 16:07:20 +0200 (Mon, 13 Aug 2012) New Revision: 3609 Url: http://chorem.org/repositories/revision/pollen/3609 Log: fixes #763: Remove close action from edit poll form page + no more usage of uriId instead of pollUri Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-08-13 14:05:59 UTC (rev 3608) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-08-13 14:07:20 UTC (rev 3609) @@ -318,15 +318,10 @@ <br/> <s:if test="edit"> - <s:submit action="edit/%{uriId}" value="%{actionLabel}" align="center"/> - <div align="center" style="margin-top: 10px"> - <button onclick="return confirmClose();"> - <s:text name="pollen.action.close"/> - </button> - </div> + <s:submit action="edit/%{pollUri}" value="%{actionLabel}" align="center"/> </s:if> <s:elseif test="clone"> - <s:submit action="clone/%{uriId}" value="%{actionLabel}" align="center"/> + <s:submit action="clone/%{pollUri}" value="%{actionLabel}" align="center"/> </s:elseif> <s:else> <s:submit action="create" value="%{actionLabel}" align="center"/>

1 0

r3608 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 16:05:59 +0200 (Mon, 13 Aug 2012) New Revision: 3608 Url: http://chorem.org/repositories/revision/pollen/3608 Log: refs #746: Improve security model Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-08-13 14:05:40 UTC (rev 3607) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-08-13 14:05:59 UTC (rev 3608) @@ -23,10 +23,10 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.PollenUserSecurityContext; -import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Comment; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; @@ -40,6 +40,7 @@ import java.util.EnumSet; import java.util.Set; +import static org.chorem.pollen.PollenUserSecurityContext.PollenUserSecurityRole; import static org.nuiton.i18n.I18n.n_; /** @@ -66,81 +67,47 @@ Preconditions.checkNotNull(poll); - String pollId = poll.getPollId(); + EnumSet<PollenUserSecurityContext.PollenUserSecurityRole> result = + EnumSet.noneOf(PollenUserSecurityRole.class); - PollAccountDAO dao = getDAO(PollAccount.class); + if (StringUtils.isNotBlank(accountId) || userAccount != null) { - EnumSet<PollenUserSecurityContext.PollenUserSecurityRole> result = EnumSet.noneOf(PollenUserSecurityContext.PollenUserSecurityRole.class); + // there is an accountId or a connected user, can find so user roles - if (StringUtils.isNotBlank(accountId)) { + // try to find an admin/creator of this poll + boolean creator = isPollCreator(poll, accountId, userAccount); - // there is a accountId - if (accountId.equals(poll.getCreator().getAccountId())) { + if (creator) { - // user is creator of poll - result.add(PollenUserSecurityContext.PollenUserSecurityRole.CREATOR); + // user is adminstrator of Pollen, so can acts as creator of poll + // or user is creator of poll linked by his accountId or user + // account email + result.add(PollenUserSecurityRole.CREATOR); } - PollUri pollUri = PollUri.newPollUri(pollId, accountId); - if (poll.isPollFree()) { - // free poll, can only find a existing voter of this poll + // try to match a voter + boolean found = isVoterAccountId(poll, accountId, userAccount); - boolean found = isVoterAccountId(dao, pollUri); - if (found) { - // account is a voter - result.add(PollenUserSecurityContext.PollenUserSecurityRole.VOTER); + // found a voter match + result.add(PollenUserSecurityRole.VOTER); } } else { - boolean found = isRestrictAccountId(dao, pollUri); + // try to match a restricted voter + boolean found = isRestrictAccountId(poll, accountId, userAccount); if (found) { - // account is a participant - result.add(PollenUserSecurityContext.PollenUserSecurityRole.RESTRICTED_VOTER); + // find a restricted voter match + result.add(PollenUserSecurityRole.RESTRICTED_VOTER); } } } - if (userAccount != null) { - - if (userAccount.isAdministrator()) { - - // user is adminstrator of Pollen, so can acts as creator of poll - result.add(PollenUserSecurityContext.PollenUserSecurityRole.CREATOR); - } - - if (poll.isPollFree()) { - - if (!result.contains(PollenUserSecurityContext.PollenUserSecurityRole.VOTER)) { - - // try to find an existing voter from the userAccount - boolean found = isVoterAccountId(dao, pollId, userAccount); - if (found) { - - // account is a voter - result.add(PollenUserSecurityContext.PollenUserSecurityRole.VOTER); - } - - } - } else { - - if (!result.contains(PollenUserSecurityContext.PollenUserSecurityRole.RESTRICTED_VOTER)) { - - // try to find an existing voter from the userAccount - boolean found = isRestrictAccountId(dao, pollId, userAccount); - if (found) { - - // account is a voter - result.add(PollenUserSecurityContext.PollenUserSecurityRole.RESTRICTED_VOTER); - } - } - } - } return result; } @@ -183,8 +150,6 @@ Poll poll = securityContext.getPoll(); - String accountId = securityContext.getAccountId(); - if (securityContext.isCreator()) { // poll admin can always access vote page @@ -203,15 +168,8 @@ return null; } - boolean pollIsFree = poll.isPollFree(); + if (!poll.isPollFree() && !securityContext.isRestrictedVoter()) { - if (pollIsFree && poll.getCreator().getAccountId().equals(accountId)) { - - // on free poll, only the creator (using his creatorId as accountId) can not vote - return n_("pollen.security.error.poll.free.creatorId.can.not.vote"); - } - if (!pollIsFree && !securityContext.isRestrictedVoter()) { - // on none free poll, only restricted user can vote return n_("pollen.security.error.poll.not.free.and.access.not.granted"); } @@ -221,8 +179,6 @@ public boolean isCanVote(PollenUserSecurityContext securityContext) { Poll poll = securityContext.getPoll(); - String accountId = securityContext.getAccountId(); - UserAccount userAccount = securityContext.getUserAccount(); Date now = serviceContext.getCurrentTime(); @@ -232,32 +188,9 @@ return false; } - boolean pollIsFree = poll.isPollFree(); + if (!poll.isPollFree() && !securityContext.isRestrictedVoter()) { - if (pollIsFree && poll.getCreator().getAccountId().equals(accountId)) { - - // on free poll, only the creator (using his creatorId as accountId) can not vote - return false; - } - if (!pollIsFree && !securityContext.isRestrictedVoter()) { - // on none free poll, only restricted user can vote - - if (userAccount != null) { - - // try to find restricted user by user account - PollAccountDAO dao = getDAO(PollAccount.class); - - boolean restrictPollAccountId = isRestrictAccountId( - dao, poll.getPollId(), userAccount); - - if (restrictPollAccountId) { - - // ok admin is also restricted user of this poll - return true; - } - - } return false; } @@ -420,437 +353,84 @@ return result; } - private boolean isVoterAccountId(PollAccountDAO dao, PollUri uri) { - try { + protected boolean isPollCreator(Poll poll, + String accountId, + UserAccount userAccount) { - PollAccount pollAccount = dao.findVoterPollAccountByAccountId( - uri.getPollId(), uri.getAccountId()); - return pollAccount != null; + Preconditions.checkNotNull(poll); + Preconditions.checkState(userAccount != null || + StringUtils.isNotBlank(accountId)); - } catch (TopiaException e) { - throw new PollenTechnicalException( - "Could not check pollAccount existence from poll '" + - uri.getPollId() + "' and account '" + uri.getAccountId() + "'", e); - } - } + boolean result; - private boolean isVoterAccountId(PollAccountDAO dao, String pollId, - UserAccount userAccount) { - try { + if (ObjectUtils.equals(poll.getCreator().getAccountId(), accountId)) { - PollAccount pollAccount = dao.findVoterPollAccountByUserAccount( - pollId, userAccount); - return pollAccount != null; + // creator found by account id + result = true; - } catch (TopiaException e) { - throw new PollenTechnicalException( - "Could not check pollAccount existence from poll '" + - pollId + "' and userAccount '" + userAccount + "'", e); + } else if (userAccount != null) { + + if (userAccount.isAdministrator()) { + + // use is admin of Pollen, so is also poll creator + result = true; + } else { + + // try to link bo user account email + result = ObjectUtils.equals(poll.getCreator().getEmail(), + userAccount.getEmail()); + } + } else { + + // no accountId, nor user connected, can not be a creator + result = false; } + return result; } - private boolean isRestrictAccountId(PollAccountDAO dao, PollUri uri) { - try { + protected boolean isVoterAccountId(Poll poll, + String accountId, + UserAccount userAccount) { - PollAccount result = - dao.findRestrictedPollAccountByAccountId(uri.getPollId(), - uri.getAccountId()); + String pollId = poll.getPollId(); - return result != null; + try { + PollAccountDAO dao = getDAO(PollAccount.class); + PollAccount pollAccount = + dao.findVoterPollAccount(pollId, + accountId, + userAccount); + return pollAccount != null; + } catch (TopiaException e) { throw new PollenTechnicalException( - "Could not check pollAccount existence from poll '" + - uri.getPollId() + "' and account '" + uri.getAccountId() + "'", e); + "Could not check voter pollAccount existence from poll '" + + pollId + "'", e); } } - private boolean isRestrictAccountId(PollAccountDAO dao, - String pollId, - UserAccount userAccount) { + protected boolean isRestrictAccountId(Poll poll, + String accountId, + UserAccount userAccount) { + + String pollId = poll.getPollId(); try { + PollAccountDAO dao = getDAO(PollAccount.class); + PollAccount result = - dao.findRestrictedPollAccountByEmail(pollId, userAccount.getEmail()); + dao.findRestrictedPollAccount(pollId, + accountId, + userAccount); return result != null; } catch (TopiaException e) { throw new PollenTechnicalException( - "Could not check pollAccount existence from poll '" + - pollId + "' and account '" + userAccount.getEmail() + "'", e); + "Could not check restricted voter pollAccount existence " + + "from poll '" + pollId + "'", e); } } -// public void removeAccountIdWhenConnected(PollUrl url, -// UserAccount userAccount) { -// if (userAccount != null) { -// -// // remove accountId from url -// url.getPollUri().setAccountId(null); -// } -// } -// -// public static final Set<PollenUserSecurityRole> NONE_FREE_ACCOUNT_ID_ROLES = Sets.newHashSet( -// PollenUserSecurityRole.RESTRICTED_VOTER, -// PollenUserSecurityRole.CREATOR -// ); -// -// public boolean isPollAdmin(Poll poll, UserAccount pollenUserAccount) { -// boolean result = pollenUserAccount != null && pollenUserAccount.isAdministrator() || -// isPollCreator(poll, null, pollenUserAccount); -// return result; -// } -// -// public boolean isPollCreator(Poll poll, String accountId, -// UserAccount pollenUserAccount) { -// -// PollAccount creator = poll.getCreator(); -// -// boolean result = creator.getAccountId().equals(accountId); -// if (!result) { -// -// if (pollenUserAccount != null) { -// -// // try to match userAccount -// result = pollenUserAccount.equals(creator.getUserAccount()); -// } -// } -// return result; -// } -// -// public boolean isCanClosePoll(Poll poll, PollenUserSecurityRole accountIdRole) { -// -// boolean result = !poll.isClosed(); -// -// if (result) { -// -// // poll can be closed, check user can do action -// result = accountIdRole == PollenUserSecurityRole.CREATOR; -// } -// -// return result; -// } -// -// public PollenUserSecurityRole getAccountIdRole(Poll poll, String accountId) { -// -// Preconditions.checkNotNull(poll); -// -// PollenUserSecurityRole result = PollenUserSecurityRole.UNDEFINED; -// -// if (StringUtils.isNotBlank(accountId)) { -// -// if (accountId.equals(poll.getCreator().getAccountId())) { -// -// result = PollenUserSecurityRole.CREATOR; -// } else { -// -// PollAccountDAO dao = getDAO(PollAccount.class); -// -// PollUri pollUri = PollUri.newPollUri(poll.getPollId(), accountId); -// -// if (poll.getPollType() == PollType.FREE) { -// -// // -// -// boolean found = isVoterAccountId(dao, pollUri); -// -// if (found) { -// result = PollenUserSecurityRole.VOTER; -// } -// } else { -// -// boolean found = isRestrictAccountId(dao, pollUri); -// -// if (found) { -// result = PollenUserSecurityRole.RESTRICTED_VOTER; -// } -// } -// } -// } -// return result; -// } - -// public boolean isCanAccessResult(Poll poll, -// String accountId, -// SecurityService.PollenUserSecurityRole accountIdRole, -// UserAccount userAccount) { -// -// if (isPollCreator(poll, accountId, userAccount)) { -// accountIdRole = PollenUserSecurityRole.CREATOR; -// } -// -// String errorMessage = isCanAccessResult(poll, accountIdRole); -// return errorMessage == null; -// } -// -// public String isCanAccessResult(Poll poll, -// SecurityService.PollenUserSecurityRole accountIdRole) { -// -// // check now poll results can be displayed -// -// boolean publicResults = poll.isPublicResults(); -// boolean continuousResults = poll.isContinuousResults(); -// -// if (!continuousResults && !poll.isClosed()) { -// -// // results are not continuous and poll is not closed -// return n_("pollen.security.error.poll.not.closed.and.results.not.continuous"); -// } -// -// if (!publicResults && -// accountIdRole != SecurityService.PollenUserSecurityRole.CREATOR) { -// -// // poll results are private, only poll admin can see results -// return n_("pollen.security.error.poll.result.private.and.access.not.granted"); -// } -// -// boolean pollIsFree = PollType.FREE == poll.getPollType(); -// -// if (publicResults && -// !pollIsFree && -// !SecurityService.NONE_FREE_ACCOUNT_ID_ROLES.contains(accountIdRole)) { -// -// // on none free poll, only creator or restricted user can have it -// return n_("pollen.security.error.poll.not.free.and.access.not.granted"); -// } -// return null; -// } -// -// public String isCanAccessResult(Poll poll) { -// -// // check now poll results can be displayed -// -// boolean publicResults = poll.isPublicResults(); -// boolean continuousResults = poll.isContinuousResults(); -// -// if (!continuousResults && !poll.isClosed()) { -// -// // results are not continuous and poll is not closed -// return n_("pollen.security.error.poll.not.closed.and.results.not.continuous"); -// } -// -// if (!publicResults) { -// -// // poll results are private, only poll admin can see results -// return n_("pollen.security.error.poll.result.private.and.access.not.granted"); -// } -// -// return null; -// } - -// public String isCanAccessVote(Poll poll, -// String accountId, -// PollenUserSecurityRole accountIdRole, -// UserAccount userAccount) { -// -// if (PollenUserSecurityRole.CREATOR == accountIdRole) { -// -// // poll admin can always access vote page -// return null; -// } -// -// if (userAccount != null && userAccount.isAdministrator()) { -// // pollen admin can always access vote page -// return null; -// } -// -// if (poll.isPublicResults()) { -// -// // with public results, everybody can access to vote page (but -// // can not vote for a non free poll) -// return null; -// } -// -// boolean pollIsFree = PollType.FREE == poll.getPollType(); -// -// if (pollIsFree && poll.getCreator().getAccountId().equals(accountId)) { -// -// // on free poll, only the creator (using his creatorId as accountId) can not vote -// return n_("pollen.security.error.poll.free.creatorId.can.not.vote"); -// } -// if (!pollIsFree && PollenUserSecurityRole.RESTRICTED_VOTER != accountIdRole) { -// -// // on none free poll, only restricted user can vote -// return n_("pollen.security.error.poll.not.free.and.access.not.granted"); -// } -// return null; -// } - -// public boolean isCanVote(Poll poll, -// String accountId, -// PollenUserSecurityRole accountIdRole, -// UserAccount userAccount) { -// -// Date now = serviceContext.getCurrentTime(); -// -// if (!poll.isRunning(now)) { -// -// // poll is not running, can not vote -// return false; -// } -// -// boolean pollIsFree = poll.isPollFree(); -// -// if (pollIsFree && poll.getCreator().getAccountId().equals(accountId)) { -// -// // on free poll, only the creator (using his creatorId as accountId) can not vote -// return false; -// } -// if (!pollIsFree && PollenUserSecurityRole.RESTRICTED_VOTER != accountIdRole) { -// -// // on none free poll, only restricted user can vote -// -// if (userAccount != null) { -// -// // try to find restricted user by user account -// PollAccountDAO dao = getDAO(PollAccount.class); -// -// boolean restrictPollAccountId = isRestrictAccountId(dao, poll.getPollId(), userAccount); -// -// if (restrictPollAccountId) { -// -// // ok admin is also restricted user of this poll -// return true; -// } -// -// } -// return false; -// } -// -// // ok can vote -// return true; -// } - -// public boolean isCanModifyVote(Poll poll, String voteId, -// String accountId, -// UserAccount userConnected) { -// -// Date now = serviceContext.getCurrentTime(); -// -// if (!poll.isRunning(now)) { -// -// // poll is not running can not modify anything -// return false; -// } -// -// if (poll.isAnonymous()) { -// -// // poll is anonymous, no vote can be modify -// return false; -// } -// -// Vote vote = poll.getVoteByTopiaId(voteId); -// -// if (vote == null) { -// -// // vote not found, can not modify it -// return false; -// } -// -// PollAccount votePollAccount = vote.getPollAccount(); -// -// if (votePollAccount.getAccountId().equals(accountId)) { -// -// // accountId is voteAccountId, can modifiy the vote -// return true; -// } -// -// if (userConnected != null) { -// -// if (userConnected.equals(votePollAccount.getUserAccount())) { -// -// // user conntected is the voter -// return true; -// } -// } -// -// // can not modify vote in other cases -// return false; -// } - -// public boolean isCanDeleteVote(Poll poll, -// String voteId, -// String accountId, -// PollenUserSecurityRole accountIdRole, -// UserAccount userConnected) { -// -// Date now = serviceContext.getCurrentTime(); -// -// if (!poll.isRunning(now)) { -// -// // poll is not running can not remove anything -// return false; -// } -// -// if (poll.isAnonymous()) { -// -// // poll is anonymous, no vote can be delete (?) FIXME Check this -// return false; -// } -// -// -// Vote vote = poll.getVoteByTopiaId(voteId); -// -// if (vote == null) { -// -// // vote not found, can not delete it -// return false; -// } -// -// if (accountIdRole == PollenUserSecurityRole.CREATOR) { -// -// // poll admin can delete any vote -// return true; -// } -// -// PollAccount votePollAccount = vote.getPollAccount(); -// -// if (votePollAccount.getAccountId().equals(accountId)) { -// -// // owner of vote (linked by accountId) can delete his own vote -// return true; -// } -// -// if (userConnected != null) { -// -// if (userConnected.equals(votePollAccount.getUserAccount())) { -// -// // owner of vote (linked by userAccount) can delete his own vote -// return true; -// } -// } -// -// // can not modify vote in other cases -// return false; -// } - -// public boolean isCanDeleteComment(Comment comment, -// String accountId, -// PollenUserSecurityRole accountIdRole, -// UserAccount userAccount) { -// -// if (accountIdRole == PollenUserSecurityRole.CREATOR) { -// -// // poll admin can always delete comments -// return true; -// } -// -// PollAccount commentAccount = comment.getPollAccount(); -// -// if (commentAccount.getAccountId().equals(accountId)) { -// -// // owner of comment (linked by accountId) can delete his comment -// return true; -// } -// -// if (userAccount != null) { -// -// if (userAccount.equals(commentAccount.getUserAccount())) { -// // owner of comment (linked by userAccount) can delete his comment -// return true; -// } -// } -// return false; -// } }

1 0

r3607 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 16:05:40 +0200 (Mon, 13 Aug 2012) New Revision: 3607 Url: http://chorem.org/repositories/revision/pollen/3607 Log: fixes #765: Can not delete poll as administrator when not creator of the poll fixes #764: Can not close poll as administrator when not creator of the poll fixes 767: Can not attach poll when pollId contains have some trim spaces Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-08-13 14:04:23 UTC (rev 3606) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-08-13 14:05:40 UTC (rev 3607) @@ -57,7 +57,6 @@ import org.chorem.pollen.services.exceptions.PollAccountNotFound; import org.chorem.pollen.services.exceptions.PollChoiceNotFoundException; import org.chorem.pollen.services.exceptions.PollNotFoundException; -import org.chorem.pollen.services.exceptions.UnauthorizedPollAccessException; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import org.nuiton.util.beans.Binder; @@ -456,42 +455,27 @@ boolean withUserAccount = userAccount != null; - if (StringUtils.isNotEmpty(accountId)) { + if (StringUtils.isNotEmpty(accountId) || withUserAccount) { - try { - pollAccountLoaded = - dao.findVoterPollAccountByAccountId(poll.getPollId(), accountId); - } catch (TopiaException e) { - throw new PollenTechnicalException(e); - } + if (poll.isPollFree()) { + try { + pollAccountLoaded = + dao.findVoterPollAccount(poll.getPollId(), + accountId, + userAccount); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } else { + // try to find pollAccount from the list of participants + try { - } else { - - // Try to retrieve existing pollAccount from user - - if (withUserAccount) { - - if (poll.isPollFree()) { - - // try to find pollAccount from the list of voters - try { - pollAccountLoaded = - dao.findVoterPollAccountByUserAccount( - poll.getPollId(), userAccount); - } catch (TopiaException e) { - throw new PollenTechnicalException(e); - } - } else { - - // try to find pollAccount from the list of participants - try { - - pollAccountLoaded = - dao.findRestrictedPollAccountByEmail( - poll.getPollId(), userAccount.getEmail()); - } catch (TopiaException e) { - throw new PollenTechnicalException(e); - } + pollAccountLoaded = + dao.findRestrictedPollAccount( + poll.getPollId(), null, + userAccount); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); } } } @@ -506,14 +490,15 @@ // Don't remove or update userAccount link if already set if (withUserAccount && result.getUserAccount() == null) { + //TODO-tchemit-2012-08-13 Is UserAccount must be done here ? Not sure (vote time is better (and unique...)) // link pollAccount to his userAccount result.setUserAccount(userAccount); } } - if (result == null && withUserAccount) { + if (result == null) { - // create a new pollAccount linked to given userAccount + // create a new pollAccount linked to given userAccount (if not null) result = getNewPollAccount(userAccount); } return result; @@ -681,67 +666,26 @@ return result; } - public PollAccount getPollAccountByAccountId(String accountId) throws PollAccountNotFound { - try { - PollAccountDAO dao = getDAO(PollAccount.class); - PollAccount result = dao.findByAccountId(accountId); + public void deletePoll(String pollId) throws PollNotFoundException { - if (result == null) { - throw new PollAccountNotFound(); - } + // can not have an null nor empty pollId + Preconditions.checkArgument(StringUtils.isNotBlank(pollId)); - return result; - } catch (TopiaException e) { - throw new PollenTechnicalException("Could not botain account with this id", e); - } - } + Poll pollToDelete = getExistingPollByPollId(pollId); - public void deletePoll(String pollId, - UserAccount userAccount, - String accountId) throws PollNotFoundException, PollAccountNotFound, UnauthorizedPollAccessException { - - Preconditions.checkNotNull(pollId); - Preconditions.checkNotNull(accountId); - - Poll poll = getExistingPollByPollId(pollId); - - if (userAccount == null || userAccount.isAdministrator()) { - - // must check that accountId matches the poll creator id - - PollAccount account = getPollAccountByAccountId(accountId); - - if (!account.getAccountId().equals(poll.getCreator().getAccountId())) { - throw new UnauthorizedPollAccessException(); - } - } - PollDAO dao = getDAO(Poll.class); - delete(dao, poll); + delete(dao, pollToDelete); - commitTransaction("Could not delete poll" + poll.getTitle()); + commitTransaction("Could not delete poll" + pollToDelete.getTitle()); } - public void closePoll(String pollId, - UserAccount userAccount, - String accountId) throws PollNotFoundException, PollAccountNotFound, UnauthorizedPollAccessException { + public void closePoll(String pollId) throws PollNotFoundException { - Preconditions.checkNotNull(pollId); - Preconditions.checkNotNull(accountId); + // can not have an null nor empty pollId + Preconditions.checkArgument(StringUtils.isNotBlank(pollId)); Poll poll = getExistingPollByPollId(pollId); - if (userAccount == null || userAccount.isAdministrator()) { - - // must check that accountId matches the poll creator id - - PollAccount account = getPollAccountByAccountId(accountId); - - if (!account.getAccountId().equals(poll.getCreator().getAccountId())) { - throw new UnauthorizedPollAccessException(); - } - } - if (!poll.isChoiceEmpty()) { for (Choice choice : poll.getChoice()) { choice.setValidate(true); @@ -756,11 +700,14 @@ commitTransaction("Could not close poll " + poll.getTitle()); } - public void attachPoll(Poll poll, UserAccount userAccount) { + public void attachPoll(String pollId, UserAccount userAccount) throws PollNotFoundException { - Preconditions.checkNotNull(poll); + // can not have an null nor empty pollId + Preconditions.checkArgument(StringUtils.isNotBlank(pollId)); Preconditions.checkNotNull(userAccount); + Poll poll = getExistingPollByPollId(pollId); + // just link poll creator account to given user account PollAccount creator = poll.getCreator(); creator.setUserAccount(userAccount); @@ -994,6 +941,8 @@ PersonToListDAO personToListDAO = getDAO(PersonToList.class); PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); + String creatorEmail = poll.getCreator().getEmail(); + // Prepare the VotingList and add it to the poll VotingList result; if (votingList.getTopiaId() == null) { @@ -1025,20 +974,40 @@ // the link must be set in both objects personToListLoaded.setVotingList(result); -// // FIXME-fdesbois-2012-04-12 : find a better way to ensure accountId + // FIXME-fdesbois-2012-04-12 : find a better way to ensure accountId String accountId = pollAccount.getAccountId(); + String accountEmail = pollAccount.getEmail(); - if (StringUtils.isBlank(accountId)) { + if (ObjectUtils.equals(creatorEmail, pollAccount.getEmail())) { + // use the creator account + pollAccountLoaded = poll.getCreator(); + if (log.isInfoEnabled()) { + log.info(String.format( + "Use the creator account as restricted account [%s]", accountEmail)); + } + + } else if (StringUtils.isBlank(accountId)) { + // creates a new pollAccount pollAccountLoaded = createWithProperties( pollAccountDAO, PollAccount.PROPERTY_ACCOUNT_ID, generateId()); + + if (log.isInfoEnabled()) { + log.info(String.format( + "Create new account as restricted account [%s]", accountEmail)); + } } else { // reuse the existing account pollAccountLoaded = pollAccountDAO.findByAccountId(accountId); + + if (log.isInfoEnabled()) { + log.info(String.format( + "Reuse existing account as restricted account [%s]", accountEmail)); + } } } else { @@ -1123,4 +1092,5 @@ + thumbCopied.length() + ")"); } } + }

1 0

r3606 - trunk/pollen-services/src/main/java/org/chorem/pollen/services
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 16:04:23 +0200 (Mon, 13 Aug 2012) New Revision: 3606 Url: http://chorem.org/repositories/revision/pollen/3606 Log: can create service from other services Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-08-13 14:03:06 UTC (rev 3605) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-08-13 14:04:23 UTC (rev 3606) @@ -124,6 +124,11 @@ return result; } + public <E extends PollenService> E newService(Class<E> serviceClass) { + E service = serviceContext.newService(serviceClass); + return service; + } + protected <T extends TopiaEntity, D extends TopiaDAO<? super T>> T newInstance(D dao) { try { return (T) dao.newInstance(); @@ -149,7 +154,6 @@ throw new PollenTechnicalException("Could not create entity ", e); } } - protected <T extends TopiaEntity, D extends TopiaDAO<? super T>> T createWithProperties(D dao, Object... properties) { try { return (T) dao.create(properties); @@ -157,6 +161,7 @@ throw new PollenTechnicalException("Could not create entity ", e); } } + protected <T extends TopiaEntity, D extends TopiaDAO<? super T>> T update(D dao, T entity) { try { return (T) dao.update(entity); @@ -177,11 +182,6 @@ return serviceContext.getConfiguration(); } - protected <E extends PollenService> E newService(Class<E> serviceClass) { - E service = serviceContext.newService(serviceClass); - return service; - } - protected void commitTransaction(String errorMessage) { try { getTransaction().commitTransaction();

1 0

r3605 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 16:03:06 +0200 (Mon, 13 Aug 2012) New Revision: 3605 Url: http://chorem.org/repositories/revision/pollen/3605 Log: make PollenSession Serializable Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-08-13 14:02:08 UTC (rev 3604) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-08-13 14:03:06 UTC (rev 3605) @@ -32,6 +32,7 @@ import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import java.io.Serializable; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -42,7 +43,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.3 */ -public class PollenSession { +public class PollenSession implements Serializable { /** Logger. */ private static final Log log = LogFactory.getLog(PollenSession.class); @@ -56,6 +57,8 @@ public static final String SESSION_TOKEN_WARNINGS = "warnings"; + private static final long serialVersionUID = -1L; + public static PollenSession get(ServletRequest servletRequest) { HttpSession httpSession = ((HttpServletRequest) servletRequest).getSession(true); PollenSession pollenSession = (PollenSession) httpSession.getAttribute(SESSION_PARAMETER); @@ -90,7 +93,7 @@ private UserAccount userAccount; /** To push dynamic data which should be consumed in a page scope. */ - private Map<String, Object> dynamicData; + private Map<String, Serializable> dynamicData; public UserAccount getUserAccount() { return userAccount; @@ -100,20 +103,40 @@ this.userAccount = userAccount; } - public <T> T getDynamicData(String token) { - Object result = getDynamicData().get(token); + public <T extends Serializable> T getDynamicData(String token) { + Serializable result = getDynamicData().get(token); return (T) result; } - public <T> T consumeDynamicData(String token) { - Object result = getDynamicData().get(token); + public <T extends Serializable> List<T> getDynamicListData(String token) { + Serializable result = getDynamicData().get(token); + return (List<T>) result; + } + + public <T extends Serializable> T consumeDynamicData(String token) { + T result = getDynamicData(token); if (result != null) { removeDynamicData(token); } - return (T) result; + return result; } - public void putDynamicData(String token, Object data) { + public <T extends Serializable> List<T> consumeDynamicListData(String token) { + List<T> result = getDynamicListData(token); + if (result != null) { + removeDynamicData(token); + } + return result; + } + + public <T extends Serializable> void putDynamicListData(String token, List<T> data) { + getDynamicData().put(token, (Serializable) data); + if (log.isDebugEnabled()) { + log.debug("Dynamic attributes size : " + getDynamicData().size()); + } + } + + public void putDynamicData(String token, Serializable data) { getDynamicData().put(token, data); if (log.isDebugEnabled()) { log.debug("Dynamic attributes size : " + getDynamicData().size()); @@ -136,7 +159,7 @@ } } - protected Map<String, Object> getDynamicData() { + protected Map<String, Serializable> getDynamicData() { if (dynamicData == null) { dynamicData = Maps.newHashMap(); } @@ -144,20 +167,20 @@ } public void addMessage(String messageScope, String message) { - List<String> messages = getDynamicData(messageScope); + List<String> messages = getDynamicListData(messageScope); if (messages == null) { messages = Lists.newArrayList(message); - putDynamicData(messageScope, messages); + putDynamicListData(messageScope, messages); } else { messages.add(message); } } public void removeDynamicDataWithPrefix(String prefix) { - Iterator<Map.Entry<String, Object>> itr = + Iterator<Map.Entry<String, Serializable>> itr = getDynamicData().entrySet().iterator(); while (itr.hasNext()) { - Map.Entry<String, Object> entry = itr.next(); + Map.Entry<String, Serializable> entry = itr.next(); if (entry.getKey().startsWith(prefix)) { itr.remove(); }

1 0

r3604 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll java/org/chorem/pollen/ui/actions/user webapp/WEB-INF/jsp/user
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 16:02:08 +0200 (Mon, 13 Aug 2012) New Revision: 3604 Url: http://chorem.org/repositories/revision/pollen/3604 Log: fixes #767: Can not attach poll when pollId contains have some trim spaces (+ move this action to user package + stop using inheritance for nothing :() Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java Removed: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp Deleted: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java 2012-08-13 13:08:27 UTC (rev 3603) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java 2012-08-13 14:02:08 UTC (rev 3604) @@ -1,93 +0,0 @@ -/* - * #%L - * Pollen :: UI (struts2) - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.poll; - -import com.google.common.base.Preconditions; -import org.apache.commons.lang3.StringUtils; -import org.chorem.pollen.business.persistence.Poll; -import org.chorem.pollen.business.persistence.UserAccount; -import org.chorem.pollen.services.exceptions.PollNotFoundException; -import org.chorem.pollen.ui.actions.PageSkin; - -/** - * To attach a anonymous poll to a connected user account. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.4 - */ -public class AttachPoll extends AbstractPollUriIdAction { - - private static final long serialVersionUID = 1L; - - public AttachPoll() { - super(PageSkin.EDITION); - } - - @Override - public String execute() throws Exception { - - String pollId = getPollId(); - - Preconditions.checkNotNull(pollId); - - Poll poll = getPollService().getExistingPollByPollId(pollId); - - UserAccount userAccount = getPollenSession().getUserAccount(); - - getPollService().attachPoll(poll, userAccount); - - addFlashMessage(_("pollen.information.poll.attached", poll.getTitle())); - - return SUCCESS; - } - - @Override - public void validate() { - - if (StringUtils.isEmpty(getPollId())) { - addFieldError("uriId", _("pollen.error.pollId.empty")); - } else { - - String pollId = getPollId(); - - try { - - // check that poll exists - Poll poll = getPollService().getExistingPollByPollId(pollId); - - // check that poll is not yet attached to another user account - - UserAccount userAccount = poll.getCreator().getUserAccount(); - if (userAccount != null) { - - addFieldError("uriId", - _("pollen.error.pollAlreadyAttached")); - } - } catch (PollNotFoundException e) { - - addFieldError("uriId", _("pollen.error.pollNotFound")); - } - - } - } -} Copied: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java (from rev 3589, trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java) =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java 2012-08-13 14:02:08 UTC (rev 3604) @@ -0,0 +1,115 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.exceptions.PollNotFoundException; +import org.chorem.pollen.ui.actions.PageSkin; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * To attach a anonymous poll to a connected user account. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class AttachPoll extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(AttachPoll.class); + + /** + * Id of the poll to attach to the connected user account. + * + * @since 1.4.5 + */ + private String pollId; + + public AttachPoll() { + super(PageSkin.EDITION); + } + + public String getPollId() { + return pollId == null ? null : pollId.trim(); + } + + public void setPollId(String pollId) { + this.pollId = pollId; + } + + @Override + public String execute() throws Exception { + + String id = getPollId(); + + UserAccount userAccount = getPollenUserAccount(); + + Poll poll = getPollService().getExistingPollByPollId(id); + + if (log.isInfoEnabled()) { + log.info(String.format("Will attach poll %s to user %s", + id, userAccount.getEmail())); + } + + getPollService().attachPoll(id, userAccount); + + addFlashMessage(_("pollen.information.poll.attached", poll.getTitle())); + + return SUCCESS; + } + + @Override + public void validate() { + + String id = getPollId(); + + if (StringUtils.isBlank(id)) { + addFieldError("pollId", _("pollen.error.pollId.empty")); + } else { + + try { + + // check that poll exists + Poll poll = getPollService().getExistingPollByPollId(id); + + // check that poll is not yet attached to another user account + + UserAccount userAccount = poll.getCreator().getUserAccount(); + if (userAccount != null) { + + addFieldError("pollId", _("pollen.error.pollAlreadyAttached")); + } + } catch (PollNotFoundException e) { + + addFieldError("pollId", _("pollen.error.pollNotFound")); + } + + } + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-08-13 13:08:27 UTC (rev 3603) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-08-13 14:02:08 UTC (rev 3604) @@ -73,7 +73,7 @@ title='%{getText("pollen.common.createDate")}'/> <sjg:gridColumn name="addingChoices" sortable="false" title='%{getText("pollen.common.addingChoices")}'/> - <sjg:gridColumn name="beginDate" width="100" + <sjg:gridColumn name="beginDate" width="100" title='%{getText("pollen.common.beginDate")}'/> <sjg:gridColumn name="endDate" width="100" title='%{getText("pollen.common.endDate")}'/> @@ -91,10 +91,9 @@ <s:form namespace="/user" method="POST"> - <s:textfield key="uriId" label='%{getText("pollen.common.pollId")}' - required="true" size="80" value='%{pollId}' - tooltip='%{getText("poll.help.pollId")}' - tooltipIconPath="/img/tooltip.png"/> + <s:textfield key="pollId" label='%{getText("pollen.common.pollId")}' + required="true" size="80" tooltipIconPath="/img/tooltip.png" + tooltip='%{getText("poll.help.pollId")}'/> <br/> <s:submit action="attachPoll" key="pollen.action.attachPoll"/>

1 0

r3603 - in trunk/pollen-persistence/src: main/java/org/chorem/pollen/business/persistence test/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 15:08:27 +0200 (Mon, 13 Aug 2012) New Revision: 3603 Url: http://chorem.org/repositories/revision/pollen/3603 Log: refs #746: Improve security model (let's have a unique request to find voter account, and anohter one to have a restricted voter) Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-08-13 13:07:02 UTC (rev 3602) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-08-13 13:08:27 UTC (rev 3603) @@ -23,6 +23,8 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.PollenPersistenceUtil; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -32,140 +34,117 @@ public class PollAccountDAOImpl<E extends PollAccount> extends PollAccountDAOAbstract<E> { /** - * Get a restricted poll account for a given poll - * ( using his {@code pollId} ) using the - * {@link PollAccount#getAccountId()} of the pollAccount. + * Get a restricted poll account for a given poll (by his {@link Poll#getPollId()}) + * using the {@link PollAccount#getAccountId()} of the pollAccount + * and/or the {@link PollAccount#getEmail()}. + * <p/> + * <strong>Note:</strong> {@code accountId} and {@code user} can not + * be null at the same time. * * @param pollId pollId of the poll * @param accountId the accountId of the pollAccount to find + * @param user the connected user account to test * @return the found pollAccount, or {@code null} if not foud * @throws TopiaException if any db pb */ - public E findRestrictedPollAccountByAccountId(String pollId, - String accountId) throws TopiaException { + public E findRestrictedPollAccount(String pollId, + String accountId, + UserAccount user) throws TopiaException { - Preconditions.checkNotNull(pollId); - Preconditions.checkNotNull(accountId); + Preconditions.checkArgument(StringUtils.isNotBlank(pollId)); + Preconditions.checkArgument(StringUtils.isNotBlank(accountId) || + user != null); -// TopiaQuery query = new TopiaQuery(PersonToList.class, "p"). -// addFrom(Poll.class, "poll"). -// setSelect("p." + PersonToList.PROPERTY_POLL_ACCOUNT). -// addWhere("poll." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). -// addWhere("p." + PersonToList.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_ACCOUNT_ID, TopiaQuery.Op.EQ, accountId). -// addInElements("p", "poll." + Poll.PROPERTY_VOTING_LIST + "." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST); -// E result = findByQuery(query); - String hql = "SELECT p.pollAccount FROM PersonToListImpl p, PollImpl poll WHERE " + "poll.pollId = :pollId AND " + - "p.pollAccount.accountId = :accountId AND " + - "p in elements (poll.votingList.pollAccountPersonToList)"; + "p in elements (poll.votingList.pollAccountPersonToList) AND "; - E result = PollenPersistenceUtil.findUnique( - this, hql, "pollId", pollId, "accountId", accountId); - return result; - } - /** - * Get a restricted poll account for a given poll - * ( using his {@code pollId} ) using the - * {@link PollAccount#getEmail()} of the pollAccount. - * - * @param pollId pollId of the poll - * @param email the email of the pollAccount to find - * @return the found pollAccount, or {@code null} if not found - * @throws TopiaException if any db pb - */ - public E findRestrictedPollAccountByEmail(String pollId, - String email) throws TopiaException { + boolean withAccountId = StringUtils.isNotBlank(accountId); + boolean withEmail = user != null; - Preconditions.checkNotNull(pollId); - Preconditions.checkNotNull(email); + List<String> params = Lists.newArrayList("pollId", pollId); -// TopiaQuery query = new TopiaQuery(PersonToList.class, "p"). -// addFrom(Poll.class, "poll"). -// setSelect("p." + PersonToList.PROPERTY_POLL_ACCOUNT). -// addWhere("poll." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). -// addWhere("p." + PersonToList.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_EMAIL, TopiaQuery.Op.EQ, email). -// addInElements("p", "poll." + Poll.PROPERTY_VOTING_LIST + "." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST); -// E result = findByQuery(query); + if (withAccountId && withEmail) { - String hql = "SELECT p.pollAccount FROM PersonToListImpl p, PollImpl poll WHERE " + - "poll.pollId = :pollId AND " + - "p.pollAccount.email = :email AND " + - "p in elements (poll.votingList.pollAccountPersonToList)"; + // try with both email or accountId + params.add("accountId"); + params.add(accountId); + params.add("email"); + params.add(user.getEmail()); + hql += "(p.pollAccount.accountId = :accountId OR p.pollAccount.email = :email)"; + } else if (withAccountId) { - E result = PollenPersistenceUtil.findUnique( - this, hql, "pollId", pollId, "email", email); + // try only with accountId + params.add("accountId"); + params.add(accountId); + hql += "p.pollAccount.accountId = :accountId"; + } else { + + // try only with email + params.add("email"); + params.add(user.getEmail()); + hql += "p.pollAccount.email = :email"; + } + + E result = PollenPersistenceUtil.findUnique(this, hql, params.toArray()); return result; } /** * Get the pollAccount of a voter for a given {@code pollId} using his - * {@code accountId}. + * {@code accountId} or {@code user}. + * <p/> + * <strong>Note:</strong> {@code accountId} and {@code user} can not + * be null at the same time. * * @param pollId the poll where to seek * @param accountId the account id to test + * @param user the connected user account to test * @return the found pollAccount, or {@code null} if not found * @throws TopiaException if any db pb */ - public E findVoterPollAccountByAccountId(String pollId, - String accountId) throws TopiaException { + public E findVoterPollAccount(String pollId, + String accountId, + UserAccount user) throws TopiaException { - Preconditions.checkNotNull(pollId); - Preconditions.checkNotNull(accountId); + Preconditions.checkArgument(StringUtils.isNotBlank(pollId)); + Preconditions.checkArgument(StringUtils.isNotBlank(accountId) || + user != null); -// TopiaQuery query = createQuery("e") -// .addFrom(Poll.class, "p") -// .addFrom(Vote.class, "v") -// .addEquals("p." + Poll.PROPERTY_POLL_ID, pollId) -// .addInElements("v", "p." + Poll.PROPERTY_VOTE) -// .addWhere("e = v." + Vote.PROPERTY_POLL_ACCOUNT) -// .addEquals("e." + PollAccount.PROPERTY_ACCOUNT_ID, accountId); -// PollAccount result = findByQuery(query); - String hql = "SELECT e FROM PollAccountImpl e, PollImpl p, VoteImpl v WHERE " + "p.pollId = :pollId AND " + "v in elements (p.vote) AND " + - "e = v.pollAccount AND " + - "e.accountId = :accountId"; + "e = v.pollAccount AND "; - E result = PollenPersistenceUtil.findUnique( - this, hql, "pollId", pollId, "accountId", accountId); - return result; - } + boolean withAccountId = StringUtils.isNotBlank(accountId); + boolean withEmail = user != null; - /** - * Get the pollAccount of a voter for a given {@code pollId} using his - * {@code user}. - * - * @param pollId the poll id where to seek - * @param user the user account to test - * @return the found pollAccount, or {@code null} if not found - * @throws TopiaException if any db pb - */ - public E findVoterPollAccountByUserAccount(String pollId, - UserAccount user) throws TopiaException { + List<Object> params = Lists.<Object>newArrayList("pollId", pollId); - Preconditions.checkNotNull(pollId); - Preconditions.checkNotNull(user); + if (withAccountId && withEmail) { -// TopiaQuery query = createQuery("e") -// .addFrom(Poll.class, "p") -// .addFrom(Vote.class, "v") -// .addEquals("p." + Poll.PROPERTY_POLL_ID, pollId) -// .addInElements("v", "p." + Poll.PROPERTY_VOTE) -// .addWhere("e = v." + Vote.PROPERTY_POLL_ACCOUNT) -// .addEquals("e." + PollAccount.PROPERTY_USER_ACCOUNT, user); -// PollAccount result = findByQuery(query); + // try with both email or accountId + params.add("accountId"); + params.add(accountId); + params.add("user"); + params.add(user); + hql += "(e.accountId = :accountId OR e.userAccount = :user)"; + } else if (withAccountId) { - String hql = "SELECT e FROM PollAccountImpl e, PollImpl p, VoteImpl v WHERE " + - "p.pollId = :pollId AND " + - "v in elements (p.vote) AND " + - "e = v.pollAccount AND " + - "e.userAccount = :user"; + // try only with accountId + params.add("accountId"); + params.add(accountId); + hql += "e.accountId = :accountId"; + } else { - E result = PollenPersistenceUtil.findUnique( - this, hql, "pollId", pollId, "user", user); + // try only with email + params.add("user"); + params.add(user); + hql += "e.userAccount = :user"; + } + + E result = PollenPersistenceUtil.findUnique(this, hql, params.toArray()); return result; } @@ -217,23 +196,23 @@ "e.email = :email"; boolean result; String pollAccountId = pollAccount.getTopiaId(); - if (pollAccountId == null) { - // no check necessary, it's a new pollAccount + List<Object> params = Lists.<Object>newArrayList( + "person", personListToUpdate, + "email", pollAccount.getEmail()); - result = PollenPersistenceUtil.exists( - this, hql, - "person", personListToUpdate, - "email", pollAccount.getEmail()); - } else { + if (StringUtils.isNotBlank(pollAccountId)) { + + // check also by account topiaId + hql += " AND e.topiaId = :topiaId"; - result = PollenPersistenceUtil.exists( - this, hql, - "person", personListToUpdate, - "email", pollAccount.getEmail(), - "topiaId", pollAccountId); + params.add("topiaId"); + params.add(pollAccountId); + } + + result = PollenPersistenceUtil.exists(this, hql, params.toArray()); return result; } Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java 2012-08-13 13:07:02 UTC (rev 3602) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java 2012-08-13 13:08:27 UTC (rev 3603) @@ -57,20 +57,13 @@ String accountEmail3 = "email3"; @Test - public void findVoterPollAccountByAccountId() throws Exception { + public void findVoterPollAccount() throws Exception { if (log.isWarnEnabled()) { - log.warn("Missing PollAccountDAOImpl#findVoterPollAccountByAccountId request test!"); + log.warn("Missing PollAccountDAOImpl#findVoterPollAccount request test!"); } } @Test - public void findVoterPollAccountByUserAccount() throws Exception { - if (log.isWarnEnabled()) { - log.warn("Missing PollAccountDAOImpl#findVoterPollAccountByUserAccount request test!"); - } - } - - @Test public void findFavoriteListUsers() throws TopiaException { if (log.isWarnEnabled()) { log.warn("Missing PollAccountDAOImpl#findFavoriteListUsers request test!"); @@ -84,8 +77,9 @@ } } + @Test - public void findRestrictedPollAccountByAccountId() throws Exception { + public void findRestrictedPollAccount() throws Exception { TopiaContext tx = beginTransaction(); @@ -94,6 +88,11 @@ VotingListDAO votingListDAO = PollenDAOHelper.getVotingListDAO(tx); PersonToListDAO personToListDAO = PollenDAOHelper.getPersonToListDAO(tx); + UserAccount userAccount = new UserAccountImpl(accountEmail); + UserAccount userAccount2 = new UserAccountImpl(accountEmail2); + UserAccount userAccount3 = new UserAccountImpl(accountEmail3); + UserAccount userAccountFake = new UserAccountImpl("HumFAKE!"); + PollAccount pollAccount = pollAccountDAO.create( PollAccount.PROPERTY_ACCOUNT_ID, accountId, PollAccount.PROPERTY_EMAIL, accountEmail); @@ -130,113 +129,80 @@ pollAccount2.addVotingListPersonToList(personToList2); pollAccount3.addVotingListPersonToList(personToList3); - PollAccount restrictedPollAccount = - pollAccountDAO.findRestrictedPollAccountByAccountId(pollId, accountId); + PollAccount restrictedPollAccount; - Assert.assertNotNull(restrictedPollAccount); - Assert.assertEquals(accountId, restrictedPollAccount.getAccountId()); - Assert.assertNotNull(restrictedPollAccount.getVotingListPersonToList()); - Assert.assertTrue(restrictedPollAccount.getVotingListPersonToList().contains(personToList)); + // -- PollAccount -- // - PollAccount restrictedPollAccount2 = - pollAccountDAO.findRestrictedPollAccountByAccountId(pollId, accountId2); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId, null); + assertRestrictedAccount(restrictedPollAccount, accountId, null, personToList); - Assert.assertNotNull(restrictedPollAccount2); - Assert.assertEquals(accountId2, restrictedPollAccount2.getAccountId()); - Assert.assertNotNull(restrictedPollAccount2.getVotingListPersonToList()); - Assert.assertFalse(restrictedPollAccount2.getVotingListPersonToList().contains(personToList)); - Assert.assertTrue(restrictedPollAccount2.getVotingListPersonToList().contains(personToList2)); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId, userAccountFake); + assertRestrictedAccount(restrictedPollAccount, accountId, null, personToList); - PollAccount restrictedPollAccount3 = - pollAccountDAO.findRestrictedPollAccountByAccountId(pollId, accountId3); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, null, userAccount); + assertRestrictedAccount(restrictedPollAccount, null, userAccount, personToList); - Assert.assertNotNull(restrictedPollAccount3); - Assert.assertEquals(accountId3, restrictedPollAccount3.getAccountId()); - Assert.assertNotNull(restrictedPollAccount3.getVotingListPersonToList()); - Assert.assertFalse(restrictedPollAccount3.getVotingListPersonToList().contains(personToList)); - Assert.assertTrue(restrictedPollAccount3.getVotingListPersonToList().contains(personToList3)); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, "HummFAKE", userAccount); + assertRestrictedAccount(restrictedPollAccount, null, userAccount, personToList); - PollAccount restrictedPollAccount4 = - pollAccountDAO.findRestrictedPollAccountByAccountId(pollId, System.nanoTime() + "--"); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId, userAccount); + assertRestrictedAccount(restrictedPollAccount, accountId, userAccount, personToList); - Assert.assertNull(restrictedPollAccount4); - } + // -- PollAccount2 -- // - @Test - public void findRestrictedPollAccountByEmail() throws Exception { - TopiaContext tx = beginTransaction(); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId2, null); - PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); - PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); - VotingListDAO votingListDAO = PollenDAOHelper.getVotingListDAO(tx); - PersonToListDAO personToListDAO = PollenDAOHelper.getPersonToListDAO(tx); + assertRestrictedAccount(restrictedPollAccount, accountId2, null, personToList2); - PollAccount pollAccount = pollAccountDAO.create( - PollAccount.PROPERTY_ACCOUNT_ID, accountId, - PollAccount.PROPERTY_EMAIL, accountEmail); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId2, userAccountFake); + assertRestrictedAccount(restrictedPollAccount, accountId2, null, personToList2); - PollAccount pollAccount2 = pollAccountDAO.create( - PollAccount.PROPERTY_ACCOUNT_ID, accountId2, - PollAccount.PROPERTY_EMAIL, accountEmail2); - PollAccount pollAccount3 = pollAccountDAO.create( - PollAccount.PROPERTY_ACCOUNT_ID, accountId3, - PollAccount.PROPERTY_EMAIL, accountEmail3); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, null, userAccount2); + assertRestrictedAccount(restrictedPollAccount, null, userAccount2, personToList2); - Poll poll = pollDAO.create(Poll.PROPERTY_POLL_ID, pollId); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, "HUMFake!", userAccount2); + assertRestrictedAccount(restrictedPollAccount, null, userAccount2, personToList2); - VotingList votingList = votingListDAO.create(); - poll.addVotingList(votingList); - VotingList votingList2 = votingListDAO.create(); - poll.addVotingList(votingList2); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId2, userAccount2); + assertRestrictedAccount(restrictedPollAccount, accountId2, userAccount2, personToList2); - PersonToList personToList = personToListDAO.create( - PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount, - PersonToList.PROPERTY_VOTING_LIST, votingList - ); + // -- PollAccount3-- // - PersonToList personToList2 = personToListDAO.create( - PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount2, - PersonToList.PROPERTY_VOTING_LIST, votingList - ); - PersonToList personToList3 = personToListDAO.create( - PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount3, - PersonToList.PROPERTY_VOTING_LIST, votingList2 - ); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId3, null); + assertRestrictedAccount(restrictedPollAccount, accountId3, null, personToList3); - pollAccount.addVotingListPersonToList(personToList); - pollAccount2.addVotingListPersonToList(personToList2); - pollAccount3.addVotingListPersonToList(personToList3); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId3, userAccountFake); + assertRestrictedAccount(restrictedPollAccount, accountId3, null, personToList3); - PollAccount restrictedPollAccount = - pollAccountDAO.findRestrictedPollAccountByEmail(pollId, accountEmail); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, null, userAccount3); + assertRestrictedAccount(restrictedPollAccount, null, userAccount3, personToList3); - Assert.assertNotNull(restrictedPollAccount); - Assert.assertEquals(accountId, restrictedPollAccount.getAccountId()); - Assert.assertNotNull(restrictedPollAccount.getVotingListPersonToList()); - Assert.assertTrue(restrictedPollAccount.getVotingListPersonToList().contains(personToList)); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, "HUMFake!", userAccount3); + assertRestrictedAccount(restrictedPollAccount, null, userAccount3, personToList3); - PollAccount restrictedPollAccount2 = - pollAccountDAO.findRestrictedPollAccountByEmail(pollId, accountEmail2); + restrictedPollAccount = pollAccountDAO.findRestrictedPollAccount(pollId, accountId3, userAccount3); + assertRestrictedAccount(restrictedPollAccount, accountId3, userAccount3, personToList3); - Assert.assertNotNull(restrictedPollAccount2); - Assert.assertEquals(accountId2, restrictedPollAccount2.getAccountId()); - Assert.assertNotNull(restrictedPollAccount2.getVotingListPersonToList()); - Assert.assertFalse(restrictedPollAccount2.getVotingListPersonToList().contains(personToList)); - Assert.assertTrue(restrictedPollAccount2.getVotingListPersonToList().contains(personToList2)); + restrictedPollAccount = + pollAccountDAO.findRestrictedPollAccount(pollId, System.nanoTime() + "--", null); - PollAccount restrictedPollAccount3 = - pollAccountDAO.findRestrictedPollAccountByEmail(pollId, accountEmail3); - - Assert.assertNotNull(restrictedPollAccount3); - Assert.assertEquals(accountId3, restrictedPollAccount3.getAccountId()); - Assert.assertNotNull(restrictedPollAccount3.getVotingListPersonToList()); - Assert.assertFalse(restrictedPollAccount3.getVotingListPersonToList().contains(personToList)); - Assert.assertTrue(restrictedPollAccount3.getVotingListPersonToList().contains(personToList3)); - - PollAccount restrictedPollAccount4 = - pollAccountDAO.findRestrictedPollAccountByEmail(pollId, System.nanoTime() + "--"); - - Assert.assertNull(restrictedPollAccount4); + Assert.assertNull(restrictedPollAccount); } + protected void assertRestrictedAccount(PollAccount restrictedPollAccount, + String accountId, + UserAccount useraccount, + PersonToList personToList) { + Assert.assertNotNull(restrictedPollAccount); + if (accountId != null) { + Assert.assertEquals(accountId, + restrictedPollAccount.getAccountId()); + } + if (useraccount != null) { + Assert.assertEquals(useraccount.getEmail(), + restrictedPollAccount.getEmail()); + } + Assert.assertNotNull(restrictedPollAccount.getVotingListPersonToList()); + Assert.assertTrue(restrictedPollAccount.getVotingListPersonToList().contains(personToList)); + } }

1 0

r3602 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 15:07:02 +0200 (Mon, 13 Aug 2012) New Revision: 3602 Url: http://chorem.org/repositories/revision/pollen/3602 Log: add a nice constructor Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-08-13 10:11:34 UTC (rev 3601) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-08-13 13:07:02 UTC (rev 3602) @@ -28,6 +28,13 @@ private static final long serialVersionUID = 1L; + public UserAccountImpl() { + } + + public UserAccountImpl(String email) { + setEmail(email); + } + @Override public String getDisplayName() { String result = "";

1 0

r3601 - trunk/pollen-services/src/main/java/org/chorem/pollen
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 12:11:34 +0200 (Mon, 13 Aug 2012) New Revision: 3601 Url: http://chorem.org/repositories/revision/pollen/3601 Log: refs #746: Improve security model (more methods to instanciate a security context) Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java 2012-08-13 10:10:10 UTC (rev 3600) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java 2012-08-13 10:11:34 UTC (rev 3601) @@ -23,6 +23,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import org.apache.commons.collections.CollectionUtils; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.bean.PollUrl; @@ -31,6 +32,7 @@ import org.chorem.pollen.services.impl.SecurityService; import java.io.Serializable; +import java.util.Collections; import java.util.Set; /** @@ -72,10 +74,27 @@ protected Set<PollenUserSecurityRole> userRoles; public static PollenUserSecurityContext newContext(UserAccount userAccount, PollUri pollUri) { + return newContext(userAccount, pollUri, null); + } + + public static PollenUserSecurityContext newContext(UserAccount userAccount, + String pollId, + String accountId, + Poll poll) { + return newContext(userAccount, + PollUri.newPollUri(pollId, accountId), + poll); + } + + public static PollenUserSecurityContext newContext(UserAccount userAccount, + PollUri pollUri, + Poll poll) { PollenUserSecurityContext result = new PollenUserSecurityContext( - userAccount, - pollUri + userAccount, pollUri ); + if (poll != null) { + result.setPoll(poll); + } return result; } @@ -97,21 +116,27 @@ } public boolean isCreator() { - return userRoles.contains(PollenUserSecurityRole.CREATOR); + return userRoles != null && userRoles.contains(PollenUserSecurityRole.CREATOR); } public boolean isVoter() { - return userRoles.contains(PollenUserSecurityRole.VOTER); + return userRoles != null && userRoles.contains(PollenUserSecurityRole.VOTER); } public boolean isRestrictedVoter() { - return userRoles.contains(PollenUserSecurityRole.RESTRICTED_VOTER); + return userRoles != null && userRoles.contains(PollenUserSecurityRole.RESTRICTED_VOTER); } public boolean hasNoRole() { return CollectionUtils.isEmpty(userRoles); } + public Set<PollenUserSecurityRole> getUserRoles() { + return CollectionUtils.isEmpty(userRoles) ? + Collections.<PollenUserSecurityRole>emptySet() : + ImmutableSet.copyOf(userRoles); + } + public UserAccount getUserAccount() { return userAccount; }

1 0

r3600 - trunk/pollen-services/src/main/java/org/chorem/pollen/bean
by tchemit＠users.chorem.org 13 Aug '12

13 Aug '12

Author: tchemit Date: 2012-08-13 12:10:10 +0200 (Mon, 13 Aug 2012) New Revision: 3600 Url: http://chorem.org/repositories/revision/pollen/3600 Log: remove unused bean Removed: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java Deleted: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-08-12 14:07:52 UTC (rev 3599) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-08-13 10:10:10 UTC (rev 3600) @@ -1,126 +0,0 @@ -/* - * #%L - * Pollen :: Services - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.bean; - - -import org.chorem.pollen.business.persistence.Poll; -import org.chorem.pollen.business.persistence.PollAccount; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -public class UserPoll implements Serializable { - - private static final long serialVersionUID = 7293352208965578801L; - - public static final String PROPERTY_POLL = "poll"; - - public static final String PROPERTY_ACCOUNTS = "accounts"; - - public static final String PROPERTY_CREATOR = "creator"; - - protected Boolean creator; - - protected Poll poll; - - protected List<PollAccount> accounts; - - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - public boolean isCreator() { - // Lazy initialization of creator boolean - if (creator == null) { - for (PollAccount account : accounts) { - if (account.equals(poll.getCreator())) { - creator = true; - break; - } - } - if (creator == null) { - creator = false; - } - } - return creator; - } - - public String getPollUid() { - return poll.getPollId(); - } - - public List<PollAccount> getAccounts() { - if (accounts == null) { - accounts = new ArrayList<PollAccount>(); - } - return accounts; - } - - public boolean addAccount(PollAccount account) { - boolean result = getAccounts().add(account); - return result; - } - - public Poll getPoll() { - return poll; - } - - public void setPoll(Poll poll) { - Poll oldValue = getPoll(); - this.poll = poll; - firePropertyChange(PROPERTY_POLL, oldValue, poll); - } - - - public void setAccounts(List<PollAccount> accounts) { - List<PollAccount> oldValue = getAccounts(); - this.accounts = accounts; - firePropertyChange(PROPERTY_ACCOUNTS, oldValue, accounts); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.removePropertyChangeListener(propertyName, listener); - } - - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - pcs.firePropertyChange(propertyName, oldValue, newValue); - } - - protected void firePropertyChange(String propertyName, Object newValue) { - firePropertyChange(propertyName, null, newValue); - } - -} //UserPoll

1 0