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

June 25, 2012

Author: tchemit Date: 2012-06-25 19:41:19 +0200 (Mon, 25 Jun 2012) New Revision: 3550 Url: http://chorem.org/repositories/revision/pollen/3550 Log: refs #590: implements number strategy Added: trunk/pollen-votecounting-strategy-number/ trunk/pollen-votecounting-strategy-number/LICENSE.txt trunk/pollen-votecounting-strategy-number/README.txt trunk/pollen-votecounting-strategy-number/changelog.txt trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-number/src/ trunk/pollen-votecounting-strategy-number/src/main/ trunk/pollen-votecounting-strategy-number/src/main/java/ trunk/pollen-votecounting-strategy-number/src/main/java/org/ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java trunk/pollen-votecounting-strategy-number/src/main/resources/ trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/ trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/ trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/ trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_en_GB.properties trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_fr_FR.properties trunk/pollen-votecounting-strategy-number/src/site/ trunk/pollen-votecounting-strategy-number/src/site/site_en.xml trunk/pollen-votecounting-strategy-number/src/site/site_fr.xml trunk/pollen-votecounting-strategy-number/src/test/ trunk/pollen-votecounting-strategy-number/src/test/java/ trunk/pollen-votecounting-strategy-number/src/test/java/org/ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-number/src/test/resources/ trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties Property changes on: trunk/pollen-votecounting-strategy-number ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .idea .classpath .project .settings Added: trunk/pollen-votecounting-strategy-number/LICENSE.txt =================================================================== --- trunk/pollen-votecounting-strategy-number/LICENSE.txt (rev 0) +++ trunk/pollen-votecounting-strategy-number/LICENSE.txt 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 Affero 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/pollen-votecounting-strategy-number/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-number/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-number/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml (rev 0) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.5-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-votecounting-strategy-number</artifactId> + + <name>Pollen :: VoteCounting strategy :: Number</name> + <description>Implements the number vote counting strategy</description> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + + </profiles> + +</project> Property changes on: trunk/pollen-votecounting-strategy-number/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,145 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Number + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Number strategy. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class NumberStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 3; + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.number"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.number.help"); + } + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); + + for (Voter voter : voters) { + // add this voter votes to result + addVoterChoices(voter, resultByChoice); + } + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(null, resultByChoice); + return result; + } + + @Override + public String getDisplayVoteValue(Integer voteValue) { + return voteValue == null ? "" : String.valueOf(voteValue); + } + + @Override + public boolean isChoiceInVote(Integer voteValue) { + return voteValue != null && voteValue >= 0; + } + + @Override + public boolean isVoteValueNull(Integer voteValue) { + return voteValue == null || voteValue == 0; + } + + @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.TEXTFIELD; + } + + @Override + public boolean isDisplayResultsByChoice() { + return true; + } + + @Override + public boolean isVoteValueValid(Integer voteValue) { + // no validation on not null vote value + return true; + } + + @Override + public boolean isTotalVoteValueValid(int totalValues) { + // no validation on total value + return true; + } + + @Override + public String getTotalVoteValueNotValidMessage() { + // no validation on total values, so no message + return null; + } + + @Override + public String getVoteValueNotValidMessage() { + // no validation on not null vote value, so no message + return null; + } + + public void addVoterChoices(Voter voter, + Map<String, ChoiceScore> resultByChoice) { + + double voterWeight = voter.getWeight(); + + for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { + Double voteValue = voteForChoice.getVoteValue(); + if (voteValue != null) { + + // get score for choice + String choiceId = voteForChoice.getChoiceId(); + ChoiceScore choiceScore = resultByChoice.get(choiceId); + + // compute score to add + double scoreToAdd = voteValue * voterWeight; + + // add to score this weighted vote + choiceScore.addScoreValue(scoreToAdd); + } + } + } +} Property changes on: trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.NumberStrategy Property changes on: trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_en_GB.properties =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_en_GB.properties (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_en_GB.properties 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,2 @@ +pollen.voteCountingType.number=Number +pollen.voteCountingType.number.help=The answer is free, leave blank or enter a integer. Property changes on: trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_fr_FR.properties (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_fr_FR.properties 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,2 @@ +pollen.voteCountingType.number=Nombre +pollen.voteCountingType.number.help=La réponse est libre, laissez vide ou entrez un nombre entier Property changes on: trunk/pollen-votecounting-strategy-number/src/main/resources/i18n/pollen-votecounting-strategy-number_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/src/site/site_en.xml (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/site/site_en.xml 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> + Property changes on: trunk/pollen-votecounting-strategy-number/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/src/site/site_fr.xml (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/site/site_fr.xml 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-votecounting-strategy-number/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,278 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Number + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link NumberStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class NumberStrategyTest { + + public static final String CHOICE_A = "a"; + + public static final String CHOICE_B = "b"; + + public static final String CHOICE_C = "c"; + + protected static VoteCountingStrategyProvider provider; + + protected VoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Before + public void setUp() throws Exception { + strategy = provider.getStrategy(NumberStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=2 c=null) + // 2 (a=2 b=null c=3) + // 3 (a=7 b=12 c=20) + // Result (a=10 b=14 c=23) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 2.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 3.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 7.). + addVoteForChoice(CHOICE_B, 12.). + addVoteForChoice(CHOICE_C, 20.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(23.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(14.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(10.)); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=null c=null) + // 2 (a=1 b=1 c=null) + // 3 (a=1 b=1 c=null) + // Result (a=3 b=2 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(2.)); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=1 c=null) + // 2 (a=1 b=1 c=null) + // 3 (a=1 b=1 c=null) + // Result (a=3 b=3 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(3.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void weightedVotecount1() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x1) (a=null b=1 c=1) + // Result (a=2 b=2 c=1) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(2.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x3) (a=null b=1 c=1) + // Result (a=2 b=4 c=3) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 3.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(4.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(2.)); + } + + public static void assertChoiceScore(ChoiceScore choiceScore, + String choiceId, + BigDecimal choiceResult) { + Assert.assertNotNull(choiceScore); + Assert.assertEquals(choiceId, choiceScore.getChoiceId()); + Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); + } + + public static void assertChoiceScoreEquals(BigDecimal choiceResult, + Set<ChoiceScore> choiceScores, + String... choiceIds) { + + Assert.assertNotNull(choiceScores); + Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( + choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); + for (String choiceId : choiceIds) { + + ChoiceScore choiceScore = choicesById.get(choiceId); + Assert.assertNotNull(choiceScore); + assertChoiceScore(choiceScore, choiceId, choiceResult); + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Number + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test + public void getStrategy() throws Exception { + + Assert.assertNotNull(provider.getStrategy(NumberStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-06-25 17:41:19 UTC (rev 3550) @@ -0,0 +1,30 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Number +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# 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% +### +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Property changes on: trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

June 25, 2012

Author: tchemit Date: 2012-06-25 19:41:00 +0200 (Mon, 25 Jun 2012) New Revision: 3549 Url: http://chorem.org/repositories/revision/pollen/3549 Log: refs #590: implements normal strategy Added: trunk/pollen-votecounting-strategy-normal/ trunk/pollen-votecounting-strategy-normal/LICENSE.txt trunk/pollen-votecounting-strategy-normal/README.txt trunk/pollen-votecounting-strategy-normal/changelog.txt trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-normal/src/ trunk/pollen-votecounting-strategy-normal/src/main/ trunk/pollen-votecounting-strategy-normal/src/main/java/ trunk/pollen-votecounting-strategy-normal/src/main/java/org/ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java trunk/pollen-votecounting-strategy-normal/src/main/resources/ trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/ trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/ trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/ trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_en_GB.properties trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_fr_FR.properties trunk/pollen-votecounting-strategy-normal/src/site/ trunk/pollen-votecounting-strategy-normal/src/site/site_en.xml trunk/pollen-votecounting-strategy-normal/src/site/site_fr.xml trunk/pollen-votecounting-strategy-normal/src/test/ trunk/pollen-votecounting-strategy-normal/src/test/java/ trunk/pollen-votecounting-strategy-normal/src/test/java/org/ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-normal/src/test/resources/ trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties Property changes on: trunk/pollen-votecounting-strategy-normal ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .idea .classpath .project .settings Added: trunk/pollen-votecounting-strategy-normal/LICENSE.txt =================================================================== --- trunk/pollen-votecounting-strategy-normal/LICENSE.txt (rev 0) +++ trunk/pollen-votecounting-strategy-normal/LICENSE.txt 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 Affero 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/pollen-votecounting-strategy-normal/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-normal/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-normal/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml (rev 0) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.5-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-votecounting-strategy-normal</artifactId> + + <name>Pollen :: VoteCounting strategy :: Normal</name> + <description>Implements the normal vote counting strategy</description> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + + </profiles> + +</project> Property changes on: trunk/pollen-votecounting-strategy-normal/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,146 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Normal + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Condorcet. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class NormalStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 0; + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.normal"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.normal.help"); + } + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); + + for (Voter voter : voters) { + // add this voter votes to result + addVoterChoices(voter, resultByChoice); + } + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(null, resultByChoice); + return result; + } + + @Override + public String getDisplayVoteValue(Integer voteValue) { + return voteValue != null ? "OK" : ""; + } + + @Override + public boolean isChoiceInVote(Integer voteValue) { + return voteValue != null && voteValue > 0; + } + + @Override + public boolean isVoteValueNull(Integer voteValue) { + return voteValue == null || voteValue == 0; + } + + @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.CHECKBOX; + } + + @Override + public boolean isDisplayResultsByChoice() { + return false; + } + + @Override + public boolean isVoteValueValid(Integer voteValue) { + // no validation on not null vote value + return true; + } + + @Override + public boolean isTotalVoteValueValid(int totalValues) { + // no validation on total value + return true; + } + + @Override + public String getVoteValueNotValidMessage() { + // no validation on not null vote value, so no message + return null; + } + + @Override + public String getTotalVoteValueNotValidMessage() { + // no validation on total values, so no message + return null; + } + + public void addVoterChoices(Voter voter, + Map<String, ChoiceScore> resultByChoice) { + + double voterWeight = voter.getWeight(); + + for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { + Double voteValue = voteForChoice.getVoteValue(); + if (voteValue != null) { + + // get score for choice + String choiceId = voteForChoice.getChoiceId(); + ChoiceScore choiceScore = resultByChoice.get(choiceId); + + // compute score to add + double scoreToAdd = voteValue * voterWeight; + + // add to score this weighted vote + choiceScore.addScoreValue(scoreToAdd); + } + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.NormalStrategy Property changes on: trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_en_GB.properties =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_en_GB.properties (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_en_GB.properties 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,2 @@ +pollen.voteCountingType.normal=Normal +pollen.voteCountingType.normal.help=Vote for your favorite choice. Property changes on: trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_fr_FR.properties (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_fr_FR.properties 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,2 @@ +pollen.voteCountingType.normal=Normal +pollen.voteCountingType.normal.help=Voter pour le ou les choix préférés. Property changes on: trunk/pollen-votecounting-strategy-normal/src/main/resources/i18n/pollen-votecounting-strategy-normal_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/site/site_en.xml (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/site/site_en.xml 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> + Property changes on: trunk/pollen-votecounting-strategy-normal/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/site/site_fr.xml (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/site/site_fr.xml 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-votecounting-strategy-normal/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,281 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Normal + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link NormalStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class NormalStrategyTest { + + public static final String CHOICE_A = "a"; + + public static final String CHOICE_B = "b"; + + public static final String CHOICE_C = "c"; + + protected static VoteCountingStrategyProvider provider; + + protected VoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Before + public void setUp() throws Exception { + strategy = provider.getStrategy(NormalStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=null c=null) + // 2 (a=null b=1 c=null) + // 3 (a=null b=1 c=1) + // Result (a=1 b=2 c=1) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(2.)); + + assertChoiceScoreEquals(BigDecimal.valueOf(1.), + Sets.newHashSet(scores.get(1), + scores.get(2)), + CHOICE_A, CHOICE_C); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=null c=null) + // 2 (a=1 b=1 c=null) + // 3 (a=1 b=1 c=null) + // Result (a=3 b=2 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(2.)); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=1 c=null) + // 2 (a=1 b=1 c=null) + // 3 (a=1 b=1 c=null) + // Result (a=3 b=3 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(3.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void weightedVotecount1() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x1) (a=null b=1 c=1) + // Result (a=2 b=2 c=1) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(2.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x3) (a=null b=1 c=1) + // Result (a=2 b=4 c=3) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 3.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(4.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(2.)); + } + + public static void assertChoiceScore(ChoiceScore choiceScore, + String choiceId, + BigDecimal choiceResult) { + Assert.assertNotNull(choiceScore); + Assert.assertEquals(choiceId, choiceScore.getChoiceId()); + Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); + } + + public static void assertChoiceScoreEquals(BigDecimal choiceResult, + Set<ChoiceScore> choiceScores, + String... choiceIds) { + + Assert.assertNotNull(choiceScores); + Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( + choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); + for (String choiceId : choiceIds) { + + ChoiceScore choiceScore = choicesById.get(choiceId); + Assert.assertNotNull(choiceScore); + assertChoiceScore(choiceScore, choiceId, choiceResult); + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Normal + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test + public void getStrategy() throws Exception { + + Assert.assertNotNull(provider.getStrategy(NormalStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-06-25 17:41:00 UTC (rev 3549) @@ -0,0 +1,30 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Normal +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# 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% +### +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Property changes on: trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

June 25, 2012

