From 65fb3aca9043a6574c672bb3fc8f9e9f384a7b11 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 9 May 2024 17:16:48 +0200 Subject: [PATCH 01/12] . --- .gitignore | 43 +- .settings/org.eclipse.core.resources.prefs | 4 + .settings/org.eclipse.jdt.core.prefs | 8 + .settings/org.eclipse.m2e.core.prefs | 4 + LICENSE | 695 +++++++++++++++++- README.md | 9 +- pom.xml | 82 +++ src/main/java/ubu/gii/Customer.java | 75 ++ src/main/java/ubu/gii/Movie.java | 38 + src/main/java/ubu/gii/Rental.java | 30 + .../java/ubu/gii/VideoClubAplicacion.java | 23 + src/test/java/ubu/gii/VideoClubTest.java | 64 ++ 12 files changed, 1038 insertions(+), 37 deletions(-) create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 pom.xml create mode 100644 src/main/java/ubu/gii/Customer.java create mode 100644 src/main/java/ubu/gii/Movie.java create mode 100644 src/main/java/ubu/gii/Rental.java create mode 100644 src/main/java/ubu/gii/VideoClubAplicacion.java create mode 100644 src/test/java/ubu/gii/VideoClubTest.java diff --git a/.gitignore b/.gitignore index 2f43530..d020ccc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,32 @@ -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -# https://github.com/takari/maven-wrapper#usage-without-binary-jar -.mvn/wrapper/maven-wrapper.jar +# Compiled class file +*.class -# Eclipse m2e generated files -# Eclipse Core +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* +/bin/ + +#Eclipse file .project -# JDT-specific (Eclipse Java Development Tools) .classpath + +#Maven target +/target \ No newline at end of file diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..f9fe345 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..2f5cc74 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/LICENSE b/LICENSE index ae570e4..70566f2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License - -Copyright (c) 2024 Carlos López - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is 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. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + 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. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + 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 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. Use with the GNU Affero General Public License. + + 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 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 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 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 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 General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + 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 GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/README.md b/README.md index 9c9d64b..704635f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,7 @@ -# HelloRefactorQA -Taller gitflow +refactoring-fowler-example +========================== + +Java code example to teach basic refactoring concepts. + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..cb7ebb0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,82 @@ + + + + 4.0.0 + + ubu.gii + javaAppFowler + 1.0-SNAPSHOT + + Refactoring Fowler Example + + https://github.com/clopezno/refactoring-fowler-example + + + UTF-8 + 8 + 8 + 5.9.1 + 0.8.8 + 3.0.0-M7 + + + + + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} + test + + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.jacoco + jacoco-maven-plugin + + + prepare-agent + + prepare-agent + + + + report + test + + report + + + + + + + + \ No newline at end of file diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java new file mode 100644 index 0000000..ab2e3e0 --- /dev/null +++ b/src/main/java/ubu/gii/Customer.java @@ -0,0 +1,75 @@ +package ubu.gii; + +/** +* Tema Refactorizaciones +* +* Ejemplo de aplicaci�n de refactorizaciones. Actualizado para colecciones gen�ricas de java 1.5 +* +* @author M. Fowler y Carlos L�pez +* @version 1.1 +* @see java.io.File +* +*/ +import java.util.*; + +public class Customer { + private String _name; + private List _rentals; + + public Customer(String name) { + _name = name; + _rentals = new ArrayList(); + + }; + + public void addRental(Rental arg) { + _rentals.add(arg); + } + + public String getName() { + return _name; + }; + + public String statement() { + double totalAmount = 0; + int frequentRenterPoints = 0; + Iterator rentals = _rentals.iterator(); + String result = "Rental Record for " + getName() + "\n"; + while (rentals.hasNext()) { + double thisAmount = 0; + Rental each = rentals.next(); + // determine amounts for each line + switch (each.getMovie().getPriceCode()) { + case Movie.REGULAR: + thisAmount += 2; + if (each.getDaysRented() > 2) + thisAmount += (each.getDaysRented() - 2) * 1.5; + break; + case Movie.NEW_RELEASE: + thisAmount += each.getDaysRented() * 3; + break; + case Movie.CHILDRENS: + thisAmount += 1.5; + if (each.getDaysRented() > 3) + thisAmount += (each.getDaysRented() - 3) * 1.5; + break; + } + + // add frequent renter points + frequentRenterPoints++; + // add bonus for a two day new release rental + if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE) + && each.getDaysRented() > 1) + frequentRenterPoints++; + // show figures for this rental + result += "\t" + each.getMovie().getTitle() + "\t" + + String.valueOf(thisAmount) + "\n"; + totalAmount += thisAmount; + } + // add footer lines + result += "Amount owed is " + String.valueOf(totalAmount) + "\n"; + result += "You earned " + String.valueOf(frequentRenterPoints) + + " frequent renter points"; + return result; + } +} diff --git a/src/main/java/ubu/gii/Movie.java b/src/main/java/ubu/gii/Movie.java new file mode 100644 index 0000000..81f2494 --- /dev/null +++ b/src/main/java/ubu/gii/Movie.java @@ -0,0 +1,38 @@ +package ubu.gii; +/** + * Tema Refactorizaciones + * + * Ejemplo de aplicación de refactorizaciones. Actualizado para colecciones + * genéricas de java 1.5. + * + * @author M. Fowler y Carlos López + * @version 1.1 + * @see java.io.File + * + */ + +public class Movie { + public static final int CHILDRENS = 2; + public static final int REGULAR = 0; + public static final int NEW_RELEASE = 1; + + private String _title; + private int _priceCode; + + public Movie(String title, int priceCode) { + _title = title; + _priceCode = priceCode; + } + + public int getPriceCode() { + return _priceCode; + } + + public void setPriceCode(int arg) { + _priceCode = arg; + } + + public String getTitle() { + return _title; + } +} diff --git a/src/main/java/ubu/gii/Rental.java b/src/main/java/ubu/gii/Rental.java new file mode 100644 index 0000000..ddb51fa --- /dev/null +++ b/src/main/java/ubu/gii/Rental.java @@ -0,0 +1,30 @@ +package ubu.gii; +/** + * Tema Refactorizaciones + * + * Ejemplo de aplicación de refactorizaciones. Actualizado para colecciones + * genéricas de java 1.5. + * + * @author M. Fowler y Carlos López + * @version 1.1 + * @see java.io.File + * + */ +public class Rental { + private Movie _movie; + private int _daysRented; + + public Rental(Movie movie, int daysRented) { + _movie = movie; + _daysRented = daysRented; + } + + public int getDaysRented() { + return _daysRented; + } + + public Movie getMovie() { + return _movie; + } + +} diff --git a/src/main/java/ubu/gii/VideoClubAplicacion.java b/src/main/java/ubu/gii/VideoClubAplicacion.java new file mode 100644 index 0000000..d3c5fc8 --- /dev/null +++ b/src/main/java/ubu/gii/VideoClubAplicacion.java @@ -0,0 +1,23 @@ +package ubu.gii; +public class VideoClubAplicacion { + + public static void main(String[] arg) { + Movie m1 = new Movie("Sky Captain", 1); + Movie m3 = new Movie("Accion Mutante", 0); + Movie m4 = new Movie("Hermano Oso", 2); + + Customer c1 = new Customer("Manuel"); + + Rental r1 = new Rental(m1, 5); + Rental r2 = new Rental(m3, 1); + Rental r3 = new Rental(m4, 10); + + c1.addRental(r1); + c1.addRental(r2); + c1.addRental(r3); + + System.out.println(c1.statement()); + + } + +} \ No newline at end of file diff --git a/src/test/java/ubu/gii/VideoClubTest.java b/src/test/java/ubu/gii/VideoClubTest.java new file mode 100644 index 0000000..0283106 --- /dev/null +++ b/src/test/java/ubu/gii/VideoClubTest.java @@ -0,0 +1,64 @@ +package ubu.gii; + + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import ubu.gii.Customer; +import ubu.gii.Movie; +import ubu.gii.Rental; + +/** + * Tema Refactorizaciones + * + * Ejemplo de aplicación de refactorizaciones. Actualizado para colecciones + * genéricas de java 1.5 + * + * @author M. Fowler y Carlos L�pez + * @version 1.1 + + * + */ +public class VideoClubTest { + protected static Movie m0, m11, m12, m2; + protected static Customer c1; + + @BeforeAll + public static void setUp() { + m11 = new Movie("Sky Captain", 1); + m12 = new Movie("Alejandro Magno", 1); + m0 = new Movie("Accion Mutante", 0); + m2 = new Movie("Hermano Oso", 2); + + c1 = new Customer("Manuel"); + } + + @AfterAll + public static void tearDown() throws Exception {} + + @Test + public void testAlquiler() { + + Rental r1 = new Rental(m11, 5); + Rental r2 = new Rental(m0, 1); + Rental r3 = new Rental(m2, 10); + + c1.addRental(r1); + c1.addRental(r2); + c1.addRental(r3); + + String salida = c1.statement(); + + String salidaEsperada = new String("Rental Record for Manuel\n" + + "\tSky Captain\t15.0\n" + "\tAccion Mutante\t2.0\n" + + "\tHermano Oso\t12.0\n" + "Amount owed is 29.0\n" + + "You earned 4 frequent renter points"); + + assertTrue(salidaEsperada.equals(salida),"Calcula mal el alquiler"); + + } + +} From 6e105450d56671b3a8d5fa0e69b96aba6d84c3fc Mon Sep 17 00:00:00 2001 From: Sermare16 Date: Wed, 15 May 2024 10:46:57 +0200 Subject: [PATCH 02/12] Refactor Extract Method (determine amounts for each line) Lines: 41-56 --- src/main/java/ubu/gii/Customer.java | 37 ++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index ab2e3e0..88e0f3d 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -38,22 +38,7 @@ public String statement() { while (rentals.hasNext()) { double thisAmount = 0; Rental each = rentals.next(); - // determine amounts for each line - switch (each.getMovie().getPriceCode()) { - case Movie.REGULAR: - thisAmount += 2; - if (each.getDaysRented() > 2) - thisAmount += (each.getDaysRented() - 2) * 1.5; - break; - case Movie.NEW_RELEASE: - thisAmount += each.getDaysRented() * 3; - break; - case Movie.CHILDRENS: - thisAmount += 1.5; - if (each.getDaysRented() > 3) - thisAmount += (each.getDaysRented() - 3) * 1.5; - break; - } + thisAmount = determineAmountsForEachMovie(thisAmount, each); // add frequent renter points frequentRenterPoints++; @@ -72,4 +57,24 @@ public String statement() { + " frequent renter points"; return result; } + + private double determineAmountsForEachMovie(double thisAmount, Rental each) { + // determine amounts for each line + switch (each.getMovie().getPriceCode()) { + case Movie.REGULAR: + thisAmount += 2; + if (each.getDaysRented() > 2) + thisAmount += (each.getDaysRented() - 2) * 1.5; + break; + case Movie.NEW_RELEASE: + thisAmount += each.getDaysRented() * 3; + break; + case Movie.CHILDRENS: + thisAmount += 1.5; + if (each.getDaysRented() > 3) + thisAmount += (each.getDaysRented() - 3) * 1.5; + break; + } + return thisAmount; + } } From 5101f9e1057789f8140a69abb504dafbffd3e065 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 15 May 2024 10:57:35 +0200 Subject: [PATCH 03/12] Refactor Move Method (determineAmountsForEachMovie) to Rental Class --- src/main/java/ubu/gii/Customer.java | 22 +--------------------- src/main/java/ubu/gii/Rental.java | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index 88e0f3d..b7de55a 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -38,7 +38,7 @@ public String statement() { while (rentals.hasNext()) { double thisAmount = 0; Rental each = rentals.next(); - thisAmount = determineAmountsForEachMovie(thisAmount, each); + thisAmount = each.determineAmountsForEachMovie(thisAmount); // add frequent renter points frequentRenterPoints++; @@ -57,24 +57,4 @@ public String statement() { + " frequent renter points"; return result; } - - private double determineAmountsForEachMovie(double thisAmount, Rental each) { - // determine amounts for each line - switch (each.getMovie().getPriceCode()) { - case Movie.REGULAR: - thisAmount += 2; - if (each.getDaysRented() > 2) - thisAmount += (each.getDaysRented() - 2) * 1.5; - break; - case Movie.NEW_RELEASE: - thisAmount += each.getDaysRented() * 3; - break; - case Movie.CHILDRENS: - thisAmount += 1.5; - if (each.getDaysRented() > 3) - thisAmount += (each.getDaysRented() - 3) * 1.5; - break; - } - return thisAmount; - } } diff --git a/src/main/java/ubu/gii/Rental.java b/src/main/java/ubu/gii/Rental.java index ddb51fa..4222a3c 100644 --- a/src/main/java/ubu/gii/Rental.java +++ b/src/main/java/ubu/gii/Rental.java @@ -27,4 +27,24 @@ public Movie getMovie() { return _movie; } + double determineAmountsForEachMovie(double thisAmount) { + // determine amounts for each line + switch (getMovie().getPriceCode()) { + case Movie.REGULAR: + thisAmount += 2; + if (getDaysRented() > 2) + thisAmount += (getDaysRented() - 2) * 1.5; + break; + case Movie.NEW_RELEASE: + thisAmount += getDaysRented() * 3; + break; + case Movie.CHILDRENS: + thisAmount += 1.5; + if (getDaysRented() > 3) + thisAmount += (getDaysRented() - 3) * 1.5; + break; + } + return thisAmount; + } + } From 10093024a6f48ed0cbfc93ae50960dcf46060515 Mon Sep 17 00:00:00 2001 From: Sermare16 Date: Wed, 15 May 2024 11:03:29 +0200 Subject: [PATCH 04/12] Refactor Move Method (determineAmountsForEachMovie) to Movie Class #6 --- src/main/java/ubu/gii/Customer.java | 2 +- src/main/java/ubu/gii/Movie.java | 20 ++++++++++++++++++++ src/main/java/ubu/gii/Rental.java | 20 -------------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index b7de55a..7221cfa 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -38,7 +38,7 @@ public String statement() { while (rentals.hasNext()) { double thisAmount = 0; Rental each = rentals.next(); - thisAmount = each.determineAmountsForEachMovie(thisAmount); + thisAmount = each.getMovie().determineAmountsForEachMovie(each, thisAmount); // add frequent renter points frequentRenterPoints++; diff --git a/src/main/java/ubu/gii/Movie.java b/src/main/java/ubu/gii/Movie.java index 81f2494..e3f4fe0 100644 --- a/src/main/java/ubu/gii/Movie.java +++ b/src/main/java/ubu/gii/Movie.java @@ -35,4 +35,24 @@ public void setPriceCode(int arg) { public String getTitle() { return _title; } + + double determineAmountsForEachMovie(Rental rental, double thisAmount) { + // determine amounts for each line + switch (rental.getMovie().getPriceCode()) { + case Movie.REGULAR: + thisAmount += 2; + if (rental.getDaysRented() > 2) + thisAmount += (rental.getDaysRented() - 2) * 1.5; + break; + case Movie.NEW_RELEASE: + thisAmount += rental.getDaysRented() * 3; + break; + case Movie.CHILDRENS: + thisAmount += 1.5; + if (rental.getDaysRented() > 3) + thisAmount += (rental.getDaysRented() - 3) * 1.5; + break; + } + return thisAmount; + } } diff --git a/src/main/java/ubu/gii/Rental.java b/src/main/java/ubu/gii/Rental.java index 4222a3c..ddb51fa 100644 --- a/src/main/java/ubu/gii/Rental.java +++ b/src/main/java/ubu/gii/Rental.java @@ -27,24 +27,4 @@ public Movie getMovie() { return _movie; } - double determineAmountsForEachMovie(double thisAmount) { - // determine amounts for each line - switch (getMovie().getPriceCode()) { - case Movie.REGULAR: - thisAmount += 2; - if (getDaysRented() > 2) - thisAmount += (getDaysRented() - 2) * 1.5; - break; - case Movie.NEW_RELEASE: - thisAmount += getDaysRented() * 3; - break; - case Movie.CHILDRENS: - thisAmount += 1.5; - if (getDaysRented() > 3) - thisAmount += (getDaysRented() - 3) * 1.5; - break; - } - return thisAmount; - } - } From 26a2dcceed0195065dfdb5cc3c8c54f3b34f6407 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 15 May 2024 11:09:43 +0200 Subject: [PATCH 05/12] Refactor Extract Method (add frequent renter points) Lines: 43-44 #7 --- src/main/java/ubu/gii/Customer.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index 7221cfa..b3ec92e 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -40,12 +40,11 @@ public String statement() { Rental each = rentals.next(); thisAmount = each.getMovie().determineAmountsForEachMovie(each, thisAmount); - // add frequent renter points - frequentRenterPoints++; + frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); // add bonus for a two day new release rental if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE) && each.getDaysRented() > 1) - frequentRenterPoints++; + frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); // show figures for this rental result += "\t" + each.getMovie().getTitle() + "\t" + String.valueOf(thisAmount) + "\n"; @@ -57,4 +56,10 @@ public String statement() { + " frequent renter points"; return result; } + + private int addFrequentRenterPoints(int frequentRenterPoints) { + // add frequent renter points + frequentRenterPoints++; + return frequentRenterPoints; + } } From 3be4bc26f51cb7e6a648f01eeae310c63ce5e336 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 15 May 2024 11:14:15 +0200 Subject: [PATCH 06/12] Refactor Extract Method (add bonus for a two day new release rental) Lines: 44-47 #8 --- src/main/java/ubu/gii/Customer.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index b3ec92e..398f33e 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -41,10 +41,7 @@ public String statement() { thisAmount = each.getMovie().determineAmountsForEachMovie(each, thisAmount); frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); - // add bonus for a two day new release rental - if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE) - && each.getDaysRented() > 1) - frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); + frequentRenterPoints = addBonusForTwoDayNewReleaseRental(frequentRenterPoints, each); // show figures for this rental result += "\t" + each.getMovie().getTitle() + "\t" + String.valueOf(thisAmount) + "\n"; @@ -57,6 +54,14 @@ public String statement() { return result; } + private int addBonusForTwoDayNewReleaseRental(int frequentRenterPoints, Rental each) { + // add bonus for a two day new release rental + if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE) + && each.getDaysRented() > 1) + frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); + return frequentRenterPoints; + } + private int addFrequentRenterPoints(int frequentRenterPoints) { // add frequent renter points frequentRenterPoints++; From 4063a02ee48708db30107e609aa4a3cca34a8d55 Mon Sep 17 00:00:00 2001 From: Sermare16 Date: Wed, 15 May 2024 11:23:41 +0200 Subject: [PATCH 07/12] Refactor Move Method (addBonusForTwoDayNewReleaseRental) to Rental Class #9 --- src/main/java/ubu/gii/Customer.java | 12 ++---------- src/main/java/ubu/gii/Rental.java | 8 ++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index 398f33e..91aebfe 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -41,7 +41,7 @@ public String statement() { thisAmount = each.getMovie().determineAmountsForEachMovie(each, thisAmount); frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); - frequentRenterPoints = addBonusForTwoDayNewReleaseRental(frequentRenterPoints, each); + frequentRenterPoints = each.addBonusForTwoDayNewReleaseRental(frequentRenterPoints, this); // show figures for this rental result += "\t" + each.getMovie().getTitle() + "\t" + String.valueOf(thisAmount) + "\n"; @@ -54,15 +54,7 @@ public String statement() { return result; } - private int addBonusForTwoDayNewReleaseRental(int frequentRenterPoints, Rental each) { - // add bonus for a two day new release rental - if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE) - && each.getDaysRented() > 1) - frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); - return frequentRenterPoints; - } - - private int addFrequentRenterPoints(int frequentRenterPoints) { + int addFrequentRenterPoints(int frequentRenterPoints) { // add frequent renter points frequentRenterPoints++; return frequentRenterPoints; diff --git a/src/main/java/ubu/gii/Rental.java b/src/main/java/ubu/gii/Rental.java index ddb51fa..9d2b016 100644 --- a/src/main/java/ubu/gii/Rental.java +++ b/src/main/java/ubu/gii/Rental.java @@ -27,4 +27,12 @@ public Movie getMovie() { return _movie; } + int addBonusForTwoDayNewReleaseRental(int frequentRenterPoints, Customer customer) { + // add bonus for a two day new release rental + if ((getMovie().getPriceCode() == Movie.NEW_RELEASE) + && getDaysRented() > 1) + frequentRenterPoints = customer.addFrequentRenterPoints(frequentRenterPoints); + return frequentRenterPoints; + } + } From e7ba97f0a5ccf89d8b861d9eb3afe29384f5b04b Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 15 May 2024 11:30:20 +0200 Subject: [PATCH 08/12] Refactor Extract Method (show figures for this rental) Lines: 45-47 #10 --- src/main/java/ubu/gii/Customer.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index 91aebfe..2d00d4d 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -42,9 +42,7 @@ public String statement() { frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); frequentRenterPoints = each.addBonusForTwoDayNewReleaseRental(frequentRenterPoints, this); - // show figures for this rental - result += "\t" + each.getMovie().getTitle() + "\t" - + String.valueOf(thisAmount) + "\n"; + result = showFiguresForThisRental(result, thisAmount, each); totalAmount += thisAmount; } // add footer lines @@ -54,6 +52,13 @@ public String statement() { return result; } + private String showFiguresForThisRental(String result, double thisAmount, Rental each) { + // show figures for this rental + result += "\t" + each.getMovie().getTitle() + "\t" + + String.valueOf(thisAmount) + "\n"; + return result; + } + int addFrequentRenterPoints(int frequentRenterPoints) { // add frequent renter points frequentRenterPoints++; From 9165864994b9a0b6fe5343d01a674f285ecfdcd9 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 15 May 2024 11:34:41 +0200 Subject: [PATCH 09/12] Refactor Extract Method (add footer lines) Lines: 48-52 #11 --- src/main/java/ubu/gii/Customer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index 2d00d4d..3fd2c42 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -45,6 +45,10 @@ public String statement() { result = showFiguresForThisRental(result, thisAmount, each); totalAmount += thisAmount; } + return addFooterLines(totalAmount, frequentRenterPoints, result); + } + + private String addFooterLines(double totalAmount, int frequentRenterPoints, String result) { // add footer lines result += "Amount owed is " + String.valueOf(totalAmount) + "\n"; result += "You earned " + String.valueOf(frequentRenterPoints) From 41ae94b1782b36beeda8ce4f08087529cd8d0c1c Mon Sep 17 00:00:00 2001 From: Sermare16 Date: Wed, 15 May 2024 11:38:05 +0200 Subject: [PATCH 10/12] Refactor Rename (variable each) to alquilerActual in Costumer Class #12 --- src/main/java/ubu/gii/Customer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index 3fd2c42..0c5cc63 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -37,12 +37,12 @@ public String statement() { String result = "Rental Record for " + getName() + "\n"; while (rentals.hasNext()) { double thisAmount = 0; - Rental each = rentals.next(); - thisAmount = each.getMovie().determineAmountsForEachMovie(each, thisAmount); + Rental alquilerActual = rentals.next(); + thisAmount = alquilerActual.getMovie().determineAmountsForEachMovie(alquilerActual, thisAmount); frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); - frequentRenterPoints = each.addBonusForTwoDayNewReleaseRental(frequentRenterPoints, this); - result = showFiguresForThisRental(result, thisAmount, each); + frequentRenterPoints = alquilerActual.addBonusForTwoDayNewReleaseRental(frequentRenterPoints, this); + result = showFiguresForThisRental(result, thisAmount, alquilerActual); totalAmount += thisAmount; } return addFooterLines(totalAmount, frequentRenterPoints, result); From 87d2da7ff7d6dde6618ea092185dea0a9f7d9716 Mon Sep 17 00:00:00 2001 From: Sermare16 Date: Wed, 15 May 2024 12:09:04 +0200 Subject: [PATCH 11/12] Informe de alquiler en formato HTML #2 --- src/main/java/ubu/gii/Customer.java | 52 +++++++++++++------ .../java/ubu/gii/VideoClubAplicacion.java | 8 ++- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index 0c5cc63..f92538e 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -29,12 +29,23 @@ public void addRental(Rental arg) { public String getName() { return _name; }; - + public String statement() { + return statement(false); + } + + public String statement(boolean isHtml) { double totalAmount = 0; int frequentRenterPoints = 0; Iterator rentals = _rentals.iterator(); - String result = "Rental Record for " + getName() + "\n"; + String result = null; + + if (!isHtml) { + result = "Rental Record for " + getName() + "\n"; + } else { + result = "

