From 088eb8505f521abf7e0d3468a959e669519eb417 Mon Sep 17 00:00:00 2001
From: vamshiduddu <44239287+vamshiduddu@users.noreply.github.com>
Date: Tue, 22 Sep 2020 11:05:31 +0530
Subject: [PATCH] 1372364
---
.classpath | 6 +-
build/classes/.gitignore | 2 +
build/classes/controller/FlamesCheck.class | Bin 1349 -> 2394 bytes
src/controller/FlamesCheck.java | 60 +++++++++--------
src/service/FlamesCheckService.java | 65 ++++++++++++++++++
src/testing/TestFlamesCheckService.java | 74 ++++++++++-----------
6 files changed, 136 insertions(+), 71 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..6423a15 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1 +1,3 @@
+/testing/
+/service/
/controller/
diff --git a/build/classes/controller/FlamesCheck.class b/build/classes/controller/FlamesCheck.class
index fe7152f9157fd498f6faf543a7b8c5a0e811fa05..31b3204911e8dd8518d33190803c9486d56e0420 100644
GIT binary patch
delta 1115
zcmZWoO-~b16g{tB)7FAmBxIloWdVW(Mn1)s0#d15hdVap9T`rfAq06XVXf!=?NHet~)^vj~*VDFhO${)xH5$~;ibz_Hu1(78GxAb`3z(-5wsq|F=<6v}
zr{@KRs`3`+UYoyIMOaXu3tHwJ4RFDW%V^BKw~S>?R+wR@-{r{X?#`pvgejjpPyl|*
zX9VXzVaRV4t?i;^55s-78e3It2cD~YsB_=S!)tk+jZ_$q}IyE_p+Y~<_fPD<$D+cisL-m*A#&g4(DGE1(XlWkS}0-LU21X$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..24f6b4d 100644
--- a/src/controller/FlamesCheck.java
+++ b/src/controller/FlamesCheck.java
@@ -13,6 +13,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import service.FlamesCheckService;
+
@WebServlet("/flames")
@@ -33,35 +35,35 @@ 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);
+
+ }
+
}
}
diff --git a/src/service/FlamesCheckService.java b/src/service/FlamesCheckService.java
index a8c006a..604b059 100644
--- a/src/service/FlamesCheckService.java
+++ b/src/service/FlamesCheckService.java
@@ -7,3 +7,68 @@
// 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)
+ {
+
+ StringBuffer str1 = new StringBuffer(name1);
+ StringBuffer str2 = new StringBuffer(name2);
+
+ ///remove same charaters
+ for (int i=0;i