Author: tchemit Date: 2012-06-25 19:39:58 +0200 (Mon, 25 Jun 2012) New Revision: 3548 Url: http://chorem.org/repositories/revision/pollen/3548 Log: refs #590: creates a simple vote counting strategy api Added: trunk/pollen-votecounting-api/ trunk/pollen-votecounting-api/LICENSE.txt trunk/pollen-votecounting-api/README.txt trunk/pollen-votecounting-api/changelog.txt trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-api/src/ trunk/pollen-votecounting-api/src/main/ trunk/pollen-votecounting-api/src/main/java/ trunk/pollen-votecounting-api/src/main/java/org/ trunk/pollen-votecounting-api/src/main/java/org/chorem/ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java trunk/pollen-votecounting-api/src/main/resources/ trunk/pollen-votecounting-api/src/main/resources/i18n/ trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_en_GB.properties trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_fr_FR.properties trunk/pollen-votecounting-api/src/src/ trunk/pollen-votecounting-api/src/src/site/ trunk/pollen-votecounting-api/src/src/site/site_en.xml trunk/pollen-votecounting-api/src/src/site/site_fr.xml trunk/pollen-votecounting-api/src/test/ trunk/pollen-votecounting-api/src/test/java/ trunk/pollen-votecounting-api/src/test/java/org/ trunk/pollen-votecounting-api/src/test/java/org/chorem/ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/model/ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/model/ChoiceScoreTest.java trunk/pollen-votecounting-api/src/test/resources/ trunk/pollen-votecounting-api/src/test/resources/log4j.properties Property changes on: trunk/pollen-votecounting-api ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .idea Added: trunk/pollen-votecounting-api/LICENSE.txt =================================================================== --- trunk/pollen-votecounting-api/LICENSE.txt (rev 0) +++ trunk/pollen-votecounting-api/LICENSE.txt 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 Affero 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/pollen-votecounting-api/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-api/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-api/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml (rev 0) +++ trunk/pollen-votecounting-api/pom.xml 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.5-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-votecounting-api</artifactId> + + <name>Pollen :: VoteCounting Api</name> + <description>Define Api to votecount</description> + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + + </profiles> + +</project> Property changes on: trunk/pollen-votecounting-api/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,98 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Base abstract implementation of a {@link VoteCountingStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public abstract class AbstractVoteCountingStrategy implements VoteCountingStrategy { + + @Override + public String getStrategyName(Locale locale) { + String result = l_(locale, getI18nName()); + return result; + } + + @Override + public String getStrategyHelp(Locale locale) { + String voteName = l_(locale, getI18nName()); + String voteHelp = l_(locale, getI18nHelp()); + String result = l_(locale, "pollen.voteCountingType.help", voteName, voteHelp); + return result; + } + + public Map<String, ChoiceScore> votersToResult(Set<Voter> voters) { + // get all choice Id + Set<String> choiceIds = getAllChoiceIds(voters); + + Map<String, ChoiceScore> resultByChoice = Maps.newTreeMap(); + + // creates all empty result for choice + for (String choiceId : choiceIds) { + ChoiceScore choiceScore = ChoiceScore.newScore(choiceId, null); + resultByChoice.put(choiceId, choiceScore); + } + return resultByChoice; + } + + public VoteCountingResult resultToList(Voter voter, + Map<String, ChoiceScore> resultByChoice) { + List<ChoiceScore> score = Lists.newArrayList(resultByChoice.values()); + Collections.sort(score); + Collections.reverse(score); + return VoteCountingResult.newResult(voter, score); + } + + public Set<String> getAllChoiceIds(Set<Voter> voters) { + ChoiceIdAble.ChoiceIdAbleById function = new ChoiceIdAble.ChoiceIdAbleById(); + Set<String> result = Sets.newHashSet(); + for (Voter voter : voters) { + Iterable<String> transform = Iterables.transform( + voter.getVoteForChoices(), function); + Iterables.addAll(result, transform); + + } + return result; + } + +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,42 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +/** + * To define how to render a vote. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public enum ChoiceToVoteRenderType { + + /** + * To render as a check box. + * <p/> + * If check box is checked, then result should be value 1, otherwise + * result will be null. + */ + CHECKBOX, + /** To render as a text field. */ + TEXTFIELD +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,41 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +/** + * Exception when a vote counting could not be found. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountigStrategyNotFound extends RuntimeException { + private static final long serialVersionUID = 1L; + + public VoteCountigStrategyNotFound(String message) { + super(message); + } + + public VoteCountigStrategyNotFound(String message, Throwable cause) { + super(message, cause); + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,71 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import com.google.common.base.Preconditions; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Set; + +/** + * Service to vote count. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingService { + + /** + * Provider of {@link VoteCountingStrategy}. + * <p/> + * <strong>Note:</strong> this provider should be injected via method + * {@link #setProvider(VoteCountingStrategyProvider)}. + */ + private VoteCountingStrategyProvider provider; + + public void setProvider(VoteCountingStrategyProvider provider) { + this.provider = provider; + } + + /** + * Execute a vote counting for a given strategy (by his id) and the + * given {@code voters}. + * + * @param strategyId the id of the vote counting strategy to use + * @param voter the votes to vote count + * @return vote counting result + */ + public VoteCountingResult voteCount(int strategyId, Set<Voter> voter) { + + Preconditions.checkNotNull(provider); + Preconditions.checkNotNull(voter); + + VoteCountingStrategy strategy = provider.getStrategy(strategyId); + Preconditions.checkNotNull(strategy); + + VoteCountingResult result = strategy.votecount(voter); + return result; + } + +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,91 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Locale; +import java.util.Set; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Contract of a vote counting method. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public interface VoteCountingStrategy { + + /** + * Obtains the unique id of this strategy. + * + * @return the unique id of this strategy. + */ + int getId(); + + /** + * Obtains the i18n name of this strategy. + * + * @return the i18n name of this strategy. + */ + String getI18nName(); + + /** + * Obtains the i18n help of this strategy. + * + * @return the i18n help of this strategy. + */ + String getI18nHelp(); + + /** + * Vote count for the given {@code voter} and return the result of it. + * + * @param voter the voter and their votes. + * @return the result of the vote counting for the given voter. + */ + VoteCountingResult votecount(Set<Voter> voter); + + String getDisplayVoteValue(Integer voteValue); + + boolean isChoiceInVote(Integer voteValue); + + String getStrategyName(Locale locale); + + String getStrategyHelp(Locale locale); + + boolean isVoteValueValid(Integer voteValue); + + String getVoteValueNotValidMessage(); + + boolean isTotalVoteValueValid(int totalValues); + + String getTotalVoteValueNotValidMessage(); + + boolean isVoteValueNull(Integer value); + + ChoiceToVoteRenderType getRenderType(); + + boolean isDisplayResultsByChoice(); +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,101 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Map; +import java.util.ServiceLoader; +import java.util.Set; + +/** + * Provider of {@link VoteCountingStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProvider { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(VoteCountingStrategyProvider.class); + + /** + * List of available strageries detected via the {@link ServiceLoader} + * mecanism no contract {@link VoteCountingStrategy}. + */ + private final Map<Integer, VoteCountingStrategy> strategies; + + public VoteCountingStrategyProvider() { + strategies = load(); + } + + public Set<Integer> getStrategyIds() { + return ImmutableSet.copyOf(strategies.keySet()); + } + + public VoteCountingStrategy getStrategy(int strategyId) throws VoteCountigStrategyNotFound { + VoteCountingStrategy type = strategies.get(strategyId); + + if (type == null) { + throw new VoteCountigStrategyNotFound( + "Could not find strategy with id " + strategyId); + } + try { + //FIXME-tchemit-2012-06-24 : should we reinstanciate each time ? + return type.getClass().newInstance(); + } catch (Exception e) { + + throw new VoteCountigStrategyNotFound( + "Could not instanciate stragegy " + strategyId, e); + } + } + + protected Map<Integer, VoteCountingStrategy> load() { + Map<Integer, VoteCountingStrategy> result = Maps.newTreeMap(); + ServiceLoader<VoteCountingStrategy> loader = + ServiceLoader.load(VoteCountingStrategy.class); + + for (VoteCountingStrategy strategy : loader) { + int id = strategy.getId(); + if (result.containsKey(id)) { + throw new IllegalStateException( + "Strategy [" + + strategy.getI18nName() + "] with id " + id + + ", can not be used since the id is already used " + + "by strategy [" + result.get(id).getI18nName() + "] "); + } + if (log.isInfoEnabled()) { + log.info("Detected strategy [" + id + "-" + + strategy.getI18nName() + "] : " + + strategy.getClass().getName()); + } + result.put(id, strategy); + } + return result; + } + +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,44 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting.model; + +import com.google.common.base.Function; + +/** + * To mark any object with identify a choice via the {@link #getChoiceId()} + * method. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public interface ChoiceIdAble { + + String getChoiceId(); + + class ChoiceIdAbleById implements Function<ChoiceIdAble, String> { + @Override + public String apply(ChoiceIdAble input) { + return input.getChoiceId(); + } + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,88 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting.model; + +import java.math.BigDecimal; + +/** + * ChoiceScore for a given choice. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class ChoiceScore implements ChoiceIdAble, Comparable<ChoiceScore> { + + /** Id of the choice. */ + private String choiceId; + + /** Score for this choice. */ + private BigDecimal scoreValue; + + public static ChoiceScore newScore(String choiceId, BigDecimal scoreValue) { + ChoiceScore choiceScore = new ChoiceScore(); + choiceScore.setChoiceId(choiceId); + choiceScore.setScoreValue(scoreValue); + return choiceScore; + } + + @Override + public String getChoiceId() { + return choiceId; + } + + public BigDecimal getScoreValue() { + return scoreValue; + } + + public void setChoiceId(String choiceId) { + this.choiceId = choiceId; + } + + public void addScoreValue(double scoreToAdd) { + if (scoreValue == null) { + + setScoreValue(BigDecimal.valueOf(scoreToAdd)); + } else { + setScoreValue(scoreValue.add(BigDecimal.valueOf(scoreToAdd))); + } + + } + + public void setScoreValue(BigDecimal scoreValue) { + this.scoreValue = scoreValue; + } + + @Override + public int compareTo(ChoiceScore o) { + BigDecimal v1 = scoreValue; + BigDecimal v2 = o.scoreValue; + if (v1 == null) { + v1 = new BigDecimal(-1); + } + if (v2 == null) { + v2 = new BigDecimal(-1); + } + int i = v1.subtract(v2).intValue(); + return i; + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,73 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting.model; + +import java.util.List; + +/** + * Contains results for a vote. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingResult { + + /** + * Group of voters which obtains this result. + * <p/> + * <strong>Note:</strong> If this is the result of a poll (says a normal + * votecouting), this value is null, only used for a grouped votecouting. + */ + private Voter voter; + + /** + * Results for each choice. + * <p/> + * <strong>Note:</strong> + */ + private List<ChoiceScore> scores; + + public static VoteCountingResult newResult(Voter voter, + List<ChoiceScore> scores) { + VoteCountingResult result = new VoteCountingResult(); + result.setVoter(voter); + result.setScores(scores); + return result; + } + + public Voter getVoter() { + return voter; + } + + public void setVoter(Voter voter) { + this.voter = voter; + } + + public List<ChoiceScore> getScores() { + return scores; + } + + public void setScores(List<ChoiceScore> scores) { + this.scores = scores; + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,62 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting.model; + +/** + * A vote for a choice. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteForChoice implements ChoiceIdAble { + + /** Id of the choice. */ + private String choiceId; + + /** Value of the vote for this choice. */ + private Double voteValue; + + public static VoteForChoice newVote(String choiceId, Double voteValue) { + VoteForChoice vote = new VoteForChoice(); + vote.setChoiceId(choiceId); + vote.setVoteValue(voteValue); + return vote; + } + + @Override + public String getChoiceId() { + return choiceId; + } + + public void setChoiceId(String choiceId) { + this.choiceId = choiceId; + } + + public Double getVoteValue() { + return voteValue; + } + + public void setVoteValue(Double voteValue) { + this.voteValue = voteValue; + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,90 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting.model; + +import java.util.Set; + +/** + * A voter (says a physical person which votes on a poll). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class Voter { + + /** Id of the voter (or the group of voters). */ + private String voterId; + + /** Weight of the voter (or group of voters). */ + private double weight; + + /** All votes for this voter (or group of voter). */ + private Set<VoteForChoice> voteForChoices; + + /** Set of voters (only when the voter is a group of voters). */ + private Set<Voter> voters; + + public static Voter newVoter(String voterId, + double weight, + Set<VoteForChoice> voteForChoices, + Set<Voter> voters) { + Voter result = new Voter(); + result.setVoterId(voterId); + result.setWeight(weight); + result.setVoteForChoices(voteForChoices); + result.setVoters(voters); + return result; + } + + public String getVoterId() { + return voterId; + } + + public double getWeight() { + return weight; + } + + public Set<VoteForChoice> getVoteForChoices() { + return voteForChoices; + } + + public Set<Voter> getVoters() { + return voters; + } + + public void setVoterId(String voterId) { + this.voterId = voterId; + } + + public void setWeight(double weight) { + this.weight = weight; + } + + public void setVoteForChoices(Set<VoteForChoice> voteForChoices) { + this.voteForChoices = voteForChoices; + } + + public void setVoters(Set<Voter> voters) { + this.voters = voters; + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,68 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting.model; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; + +import java.util.Set; + +/** + * To build some {@link Voter}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoterBuilder { + + private Set<Voter> voters = Sets.newHashSet(); + + private Voter voter; + + public VoterBuilder newVoter(String voterId, double weight) { + flushVoter(); + voter = Voter.newVoter(voterId, weight, + Sets.<VoteForChoice>newHashSet(), null); + return this; + } + + public VoterBuilder addVoteForChoice(String choiceId, Double voteValue) { + Preconditions.checkState(voter != null); + VoteForChoice voteForChoice = VoteForChoice.newVote(choiceId, + voteValue); + voter.getVoteForChoices().add(voteForChoice); + return this; + } + + public Set<Voter> getVoters() { + flushVoter(); + return voters; + } + + protected void flushVoter() { + if (voter != null) { + voters.add(voter); + voter = null; + } + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_en_GB.properties =================================================================== --- trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_en_GB.properties (rev 0) +++ trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_en_GB.properties 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1 @@ +pollen.voteCountingType.help=%s Vote\: %s Property changes on: trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_fr_FR.properties (rev 0) +++ trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_fr_FR.properties 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1 @@ +pollen.voteCountingType.help=Vote %s \: %s Property changes on: trunk/pollen-votecounting-api/src/main/resources/i18n/pollen-votecounting-api_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting-api/src/src/site/site_en.xml (rev 0) +++ trunk/pollen-votecounting-api/src/src/site/site_en.xml 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> + Property changes on: trunk/pollen-votecounting-api/src/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting-api/src/src/site/site_fr.xml (rev 0) +++ trunk/pollen-votecounting-api/src/src/site/site_fr.xml 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-votecounting-api/src/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,50 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test(expected = VoteCountigStrategyNotFound.class) + public void getStrategy() throws Exception { + + Assert.assertNull(provider.getStrategy(-1)); + } +} Property changes on: trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/model/ChoiceScoreTest.java =================================================================== --- trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/model/ChoiceScoreTest.java (rev 0) +++ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/model/ChoiceScoreTest.java 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,81 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.votecounting.model; + +import org.junit.Assert; +import org.junit.Test; + +import java.math.BigDecimal; + +/** + * Tests the {@link ChoiceScore}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class ChoiceScoreTest { + + @Test + public void compareTo() throws Exception { + + ChoiceScore c1; + ChoiceScore c2; + + // c1 == c2 + c1 = ChoiceScore.newScore("c1", null); + c2 = ChoiceScore.newScore("c2", null); + Assert.assertTrue(c1.compareTo(c2) == 0); + + // c1 < c2 + c1 = ChoiceScore.newScore("c1", null); + c2 = ChoiceScore.newScore("c2", BigDecimal.ZERO); + Assert.assertTrue(c1.compareTo(c2) < 0); + + // c1 > c2 + c1 = ChoiceScore.newScore("c1", BigDecimal.ZERO); + c2 = ChoiceScore.newScore("c2", null); + Assert.assertTrue(c1.compareTo(c2) > 0); + + // c1 == c2 + c1 = ChoiceScore.newScore("c1", BigDecimal.ZERO); + c2 = ChoiceScore.newScore("c2", BigDecimal.ZERO); + Assert.assertTrue(c1.compareTo(c2) == 0); + + + // c1 > c2 + c1 = ChoiceScore.newScore("c1", BigDecimal.ONE); + c2 = ChoiceScore.newScore("c2", BigDecimal.ZERO); + Assert.assertTrue(c1.compareTo(c2) > 0); + + // c1 == c2 + c1 = ChoiceScore.newScore("c1", BigDecimal.ONE); + c2 = ChoiceScore.newScore("c2", BigDecimal.ONE); + Assert.assertTrue(c1.compareTo(c2) == 0); + + // c1 < c2 + c1 = ChoiceScore.newScore("c1", BigDecimal.ONE); + c2 = ChoiceScore.newScore("c2", BigDecimal.TEN); + Assert.assertTrue(c1.compareTo(c2) < 0); + + } +} Property changes on: trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/model/ChoiceScoreTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-api/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-api/src/test/resources/log4j.properties 2012-06-25 17:39:58 UTC (rev 3548) @@ -0,0 +1,30 @@ +### +# #%L +# Pollen :: VoteCounting Api +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# 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% +### +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Property changes on: trunk/pollen-votecounting-api/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3547 - trunk/pollen-persistence/src/test/resources
by tchemit＠users.chorem.org June 25, 2012