Rental Record for " + getName() + "

\n"; + } + while (rentals.hasNext()) { double thisAmount = 0; Rental alquilerActual = rentals.next(); @@ -42,25 +53,36 @@ public String statement() { frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); frequentRenterPoints = alquilerActual.addBonusForTwoDayNewReleaseRental(frequentRenterPoints, this); - result = showFiguresForThisRental(result, thisAmount, alquilerActual); + result = showFiguresForThisRental(result, thisAmount, alquilerActual, isHtml); totalAmount += thisAmount; } - return addFooterLines(totalAmount, frequentRenterPoints, result); + return addFooterLines(totalAmount, frequentRenterPoints, result, isHtml); } - private String addFooterLines(double totalAmount, int frequentRenterPoints, String result) { - // add footer lines - result += "Amount owed is " + String.valueOf(totalAmount) + "\n"; - result += "You earned " + String.valueOf(frequentRenterPoints) - + " frequent renter points"; - return result; + private String addFooterLines(double totalAmount, int frequentRenterPoints, String result, boolean isHtml) { + if (isHtml) { + result += "

Amount owed is " + String.valueOf(totalAmount) + "

\n"; + result += "

You earned " + String.valueOf(frequentRenterPoints) + + " frequent renter points

"; + } else { + // add footer lines + result += "Amount owed is " + String.valueOf(totalAmount) + "\n"; + result += "You earned " + String.valueOf(frequentRenterPoints) + + " frequent renter points"; + } + return result; } - private String showFiguresForThisRental(String result, double thisAmount, Rental each) { - // show figures for this rental - result += "\t" + each.getMovie().getTitle() + "\t" - + String.valueOf(thisAmount) + "\n"; - return result; + private String showFiguresForThisRental(String result, double thisAmount, Rental each, boolean isHtml) { + if (isHtml) { + result += "

