From f2cc6694989dfb3978bbf78772139a4d99e2d937 Mon Sep 17 00:00:00 2001 From: PRiNCE BHARDWAj Date: Wed, 25 Mar 2020 13:01:13 +0530 Subject: [PATCH] FSJ0320A021 --- build/classes/.gitignore | 2 + build/classes/controller/FlamesCheck.class | Bin 1349 -> 2394 bytes src/controller/FlamesCheck.java | 61 ++++++++++----------- src/service/FlamesCheckService.java | 61 +++++++++++++++++++++ src/testing/TestFlamesCheckService.java | 52 +++++++++--------- 5 files changed, 118 insertions(+), 58 deletions(-) diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 4e7e508..3a11f75 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1 +1,3 @@ /controller/ +/service/ +/testing/ diff --git a/build/classes/controller/FlamesCheck.class b/build/classes/controller/FlamesCheck.class index fe7152f9157fd498f6faf543a7b8c5a0e811fa05..1e55f2e36817f3adac4877bbaef9582c18fe457c 100644 GIT binary patch delta 1115 zcmZWoO-~b16g{t_`y(K%RoEDnNlM$sfqpp z(j5y!;=(l>Owq70CdQp{hfDbZ`~vk-Xp?p(Gxwf(=f3mKyEE^bW5?zA@po$*KqqE5 z9GbbthE4|IRdQK7f-YPY(aq4Xy4O(a#5MRCoH3pnlQlWPQ(R+c%t|JAMvBX7ObVwo zMUC~?aGk*t(U$dj5xop`I@i)lgiE0~&C-MOJhB)*7;+$h%KdQDiGBnb98pD`JE&v0 z*fhK#r{xlH<4AMRmcalmBTWqSw+)Skq_o0c>QYowxH_l%7W5?>ZZo*c_;@nSwL^M{ z!Ba-d(I}6kl%#qfaF^j!Sw%wDG)0ba-$G`8i4mg(uJVM!57)S7RM3^#ICU&vKrK_L zJ?#uG;~o#m%M9jdL?^SuB|U8|X=)DxTcn5DSrJajk;M^tXWv#JRMc3hJ*+iY|Ru1(h_(iwqZOx(4jE`6+K3?EMM*a=) za)BSrAyY0eLj{RK!5yPOAMw1v4;%S<;`Md7^9D!D`3>5r8AmBTLoLPg8Q5_F)o6qV zO%z+;hZjM#;W2!O;1XV-9XjO|%5TwuRXSK%%4?KA(1F@QH@?zI`bjf?QQo2a2fe5w z`FE(GxQkLU21X$1$RGeD6(Euff($}H9#9#B4udXOo{>S1K_94tiNP2s X&IGj06iD*{<;;NCJeq;An85-73)2y+ diff --git a/src/controller/FlamesCheck.java b/src/controller/FlamesCheck.java index b9b9a0b..6067bd8 100644 --- a/src/controller/FlamesCheck.java +++ b/src/controller/FlamesCheck.java @@ -12,8 +12,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - - +import service.FlamesCheckService; @WebServlet("/flames") public class FlamesCheck extends HttpServlet { @@ -32,36 +31,34 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - /* - * Uncomment the below code to test your output - * String name1 = request.getParameter("your"); - * String name2 = request.getParameter("crush"); - * - * FlamesCheckService fcs = new FlamesCheckService(); - * - * char k = fcs.findFlames(name1,name2); - * - * if (k == 'f') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/friends.jsp" - * ); rd.forward(request, response); - * - * } else if (k == 'l') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/lovers.jsp") - * ; rd.forward(request, response); - * - * } else if (k == 'a') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( - * "/WEB-INF/views/affection.jsp"); rd.forward(request, response); - * - * } else if (k == 'm') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( - * "/WEB-INF/views/marriage.jsp"); rd.forward(request, response); - * - * } else if (k == 'e') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/enemies.jsp" - * ); rd.forward(request, response); - * - * } else if (k == 's') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( - * "/WEB-INF/views/siblings.jsp"); rd.forward(request, response); - * - * } - */ + + String name1 = request.getParameter("your"); + String name2 = request.getParameter("crush"); + + FlamesCheckService fcs = new FlamesCheckService(); + + char k = fcs.findFlames(name1,name2); + + if (k == 'f') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/friends.jsp" + ); rd.forward(request, response); + + } else if (k == 'l') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/lovers.jsp") + ; rd.forward(request, response); + + } else if (k == 'a') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( + "/WEB-INF/views/affection.jsp"); rd.forward(request, response); + + } else if (k == 'm') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( + "/WEB-INF/views/marriage.jsp"); rd.forward(request, response); + + } else if (k == 'e') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/enemies.jsp" + ); rd.forward(request, response); + + } else if (k == 's') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher( + "/WEB-INF/views/siblings.jsp"); rd.forward(request, response); + + } + } } diff --git a/src/service/FlamesCheckService.java b/src/service/FlamesCheckService.java index a8c006a..41ed200 100644 --- a/src/service/FlamesCheckService.java +++ b/src/service/FlamesCheckService.java @@ -7,3 +7,64 @@ // You must return only the following values ['f','l','a','m','e','s'] // change the return value at the end of the method corresponding to your return value +public class FlamesCheckService{ + public char findFlames(String name1, String name2) { + name1=name1.toLowerCase(); + name2=name2.toLowerCase(); + StringBuilder str1 = new StringBuilder(name1); + StringBuilder str2 = new StringBuilder(name2); + int l1=str1.length(); + int l2=str2.length(); + for(int i=0;i