June 25, 2012

Author: tchemit Date: 2012-06-25 19:29:26 +0200 (Mon, 25 Jun 2012) New Revision: 3547 Url: http://chorem.org/repositories/revision/pollen/3547 Log: use better test configuration (just db config and nothing to do with aplication config) Added: trunk/pollen-persistence/src/test/resources/db.properties Removed: trunk/pollen-persistence/src/test/resources/pollen-fake.properties Added: trunk/pollen-persistence/src/test/resources/db.properties =================================================================== --- trunk/pollen-persistence/src/test/resources/db.properties (rev 0) +++ trunk/pollen-persistence/src/test/resources/db.properties 2012-06-25 17:29:26 UTC (rev 3547) @@ -0,0 +1,6 @@ +hibernate.show_sql=false +hibernate.hbm2ddl.auto=update +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver Deleted: trunk/pollen-persistence/src/test/resources/pollen-fake.properties =================================================================== --- trunk/pollen-persistence/src/test/resources/pollen-fake.properties 2012-06-25 17:28:57 UTC (rev 3546) +++ trunk/pollen-persistence/src/test/resources/pollen-fake.properties 2012-06-25 17:29:26 UTC (rev 3547) @@ -1,39 +0,0 @@ -### -# #%L -# Pollen :: Persistence -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# 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% -### -hibernate.show_sql=false -hibernate.hbm2ddl.auto=update -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver - -# Migration configuration -topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine -topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback -topia.service.migration.showSql=true - -siteUrl=http://meFake/pollen -upImgDir=${testDirectory}/.pollen/uploadedImages -feedDir=${testDirectory}/.pollen/feeds -tmpDir=${testDirectory}/.pollen/tmpDir -pollen.emails.directory=${testDirectory}/.pollen/emails

1 0

r3546 - trunk/pollen-persistence/src/main/java/org/chorem/pollen
by tchemit＠users.chorem.org June 25, 2012

June 25, 2012

Author: tchemit Date: 2012-06-25 19:28:57 +0200 (Mon, 25 Jun 2012) New Revision: 3546 Url: http://chorem.org/repositories/revision/pollen/3546 Log: remove empty package Removed: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/

1 0

r3545 - in trunk/pollen-persistence/src: main/java/org/chorem/pollen/business/persistence test/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org June 25, 2012

June 25, 2012