" + each.getMovie().getTitle() + " - " + + String.valueOf(thisAmount) + "

\n"; + } else { + // show figures for this rental + result += "\t" + each.getMovie().getTitle() + "\t" + + String.valueOf(thisAmount) + "\n"; + } + return result; } int addFrequentRenterPoints(int frequentRenterPoints) { diff --git a/src/main/java/ubu/gii/VideoClubAplicacion.java b/src/main/java/ubu/gii/VideoClubAplicacion.java index d3c5fc8..8bfb74b 100644 --- a/src/main/java/ubu/gii/VideoClubAplicacion.java +++ b/src/main/java/ubu/gii/VideoClubAplicacion.java @@ -15,8 +15,14 @@ public static void main(String[] arg) { c1.addRental(r1); c1.addRental(r2); c1.addRental(r3); - + + // Imprime historial de alquiler en texto plano System.out.println(c1.statement()); + + System.out.println("\n---------------------------------------\n"); + + // Imprime historial de alquiler en formato html + System.out.println(c1.statement(true)); } From b5876c2e75fd9eb00a36185457a25240664280f4 Mon Sep 17 00:00:00 2001 From: Sermare16 Date: Thu, 16 May 2024 17:51:01 +0200 Subject: [PATCH 12/12] =?UTF-8?q?Implementado=20la=20clasificaci=C3=B3n=20?= =?UTF-8?q?de=20pel=C3=ADculas=20junto=20con=20las=20reglas=20para=20calcu?= =?UTF-8?q?lar=20el=20precio=20y=20los=20puntos=20frecuentes=20de=20alquil?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ubu/gii/ChildrenPrice.java | 26 +++++++++++++ src/main/java/ubu/gii/Customer.java | 7 ---- src/main/java/ubu/gii/Movie.java | 43 ++++++++++++---------- src/main/java/ubu/gii/NewReleasePrice.java | 27 ++++++++++++++ src/main/java/ubu/gii/Price.java | 9 +++++ src/main/java/ubu/gii/RegularPrice.java | 24 ++++++++++++ src/main/java/ubu/gii/Rental.java | 14 +++++-- 7 files changed, 120 insertions(+), 30 deletions(-) create mode 100644 src/main/java/ubu/gii/ChildrenPrice.java create mode 100644 src/main/java/ubu/gii/NewReleasePrice.java create mode 100644 src/main/java/ubu/gii/Price.java create mode 100644 src/main/java/ubu/gii/RegularPrice.java diff --git a/src/main/java/ubu/gii/ChildrenPrice.java b/src/main/java/ubu/gii/ChildrenPrice.java new file mode 100644 index 0000000..1cb7bfc --- /dev/null +++ b/src/main/java/ubu/gii/ChildrenPrice.java @@ -0,0 +1,26 @@ +package ubu.gii; + +public class ChildrenPrice extends Price { + + @Override + public int getPriceCode() { + return Movie.CHILDRENS; + } + + @Override + public double getCharge(int daysRented) { + double result=1.5; + + if (daysRented > 3) { + result += (daysRented - 3) * 1.5; + } + + return result; + } + + @Override + public int getFrequentRenterPoint(int daysRented) { + return 1; + } + +} diff --git a/src/main/java/ubu/gii/Customer.java b/src/main/java/ubu/gii/Customer.java index f92538e..eac184e 100644 --- a/src/main/java/ubu/gii/Customer.java +++ b/src/main/java/ubu/gii/Customer.java @@ -50,8 +50,6 @@ public String statement(boolean isHtml) { double thisAmount = 0; Rental alquilerActual = rentals.next(); thisAmount = alquilerActual.getMovie().determineAmountsForEachMovie(alquilerActual, thisAmount); - - frequentRenterPoints = addFrequentRenterPoints(frequentRenterPoints); frequentRenterPoints = alquilerActual.addBonusForTwoDayNewReleaseRental(frequentRenterPoints, this); result = showFiguresForThisRental(result, thisAmount, alquilerActual, isHtml); totalAmount += thisAmount; @@ -85,9 +83,4 @@ private String showFiguresForThisRental(String result, double thisAmount, Rental return result; } - int addFrequentRenterPoints(int frequentRenterPoints) { - // add frequent renter points - frequentRenterPoints++; - return frequentRenterPoints; - } } diff --git a/src/main/java/ubu/gii/Movie.java b/src/main/java/ubu/gii/Movie.java index e3f4fe0..38bb618 100644 --- a/src/main/java/ubu/gii/Movie.java +++ b/src/main/java/ubu/gii/Movie.java @@ -17,19 +17,31 @@ public class Movie { public static final int NEW_RELEASE = 1; private String _title; - private int _priceCode; + private Price _priceCode; public Movie(String title, int priceCode) { _title = title; - _priceCode = priceCode; + setPriceCode(priceCode); } - public int getPriceCode() { + public Price getPriceCode() { return _priceCode; } public void setPriceCode(int arg) { - _priceCode = arg; + switch (arg) { + case REGULAR: + _priceCode = new RegularPrice(); + break; + case CHILDRENS: + _priceCode = new ChildrenPrice(); + break; + case NEW_RELEASE: + _priceCode = new NewReleasePrice(); + break; + default: + throw new IllegalArgumentException("No se reconoce el PriceCode especificado"); + } } public String getTitle() { @@ -37,22 +49,15 @@ public String getTitle() { } double determineAmountsForEachMovie(Rental rental, double thisAmount) { - // determine amounts for each line - switch (rental.getMovie().getPriceCode()) { - case Movie.REGULAR: - thisAmount += 2; - if (rental.getDaysRented() > 2) - thisAmount += (rental.getDaysRented() - 2) * 1.5; - break; - case Movie.NEW_RELEASE: - thisAmount += rental.getDaysRented() * 3; - break; - case Movie.CHILDRENS: - thisAmount += 1.5; - if (rental.getDaysRented() > 3) - thisAmount += (rental.getDaysRented() - 3) * 1.5; - break; + + if (rental.getMovie().getPriceCode() instanceof RegularPrice) { + thisAmount = new RegularPrice().getCharge(rental.getDaysRented()); + } else if (rental.getMovie().getPriceCode() instanceof NewReleasePrice) { + thisAmount = new NewReleasePrice().getCharge(rental.getDaysRented()); + } else if (rental.getMovie().getPriceCode() instanceof ChildrenPrice) { + thisAmount = new ChildrenPrice().getCharge(rental.getDaysRented()); } + return thisAmount; } } diff --git a/src/main/java/ubu/gii/NewReleasePrice.java b/src/main/java/ubu/gii/NewReleasePrice.java new file mode 100644 index 0000000..9fd664e --- /dev/null +++ b/src/main/java/ubu/gii/NewReleasePrice.java @@ -0,0 +1,27 @@ +package ubu.gii; + +public class NewReleasePrice extends Price { + + @Override + public int getPriceCode() { + return Movie.NEW_RELEASE; + } + + @Override + public double getCharge(int daysRented) { + int result = daysRented * 3; + return result; + } + + @Override + public int getFrequentRenterPoint(int daysRented) { + int frequentRenterPoints=1; + // Añadir un bonus si la pelicula es de tipo "NEW RELEASE" y ha sido alquilada durante más de un día + if (getPriceCode() == Movie.NEW_RELEASE && daysRented >= 2) { + frequentRenterPoints++; + } + return frequentRenterPoints; + } + + +} diff --git a/src/main/java/ubu/gii/Price.java b/src/main/java/ubu/gii/Price.java new file mode 100644 index 0000000..0c11574 --- /dev/null +++ b/src/main/java/ubu/gii/Price.java @@ -0,0 +1,9 @@ +package ubu.gii; + +public abstract class Price { + public abstract int getPriceCode(); + + public abstract double getCharge(int daysRented); + + public abstract int getFrequentRenterPoint(int daysRented); +} diff --git a/src/main/java/ubu/gii/RegularPrice.java b/src/main/java/ubu/gii/RegularPrice.java new file mode 100644 index 0000000..f68ccd3 --- /dev/null +++ b/src/main/java/ubu/gii/RegularPrice.java @@ -0,0 +1,24 @@ +package ubu.gii; + +public class RegularPrice extends Price{ + + @Override + public int getPriceCode() { + return Movie.REGULAR; + } + + @Override + public double getCharge(int daysRented) { + double result = 2; + if (daysRented > 2) { + result += (daysRented - 2) * 1.5; + } + return result; + } + + @Override + public int getFrequentRenterPoint(int daysRented) { + return 1; + } + +} diff --git a/src/main/java/ubu/gii/Rental.java b/src/main/java/ubu/gii/Rental.java index 9d2b016..c36937a 100644 --- a/src/main/java/ubu/gii/Rental.java +++ b/src/main/java/ubu/gii/Rental.java @@ -28,11 +28,17 @@ public Movie getMovie() { } int addBonusForTwoDayNewReleaseRental(int frequentRenterPoints, Customer customer) { - // add bonus for a two day new release rental - if ((getMovie().getPriceCode() == Movie.NEW_RELEASE) - && getDaysRented() > 1) - frequentRenterPoints = customer.addFrequentRenterPoints(frequentRenterPoints); + + if (getMovie().getPriceCode() instanceof NewReleasePrice) { + frequentRenterPoints += new NewReleasePrice().getFrequentRenterPoint(getDaysRented()); + } else if (getMovie().getPriceCode() instanceof RegularPrice) { + frequentRenterPoints += new RegularPrice().getFrequentRenterPoint(getDaysRented()); + } else if (getMovie().getPriceCode() instanceof ChildrenPrice) { + frequentRenterPoints += new ChildrenPrice().getFrequentRenterPoint(getDaysRented()); + } + return frequentRenterPoints; + } }