This is an automated email from the git hooks/post-receive script. New commit to branch feature/spgeed in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit b7c30d1c9c30bee84b4ef805edd683ed7abe33b9 Author: Killian <killian.herbreteau@epitech.eu> Date: Mon Sep 30 10:13:39 2019 +0200 adding entities's Dao --- .../Dao/PollenChildFavoriteListSpgeedDao.java | 8 +- .../persistence/Dao/PollenChoiceSpgeedDao.java | 9 +- .../persistence/Dao/PollenCommentSpgeedDao.java | 7 +- .../Dao/PollenFavoriteListMemberSpgeedDao.java | 7 +- .../Dao/PollenFavoriteListSpgeedDao.java | 15 +- .../persistence/Dao/PollenPollSpgeedDao.java | 85 +++++---- .../persistence/Dao/PollenPrincipalSpgeedDao.java | 36 ++-- .../persistence/Dao/PollenRessourceSpgeedDao.java | 15 +- .../Dao/PollenSessionTokenSpgeedDao.java | 7 - .../pollen/persistence/Dao/PollenSpgeedDao.java | 5 + .../persistence/Dao/PollenTokenSpgeedDao.java | 3 - .../Dao/PollenUserEmailAddressSpgeedDao.java | 42 ++-- .../persistence/Dao/PollenUserSpgeedDao.java | 38 +++- .../persistence/Dao/PollenVoteSpgeedDao.java | 7 - .../Dao/PollenVoterListMemberSpgeedDao.java | 5 - .../persistence/Dao/PollenVoterListSpgeedDao.java | 15 +- .../pollen/persistence/Dao/SpgeedDaoUtils.java | 37 ---- .../chorem/pollen/services/SpgeedDaoUtilsTest.java | 211 --------------------- 18 files changed, 123 insertions(+), 429 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenChildFavoriteListSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenChildFavoriteListSpgeedDao.java index cd64d5e5..eee526fe 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenChildFavoriteListSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenChildFavoriteListSpgeedDao.java @@ -2,14 +2,8 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.ChildFavoriteList; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.addStringToArray; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.getProperty; - public interface PollenChildFavoriteListSpgeedDao { - String propertieswoForeignKey[] = {ChildFavoriteList.PROPERTY_WEIGHT, ChildFavoriteList.TOPIA_ID}; - - String Properties[] = addStringToArray(propertieswoForeignKey, ChildFavoriteList.PROPERTY_PARENT, ChildFavoriteList.PROPERTY_CHILD); + String propertieswoForeignKey[] = {ChildFavoriteList.PROPERTY_WEIGHT, ChildFavoriteList.PROPERTY_TOPIA_ID}; - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenChoiceSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenChoiceSpgeedDao.java index bb476bc8..fb157bc2 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenChoiceSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenChoiceSpgeedDao.java @@ -2,14 +2,7 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.Choice; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.addStringToArray; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.getProperty; - public interface PollenChoiceSpgeedDao { - String propertieswoForeignKey[] = {Choice.PROPERTY_CHOICE_VALUE, Choice.PROPERTY_DESCRIPTION, Choice.PROPERTY_CHOICE_ORDER, Choice.TOPIA_ID}; - - String Properties[] = addStringToArray(propertieswoForeignKey, Choice.PROPERTY_QUESTION, Choice.PROPERTY_CREATOR, Choice.PROPERTY_CHOICE_TYPE); - - String woForeignKey = getProperty(propertieswoForeignKey); + String propertieswoForeignKey[] = {Choice.PROPERTY_CHOICE_VALUE, Choice.PROPERTY_DESCRIPTION, Choice.PROPERTY_CHOICE_ORDER, Choice.PROPERTY_TOPIA_ID}; } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenCommentSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenCommentSpgeedDao.java index 60cb7125..c454a982 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenCommentSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenCommentSpgeedDao.java @@ -2,12 +2,7 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.Comment; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.*; - public interface PollenCommentSpgeedDao { - String propertieswoForeignKey[] = {Comment.PROPERTY_TEXT, Comment.PROPERTY_POST_DATE, Comment.TOPIA_ID}; - - String Properties[] = addStringToArray(propertieswoForeignKey, Comment.PROPERTY_POLL, Comment.PROPERTY_AUTHOR, Comment.PROPERTY_QUESTION); + String propertieswoForeignKey[] = {Comment.PROPERTY_TEXT, Comment.PROPERTY_POST_DATE, Comment.PROPERTY_TOPIA_ID}; - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenFavoriteListMemberSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenFavoriteListMemberSpgeedDao.java index e90847e1..ec8a5772 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenFavoriteListMemberSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenFavoriteListMemberSpgeedDao.java @@ -3,13 +3,8 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.FavoriteList; import org.chorem.pollen.persistence.entity.FavoriteListMember; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.*; - public interface PollenFavoriteListMemberSpgeedDao { - String propertieswoForeignKey[] = {FavoriteListMember.PROPERTY_NAME, FavoriteListMember.PROPERTY_EMAIL, FavoriteListMember.PROPERTY_WEIGHT, FavoriteList.TOPIA_ID}; - - String Properties[] = addStringToArray(propertieswoForeignKey, FavoriteListMember.PROPERTY_FAVORITE_LIST); + String propertieswoForeignKey[] = {FavoriteListMember.PROPERTY_NAME, FavoriteListMember.PROPERTY_EMAIL, FavoriteListMember.PROPERTY_WEIGHT, FavoriteList.PROPERTY_TOPIA_ID}; - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenFavoriteListSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenFavoriteListSpgeedDao.java index ac7768d7..981fd78e 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenFavoriteListSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenFavoriteListSpgeedDao.java @@ -1,22 +1,9 @@ package org.chorem.pollen.persistence.Dao; -import org.chorem.pollen.persistence.PollenMapper; import org.chorem.pollen.persistence.entity.FavoriteList; -import org.chorem.pollen.persistence.entity.Poll; -import org.chorem.pollen.persistence.entity.VoterList; -import org.nuiton.spgeed.annotations.Select; -import org.nuiton.spgeed.annotations.Update; - -import java.sql.Date; - -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.addStringToArray; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.getProperty; public interface PollenFavoriteListSpgeedDao { - String propertieswoForeignKey[] = {FavoriteList.PROPERTY_NAME, FavoriteList.TOPIA_ID}; - - String Properties[] = addStringToArray(propertieswoForeignKey, FavoriteList.PROPERTY_POLLEN_USER, FavoriteList.PROPERTY_OWNER, FavoriteList.PROPERTY_PARENT_LISTS); + String propertieswoForeignKey[] = {FavoriteList.PROPERTY_NAME, FavoriteList.PROPERTY_TOPIA_ID}; - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenPollSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenPollSpgeedDao.java index a933a4a3..7c3e6563 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenPollSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenPollSpgeedDao.java @@ -2,52 +2,67 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.PollenMapper; import org.chorem.pollen.persistence.entity.Poll; +import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.nuiton.spgeed.annotations.Select; import org.nuiton.spgeed.annotations.Update; import java.sql.Date; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.*; +public interface PollenPollSpgeedDao extends PollenSpgeedDao { -public interface PollenPollSpgeedDao { + String pollName = "po"; - String propertieswoForeignKey[] = {Poll.PROPERTY_TITLE, Poll.PROPERTY_DESCRIPTION, Poll.PROPERTY_BEGIN_DATE, Poll.PROPERTY_END_DATE, - Poll.PROPERTY_ANONYMOUS_VOTE_ALLOWED, Poll.PROPERTY_CONTINUOUS_RESULTS, Poll.PROPERTY_NOTIFY_ME_HOURS_BEFORE_POLL_ENDS, - Poll.PROPERTY_POLL_END_REMINDER_SENT, Poll.PROPERTY_NOTIFICATION_LOCALE, Poll.PROPERTY_VOTE_NOTIFICATION, Poll.PROPERTY_FEED_CONTENT, - Poll.PROPERTY_COMMENT_NOTIFICATION, Poll.PROPERTY_NEW_CHOICE_NOTIFICATION, Poll.PROPERTY_GTU_VALIDATION_DATE, Poll.PROPERTY_PREMIUM, - Poll.PROPERTY_NOTIFICATION_MAX_VOTER_SEND, Poll.PROPERTY_EMAIL_ADDRESS_SUFFIXES, Poll.PROPERTY_POLL_TYPE, Poll.PROPERTY_VOTE_VISIBILITY, - Poll.PROPERTY_COMMENT_VISIBILITY, Poll.PROPERTY_RESULT_VISIBILITY, Poll.PROPERTY_TOPIA_ID}; + String aggName = "polls_agg"; - String Properties[] = addStringToArray(propertieswoForeignKey, Poll.PROPERTY_CREATOR); + String propertieswoForeignKey = pollName+"."+Poll.PROPERTY_TITLE+ ", " + pollName+"."+Poll.PROPERTY_DESCRIPTION+ ", " + pollName+"."+Poll.PROPERTY_BEGIN_DATE+ ", " + pollName+"."+Poll.PROPERTY_END_DATE+ ", " + + pollName+"."+Poll.PROPERTY_ANONYMOUS_VOTE_ALLOWED+ ", " + pollName+"."+Poll.PROPERTY_CONTINUOUS_RESULTS+ ", " + pollName+"."+Poll.PROPERTY_NOTIFY_ME_HOURS_BEFORE_POLL_ENDS+ ", " + + pollName+"."+Poll.PROPERTY_POLL_END_REMINDER_SENT+ ", " + pollName+"."+Poll.PROPERTY_NOTIFICATION_LOCALE+ ", " + pollName+"."+Poll.PROPERTY_VOTE_NOTIFICATION+ ", " + + pollName+"."+Poll.PROPERTY_FEED_CONTENT+ ", " + pollName+"."+Poll.PROPERTY_COMMENT_NOTIFICATION+ ", " + pollName+"."+Poll.PROPERTY_NEW_CHOICE_NOTIFICATION+ ", " + + pollName+"."+Poll.PROPERTY_GTU_VALIDATION_DATE+ ", " + pollName+"."+Poll.PROPERTY_PREMIUM+ ", " + pollName+"."+Poll.PROPERTY_NOTIFICATION_MAX_VOTER_SEND+ ", " + + pollName+"."+Poll.PROPERTY_EMAIL_ADDRESS_SUFFIXES+ ", " + pollName+"."+Poll.PROPERTY_POLL_TYPE+ ", " + pollName+"."+Poll.PROPERTY_VOTE_VISIBILITY+ ", " + pollName+"."+Poll.PROPERTY_COMMENT_VISIBILITY+ ", " + + pollName+"."+Poll.PROPERTY_RESULT_VISIBILITY+ ", " + pollName+"."+ Poll.PROPERTY_TOPIA_ID; - String woForeignKey = getProperty(propertieswoForeignKey); + String command = aggName+" AS (" + + " SELECT "+propertieswoForeignKey+", json_agg("+PollenPrincipalSpgeedDao.principalName+".*)->0 AS "+Poll.PROPERTY_CREATOR + + " FROM "+PollenPrincipalSpgeedDao.aggName+" "+PollenPrincipalSpgeedDao.principalName+ + " RIGHT JOIN poll "+pollName+" ON "+PollenPrincipalSpgeedDao.principalName+"."+ PollenPrincipal.PROPERTY_TOPIA_ID+" = "+pollName+"."+Poll.PROPERTY_CREATOR + + " GROUP BY "+pollName+"."+Poll.PROPERTY_TOPIA_ID + + ") "; - String command = "WITH " + - "email_agg AS (" + - " SELECT emailaddress, topiaid, pollenuser" + - " FROM pollenuseremailaddress" + - ")," + - "users_agg AS (" + - " SELECT userx.topiaid, json_agg(demail.*)->0 AS defaultemailaddress, json_agg(emails.*) AS emailaddresses" + - " FROM email_agg demail, email_agg emails, pollenuser userx" + - " WHERE demail.topiaid = userx.defaultemailaddress AND emails.pollenuser = userx.topiaid" + - " GROUP BY userx.topiaid" + - ")," + - "principals_agg AS (" + - " SELECT principals.topiaid, json_agg(userx.*)->0 AS pollenuser" + - " FROM users_agg userx, pollenprincipal principals" + - " WHERE userx.topiaid = principals.pollenuser" + - " GROUP BY principals.topiaid" + - "), " + - "polls_agg AS (" + - " SELECT p.topiaid, json_agg(a.*)->0 AS creator" + - " FROM principals_agg a, poll p" + - " WHERE a.topiaid = p.creator" + - " GROUP BY p.topiaid" + - ") " + - "SELECT * FROM polls_agg"; + String commands = "WITH " + + PollenUserEmailAddressSpgeedDao.command+"," + + PollenUserSpgeedDao.command+", " + + PollenPrincipalSpgeedDao.command+", " + + PollenPollSpgeedDao.command + + "SELECT * FROM "+aggName; - @Select(sql = command, mapper = PollenMapper.class) + String com = "WITH "+ + "emails_agg AS ( "+ + "SELECT topiaid, pollenuser "+ + "FROM pollenuseremailaddress "+ + "), "+ + "users_agg AS ( "+ + "SELECT userx.topiaid, json_agg(emails.*) AS emailaddresses, json_agg(demail.*)->0 AS defaultemailaddress "+ + "FROM pollenuser userx "+ + "JOIN emails_agg demail ON demail.topiaid = userx.defaultemailaddress "+ + "JOIN emails_agg emails ON emails.pollenuser = userx.topiaid "+ + "GROUP BY userx.topiaid "+ +"), "+ + "principals_agg AS ( "+ + "SELECT principals.topiaid, json_agg(userx.*)->0 AS pollenuser "+ + "FROM users_agg userx JOIN pollenprincipal principals "+ + "ON userx.topiaid = principals.pollenuser "+ + "GROUP BY principals.topiaid "+ +"), "+ + "polls_agg AS ( "+ + "SELECT p.topiaid, json_agg(a.*)->0 AS creator "+ + "FROM principals_agg a "+ + "RIGHT JOIN poll p ON a.topiaid = p.creator "+ + "GROUP BY p.topiaid "+ +") "+ + "SELECT json_agg(po.*) FROM polls_agg po"; + + @Select(sql = commands, mapper = PollenMapper.class) Poll[] getallpoll(); @Update(sql = "insert into poll (title, description, begindate, enddate, anonymousvoteallowed, " + diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenPrincipalSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenPrincipalSpgeedDao.java index df8dea4a..123bff7a 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenPrincipalSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenPrincipalSpgeedDao.java @@ -1,38 +1,36 @@ package org.chorem.pollen.persistence.Dao; -import org.chorem.pollen.persistence.entity.FavoriteList; import org.chorem.pollen.persistence.entity.PollenPrincipal; - -import java.security.Principal; - -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.*; +import org.chorem.pollen.persistence.entity.PollenUser; public interface PollenPrincipalSpgeedDao { + String principalName = "pr"; - String propertieswoForeignKey[] = {PollenPrincipal.PROPERTY_NAME, PollenPrincipal.PROPERTY_EMAIL, PollenPrincipal.PROPERTY_INVALID, PollenPrincipal.TOPIA_ID}; + String aggName = "principals_agg"; - String Properties[] = addStringToArray(propertieswoForeignKey, PollenPrincipal.PROPERTY_PERMISSION, PollenPrincipal.PROPERTY_POLLEN_USER); + String propertieswoForeignKey = principalName+"." +PollenPrincipal.PROPERTY_NAME + ", " + + principalName+"." +PollenPrincipal.PROPERTY_EMAIL + ", "+principalName+"."+PollenPrincipal.PROPERTY_INVALID + ", " + + principalName+"." +PollenPrincipal.TOPIA_ID; - String woForeignKey = getProperty(propertieswoForeignKey); + String Properties = propertieswoForeignKey+ PollenPrincipal.PROPERTY_PERMISSION+ PollenPrincipal.PROPERTY_POLLEN_USER; - String command = "WITH " + - "email_agg AS (" + - " SELECT emailaddress, topiaid, pollenuser" + - " FROM pollenuseremailaddress" + - ")," + + String command = aggName+" AS (" + + " SELECT "+ propertieswoForeignKey +", json_agg("+PollenUserSpgeedDao.userName+".*)->0 AS "+PollenPrincipal.PROPERTY_POLLEN_USER+ + " FROM "+PollenUserSpgeedDao.aggName+" "+PollenUserSpgeedDao.userName+ + " JOIN pollenprincipal "+principalName+" ON "+PollenUserSpgeedDao.userName+"."+ PollenUser.PROPERTY_TOPIA_ID+" = "+principalName+"."+PollenPrincipal.PROPERTY_POLLEN_USER+ + " GROUP BY "+ principalName+"."+PollenPrincipal.PROPERTY_TOPIA_ID+ + ")"; + + String commands = "WITH " + + PollenUserEmailAddressSpgeedDao.command+", " + "users_agg AS (" + " SELECT userx.topiaid, json_agg(demail.*)->0 AS defaultemailaddress, json_agg(emails.*) AS emailaddresses" + " FROM email_agg demail, email_agg emails, pollenuser userx" + " WHERE demail.topiaid = userx.defaultemailaddress AND emails.pollenuser = userx.topiaid" + " GROUP BY userx.topiaid" + ")," + - "principals_agg AS (" + - " SELECT principals.topiaid, json_agg(userx.*)->0 AS pollenuser" + - " FROM users_agg userx, pollenprincipal principals" + - " WHERE userx.topiaid = principals.pollenuser" + - " GROUP BY principals.topiaid" + - "), " + + PollenPrincipalSpgeedDao.command+", " + "polls_agg AS (" + " SELECT p.topiaid, json_agg(a.*)->0 AS creator" + " FROM principals_agg a, poll p" + diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenRessourceSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenRessourceSpgeedDao.java index 3a8b37c7..44399f15 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenRessourceSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenRessourceSpgeedDao.java @@ -1,23 +1,10 @@ package org.chorem.pollen.persistence.Dao; -import org.chorem.pollen.persistence.PollenMapper; -import org.chorem.pollen.persistence.entity.FavoriteList; -import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenResource; -import org.nuiton.spgeed.annotations.Select; -import org.nuiton.spgeed.annotations.Update; - -import java.sql.Date; - -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.addStringToArray; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.getProperty; public interface PollenRessourceSpgeedDao { String propertieswoForeignKey[] = {PollenResource.PROPERTY_RESOURCE_CONTENT, PollenResource.PROPERTY_CONTENT_TYPE, - PollenResource.PROPERTY_NAME, PollenResource.PROPERTY_SIZE, PollenResource.TOPIA_ID}; - - String Properties[] = addStringToArray(propertieswoForeignKey, PollenResource.PROPERTY_RESOURCE_TYPE); + PollenResource.PROPERTY_NAME, PollenResource.PROPERTY_SIZE, PollenResource.PROPERTY_TOPIA_ID}; - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenSessionTokenSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenSessionTokenSpgeedDao.java index 594e6bc3..0123fc22 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenSessionTokenSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenSessionTokenSpgeedDao.java @@ -1,16 +1,9 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.SessionToken; -import org.chorem.pollen.persistence.entity.VoterList; - -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.addStringToArray; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.getProperty; public interface PollenSessionTokenSpgeedDao { String propertieswoForeignKey[] = {SessionToken.PROPERTY_TOPIA_ID}; - String Properties[] = addStringToArray(propertieswoForeignKey, SessionToken.PROPERTY_POLLEN_TOKEN, SessionToken.PROPERTY_POLLEN_USER, SessionToken.TOPIA_ID); - - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenSpgeedDao.java new file mode 100644 index 00000000..1ad613bd --- /dev/null +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenSpgeedDao.java @@ -0,0 +1,5 @@ +package org.chorem.pollen.persistence.Dao; + +public interface PollenSpgeedDao { + +} \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenTokenSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenTokenSpgeedDao.java index 4e07e7b7..9acfd47c 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenTokenSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenTokenSpgeedDao.java @@ -2,11 +2,8 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.PollenToken; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.*; - public interface PollenTokenSpgeedDao { String propertieswoForeignKey[] = {PollenToken.PROPERTY_TOKEN, PollenToken.PROPERTY_CREATION_DATE, PollenToken.PROPERTY_END_DATE, PollenToken.TOPIA_ID}; - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenUserEmailAddressSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenUserEmailAddressSpgeedDao.java index 65524df2..d72d41fa 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenUserEmailAddressSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenUserEmailAddressSpgeedDao.java @@ -2,37 +2,23 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.PollenUserEmailAddress; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.getProperty; - public interface PollenUserEmailAddressSpgeedDao { - String properties[] = {PollenUserEmailAddress.PROPERTY_EMAIL_ADDRESS, PollenUserEmailAddress.PROPERTY_PGP_PUBLIC_KEY, - PollenUserEmailAddress.PROPERTY_VALIDATED, PollenUserEmailAddress.TOPIA_ID}; + String demailName = "pde"; + + String emailsName = "pes"; + + String aggName = "emails_agg"; + + String properties = PollenUserEmailAddress.PROPERTY_EMAIL_ADDRESS + ", " + + PollenUserEmailAddress.PROPERTY_PGP_PUBLIC_KEY + ", " + + PollenUserEmailAddress.PROPERTY_VALIDATED + ", " + + PollenUserEmailAddress.TOPIA_ID + ", " + + "pollenuser"; - String formatedProperties = getProperty(properties); - String command = "WITH " + - "email_agg AS (" + - " SELECT " + formatedProperties + + final String command = aggName+" AS (" + + " SELECT " + properties + " FROM pollenuseremailaddress" + - ")," + - "users_agg AS (" + - " SELECT userx.topiaid, json_agg(demail.*)->0 AS defaultemailaddress, json_agg(emails.*) AS emailaddresses" + - " FROM email_agg demail, email_agg emails, pollenuser userx" + - " WHERE demail.topiaid = userx.defaultemailaddress AND emails.pollenuser = userx.topiaid" + - " GROUP BY userx.topiaid" + - ")," + - "principals_agg AS (" + - " SELECT principals.topiaid, json_agg(userx.*)->0 AS pollenuser" + - " FROM users_agg userx, pollenprincipal principals" + - " WHERE userx.topiaid = principals.pollenuser" + - " GROUP BY principals.topiaid" + - "), " + - "polls_agg AS (" + - " SELECT p.topiaid, json_agg(a.*)->0 AS creator" + - " FROM principals_agg a, poll p" + - " WHERE a.topiaid = p.creator" + - " GROUP BY p.topiaid" + - ") " + - "SELECT * FROM polls_agg"; + ")"; } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenUserSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenUserSpgeedDao.java index 313e8557..3e7f9605 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenUserSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenUserSpgeedDao.java @@ -1,22 +1,41 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.PollenMapper; +import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.PollenUserEmailAddress; import org.nuiton.spgeed.annotations.Select; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.*; +public interface PollenUserSpgeedDao extends PollenSpgeedDao { -public interface PollenUserSpgeedDao { + String userName = "pu"; - String propertieswoForeignKey[] = {PollenUser.PROPERTY_NAME, PollenUser.PROPERTY_ADMINISTRATOR, PollenUser.PROPERTY_LANGUAGE, PollenUser.PROPERTY_PASSWORD, - PollenUser.PROPERTY_SALT, PollenUser.PROPERTY_BANNED, PollenUser.PROPERTY_GTU_VALIDATION_DATE, PollenUser.PROPERTY_PREMIUM_TO, - PollenUser.PROPERTY_CAN_CREATE_POLL, PollenUser.PROPERTY_TOPIA_ID}; + String aggName = "users_agg"; - String Properties[] = addStringToArray(propertieswoForeignKey, PollenUser.PROPERTY_USER_CREDENTIAL, PollenUser.PROPERTY_DEFAULT_EMAIL_ADDRESS, - PollenUser.PROPERTY_EMAIL_ADDRESSES, PollenUser.PROPERTY_AVATAR); + String propertieswoForeignKey = userName+"."+PollenUser.PROPERTY_NAME+", " + + userName+"."+PollenUser.PROPERTY_ADMINISTRATOR + ", "+userName+"."+PollenUser.PROPERTY_LANGUAGE+", " + + userName+"."+PollenUser.PROPERTY_PASSWORD + ", "+userName+"."+PollenUser.PROPERTY_SALT+", " + + userName+"."+PollenUser.PROPERTY_BANNED + ", "+userName+"."+PollenUser.PROPERTY_GTU_VALIDATION_DATE+", " + + userName+"."+PollenUser.PROPERTY_PREMIUM_TO + ", "+userName+"."+PollenUser.PROPERTY_CAN_CREATE_POLL+", " + + userName+"."+PollenUser.PROPERTY_TOPIA_ID; - String woForeignKey = getProperty(propertieswoForeignKey); + String Properties = propertieswoForeignKey+ PollenUser.PROPERTY_USER_CREDENTIAL+ PollenUser.PROPERTY_DEFAULT_EMAIL_ADDRESS+ + PollenUser.PROPERTY_EMAIL_ADDRESSES+ PollenUser.PROPERTY_AVATAR; + + String command = aggName+" AS (" + + " SELECT "+propertieswoForeignKey+", " + + "json_agg("+PollenUserEmailAddressSpgeedDao.demailName+".*)->0 AS "+PollenUser.PROPERTY_DEFAULT_EMAIL_ADDRESS+", " + + "json_agg("+PollenUserEmailAddressSpgeedDao.emailsName+".*) AS "+PollenUser.PROPERTY_EMAIL_ADDRESSES+ + " FROM pollenuser "+userName+ + " JOIN "+PollenUserEmailAddressSpgeedDao.aggName+" "+PollenUserEmailAddressSpgeedDao.demailName+" ON "+PollenUserEmailAddressSpgeedDao.demailName+"."+PollenUserEmailAddress.PROPERTY_TOPIA_ID+ " = "+userName+"."+PollenUser.PROPERTY_DEFAULT_EMAIL_ADDRESS+ + " JOIN "+PollenUserEmailAddressSpgeedDao.aggName+" "+PollenUserEmailAddressSpgeedDao.emailsName+" ON "+PollenUserEmailAddressSpgeedDao.emailsName+".pollenuser = "+userName+"."+PollenUser.PROPERTY_TOPIA_ID+ + " GROUP BY "+userName+"."+PollenUser.PROPERTY_TOPIA_ID+ + ")"; + + String commands = "WITH " + + PollenUserEmailAddressSpgeedDao.command+", "+ + PollenUserSpgeedDao.command + + "SELECT * from "+aggName; String getuser = "with pollenu as " + "((select json_agg(e) as emailaddresses from pollenuseremailaddress e where e.pollenuser = u.topiaid), " + @@ -28,6 +47,9 @@ public interface PollenUserSpgeedDao { @Select(sql = getuser, mapper = PollenMapper.class) PollenUser getFirstUser(); + @Select(sql = commands + " "+userName+" WHERE "+userName+"."+ PollenUser.PROPERTY_TOPIA_ID+" = ${userId}", mapper = PollenMapper.class) + PollenUser getUser(String userId); + @Select(sql = getuser, mapper = PollenMapper.class) PollenUser[] getallUser(); diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoteSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoteSpgeedDao.java index 14f6bb97..c030ea01 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoteSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoteSpgeedDao.java @@ -2,14 +2,7 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.Vote; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.*; - public interface PollenVoteSpgeedDao { String propertieswoForeignKey[] = {Vote.PROPERTY_WEIGHT, Vote.PROPERTY_ANONYMOUS, Vote.PROPERTY_TOPIA_ID}; - - String Properties[] = addStringToArray(propertieswoForeignKey, Vote.PROPERTY_QUESTION, Vote.PROPERTY_VOTE_TO_CHOICE, - Vote.PROPERTY_VOTER_LIST_MEMBER, Vote.PROPERTY_VOTER); - - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoterListMemberSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoterListMemberSpgeedDao.java index 0d2bacd6..7d190a51 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoterListMemberSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoterListMemberSpgeedDao.java @@ -2,13 +2,8 @@ package org.chorem.pollen.persistence.Dao; import org.chorem.pollen.persistence.entity.VoterListMember; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.*; - public interface PollenVoterListMemberSpgeedDao { String propertieswoForeignKey[] = {VoterListMember.PROPERTY_WEIGHT, VoterListMember.PROPERTY_INVITATION_SENT, VoterListMember.PROPERTY_TOPIA_ID}; - String Properties[] = addStringToArray(propertieswoForeignKey, VoterListMember.PROPERTY_VOTER_LIST, VoterListMember.PROPERTY_MEMBER); - - String woForeignKey = getProperty(propertieswoForeignKey); } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoterListSpgeedDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoterListSpgeedDao.java index 8e2f283b..38796255 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoterListSpgeedDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/PollenVoterListSpgeedDao.java @@ -1,22 +1,9 @@ package org.chorem.pollen.persistence.Dao; -import org.chorem.pollen.persistence.PollenMapper; -import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.VoterList; -import org.nuiton.spgeed.annotations.Select; -import org.nuiton.spgeed.annotations.Update; - -import java.sql.Date; - -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.addStringToArray; -import static org.chorem.pollen.persistence.Dao.SpgeedDaoUtils.getProperty; public interface PollenVoterListSpgeedDao { - String propertieswoForeignKey[] = {VoterList.PROPERTY_NAME, VoterList.PROPERTY_WEIGHT, VoterList.TOPIA_ID}; - - String Properties[] = addStringToArray(propertieswoForeignKey, VoterList.PROPERTY_POLL, VoterList.PROPERTY_PARENT); - - String woForeignKey = getProperty(propertieswoForeignKey); + String propertieswoForeignKey[] = {VoterList.PROPERTY_NAME, VoterList.PROPERTY_WEIGHT, VoterList.PROPERTY_TOPIA_ID}; } \ No newline at end of file diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/SpgeedDaoUtils.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/SpgeedDaoUtils.java deleted file mode 100644 index ac1a19ec..00000000 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/Dao/SpgeedDaoUtils.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.chorem.pollen.persistence.Dao; - -import org.apache.commons.lang3.StringUtils; - -import java.sql.SQLException; - -public class SpgeedDaoUtils { - public static String getProperty(String ...properties) { - return StringUtils.join(properties, ", "); - } - - public static String[] propertiesToParameters(String format, String[] array) throws SQLException { - if (!format.contains("%s") || format.indexOf("%s") != format.lastIndexOf("%s")) { - System.err.println("Error: propertiesToParameters format's need to contain one : \"%s\""); - throw new SQLException(); - } - - int j = format.indexOf("%s"); - - for (int i = 0; i < array.length; i++) { - array[i] = format.substring(0, j).concat(array[i]); - array[i] = array[i].concat(format.substring(j + 2)); - } - return array; - } - - public static String []addStringToArray(String Array[], String ...Values) { - String result[] = new String[Array.length + Values.length]; - for (int i = 0; i < Array.length; i++) { - result[i] = Array[i]; - } - for (int i = 0; i < Values.length; i++) { - result[i + Array.length] = Values[i]; - } - return result; - } -} \ No newline at end of file diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/SpgeedDaoUtilsTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/SpgeedDaoUtilsTest.java deleted file mode 100644 index 29a3c39f..00000000 --- a/pollen-services/src/test/java/org/chorem/pollen/services/SpgeedDaoUtilsTest.java +++ /dev/null @@ -1,211 +0,0 @@ -package org.chorem.pollen.services; - -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.chorem.pollen.persistence.PollenTopiaApplicationContext; -import org.chorem.pollen.persistence.PollenTopiaPersistenceContext; -import org.chorem.pollen.persistence.entity.*; -import org.chorem.pollen.services.service.security.SpgeedDummyService; -import org.chorem.pollen.services.test.FakePollenApplicationContext; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; - -import java.util.List; - -/** - * @author ymartel (martel@codelutin.com) - */ -public class SpgeedTest { - - @Rule - public final FakePollenApplicationContext application = new FakePollenApplicationContext("pollen-rest-api.properties"); - - public static final String EMAIL_JSON = "{ " + - " \"topiaid\":\"PollenUserEmailAddress_M-wGbZ74QQCUr_hwl6JXmw\"," + - " \"topiaversion\":1," + - " \"topiacreatedate\":\"2019-07-19T10:00:30.962\"," + - " \"emailaddress\":\"admin@chorem.org\"," + - " \"pgppublickey\":null," + - " \"validated\":true," + - " \"pollenuser\":\"PollenUser_6qdaqbgBTyCBa8Dvz5SeHQ\"" + - "}"; - - public static final String USER_JSON = "{" + - " \"name\":\"admin\"," + - " \"administrator\":true," + - " \"language\":null," + - " \"password\":\"m7LAmO/AeLrjPI6kkzS0wTmU6fpbG/nxptfi/P7fg0BToZoIAV6xVre3tcttYxnLTDrXjtq7YOpggTFRz7mTjA==\"," + - " \"banned\":false," + - " \"gtuvalidationdate\":null," + - " \"premiumto\":null," + - " \"cancreatepoll\":false," + - " \"emailaddresses\":[" + - " {" + - " \"topiaid\":\"PollenUserEmailAddress_M-wGbZ74QQCUr_hwl6JXmw\"," + - " \"topiaversion\":1," + - " \"topiacreatedate\":\"2019-07-19T10:00:30.962\"," + - " \"emailaddress\":\"admin@chorem.org\"," + - " \"pgppublickey\":null," + - " \"validated\":true," + - " \"pollenuser\":\"PollenUser_6qdaqbgBTyCBa8Dvz5SeHQ\"" + - " }" + - " ]," + - " \"defaultemailaddress\":" + - " {" + - " \"topiaid\":\"PollenUserEmailAddress_M-wGbZ74QQCUr_hwl6JXmw\"," + - " \"topiaversion\":1," + - " \"topiacreatedate\":\"2019-07-19T10:00:30.962\"," + - " \"emailaddress\":\"admin@chorem.org\"," + - " \"pgppublickey\":null," + - " \"validated\":true," + - " \"pollenuser\":\"PollenUser_6qdaqbgBTyCBa8Dvz5SeHQ\"" + - " }" + - "}"; - - @Test - public void testEmailDeserialization() throws Exception { - - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); - PollenUserEmailAddress email = mapper.readValue(EMAIL_JSON, PollenUserEmailAddress.class); - - Assert.assertNotNull(email); - Assert.assertEquals("admin@chorem.org", email.getEmailAddress()); - } - - @Test - public void testUserDeserialization() throws Exception { - - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); - PollenUser pollenUser = mapper.readValue(USER_JSON, PollenUser.class); - - Assert.assertNotNull(pollenUser); - Assert.assertNotNull(pollenUser.getEmailAddresses()); - Assert.assertNotNull(pollenUser.getDefaultEmailAddress()); - Assert.assertEquals("admin@chorem.org", pollenUser.getDefaultEmailAddress().getEmailAddress()); - Assert.assertEquals("admin", pollenUser.getName()); - Assert.assertTrue(pollenUser.isAdministrator()); - } - - @Test - public void testUserDeserializationCallDB() { - SpgeedDummyService spgeedDummyService = new SpgeedDummyService(); - PollenUser[] pollenUser = spgeedDummyService.getallPollenUser(); - Assert.assertNotNull(pollenUser); - } - - @Test - public void testPoll() { - SpgeedDummyService spgeedDummyService = new SpgeedDummyService(); - Poll[] polls = spgeedDummyService.getallPoll(); - PollenUser[] user = spgeedDummyService.getallPollenUser(); - - System.out.println(spgeedDummyService.getPollenUsercount()); - Assert.assertNotNull(polls); - } - - public List<Poll> getTopiaPolls() { - List<Poll> topiaPoll = null; - - try (PollenTopiaApplicationContext topiaApplicationContext = application.getTopiaApplicationContext()) { - try (PollenTopiaPersistenceContext topiaPersistenceContext = topiaApplicationContext.newPersistenceContext()) { - for (int i = 0; i < 1; i++) { - PollTopiaDao pollDao = topiaPersistenceContext.getPollDao(); - topiaPoll = pollDao.findAll(); - for (int j = 0; j < topiaPoll.size(); j++) { - Assert.assertNotNull(topiaPoll.get(j)); - Assert.assertNotNull(topiaPoll.get(j).getCreator()); - Assert.assertNotNull(topiaPoll.get(j).getCreator().getPollenUser()); - Assert.assertNotNull(topiaPoll.get(j).getCreator().getPollenUser().getDefaultEmailAddress()); - Assert.assertNotNull(topiaPoll.get(j).getCreator().getPollenUser().getDefaultEmailAddress().getEmailAddress()); - topiaPoll.get(j).getTitle(); - topiaPoll.get(j).getEndDate(); - topiaPoll.get(j).getVoteVisibility(); - topiaPoll.get(j).getCommentVisibility(); - topiaPoll.get(j).getResultVisibility(); - topiaPoll.get(j).getBeginDate(); - topiaPoll.get(j).getPollType(); - topiaPoll.get(j).getNotifyMeHoursBeforePollEnds(); - topiaPoll.get(j).getFeedContent(); - topiaPoll.get(j).getNotificationLocale(); - topiaPoll.get(j).getDescription(); - topiaPoll.get(j).getEmailAddressSuffixes(); - topiaPoll.get(j).getGtuValidationDate(); - topiaPoll.get(j).getClass(); - topiaPoll.get(j).getTopiaVersion(); - topiaPoll.get(j).getTopiaId(); - topiaPoll.get(j).getTopiaCreateDate(); - } - } - } - } - return topiaPoll; - } - - public Poll[] getSpgeedPolls() { - SpgeedDummyService spgeedDummyService = new SpgeedDummyService(); - Poll[] spgeedPollArray = null; - - for (int i = 0; i < 1; i++) { - spgeedPollArray = spgeedDummyService.getallPoll(); - } - return spgeedPollArray; - } - - - @Test - public void testPollLink() { - SpgeedDummyService spgeedDummyService = new SpgeedDummyService(); - Poll[] PollArray = spgeedDummyService.getallPoll(); - /* Testing foreign key value */ - Assert.assertNotNull(PollArray); - Assert.assertNotNull(PollArray[0]); - Assert.assertNotNull(PollArray[0].getCreator().getPollenUser()); - Assert.assertNotNull(PollArray[0].getCreator().getPollenUser().getEmailAddresses()); - Assert.assertNotNull(PollArray[0].getCreator().getPollenUser().getDefaultEmailAddress()); - - /* Testing Poll filling */ - Assert.assertNotNull(PollArray[0].getTitle()); - Assert.assertNotNull(PollArray[0].getEndDate()); - Assert.assertNotNull(PollArray[0].getVoteVisibility()); - Assert.assertNotNull(PollArray[0].getCommentVisibility()); - Assert.assertNotNull(PollArray[0].getResultVisibility()); - Assert.assertNotNull(PollArray[0].getBeginDate()); - Assert.assertNotNull(PollArray[0].getNotifyMeHoursBeforePollEnds()); - Assert.assertNotNull(PollArray[0].getFeedContent()); - Assert.assertNotNull(PollArray[0].getNotificationLocale()); - Assert.assertNotNull(PollArray[0].getEmailAddressSuffixes()); - Assert.assertNotNull(PollArray[0].getGtuValidationDate()); - Assert.assertNotNull(PollArray[0].getTopiaId()); - Assert.assertNotNull(PollArray[0].getClass()); - Assert.assertNotNull(PollArray[0].getTopiaVersion()); - Assert.assertNotNull(PollArray[0].getTopiaCreateDate()); - Assert.assertNotNull(PollArray[0].getDescription()); - Assert.assertNotNull(PollArray[0].getCreator()); - } - @Test - public void testPerformance() { - Poll[] spgeedPollArray; - List<Poll> topiaPoll; - long beforSpgeed = System.currentTimeMillis(); - - spgeedPollArray = getSpgeedPolls(); - - long afterSpgeed = System.currentTimeMillis(); - - topiaPoll = getTopiaPolls(); - - long topiaExecutionTime = System.currentTimeMillis() - afterSpgeed; - Assert.assertNotNull(spgeedPollArray); - Assert.assertNotNull(topiaPoll); - Assert.assertEquals(topiaPoll.size(), spgeedPollArray.length); - long spgeedExecutionTime = afterSpgeed - beforSpgeed; - System.out.println(topiaExecutionTime + " "+spgeedExecutionTime); - Assert.assertTrue(topiaExecutionTime > spgeedExecutionTime); - } -} \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.