Author: tchemit Date: 2012-06-25 19:27:47 +0200 (Mon, 25 Jun 2012) New Revision: 3545 Url: http://chorem.org/repositories/revision/pollen/3545 Log: replace TopiaQuery and simple hql code (to add tests of DAO) Added: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java Removed: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -23,8 +23,8 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; +import org.chorem.pollen.PollenIOUtil; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.List; @@ -37,17 +37,25 @@ Preconditions.checkNotNull(pager); Preconditions.checkNotNull(pollId); - TopiaQuery countQuery = createQuery("e"). - addFrom(Poll.class, "p"). - addWhere("p." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). - addWhere("e in elements(p." + Poll.PROPERTY_COMMENT + ")"); - long records = countByQuery(countQuery); - pager.setRecords((int) records); + String countHql = "SELECT COUNT(e) FROM CommentImpl e, PollImpl p WHERE p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; + PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager, + "pollId", pollId); - TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, - pager); - List<E> result = findAllByQuery(query); + String hql = "SELECT e FROM CommentImpl e, PollImpl p WHERE p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; + List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, + "pollId", pollId); return result; +// TopiaQuery countQuery = createQuery("e"). +// addFrom(Poll.class, "p"). +// addWhere("p." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). +// addWhere("e in elements(p." + Poll.PROPERTY_COMMENT + ")"); +// long records = countByQuery(countQuery); +// pager.setRecords((int) records); +// +// TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, +// pager); +// List<E> result = findAllByQuery(query); +// return result; } @@ -55,13 +63,16 @@ Preconditions.checkNotNull(pollId); - TopiaQuery query = createQuery("e"). - addFrom(Poll.class, "p"). - addWhere("p." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). - addWhere("e in elements(p." + Poll.PROPERTY_COMMENT + ")"); - query.addOrderDesc(Comment.PROPERTY_POST_DATE); - List<E> result = findAllByQuery(query); + String hql = "SELECT e FROM CommentImpl e, PollImpl p WHERE p.pollId = :pollId AND e IN ELEMENTS(p.comment)"; + List<E> result = getContext().findAll(hql, "pollId", pollId); return result; +// TopiaQuery query = createQuery("e"). +// addFrom(Poll.class, "p"). +// addWhere("p." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId). +// addWhere("e in elements(p." + Poll.PROPERTY_COMMENT + ")"); +// query.addOrderDesc(Comment.PROPERTY_POST_DATE); +// List<E> result = findAllByQuery(query); +// return result; } Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -24,8 +24,8 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.PollenIOUtil; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.List; @@ -36,31 +36,42 @@ TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { Preconditions.checkNotNull(user); + Preconditions.checkNotNull(pager); - TopiaQuery countQuery = createQuery("e"); - countQuery.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); - long records = countByQuery(countQuery); + String countHql = "SELECT COUNT(*) FROM PersonListImpl WHERE owner = :owner"; + PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager, + "owner", user); - pager.setRecords((int) records); - - TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, pager); - - List<E> result = findAllByQuery(query); + String hql = "FROM PersonListImpl e WHERE e.owner = :owner"; + List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, + "owner", user); return result; +// TopiaQuery countQuery = createQuery("e"); +// countQuery.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); +// long records = countByQuery(countQuery); +// +// pager.setRecords((int) records); +// +// TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, pager); +// +// List<E> result = findAllByQuery(query); +// return result; } public List<E> getFavoriteLists(UserAccount user) throws TopiaException { Preconditions.checkNotNull(user); - - TopiaQuery query = createQuery("e"); - query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); - List<E> result = findAllByQuery(query); + String hql = "FROM PersonListImpl WHERE owner = :owner"; + List<E> result = getContext().findAll(hql, "owner", user); return result; - +// TopiaQuery query = createQuery("e"); +// query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); +// List<E> result = findAllByQuery(query); +// return result; } - public boolean isPersonListExist(UserAccount user, String name) throws TopiaException { + public boolean isPersonListExist(UserAccount user, + String name) throws TopiaException { Preconditions.checkNotNull(user); Preconditions.checkNotNull(name); @@ -68,16 +79,18 @@ // can't accept favorite list without name Preconditions.checkArgument(StringUtils.isNotEmpty(name)); - // check list does not already exists - TopiaQuery query = createQuery("e"); - - query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); - query.addWhere("e." + PersonList.PROPERTY_NAME, TopiaQuery.Op.EQ, name); - - boolean exist = existByQuery(query); - return exist; + String hql = "SELECT COUNT(*) FROM PersonListImpl WHERE owner = :owner AND name = :name"; + long count = (Long) getContext().findUnique(hql, "owner", user, "name", name); + return count > 0; +// TopiaQuery query = createQuery("e"); +// +// query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); +// query.addWhere("e." + PersonList.PROPERTY_NAME, TopiaQuery.Op.EQ, name); +// +// boolean exist = existByQuery(query); +// return exist; } } //PersonListDAOImpl<E extends PersonList> Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -22,35 +22,29 @@ */ package org.chorem.pollen.business.persistence; -import java.util.List; - /** * Created: 28/03/12 * * @author fdesbois <desbois(a)codelutin.com> - * $Id$ + * @author tchemit <cheit(a)codelutin.com> + * @since 1.3 */ public class PersonToListDAOImpl<E extends PersonToList> extends PersonToListDAOAbstract<E> { public PersonToList findByPollAndAccount(Poll poll, PollAccount account) { -// TopiaQuery query = createQuery("e") -// .addFrom(Poll.class, "p") -// .addFrom(VotingList.class, "v") -// .addEquals("p", poll) -// .addInElements("v", "p." + Poll.PROPERTY_VOTING_LIST) -// .addWhere("e." + PersonToList.PROPERTY_VOTING_LIST + " = v." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST) -// .addEquals("e." + PersonToList.PROPERTY_POLL_ACCOUNT, account); + PersonToList result = null; + if (!poll.isVotingListEmpty()) { + for (VotingList votingList : poll.getVotingList()) { + result = votingList.getPollAccountPersonToList(account); + if (result != null) { - PersonToList result; - List<VotingList> votingLists = poll.getVotingList(); - for (VotingList votingList : votingLists) { - result = votingList.getPollAccountPersonToList(account); - if (result != null) { - return result; + // personToList found + break; + } } } - return null; + return result; } - + } 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-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -34,17 +34,15 @@ public E getRestrictedPollAccount(String pollId, String accountId) throws TopiaException { -// List<PersonToList> tmp = transaction.find( -// "FROM " + PersonToList.class.getName() + -// " WHERE pollAccount.accountId = :accountUId" + -// " AND votingList.poll.pollId = :pollUId", -// "accountUId", accountId, -// "pollUId", pollId); + Preconditions.checkNotNull(pollId); + Preconditions.checkNotNull(accountId); 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). - addWhere("p." + PersonToList.PROPERTY_VOTING_LIST + "." + VotingList.PROPERTY_POLL + "." + Poll.PROPERTY_POLL_ID, TopiaQuery.Op.EQ, pollId); + addInElements("p", "poll." + Poll.PROPERTY_VOTING_LIST + "." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST); E result = findByQuery(query); return result; } @@ -55,7 +53,6 @@ Preconditions.checkNotNull(favoriteList); Preconditions.checkNotNull(pager); - int records = favoriteList.sizePollAccount(); pager.setRecords(records); @@ -89,13 +86,13 @@ boolean result = existByQuery(query); return result; } - + public PollAccount findByPollVoteUser(Poll poll, UserAccount user) throws TopiaException { - + Preconditions.checkNotNull(poll); Preconditions.checkNotNull(user); - + TopiaQuery query = createQuery("e") .addFrom(Poll.class, "p") .addFrom(Vote.class, "v") Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -26,109 +26,135 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.lang3.tuple.Pair; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenFunctions; -import org.chorem.pollen.entities.PollenDAOHelper; +import org.chorem.pollen.PollenIOUtil; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import java.util.Date; import java.util.List; import java.util.Map; public class PollDAOImpl<E extends Poll> extends PollDAOAbstract<E> { - /** Logger. */ - private static final Log log = LogFactory.getLog(PollDAOImpl.class); + public List<E> getPolls( + TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { - public List<E> getPolls(TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { - Preconditions.checkNotNull(pager); - long records = count(); - pager.setRecords((int) records); - - TopiaQuery query = createQuery("e"); - TopiaFilterPagerUtil.addPagerToQuery(query, pager); - - List<E> result = findAllByQuery(query); + String countHql = "SELECT COUNT(*) FROM PollImpl"; + PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager); + String hql = "FROM PollImpl"; + List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager); return result; +// long records = count(); +// pager.setRecords((int) records); +// +// TopiaQuery query = createQuery("e"); +// TopiaFilterPagerUtil.addPagerToQuery(query, pager); +// +// List<E> result = findAllByQuery(query); +// return result; } - public List<E> getCreatedPolls(TopiaFilterPagerUtil.FilterPagerBean pager, UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(user); - TopiaQuery countQuery = createQuery("e"); - countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); - long records = countByQuery(countQuery); - pager.setRecords((int) records); + String countHql = "SELECT COUNT(*) FROM PollImpl " + + "WHERE creator.userAccount = :user"; + PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager, + "user", user); + String hql = "FROM PollImpl WHERE creator.userAccount = :user"; + List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager, + "user", user); + return result; - TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, pager); - - List<E> result = findAllByQuery(query); - return result; +// TopiaQuery countQuery = createQuery("e"); +// countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + +// PollAccount.PROPERTY_USER_ACCOUNT, +// TopiaQuery.Op.EQ, user); +// long records = countByQuery(countQuery); +// pager.setRecords((int) records); +// +// TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, pager); +// +// List<E> result = findAllByQuery(query); +// return result; } public List<Pair<Poll, PollAccount>> getInvitedPolls( TopiaFilterPagerUtil.FilterPagerBean pager, - UserAccount userToUse) throws TopiaException { + UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); - Preconditions.checkNotNull(userToUse); + Preconditions.checkNotNull(user); - String email = userToUse.getEmail(); - - TopiaQuery query = createQuery("p"). - setSelect("p", "l." + PersonToList.PROPERTY_POLL_ACCOUNT). - addLeftJoin("p." + Poll.PROPERTY_VOTING_LIST, "v", false). - addLeftJoin("v." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST, "l", false). - addEquals("l." + PersonToList.PROPERTY_POLL_ACCOUNT - + "." + PollAccount.PROPERTY_EMAIL, email); - + String hql = "SELECT p, l.pollAccount FROM PollImpl p, " + + "LEFT JOIN p.votingList v, " + + "LEFT JOIN v.pollAccountPersonToList l " + + "WHERE l.pollAccount.email = :email"; List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( - query, pager); + hql, pager, "email", user.getEmail()); return result; + +// String email = user.getEmail(); +// +// TopiaQuery query = createQuery("p"). +// setSelect("p", "l." + PersonToList.PROPERTY_POLL_ACCOUNT). +// addLeftJoin("p." + Poll.PROPERTY_VOTING_LIST, "v", false). +// addLeftJoin("v." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST, "l", false). +// addEquals("l." + PersonToList.PROPERTY_POLL_ACCOUNT +// + "." + PollAccount.PROPERTY_EMAIL, email); +// +// List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( +// query, pager); +// return result; } public List<Pair<Poll, PollAccount>> getParticipatedPolls( TopiaFilterPagerUtil.FilterPagerBean pager, - UserAccount userToUse) throws TopiaException { + UserAccount user) throws TopiaException { Preconditions.checkNotNull(pager); - Preconditions.checkNotNull(userToUse); + Preconditions.checkNotNull(user); - VoteDAO voteDao = PollenDAOHelper.getVoteDAO(context); - - TopiaQuery query = voteDao.createQuery("e"). - addFrom(Poll.class, "p"). - addWhere("e in elements(p." + Poll.PROPERTY_VOTE + ")"). - setSelect("p", "e." + Vote.PROPERTY_POLL_ACCOUNT). - addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + - PollAccount.PROPERTY_USER_ACCOUNT, - TopiaQuery.Op.EQ, userToUse); - + String hql = "SELECT p, v.pollAccount FROM VoteImpl v, PollImpl p " + + "WHERE v IN ELEMENTS(p.vote) " + + "AND v.pollAccount.userAccount = :user"; List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( - query, pager); + hql, pager, "user", user); return result; + +// VoteDAO voteDao = PollenDAOHelper.getVoteDAO(context); +// +// TopiaQuery query = voteDao.createQuery("e"). +// addFrom(Poll.class, "p"). +// addWhere("e in elements(p." + Poll.PROPERTY_VOTE + ")"). +// setSelect("p", "e." + Vote.PROPERTY_POLL_ACCOUNT). +// addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + +// PollAccount.PROPERTY_USER_ACCOUNT, +// TopiaQuery.Op.EQ, user); +// +// List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( +// query, pager); +// return result; } - protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts(TopiaQuery query, - TopiaFilterPagerUtil.FilterPagerBean pager) + protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts( + String hql, + TopiaFilterPagerUtil.FilterPagerBean pager, Object... params) throws TopiaException { - List<Object[]> queryResults = getContext().findByQuery(query); + List<Object[]> queryResults = getContext().findAll(hql, params); Map<Poll, PollAccount> mapResult = Maps.newLinkedHashMap(); for (Object[] row : queryResults) { Poll poll = (Poll) row[0]; PollAccount pollAccount = (PollAccount) row[1]; mapResult.put(poll, pollAccount); } - long records = mapResult.size(); pager.setRecords((int) records); TopiaFilterPagerUtil.computeRecordIndexesAndPagesNumber(pager); @@ -140,40 +166,55 @@ return result; } - public List<E> getRunningPolls(boolean withEndDate) throws TopiaException { +// protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts( +// TopiaQuery query, +// TopiaFilterPagerUtil.FilterPagerBean pager) +// throws TopiaException { +// +// List<Object[]> queryResults = getContext().findByQuery(query); +// Map<Poll, PollAccount> mapResult = Maps.newLinkedHashMap(); +// for (Object[] row : queryResults) { +// Poll poll = (Poll) row[0]; +// PollAccount pollAccount = (PollAccount) row[1]; +// mapResult.put(poll, pollAccount); +// } +// +// long records = mapResult.size(); +// pager.setRecords((int) records); +// TopiaFilterPagerUtil.computeRecordIndexesAndPagesNumber(pager); +// List<Map.Entry<Poll, PollAccount>> entries = +// Lists.newLinkedList(mapResult.entrySet()); +// List<Pair<Poll, PollAccount>> result = +// Lists.transform(TopiaFilterPagerUtil.getPageFromList(entries, pager), +// PollenFunctions.MAP_ENTRY_TO_PAIR_FUNCTION); +// return result; +// } - List<E> results; - TopiaQuery query; + public List<E> getRunningPolls(Date currentTime) throws TopiaException { - if (withEndDate) { - - query = createQuery("poll"). - addWhere("poll.endDate is not null and poll.endDate > current_timestamp()"). - addWhere("poll.beginDate is null or poll.beginDate < current_timestamp()"); - -// results = transaction -// .find("from " -// + Poll.class.getName() -// + " as poll where (poll.endDate is not null and poll.endDate > current_timestamp())" -// + " and (poll.beginDate is null or poll.beginDate < current_timestamp())"); - } else { - query = createQuery("poll"). - addWhere("poll.endDate is null or poll.endDate > current_timestamp()"). - addWhere("poll.beginDate is null or poll.beginDate < current_timestamp()"); - -// results = transaction -// .find("from " -// + Poll.class.getName() -// + " as poll where (poll.endDate is null or poll.endDate > current_timestamp())" -// + " and (poll.beginDate is null or poll.beginDate < current_timestamp())"); - } - - results = findAllByQuery(query); - - if (log.isDebugEnabled()) { - log.debug("Entities found: " - + ((results == null) ? "null" : results.size())); - } + String hql = "FROM PollImpl WHERE (endDate IS NULL OR endDate > :currentTime) AND (beginDate IS NULL OR beginDate < :currentTime)"; + List<E> results = getContext().findAll(hql, "currentTime", currentTime); return results; +// List<E> results; +// TopiaQuery query; +// +// if (withEndDate) { +// +// query = createQuery("poll"). +// addWhere("poll.endDate is not null and poll.endDate > current_timestamp()"). +// addWhere("poll.beginDate is null or poll.beginDate < current_timestamp()"); +// } else { +// query = createQuery("poll"). +// addWhere("poll.endDate is null or poll.endDate > current_timestamp()"). +// addWhere("poll.beginDate is null or poll.beginDate < current_timestamp()"); +// } +// +// results = findAllByQuery(query); +// +// if (log.isDebugEnabled()) { +// log.debug("Entities found: " +// + ((results == null) ? "null" : results.size())); +// } +// return results; } } //PollDAOImpl<E extends Poll> Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -24,8 +24,8 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.PollenIOUtil; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.List; @@ -39,28 +39,40 @@ // In case of email change, check if an other user has not already // the new email // FIXME-fdesbois-20100510 : replace by using id directly - TopiaQuery query = createQuery(). - addWhere(UserAccount.PROPERTY_LOGIN, - TopiaQuery.Op.NEQ, user.getLogin()); - query.addEquals(UserAccount.PROPERTY_EMAIL, - StringUtils.lowerCase(user.getEmail())); - - // existing user found - boolean result = existByQuery(query); - return result; + String hql = "SELECT COUNT(*) FROM UserAccountImpl WHERE login = :login AND email = :email"; + long count = (Long) getContext().findUnique( + hql, + "login", user.getLogin(), + "email", StringUtils.lowerCase(user.getEmail())); + return count > 0; +// TopiaQuery query = createQuery(). +// addWhere(UserAccount.PROPERTY_LOGIN, +// TopiaQuery.Op.NEQ, user.getLogin()). +// addEquals(UserAccount.PROPERTY_EMAIL, +// StringUtils.lowerCase(user.getEmail())); +// +// // existing user found +// boolean result = existByQuery(query); +// return result; } public List<E> getUsers(TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { Preconditions.checkNotNull(pager); - long records = count(); - pager.setRecords((int) records); + String countHql = "SELECT COUNT(*) FROM UserAccountImpl"; + PollenIOUtil.computeAndAddRecordsToPager(getContext(), countHql, pager); - TopiaQuery query = createQuery("e"); - TopiaFilterPagerUtil.addPagerToQuery(query, pager); - - List<E> result = findAllByQuery(query); + String hql = "FROM UserAccountImpl"; + List<E> result = PollenIOUtil.findByPager(getContext(), hql, pager); return result; +// long records = count(); +// pager.setRecords((int) records); +// +// TopiaQuery query = createQuery("e"); +// TopiaFilterPagerUtil.addPagerToQuery(query, pager); +// +// List<E> result = findAllByQuery(query); +// return result; } } //UserAccountDAOImpl<E extends UserAccount> Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -24,19 +24,14 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenIOUtil; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.List; public class VoteDAOImpl<E extends Vote> extends VoteDAOAbstract<E> { - /** Logger. */ - private static final Log log = LogFactory.getLog(VoteDAOImpl.class); - public List<E> getAllVotes(Poll poll) throws TopiaException { Preconditions.checkNotNull(poll); @@ -48,25 +43,15 @@ results = Lists.newArrayList(); } else { - // FIXME-FD20100309 : change model to suppress link from poll to vote - // It's not necessary to have votes when retrieving the poll, this - // method do this job only when it's needed + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE p = :p AND e IN ELEMENTS(p.vote) ORDER BY e.topiaCreateDate DESC"; + results = getContext().findAll(hql, "p", poll); -// if (log.isDebugEnabled()) { -// log.debug("Load votes for poll with uid = " + poll.getPollId()); -// log.debug("LIMIT : startIndex = " + startIndex + " _ " + -// "endIndex = " + endIndex); -// } - - // FIXME : refactor this to use TopiaQuery from ToPIA 2.3 - // Order the results by creation date (the last vote done will be - // at the end of the list) - TopiaQuery query = createQuery("e"). - addFrom(Poll.class, "p"). - addWhere("p", TopiaQuery.Op.EQ, poll). - addWhere("e in elements (p." + Poll.PROPERTY_VOTE + ")"). - addOrder("e.topiaCreateDate DESC"); - results = findAllByQuery(query); +// TopiaQuery query = createQuery("e"). +// addFrom(Poll.class, "p"). +// addWhere("p", TopiaQuery.Op.EQ, poll). +// addInElements("e", "p." + Poll.PROPERTY_VOTE). +// addOrder("e.topiaCreateDate DESC"); +// results = findAllByQuery(query); } return results; } @@ -85,26 +70,29 @@ results = Lists.newArrayList(); } else { - // FIXME-FD20100309 : change model to suppress link from poll to vote - // It's not necessary to have votes when retrieving the poll, this - // method do this job only when it's needed + String countHql = "SELECT COUNT(e) FROM VoteImpl e, PollImpl p WHERE p = :p AND e IN ELEMENTS(p.vote)"; -// if (log.isDebugEnabled()) { -// log.debug("Load votes for poll with uid = " + poll.getPollId()); -// log.debug("LIMIT : startIndex = " + startIndex + " _ " + -// "endIndex = " + endIndex); -// } + PollenIOUtil.computeAndAddRecordsToPager(getContext(), + countHql, pager, + "p", poll); - // FIXME : refactor this to use TopiaQuery from ToPIA 2.3 - // Order the results by creation date (the last vote done will be - // at the end of the list) - TopiaQuery query = createQuery("e"). - addFrom(Poll.class, "p"). - addWhere("p", TopiaQuery.Op.EQ, poll). - addWhere("e in elements (p." + Poll.PROPERTY_VOTE + ")"). - addOrder("e.topiaCreateDate"); - TopiaFilterPagerUtil.addPagerToQuery(query, pager); - results = findAllByQuery(query); + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE p = :p AND e IN ELEMENTS(p.vote) ORDER BY e.topiaCreateDate DESC"; + + + results = PollenIOUtil.findByPager(getContext(), hql, pager, + "p", poll); + +// TopiaQuery countQuery = createQuery("e"). +// addFrom(Poll.class, "p"). +// addWhere("p", TopiaQuery.Op.EQ, poll). +// addInElements("e", "p." + Poll.PROPERTY_VOTE). +// addOrder("e.topiaCreateDate"); +// long records = countByQuery(countQuery); +// pager.setRecords((int) records); +// +// TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery( +// countQuery, pager); +// results = findAllByQuery(query); } return results; } @@ -112,24 +100,28 @@ public boolean hasAlreadyVoted(Poll poll, String votingId) throws TopiaException { // Test using a count(*) on votes - TopiaQuery query = createQuery("e"). - addFrom(Poll.class, "p"). - addWhere("p", TopiaQuery.Op.EQ, poll). - addWhere("e in elements(p." + Poll.PROPERTY_VOTE + ")"). - addWhere("e.pollAccount.votingId", TopiaQuery.Op.EQ, votingId). - addOrder("e.topiaCreateDate"); - boolean result = existByQuery(query); - return result; + String hql = "SELECT COUNT(*) FROM VoteImpl e, PollImpl p WHERE p = :p AND e in elements(p.vote) AND e.pollAccount.votingId = :v"; + Long nb = (Long) getContext().findUnique(hql, "p", poll, "v", votingId); + return nb == 1; +// TopiaQuery query = createQuery("e"). +// addFrom(Poll.class, "p"). +// addWhere("p", TopiaQuery.Op.EQ, poll). +// addInElements("e", "p." + Poll.PROPERTY_VOTE). +// addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_VOTING_ID, TopiaQuery.Op.EQ, votingId); +// boolean result = existByQuery(query); +// return result; } public Vote findByAccountId(String accountId) throws TopiaException { - String accountIdProperty = - TopiaQuery.getProperty("e", Vote.PROPERTY_POLL_ACCOUNT, PollAccount.PROPERTY_ACCOUNT_ID); - - TopiaQuery query = createQuery("e").addEquals(accountIdProperty, accountId); - Vote result = findByQuery(query); + String hql = "FROM VoteImpl e WHERE e.pollAccount.accountId = :a"; + Vote result = (Vote) getContext().findUnique(hql, "a", accountId); return result; +// String accountIdProperty = +// TopiaQuery.getProperty("e", Vote.PROPERTY_POLL_ACCOUNT, PollAccount.PROPERTY_ACCOUNT_ID); +// TopiaQuery query = createQuery("e").addEquals(accountIdProperty, accountId); +// Vote result = findByQuery(query); +// return result; } Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenIOUtil; -import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenTopiaRootContextFactory; import org.junit.Rule; import org.junit.rules.TestWatcher; @@ -36,7 +35,6 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import java.io.File; -import java.util.Properties; /** * Base test for daos. @@ -49,7 +47,7 @@ /** Logger. */ private static final Log log = LogFactory.getLog(AbstractDAOTest.class); - public static final String CONFIGURATION_PATH = "pollen-fake.properties"; + public static final String CONFIGURATION_PATH = "db.properties"; public static final long TIMESTAMP = System.nanoTime(); @@ -64,10 +62,6 @@ return db.beginTransaction(); } - public PollenConfiguration getConfiguration() { - return getDb().getConfiguration(); - } - /** * A new database created for each test. * @@ -80,12 +74,6 @@ private TopiaContext rootCtxt; - private PollenConfiguration configuration; - - public PollenConfiguration getConfiguration() { - return configuration; - } - @Override protected void starting(Description description) { @@ -99,10 +87,10 @@ testBasedir, "/" + CONFIGURATION_PATH ); - - Properties props = new Properties(); - props.put("testDirectory", testBasedir.getAbsolutePath()); - configuration = new PollenConfiguration(CONFIGURATION_PATH, props); + if (log.isInfoEnabled()) { + log.info("Starts db " + + ((TopiaContextImplementor) rootCtxt).getConfig().get(TopiaContextFactory.CONFIG_URL)); + } } @Override @@ -111,9 +99,9 @@ TopiaContextImplementor rootContext = ((TopiaContextImplementor) rootCtxt).getRootContext(); - if (log.isInfoEnabled()) { - log.info("release database " + - rootContext.getConfig().get(TopiaContextFactory.CONFIG_URL)); + if (log.isDebugEnabled()) { + log.debug("release db " + + rootContext.getConfig().get(TopiaContextFactory.CONFIG_URL)); } try { if (rootContext != null && !rootContext.isClosed()) { Added: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java (rev 0) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -0,0 +1,104 @@ +package org.chorem.pollen.business.persistence; + +import org.chorem.pollen.entities.PollenDAOHelper; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; + +import java.util.List; + +/** + * Tests the {@link CommentDAOImpl}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class CommentDAOImplTest extends AbstractDAOTest { + + @Test + public void getComments() throws Exception { + + TopiaContext tx = beginTransaction(); + CommentDAO dao = PollenDAOHelper.getCommentDAO(tx); + PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); + String pollId1 = "pollId1"; + Poll poll = pollDAO.create(Poll.PROPERTY_POLL_ID, pollId1); + for (int i = 0; i < 9; i++) { + poll.addComment(dao.create(Comment.PROPERTY_TEXT, "comment" + i)); + } + tx.commitTransaction(); + + List<Comment> actual; + TopiaFilterPagerUtil.FilterPagerBean pager; + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(Comment.PROPERTY_TEXT); + pager.setSortAscendant(true); + actual = dao.getComments(pager, pollId1); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("comment" + i, actual.get(i).getText()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setPageIndex(2); + pager.setSortColumn(Comment.PROPERTY_TEXT); + pager.setSortAscendant(true); + actual = dao.getComments(pager, pollId1); + Assert.assertNotNull(actual); + Assert.assertEquals(4, actual.size()); + for (int i = 0; i < 4; i++) { + Assert.assertEquals("comment" + (5 + i), actual.get(i).getText()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(Comment.PROPERTY_TEXT); + pager.setSortAscendant(false); + actual = dao.getComments(pager, pollId1); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("comment" + (8 - i), actual.get(i).getText()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(Comment.PROPERTY_TEXT); + pager.setSortAscendant(false); + actual = dao.getComments(pager, pollId1 + "-"); + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + } + + @Test + public void getAllComments() throws Exception { + + + TopiaContext tx = beginTransaction(); + CommentDAO dao = PollenDAOHelper.getCommentDAO(tx); + PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); + String pollId1 = "pollId1"; + Poll poll = pollDAO.create(Poll.PROPERTY_POLL_ID, pollId1); + for (int i = 0; i < 9; i++) { + + Comment comment = dao.create(); + poll.addComment(comment); + } + + tx.commitTransaction(); + + List<Comment> actual; + actual = dao.getAllComments(pollId1); + Assert.assertNotNull(actual); + Assert.assertEquals(9, actual.size()); + + actual = dao.getAllComments(pollId1 + "-"); + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + } +} Added: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java (rev 0) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -0,0 +1,140 @@ +package org.chorem.pollen.business.persistence; + +import org.chorem.pollen.entities.PollenDAOHelper; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; + +import java.util.List; + +/** + * Tests the {@link PersonListDAOImpl}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class PersonListDAOImplTest extends AbstractDAOTest { + + @Test + public void getAllFavoriteLists() throws Exception { + + TopiaContext tx = beginTransaction(); + PersonListDAO dao = PollenDAOHelper.getPersonListDAO(tx); + UserAccountDAO userDao = PollenDAOHelper.getUserAccountDAO(tx); + + UserAccount userAccount1 = userDao.create(UserAccount.PROPERTY_LOGIN, "login1"); + UserAccount userAccount2 = userDao.create(UserAccount.PROPERTY_LOGIN, "login2"); + + for (int i = 0; i < 9; i++) { + + PersonList personList = dao.create(PersonList.PROPERTY_NAME, "name" + i); + userAccount1.addFavoriteList(personList); + } + + tx.commitTransaction(); + + List<PersonList> actual; + actual = dao.getFavoriteLists(userAccount1); + Assert.assertNotNull(actual); + Assert.assertEquals(9, actual.size()); + + actual = dao.getFavoriteLists(userAccount2); + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + } + + @Test + public void getFavoriteLists() throws Exception { + + TopiaContext tx = beginTransaction(); + PersonListDAO dao = PollenDAOHelper.getPersonListDAO(tx); + UserAccountDAO userDao = PollenDAOHelper.getUserAccountDAO(tx); + + UserAccount userAccount1 = userDao.create(UserAccount.PROPERTY_LOGIN, "login1"); + UserAccount userAccount2 = userDao.create(UserAccount.PROPERTY_LOGIN, "login2"); + + for (int i = 0; i < 9; i++) { + + PersonList personList = dao.create(PersonList.PROPERTY_NAME, "name" + i); + userAccount1.addFavoriteList(personList); + } + + tx.commitTransaction(); + + List<PersonList> actual; + TopiaFilterPagerUtil.FilterPagerBean pager; + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(PersonList.PROPERTY_NAME); + pager.setSortAscendant(true); + + actual = dao.getFavoriteLists(userAccount1, pager); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("name" + i, actual.get(i).getName()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setPageIndex(2); + pager.setSortColumn(PersonList.PROPERTY_NAME); + pager.setSortAscendant(true); + actual = dao.getFavoriteLists(userAccount1, pager); + Assert.assertNotNull(actual); + Assert.assertEquals(4, actual.size()); + for (int i = 0; i < 4; i++) { + Assert.assertEquals("name" + (5 + i), actual.get(i).getName()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(PersonList.PROPERTY_NAME); + pager.setSortAscendant(false); + actual = dao.getFavoriteLists(userAccount1, pager); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("name" + (8 - i), actual.get(i).getName()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(PersonList.PROPERTY_NAME); + pager.setSortAscendant(false); + + actual = dao.getFavoriteLists(userAccount2, pager); + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + } + + @Test + public void isPersonListExist() throws Exception { + TopiaContext tx = beginTransaction(); + PersonListDAO dao = PollenDAOHelper.getPersonListDAO(tx); + UserAccountDAO userDao = PollenDAOHelper.getUserAccountDAO(tx); + + UserAccount userAccount1 = userDao.create(UserAccount.PROPERTY_LOGIN, "login1"); + UserAccount userAccount2 = userDao.create(UserAccount.PROPERTY_LOGIN, "login2"); + + for (int i = 0; i < 9; i++) { + + PersonList personList = dao.create(PersonList.PROPERTY_NAME, "name" + i); + userAccount1.addFavoriteList(personList); + } + + tx.commitTransaction(); + + boolean actual; + actual = dao.isPersonListExist(userAccount1, "name1"); + Assert.assertTrue(actual); + + actual = dao.isPersonListExist(userAccount1, "name-"); + Assert.assertFalse(actual); + + actual = dao.isPersonListExist(userAccount2, "name1"); + Assert.assertFalse(actual); + } +} Added: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java (rev 0) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -0,0 +1,79 @@ +package org.chorem.pollen.business.persistence; + +import org.chorem.pollen.entities.PollenDAOHelper; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; + +/** + * Tests the {@link PersonToListDAOImpl}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class PersonToListDAOImplTest extends AbstractDAOTest { + + @Test + public void findByPollAndAccount() throws Exception { + + TopiaContext tx = beginTransaction(); + PersonToListDAO dao = PollenDAOHelper.getPersonToListDAO(tx); + PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); + PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); + VotingListDAO votingListDAO = PollenDAOHelper.getVotingListDAO(tx); + + Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); + Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2"); + Poll poll3 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId3"); + + PollAccount pollAccount1 = pollAccountDAO.create(PollAccount.PROPERTY_VOTING_ID, "votingId1"); + PollAccount pollAccount2 = pollAccountDAO.create(PollAccount.PROPERTY_VOTING_ID, "votingId2"); + PollAccount pollAccount3 = pollAccountDAO.create(PollAccount.PROPERTY_VOTING_ID, "votingId3"); + + VotingList votingList1 = votingListDAO.create(VotingList.PROPERTY_NAME, "votingList1"); + poll1.addVotingList(votingList1); + VotingList votingList2 = votingListDAO.create(VotingList.PROPERTY_NAME, "votingList2"); + poll2.addVotingList(votingList2); + + PersonToList personToList1 = dao.create(PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount1); + votingList1.addPollAccountPersonToList(personToList1); + + PersonToList personToList2 = dao.create(PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount2); + votingList1.addPollAccountPersonToList(personToList2); + + PersonToList personToList3 = dao.create(PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount3); + votingList2.addPollAccountPersonToList(personToList3); + + PersonToList actual; + + actual = dao.findByPollAndAccount(poll1, pollAccount1); + Assert.assertNotNull(actual); + Assert.assertEquals(personToList1, actual); + + actual = dao.findByPollAndAccount(poll1, pollAccount2); + Assert.assertNotNull(actual); + Assert.assertEquals(personToList2, actual); + + actual = dao.findByPollAndAccount(poll1, pollAccount3); + Assert.assertNull(actual); + + actual = dao.findByPollAndAccount(poll2, pollAccount1); + Assert.assertNull(actual); + + actual = dao.findByPollAndAccount(poll2, pollAccount2); + Assert.assertNull(actual); + + actual = dao.findByPollAndAccount(poll2, pollAccount3); + Assert.assertNotNull(actual); + Assert.assertEquals(personToList3, actual); + + actual = dao.findByPollAndAccount(poll3, pollAccount1); + Assert.assertNull(actual); + + actual = dao.findByPollAndAccount(poll3, pollAccount2); + Assert.assertNull(actual); + + actual = dao.findByPollAndAccount(poll3, pollAccount3); + Assert.assertNull(actual); + } +} Copied: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java (from rev 3544, trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java) =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java (rev 0) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -0,0 +1,151 @@ +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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.business.persistence; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.entities.PollenDAOHelper; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +/** + * Test the {@link PollAccountDAOImpl}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class PollAccountDAOImplTest extends AbstractDAOTest { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(PollAccountDAOImplTest.class); + + @Test + public void getRestrictedPollAccount() throws Exception { + TopiaContext tx = beginTransaction(); + + PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); + PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); + VotingListDAO votingListDAO = PollenDAOHelper.getVotingListDAO(tx); + PersonToListDAO personToListDAO = PollenDAOHelper.getPersonToListDAO(tx); + + String pollId = "pollId"; + String accountId = "accountId"; + String accountId2 = "accountId2"; + String accountId3 = "accountId3"; + + PollAccount pollAccount = pollAccountDAO.create( + PollAccount.PROPERTY_ACCOUNT_ID, accountId); + + PollAccount pollAccount2 = pollAccountDAO.create( + PollAccount.PROPERTY_ACCOUNT_ID, accountId2); + PollAccount pollAccount3 = pollAccountDAO.create( + PollAccount.PROPERTY_ACCOUNT_ID, accountId3); + + Poll poll = pollDAO.create(Poll.PROPERTY_POLL_ID, pollId); + + VotingList votingList = votingListDAO.create(); + poll.addVotingList(votingList); + VotingList votingList2 = votingListDAO.create(); + poll.addVotingList(votingList2); + + PersonToList personToList = personToListDAO.create( + PersonToList.PROPERTY_POLL_ACCOUNT, pollAccount, + PersonToList.PROPERTY_VOTING_LIST, votingList + ); + + 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 + ); + + pollAccount.addVotingListPersonToList(personToList); + pollAccount2.addVotingListPersonToList(personToList2); + pollAccount3.addVotingListPersonToList(personToList3); + + PollAccount restrictedPollAccount = + pollAccountDAO.getRestrictedPollAccount(pollId, accountId); + + Assert.assertNotNull(restrictedPollAccount); + Assert.assertEquals(accountId, restrictedPollAccount.getAccountId()); + Assert.assertNotNull(restrictedPollAccount.getVotingListPersonToList()); + Assert.assertTrue(restrictedPollAccount.getVotingListPersonToList().contains(personToList)); + + PollAccount restrictedPollAccount2 = + pollAccountDAO.getRestrictedPollAccount(pollId, accountId2); + + Assert.assertNotNull(restrictedPollAccount2); + Assert.assertEquals(accountId2, restrictedPollAccount2.getAccountId()); + Assert.assertNotNull(restrictedPollAccount2.getVotingListPersonToList()); + Assert.assertFalse(restrictedPollAccount2.getVotingListPersonToList().contains(personToList)); + Assert.assertTrue(restrictedPollAccount2.getVotingListPersonToList().contains(personToList2)); + + PollAccount restrictedPollAccount3 = + pollAccountDAO.getRestrictedPollAccount(pollId, accountId3); + + 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.getRestrictedPollAccount(pollId, System.nanoTime() + "--"); + + Assert.assertNull(restrictedPollAccount4); + } + + @Test + public void getFavoriteListUsers() throws TopiaException { + if (log.isInfoEnabled()) { + log.info("TODO"); + } + } + + @Test + public void isPollAccountExists() throws TopiaException { + if (log.isInfoEnabled()) { + log.info("TODO"); + } + } + + @Test + public void findByPollVoteUser() throws TopiaException { + if (log.isInfoEnabled()) { + log.info("TODO"); + } + } + + @Test + public void existsByPollVoteAccountId() throws TopiaException { + if (log.isInfoEnabled()) { + log.info("TODO"); + } + } +} Property changes on: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java 2012-06-20 14:08:36 UTC (rev 3544) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -1,89 +0,0 @@ -/* - * #%L - * Pollen :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * 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.business.persistence; - -import org.chorem.pollen.entities.PollenDAOHelper; -import org.junit.Assert; -import org.junit.Test; -import org.nuiton.topia.TopiaContext; - -/** - * Test the {@link PollAccountDAO}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.3 - */ -public class PollAccountDAOTest extends AbstractDAOTest { - - @Test - public void getRestrictedPollAccount() throws Exception { - TopiaContext tx = beginTransaction(); - - PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); - - String pollId = "pollId"; - String accountId = "accountId"; - - PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); - PollAccount pollAccount = pollAccountDAO.newInstance(); - pollAccount.setAccountId(accountId); - pollAccount = pollAccountDAO.create(pollAccount); - - Poll poll = pollDAO.newInstance(); - poll.setPollId(pollId); - poll = pollDAO.create(poll); - - - VotingListDAO votingListDAO = PollenDAOHelper.getVotingListDAO(tx); - - VotingList votingList = votingListDAO.newInstance(); - - votingList.setPoll(poll); - votingList = votingListDAO.create(votingList); - - - PersonToListDAO personToListDAO = PollenDAOHelper.getPersonToListDAO(tx); - - PersonToList personToList = personToListDAO.newInstance(); - personToList.setPollAccount(pollAccount); - personToList.setVotingList(votingList); - personToList.setPollAccount(pollAccount); - - personToList = personToListDAO.create(personToList); - - poll.addVotingList(votingList); - pollAccount.addVotingListPersonToList(personToList); - - pollDAO.update(poll); - pollAccountDAO.update(pollAccount); - - - PollAccount restrictedPollAccount = - pollAccountDAO.getRestrictedPollAccount(pollId, accountId); - - Assert.assertNotNull(restrictedPollAccount); - Assert.assertEquals(accountId, restrictedPollAccount.getAccountId()); - Assert.assertNotNull(restrictedPollAccount.getVotingListPersonToList()); - Assert.assertTrue(restrictedPollAccount.getVotingListPersonToList().contains(personToList)); - } -} Added: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java (rev 0) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -0,0 +1,272 @@ +package org.chorem.pollen.business.persistence; + +import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.entities.PollenDAOHelper; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.util.DateUtil; + +import java.util.Date; +import java.util.List; + +/** + * Tests the {@link PollDAOImpl}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class PollDAOImplTest extends AbstractDAOTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(PollDAOImplTest.class); + + @Test + public void getPolls() throws Exception { + + TopiaContext tx = beginTransaction(); + PollDAO dao = PollenDAOHelper.getPollDAO(tx); + + for (int i = 0; i < 9; i++) { + dao.create(Poll.PROPERTY_POLL_ID, "pollId" + i, + Poll.PROPERTY_TITLE, "title" + i); + } + + tx.commitTransaction(); + + List<Poll> actual; + TopiaFilterPagerUtil.FilterPagerBean pager; + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(Poll.PROPERTY_TITLE); + pager.setSortAscendant(true); + actual = dao.getPolls(pager); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("title" + i, actual.get(i).getTitle()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setPageIndex(2); + pager.setSortColumn(Poll.PROPERTY_TITLE); + pager.setSortAscendant(true); + actual = dao.getPolls(pager); + Assert.assertNotNull(actual); + Assert.assertEquals(4, actual.size()); + for (int i = 0; i < 4; i++) { + Assert.assertEquals("title" + (5 + i), actual.get(i).getTitle()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(Poll.PROPERTY_TITLE); + pager.setSortAscendant(false); + actual = dao.getPolls(pager); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("title" + (8 - i), actual.get(i).getTitle()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setPageIndex(3); + pager.setSortColumn(Poll.PROPERTY_TITLE); + pager.setSortAscendant(false); + actual = dao.getPolls(pager); + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + + } + + @Test + public void getCreatedPolls() throws Exception { + + TopiaContext tx = beginTransaction(); + PollDAO dao = PollenDAOHelper.getPollDAO(tx); + PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); + UserAccountDAO userAccountDAO = PollenDAOHelper.getUserAccountDAO(tx); + UserAccount userAccount1 = userAccountDAO.create(UserAccount.PROPERTY_LOGIN, "login1"); + UserAccount userAccount2 = userAccountDAO.create(UserAccount.PROPERTY_LOGIN, "login2"); + + for (int i = 0; i < 9; i++) { + PollAccount creator = pollAccountDAO.create( + PollAccount.PROPERTY_USER_ACCOUNT, userAccount1); + dao.create(Poll.PROPERTY_POLL_ID, "pollId" + i, + Poll.PROPERTY_TITLE, "title" + i, + Poll.PROPERTY_CREATOR, creator); + } + + tx.commitTransaction(); + + List<Poll> actual; + TopiaFilterPagerUtil.FilterPagerBean pager; + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(Poll.PROPERTY_TITLE); + pager.setSortAscendant(true); + actual = dao.getCreatedPolls(pager, userAccount1); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("title" + i, actual.get(i).getTitle()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setPageIndex(2); + pager.setSortColumn(Poll.PROPERTY_TITLE); + pager.setSortAscendant(true); + actual = dao.getCreatedPolls(pager, userAccount1); + Assert.assertNotNull(actual); + Assert.assertEquals(4, actual.size()); + for (int i = 0; i < 4; i++) { + Assert.assertEquals("title" + (5 + i), actual.get(i).getTitle()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(Poll.PROPERTY_TITLE); + pager.setSortAscendant(false); + actual = dao.getCreatedPolls(pager, userAccount1); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("title" + (8 - i), actual.get(i).getTitle()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(Poll.PROPERTY_TITLE); + pager.setSortAscendant(false); + actual = dao.getCreatedPolls(pager, userAccount2); + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + + } + + @Test + public void getInvitedPolls() throws Exception { + + TopiaContext tx = beginTransaction(); + PollDAO dao = PollenDAOHelper.getPollDAO(tx); + if (log.isInfoEnabled()) { + log.info("TODO"); + } + } + + @Test + public void getParticipatedPolls() throws Exception { + + TopiaContext tx = beginTransaction(); + PollDAO dao = PollenDAOHelper.getPollDAO(tx); + VoteDAO voteDao = PollenDAOHelper.getVoteDAO(tx); + PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); + UserAccountDAO userAccountDAO = PollenDAOHelper.getUserAccountDAO(tx); + + Poll poll0 = dao.create(Poll.PROPERTY_POLL_ID, "pollId0"); + Poll poll1 = dao.create(Poll.PROPERTY_POLL_ID, "pollId1"); + + UserAccount userAccount1 = userAccountDAO.create(UserAccount.PROPERTY_LOGIN, "login1"); + UserAccount userAccount2 = userAccountDAO.create(UserAccount.PROPERTY_LOGIN, "login2"); + PollAccount pollAccount1 = pollAccountDAO.create(PollAccount.PROPERTY_ACCOUNT_ID, "accountId1", PollAccount.PROPERTY_USER_ACCOUNT, userAccount1); + PollAccount pollAccount2 = pollAccountDAO.create(PollAccount.PROPERTY_ACCOUNT_ID, "accountId2", PollAccount.PROPERTY_USER_ACCOUNT, userAccount2); + + Vote vote1 = voteDao.create(Vote.PROPERTY_POLL_ACCOUNT, pollAccount1); + poll0.addVote(vote1); + + Vote vote2 = voteDao.create(Vote.PROPERTY_POLL_ACCOUNT, pollAccount1); + poll1.addVote(vote2); + + + tx.commitTransaction(); + + TopiaFilterPagerUtil.FilterPagerBean pager; + List<Pair<Poll, PollAccount>> actual; + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + + actual = dao.getParticipatedPolls(pager, userAccount1); + Assert.assertNotNull(actual); + Assert.assertEquals(2, actual.size()); + Assert.assertEquals(poll0, actual.get(0).getLeft()); + Assert.assertEquals(pollAccount1, actual.get(0).getRight()); + Assert.assertEquals(poll1, actual.get(1).getLeft()); + Assert.assertEquals(pollAccount1, actual.get(1).getRight()); + + actual = dao.getParticipatedPolls(pager, userAccount2); + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + } + + @Test + public void getRunningPolls() throws Exception { + + TopiaContext tx = beginTransaction(); + PollDAO dao = PollenDAOHelper.getPollDAO(tx); + + Date now = DateUtil.createDate(5, 6, 2010); + Date lastYearNow = DateUtil.createDate(5, 6, 2009); + Date nextMonthNow = DateUtil.createDate(5, 7, 2010); + Date nextYearNow = DateUtil.createDate(5, 6, 2011); + + Poll poll0 = dao.create(Poll.PROPERTY_POLL_ID, "pollId0"); + Poll poll1 = dao.create(Poll.PROPERTY_POLL_ID, "pollId1", Poll.PROPERTY_BEGIN_DATE, DateUtil.createDate(1, 5, 2010)); + Poll poll2 = dao.create(Poll.PROPERTY_POLL_ID, "pollId2", Poll.PROPERTY_BEGIN_DATE, DateUtil.createDate(1, 7, 2010)); + Poll poll3 = dao.create(Poll.PROPERTY_POLL_ID, "pollId3", + Poll.PROPERTY_BEGIN_DATE, DateUtil.createDate(1, 5, 2010), + Poll.PROPERTY_END_DATE, DateUtil.createDate(1, 10, 2010) + ); + Poll poll4 = dao.create(Poll.PROPERTY_POLL_ID, "pollId4", + Poll.PROPERTY_BEGIN_DATE, DateUtil.createDate(1, 5, 2010), + Poll.PROPERTY_END_DATE, DateUtil.createDate(1, 7, 2010) + ); + Poll poll5 = dao.create(Poll.PROPERTY_POLL_ID, "pollId5", + Poll.PROPERTY_END_DATE, DateUtil.createDate(1, 8, 2010) + ); + + tx.commitTransaction(); + + List<Poll> actual; + + actual = dao.getRunningPolls(now); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + Assert.assertEquals(poll0, actual.get(0)); + Assert.assertEquals(poll1, actual.get(1)); + Assert.assertEquals(poll3, actual.get(2)); + Assert.assertEquals(poll4, actual.get(3)); + Assert.assertEquals(poll5, actual.get(4)); + + + actual = dao.getRunningPolls(lastYearNow); + Assert.assertNotNull(actual); + Assert.assertEquals(2, actual.size()); + Assert.assertEquals(poll0, actual.get(0)); + Assert.assertEquals(poll5, actual.get(1)); + + actual = dao.getRunningPolls(nextMonthNow); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + Assert.assertEquals(poll0, actual.get(0)); + Assert.assertEquals(poll1, actual.get(1)); + Assert.assertEquals(poll2, actual.get(2)); + Assert.assertEquals(poll3, actual.get(3)); + Assert.assertEquals(poll5, actual.get(4)); + + actual = dao.getRunningPolls(nextYearNow); + Assert.assertNotNull(actual); + Assert.assertEquals(3, actual.size()); + Assert.assertEquals(poll0, actual.get(0)); + Assert.assertEquals(poll1, actual.get(1)); + Assert.assertEquals(poll2, actual.get(2)); + } +} Added: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java (rev 0) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -0,0 +1,110 @@ +package org.chorem.pollen.business.persistence; + +import org.chorem.pollen.entities.PollenDAOHelper; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; + +import java.util.List; + +/** + * Tests the {@link UserAccountDAOImpl}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class UserAccountDAOImplTest extends AbstractDAOTest { + + @Test + public void isUserExist() throws Exception { + TopiaContext tx = beginTransaction(); + + UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(tx); + + for (int i = 0; i < 20; i++) { + dao.create(UserAccount.PROPERTY_LOGIN, "login" + i, UserAccount.PROPERTY_EMAIL, "email" + i); + } + + tx.commitTransaction(); + + boolean actual; + UserAccount userAccount; + userAccount = dao.newInstance(); + userAccount.setLogin("login1"); + userAccount.setEmail("email1"); + actual = dao.isUserExist(userAccount); + Assert.assertTrue(actual); + + userAccount = dao.newInstance(); + userAccount.setLogin("login1"); + userAccount.setEmail("Email1"); + actual = dao.isUserExist(userAccount); + Assert.assertTrue(actual); + + userAccount = dao.newInstance(); + userAccount.setLogin("Login1"); + userAccount.setEmail("email1"); + actual = dao.isUserExist(userAccount); + Assert.assertFalse(actual); + + userAccount = dao.newInstance(); + userAccount.setLogin("login1"); + userAccount.setEmail("email111"); + actual = dao.isUserExist(userAccount); + Assert.assertFalse(actual); + } + + @Test + public void getUsers() throws Exception { + + TopiaContext tx = beginTransaction(); + + UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(tx); + + for (int i = 0; i < 9; i++) { + dao.create(UserAccount.PROPERTY_LOGIN, "login" + i, UserAccount.PROPERTY_EMAIL, "email" + i); + } + + tx.commitTransaction(); + + TopiaFilterPagerUtil.FilterPagerBean pager; + List<UserAccount> actual; + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(UserAccount.PROPERTY_LOGIN); + pager.setSortAscendant(true); + actual = dao.getUsers(pager); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("login" + i, actual.get(i).getLogin()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setPageIndex(2); + pager.setSortColumn(UserAccount.PROPERTY_LOGIN); + pager.setSortAscendant(true); + actual = dao.getUsers(pager); + Assert.assertNotNull(actual); + Assert.assertEquals(4, actual.size()); + for (int i = 0; i < 4; i++) { + Assert.assertEquals("login" + (5 + i), actual.get(i).getLogin()); + } + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(5); + pager.setSortColumn(UserAccount.PROPERTY_LOGIN); + pager.setSortAscendant(false); + actual = dao.getUsers(pager); + Assert.assertNotNull(actual); + Assert.assertEquals(5, actual.size()); + for (int i = 0; i < 5; i++) { + Assert.assertEquals("login" + (8 - i), actual.get(i).getLogin()); + } + + + } +} Added: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java (rev 0) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-06-25 17:27:47 UTC (rev 3545) @@ -0,0 +1,191 @@ +package org.chorem.pollen.business.persistence; + +import org.chorem.pollen.entities.PollenDAOHelper; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.util.DateUtil; + +import java.util.List; + +/** + * Tests the {@link VoteDAOImpl}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteDAOImplTest extends AbstractDAOTest { + + @Test + public void getAllVotes() throws Exception { + + TopiaContext tx = beginTransaction(); + + VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(tx); + PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); + + Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); + Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", + Poll.PROPERTY_ANONYMOUS, true); + + Vote vote1 = voteDAO.create(); + vote1.setTopiaCreateDate(DateUtil.createDate(0, 0, 0, 1, 1, 2010)); + poll1.addVote(vote1); + Vote vote2 = voteDAO.create(); + vote2.setTopiaCreateDate(DateUtil.createDate(10, 0, 0, 1, 1, 2010)); + poll1.addVote(vote2); + + Vote vote3 = voteDAO.create(); + poll2.addVote(vote3); + + tx.commitTransaction(); + + List<Vote> actual; + + actual = voteDAO.getAllVotes(poll1); + + Assert.assertNotNull(actual); + Assert.assertEquals(2, actual.size()); + Assert.assertEquals(vote2, actual.get(0)); + Assert.assertEquals(vote1, actual.get(1)); + Assert.assertFalse(actual.contains(vote3)); + + actual = voteDAO.getAllVotes(poll2); + + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + } + + @Test + public void getVotesByPoll() throws Exception { + + + TopiaContext tx = beginTransaction(); + + VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(tx); + PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); + + Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); + Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", + Poll.PROPERTY_ANONYMOUS, true); + + Vote vote1 = voteDAO.create(); + vote1.setTopiaCreateDate(DateUtil.createDate(0, 0, 0, 1, 1, 2010)); + poll1.addVote(vote1); + Vote vote2 = voteDAO.create(); + vote2.setTopiaCreateDate(DateUtil.createDate(10, 0, 0, 1, 1, 2010)); + poll1.addVote(vote2); + + Vote vote3 = voteDAO.create(); + poll2.addVote(vote3); + + tx.commitTransaction(); + + List<Vote> actual; + TopiaFilterPagerUtil.FilterPagerBean pager = + TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(10); + actual = voteDAO.getVotesByPoll(poll1, pager); + + Assert.assertNotNull(actual); + Assert.assertEquals(2, actual.size()); + Assert.assertEquals(vote2, actual.get(0)); + Assert.assertEquals(vote1, actual.get(1)); + Assert.assertFalse(actual.contains(vote3)); + + pager = TopiaFilterPagerUtil.newFilterPagerBean(); + pager.setPageSize(10); + actual = voteDAO.getVotesByPoll(poll2, pager); + + Assert.assertNotNull(actual); + Assert.assertTrue(actual.isEmpty()); + } + + @Test + public void hasAlreadyVoted() throws Exception { + + + TopiaContext tx = beginTransaction(); + + VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(tx); + PollDAO pollDAO = PollenDAOHelper.getPollDAO(tx); + PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); + + Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); + Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", + Poll.PROPERTY_ANONYMOUS, true); + + String votingId1 = "votingId1"; + String votingId2 = "votingId2"; + + PollAccount pollAccount1 = pollAccountDAO.create( + PollAccount.PROPERTY_VOTING_ID, votingId1); + + PollAccount pollAccount2 = pollAccountDAO.create( + PollAccount.PROPERTY_VOTING_ID, votingId2); + Vote vote1 = voteDAO.create(Vote.PROPERTY_POLL_ACCOUNT, pollAccount1); + poll1.addVote(vote1); + Vote vote2 = voteDAO.create(); + poll1.addVote(vote2); + Vote vote3 = voteDAO.create(Vote.PROPERTY_POLL_ACCOUNT, pollAccount2); + poll2.addVote(vote3); + + tx.commitTransaction(); + + boolean actual; + actual = voteDAO.hasAlreadyVoted(poll1, votingId1); + Assert.assertTrue(actual); + actual = voteDAO.hasAlreadyVoted(poll2, votingId1); + Assert.assertFalse(actual); + + actual = voteDAO.hasAlreadyVoted(poll1, votingId2); + Assert.assertFalse(actual); + actual = voteDAO.hasAlreadyVoted(poll2, votingId2); + Assert.assertTrue(actual); + } + + @Test + public void findByAccountId() throws Exception { + + TopiaContext tx = beginTransaction(); + + VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(tx); + PollAccountDAO pollAccountDAO = PollenDAOHelper.getPollAccountDAO(tx); + + String accountId1 = "accountId1"; + PollAccount pollAccount1 = pollAccountDAO.create(PollAccount.PROPERTY_ACCOUNT_ID, accountId1); + String accountId2 = "accountId2"; + PollAccount pollAccount2 = pollAccountDAO.create(PollAccount.PROPERTY_ACCOUNT_ID, accountId2); + + tx.commitTransaction(); + + Vote actual; + actual = voteDAO.findByAccountId(accountId1); + Assert.assertNull(actual); + actual = voteDAO.findByAccountId(accountId2); + Assert.assertNull(actual); + + // attach accountId1 to vote1 + + Vote vote1 = voteDAO.create(Vote.PROPERTY_POLL_ACCOUNT, pollAccount1); + + tx.commitTransaction(); + + actual = voteDAO.findByAccountId(accountId1); + Assert.assertNotNull(actual); + Assert.assertEquals(vote1, actual); + actual = voteDAO.findByAccountId(accountId2); + Assert.assertNull(actual); + + // attach accountId2 to vote2 + Vote vote2 = voteDAO.create(Vote.PROPERTY_POLL_ACCOUNT, pollAccount2); + tx.commitTransaction(); + + actual = voteDAO.findByAccountId(accountId2); + Assert.assertNotNull(actual); + Assert.assertEquals(vote2, actual); + + + } +}

