Skip to content

Commit

Permalink
feat: Simplified
Browse files Browse the repository at this point in the history
  • Loading branch information
SeriousSoftware committed Dec 21, 2019
1 parent 345a7b1 commit 46cbb30
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 57 deletions.
7 changes: 0 additions & 7 deletions src/main/scala/app/entities/User.scala

This file was deleted.

14 changes: 8 additions & 6 deletions src/main/scala/app/model/Model.scala
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package app.model

import java.util
import scala.jdk.CollectionConverters._

import app.entities.User
case class User(name: String, password: String) {
def getName: String = name

import scala.jdk.CollectionConverters._
override def toString: String = s"User{name='$name', password='$password'}"
}

object Model {
val model: util.ArrayList[User] = new util.ArrayList()
val model = collection.mutable.ArrayBuffer[User]()

def add(user: User): Unit = model.add(user)
def add(user: User): Unit = model.append(user)

def list: util.List[String] = model.asScala.map(_.name).asJava
def userList: java.util.List[String] = model.map(_.name).asJava
}
25 changes: 13 additions & 12 deletions src/main/scala/app/servlets/AddServlet.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,28 @@ package app.servlets

import java.io.IOException

import app.entities.User
import app.model.Model
import app.model.{Model, User}
import javax.servlet.ServletException
import javax.servlet.annotation.WebServlet
import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}


@WebServlet(Array("/add"))
class AddServlet extends HttpServlet {
@throws[ServletException]
@throws[IOException]
override protected def doGet(req: HttpServletRequest, resp: HttpServletResponse): Unit = {
val requestDispatcher = req.getRequestDispatcher("views/add.jsp")
requestDispatcher.forward(req, resp)
}

@throws[ServletException]
@throws[IOException]
@throws[ServletException]
override protected def doPost(req: HttpServletRequest, resp: HttpServletResponse): Unit = {
val name = req.getParameter("name")
def user = new User(name, req.getParameter("pass"))
Model.add(user)

Model.add(User(name, req.getParameter("pass")))
req.setAttribute("userName", name)
doGet(req, resp)
}

@throws[IOException]
@throws[ServletException]
override protected def doGet(req: HttpServletRequest, resp: HttpServletResponse): Unit = {
val requestDispatcher = req.getRequestDispatcher("views/add.jsp")
requestDispatcher.forward(req, resp)
}
}
8 changes: 5 additions & 3 deletions src/main/scala/app/servlets/ListServlet.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ import java.io.IOException

import app.model.Model
import javax.servlet.ServletException
import javax.servlet.annotation.WebServlet
import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}


@WebServlet(Array("/list"))
class ListServlet extends HttpServlet {
@throws[ServletException]

@throws[IOException]
@throws[ServletException]
override protected def doGet(req: HttpServletRequest, resp: HttpServletResponse): Unit = {
req.setAttribute("userNames", Model.list)
req.setAttribute("userNames", Model.userList)
val requestDispatcher = req.getRequestDispatcher("views/list.jsp")
requestDispatcher.forward(req, resp)
}
Expand Down
29 changes: 0 additions & 29 deletions web/WEB-INF/web.xml

This file was deleted.

0 comments on commit 46cbb30

Please sign in to comment.