From c2a943f383577671ac447f08c3dadccdd59300f9 Mon Sep 17 00:00:00 2001
From: Deepankar <61615789+lemecode@users.noreply.github.com>
Date: Wed, 23 Sep 2020 23:59:36 +0530
Subject: [PATCH] FSJ0320B001
---
.classpath | 6 +-
build/classes/.gitignore | 2 +
build/classes/controller/FlamesCheck.class | Bin 1349 -> 2394 bytes
src/controller/FlamesCheck.java | 63 ++++++++---------
src/service/FlamesCheckService.java | 75 +++++++++++++++++++++
src/testing/TestFlamesCheckService.java | 52 +++++++-------
6 files changed, 136 insertions(+), 62 deletions(-)
diff --git a/.classpath b/.classpath
index 2846539..20c137d 100644
--- a/.classpath
+++ b/.classpath
@@ -8,10 +8,6 @@
-
-
-
-
-
+
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..9c9c3b7b548fe3b6b8f10a0b7549aca16f5c116d 100644
GIT binary patch
delta 1092
zcmZWoO-~b16g{tBQz{^q5K?R+F8D4TLB4DSkxCT>M2jNg2an;kOlhY$Q)(n8W1@e6
zuwzBy!Zk606caYa#JDr=a4A24U!YzJZ9-=<@7*)++&TBWJ8!;u4!oWpfA{tQ^k8Az
zqucA;=wWcY$*k(<(1!sD{R~a(M@{vWxP}lzWkO`9xX#leD|CkD4cX>1
zS|aSmbq1%RuNq4dh8P+Qq32XZ$k7zNWki;QvK%{E@?a3v$J5P9j3C0`iL2V;NghK>
z>v)pq_!)8QN?XKjVwB3rGovG&W0O%ir;68x9M@H$EgHe3vEs&U245MU%H)K8N{=!4
z%V-{t3ni;&v=f1Q3>V8X(p=Y7o)E#Ld0b+`YC&ist%}nc_pJ(sx{#ud6%wdr8nvg3
z!E4>)DcQ|nk1Gb59Y534z?r6o8Q3xnYG+j}%a!E`zB0`hQbNKkeX#YTM!&I=(F}T?
zW2h-_@#nYpBr|PJ*x{ygaoFL#nn$k0-iNtH3bvqR5Y1
z`9|W6E%*usC(HS5+Nd4pX?}rvnp;d%pcS=fhaUknBZv@WM9_t&=!Qan%PaK4ptwfy
zJ^HbZ0c=p*r1+7t_YlTcI@v!lgkKa7DE^^CUPJO9P(|}0F2GCi7zNM?RzN|jV}n_N
z-c)=
delta 120
zcmca5bd-zh)W2Q(7#J8#7%Vq(6)|r<&6>p+&tMM}VFqHxjX;8lfgeb+F)#v2M+N~P
zsQ{5=5M&Sn@_@=1bQpBO@{A064EjJFObo_AaVDU#ra+nxC}#%5=Ftp{#S9hzg***&
diff --git a/src/controller/FlamesCheck.java b/src/controller/FlamesCheck.java
index b9b9a0b..dd0108f 100644
--- a/src/controller/FlamesCheck.java
+++ b/src/controller/FlamesCheck.java
@@ -12,7 +12,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
+import service.FlamesCheckService;
@WebServlet("/flames")
@@ -33,35 +33,36 @@ 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);
- *
- * }
- */
+
+ //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);
+
+ }
+
}
-}
+}
\ No newline at end of file
diff --git a/src/service/FlamesCheckService.java b/src/service/FlamesCheckService.java
index a8c006a..2fe1dc2 100644
--- a/src/service/FlamesCheckService.java
+++ b/src/service/FlamesCheckService.java
@@ -7,3 +7,78 @@
// 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