1 0

r3544 - in trunk: . pollen-ui-struts2
by tchemit＠users.chorem.org June 20, 2012

June 20, 2012

Author: tchemit Date: 2012-06-20 16:08:36 +0200 (Wed, 20 Jun 2012) New Revision: 3544 Url: http://chorem.org/repositories/revision/pollen/3544 Log: update to mavenpom 3.3.4 + add deploy files Modified: trunk/pollen-ui-struts2/pom.xml trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-20 10:56:10 UTC (rev 3543) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-20 14:08:36 UTC (rev 3544) @@ -246,6 +246,8 @@ target/${project.build.finalName}-bin.zip </redmine.releaseFiles> + <deployFiles>target/${project.build.finalName}.war</deployFiles> + <defaultWebContextPath>pollen</defaultWebContextPath> <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-20 10:56:10 UTC (rev 3543) +++ trunk/pom.xml 2012-06-20 14:08:36 UTC (rev 3544) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.3</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId>

1 0

r3543 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll resources/i18n webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org June 20, 2012

June 20, 2012

Author: tchemit Date: 2012-06-20 12:56:10 +0200 (Wed, 20 Jun 2012) New Revision: 3543 Url: http://chorem.org/repositories/revision/pollen/3543 Log: - fixes #177: [Results] pas le nombre total de votants - fixes #628: Improve nb votes messages + use warning messages on vote page when needed Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-20 10:56:10 UTC (rev 3543) @@ -220,7 +220,17 @@ } public String getVoteSizeMessage() { - return _("pollen.common.voteNbVotes", getPoll().sizeVote()); + int i = getPoll().sizeVote(); + + String result; + if (i==0) { + result = _("pollen.common.voteNoVote"); + } else if (i==1) { + result = _("pollen.common.voteOneVote"); + }else { + result = _("pollen.common.voteNbVotes", i); + } + return result; } public String getCommentAuthor() { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-20 10:56:10 UTC (rev 3543) @@ -182,6 +182,20 @@ return subtitles; } + public String getVoteSizeMessage() { + int i = getPoll().sizeVote(); + + String result; + if (i==0) { + result = _("pollen.common.voteNoVote"); + } else if (i==1) { + result = _("pollen.common.voteOneVote"); + }else { + result = _("pollen.common.voteNbVotes", i); + } + return result; + } + public String getVictoryMessage() { String victoryMessage; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-20 10:56:10 UTC (rev 3543) @@ -60,11 +60,11 @@ // Messages if (getPoll().isClosed()) { - addFlashMessage(_("pollen.information.pollClosed")); + addFlashWarning(_("pollen.information.pollClosed")); } else if (!isPollStarted()) { - addFlashMessage(_("pollen.information.pollNotStarted")); + addFlashWarning(_("pollen.information.pollNotStarted")); } else if (isPollFinished()) { - addFlashMessage(_("pollen.information.pollFinished")); + addFlashWarning(_("pollen.information.pollFinished")); } if (isPollChoiceRunning()) { addFlashMessage(_("pollen.information.pollChoiceRunning")); Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-20 10:56:10 UTC (rev 3543) @@ -157,6 +157,8 @@ pollen.common.voteCountingTypeHelp.number=Voting by number\: The answer is free, leave blank or enter a integer. pollen.common.voteCountingTypeHelp.percentage=Percentage vote\: allocate choices to get a 100%% total. pollen.common.voteNbVotes=%d existing votes +pollen.common.voteNoVote=No existing vote +pollen.common.voteOneVote=1 existing vote pollen.common.votePerson=Voter pollen.common.voterName=Votant pollen.common.votingList=Group Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-20 10:56:10 UTC (rev 3543) @@ -157,6 +157,8 @@ pollen.common.voteCountingTypeHelp.number=Vote par nombre \: La réponse est libre, laissez vide ou entrez un nombre entier pollen.common.voteCountingTypeHelp.percentage=Vote par pourcentage \: répartir les choix de manière à obtenir 100%% au total. pollen.common.voteNbVotes=%d votes existants +pollen.common.voteNoVote=Pas de vote existant +pollen.common.voteOneVote=1 vote existant pollen.common.votePerson=Votant pollen.common.voterName=Votant pollen.common.votingList=Groupe Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-20 10:56:10 UTC (rev 3543) @@ -108,6 +108,10 @@ </fieldset> </div> +<h4> + <s:property value="%{voteSizeMessage}"/> +</h4> +  <s:if test="victoryMessage != ''"> <h4><s:property value="victoryMessage"/>

1 0

r3542 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/io java/org/chorem/pollen/ui/actions/poll webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org June 20, 2012

June 20, 2012

Author: tchemit Date: 2012-06-20 12:46:32 +0200 (Wed, 20 Jun 2012) New Revision: 3542 Url: http://chorem.org/repositories/revision/pollen/3542 Log: refs #613: No thumbnail and image if accents in image name (vote + result page) + clean some jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-06-20 10:00:52 UTC (rev 3541) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-06-20 10:46:32 UTC (rev 3542) @@ -22,6 +22,7 @@ */ package org.chorem.pollen.ui.actions.io; +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.ui.actions.PollenActionSupport; @@ -30,6 +31,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import java.net.URLDecoder; /** * Obtain the image choice of a given choice of an image-like poll. @@ -93,8 +95,12 @@ Preconditions.checkNotNull(pollId); Preconditions.checkNotNull(choiceId); - file = getPollService().getPollChoiceImageFile(pollId, choiceId); + // decode choice Id + String choiceName = URLDecoder.decode(choiceId, + Charsets.UTF_8.name()); + file = getPollService().getPollChoiceImageFile(pollId, choiceName); + if (thumb) { file = getPollService().getImageThumbFile(file); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-20 10:00:52 UTC (rev 3541) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-20 10:46:32 UTC (rev 3542) @@ -215,17 +215,6 @@ public abstract boolean isEdit(); - public String getImagechoicesThumbPrefix(Choice choice) { - String name = choice.getName(); - try { - String result = URLEncoder.encode(IMAGECHOICES_THUMB_PREFIX + name, Charsets.UTF_8.name()); - return result; - } catch (UnsupportedEncodingException e) { - throw new PollenTechnicalException( - "Could not encode name " + name, e); - } - } - @Override public void setServletRequest(HttpServletRequest request) { this.request = request; @@ -504,12 +493,6 @@ poll.setMaxChoiceNb(0); } -// if (!poll.isPublicResults()) { -// -// // force to not have continous results -// poll.setContinuousResults(false); -// } - if (poll.isAnonymous()) { // force to not have choice to vote anonymously @@ -731,6 +714,17 @@ return creator.getUserAccount() != null; } + public String getImageChoiceName(Choice choice) { + String name = choice.getName(); + try { + String result = URLEncoder.encode(IMAGECHOICES_THUMB_PREFIX + name, Charsets.UTF_8.name()); + return result; + } catch (UnsupportedEncodingException e) { + throw new PollenTechnicalException( + "Could not encode name " + name, e); + } + } + public void prepareFormPage() throws Exception { getPollenSession().removeDynamicDataWithPrefix(IMAGECHOICES_THUMB_PREFIX); @@ -1320,7 +1314,7 @@ // keep in session the location of this thumb (do not // want to expose the full path location in url) - String key = getImagechoicesThumbPrefix(choice); + String key = getImageChoiceName(choice); getPollenSession().putDynamicData(key, thumbFile); } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-20 10:00:52 UTC (rev 3541) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-20 10:46:32 UTC (rev 3542) @@ -22,12 +22,14 @@ */ package org.chorem.pollen.ui.actions.poll; +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.interceptor.ServletRequestAware; +import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.bean.PollResult; import org.chorem.pollen.bean.PollResultList; import org.chorem.pollen.bean.PollUrl; @@ -48,6 +50,8 @@ import org.chorem.pollen.ui.actions.PageSkin; import javax.servlet.http.HttpServletRequest; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Date; import java.util.List; import java.util.Map; @@ -489,6 +493,17 @@ return text; } + public String getImageChoiceName(Choice choice) { + String name = choice.getName(); + try { + String result = URLEncoder.encode(name, Charsets.UTF_8.name()); + return result; + } catch (UnsupportedEncodingException e) { + throw new PollenTechnicalException( + "Could not encode name " + name, e); + } + } + protected void loadPollAccount() throws PollAccountNotFound { // Current poll account Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-20 10:00:52 UTC (rev 3541) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-20 10:46:32 UTC (rev 3542) @@ -142,7 +142,7 @@ <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" escapeAmp="true"> <s:param name="choiceTokenId" - value="%{getImagechoicesThumbPrefix(#choice)}"/> + value="%{getImageChoiceName(#choice)}"/> </s:url> <img name="<s:property value="#prefix"/>.thumb" alt="<s:property value='name'/>" @@ -151,8 +151,7 @@ class="fleft choiceImage"> <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" - class="fright" - cssStyle="opacity: 0;"/> + class="fright" cssStyle="opacity: 0;"/> </s:if> <s:else> <%--New image--%> @@ -164,8 +163,7 @@ src="<s:property value='imageUrl'/>" width="100px" height="75px" class="fleft choiceImage"> <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" - class="fright" - cssStyle="opacity: 0;"/> + class="fright" cssStyle="opacity: 0;"/> </s:else> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-06-20 10:00:52 UTC (rev 3541) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-06-20 10:46:32 UTC (rev 3542) @@ -42,24 +42,10 @@ displayFormat="%{getText('pollen.common.datePickerPattern')}"/> </div> <div class="fright"> - <%--s:a id='choicesDATE_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesDATE_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> <s:label for="%{#prefix}.description" key="pollen.common.description" theme="simple"/> - <s:textarea cols="30" id="%{#prefix}.description" - key="%{#prefix}.description" label='' theme="simple" - value="%{choice.description}"/> + <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" + key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> <image alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-20 10:00:52 UTC (rev 3541) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-20 10:46:32 UTC (rev 3542) @@ -46,26 +46,11 @@ title="<s:text name='pollen.image.not.loaded'/>" src="<s:property value='imageUrl'/>" width="100px" height="75" class="fleft choiceImage"> - <s:file key='%{#prefix2}' label='' - theme="simple" - class="fright" + <s:file key='%{#prefix2}' label='' theme="simple" class="fright" cssStyle="opacity: 0;"/> </div> </div> <div class="fright"> - <%--s:a id='choicesIMAGE_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesIMAGE_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> <s:label for="%{#prefix}.description" key="pollen.common.description" theme="simple"/> <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-06-20 10:00:52 UTC (rev 3541) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-06-20 10:46:32 UTC (rev 3542) @@ -39,19 +39,6 @@ label='' theme="simple" value="%{choice.name}"/> </div> <div class="fright"> - <%--s:a id='choicesTEXT_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesTEXT_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> <s:label for="%{#prefix}.description" key="pollen.common.description" theme="simple"/> <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-20 10:00:52 UTC (rev 3541) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-20 10:46:32 UTC (rev 3542) @@ -244,13 +244,13 @@ <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" escapeAmp="false"> - <s:param name="choiceId" value="name"/> + <s:param name="choiceId" value="%{getImageChoiceName(#choice)}"/> <s:param name="pollId" value="poll.pollId"/> <s:param name="thumb" value="false"/> </s:url> <s:url id="imageUrlThumb" namespace="/io" action="getPollChoiceImage" escapeAmp="false"> - <s:param name="choiceId" value="name"/> + <s:param name="choiceId" value="%{getImageChoiceName(#choice)}"/> <s:param name="pollId" value="poll.pollId"/> <s:param name="thumb" value="true"/> </s:url>

1 0

r3541 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org June 20, 2012

June 20, 2012

Author: tchemit Date: 2012-06-20 12:00:52 +0200 (Wed, 20 Jun 2012) New Revision: 3541 Url: http://chorem.org/repositories/revision/pollen/3541 Log: fixes #613: No thumbnail and image if accents in image name Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-20 08:48:50 UTC (rev 3540) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-20 10:00:52 UTC (rev 3541) @@ -22,6 +22,7 @@ */ package org.chorem.pollen.ui.actions.poll; +import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -39,6 +40,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.interceptor.ServletRequestAware; +import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.bean.PollDateChoice; import org.chorem.pollen.bean.PollImageChoice; import org.chorem.pollen.bean.PollUri; @@ -70,6 +72,8 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -211,6 +215,17 @@ public abstract boolean isEdit(); + public String getImagechoicesThumbPrefix(Choice choice) { + String name = choice.getName(); + try { + String result = URLEncoder.encode(IMAGECHOICES_THUMB_PREFIX + name, Charsets.UTF_8.name()); + return result; + } catch (UnsupportedEncodingException e) { + throw new PollenTechnicalException( + "Could not encode name " + name, e); + } + } + @Override public void setServletRequest(HttpServletRequest request) { this.request = request; @@ -1305,9 +1320,8 @@ // keep in session the location of this thumb (do not // want to expose the full path location in url) - getPollenSession().putDynamicData( - IMAGECHOICES_THUMB_PREFIX + choice.getName(), - thumbFile); + String key = getImagechoicesThumbPrefix(choice); + getPollenSession().putDynamicData(key, thumbFile); } } Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-20 08:48:50 UTC (rev 3540) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-20 10:00:52 UTC (rev 3541) @@ -54,19 +54,6 @@ key="%{#prefix}.name" label='' value="%{#choice.name}"/> </div> <div class="fright"> - <%--s:a id='choicesTEXT_down_%{choiceNumber}' - cssClass="hidden" href='#' - onclick="return downChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesTEXT_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> <s:label for="%{#prefix}.description" key="pollen.common.description" theme="simple"/> <s:textarea cols="30" id="%{#prefix}.description" label='' @@ -108,19 +95,6 @@ displayFormat="%{getText('pollen.common.datePickerPattern')}"/> </div> <div class="fright"> - <%--s:a id='choicesDATE_down_%{choiceNumber}' cssClass="hidden" - href='#' - onclick="return downChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesDATE_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> <s:label for="%{#prefix}.description" key="pollen.common.description" theme="simple"/> <s:textarea cols="30" id="%{#prefix}.description" theme="simple" @@ -167,9 +141,8 @@ value="%{#choice.location}" label='' theme="simple"/> <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" escapeAmp="true"> - <s:param name="choiceTokenId"> - imagechoicesThumb_<s:property value='name'/> - </s:param> + <s:param name="choiceTokenId" + value="%{getImagechoicesThumbPrefix(#choice)}"/> </s:url> <img name="<s:property value="#prefix"/>.thumb" alt="<s:property value='name'/>" @@ -199,19 +172,6 @@ </div> <div class="fright"> - <%--s:a id='choicesIMAGE_down_%{choiceNumber}' cssClass="hidden" - href='#' - onclick="return downChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="downTitle"/>' - title='<s:property value="downTitle"/>' - src="<s:url value='/img/1downarrow.png'/>"></image> - </s:a> - <s:a id='choicesIMAGE_up_%{choiceNumber}' href='#' cssClass="hidden" - onclick="return upChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="upTitle"/>' - title='<s:property value="upTitle"/>' - src="<s:url value='/img/1uparrow.png'/>"></image> - </s:a--%> <s:label for="%{#prefix}.description" key="pollen.common.description" theme="simple"/> <s:textarea cols="30" id="%{#prefix}.description" label=''

1 0