-
Notifications
You must be signed in to change notification settings - Fork 618
added controllers & appropriate jsp pages #663
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
TemkaHillfinger
wants to merge
4
commits into
mate-academy:master
Choose a base branch
from
TemkaHillfinger:hw-web-practice
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
a790379
added controllers & appropriate jsp pages
TemkaHillfinger c5a37c6
add redirect to the page where you can see the change just made (all …
TemkaHillfinger 41b8b05
single space
TemkaHillfinger 64a6372
After all doPost method we should redirect user to page
TemkaHillfinger File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
src/main/java/mate/controller/car/AddDriverToCarController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package mate.controller.car; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.model.Car; | ||
| import mate.model.Driver; | ||
| import mate.service.CarService; | ||
| import mate.service.DriverService; | ||
|
|
||
| public class AddDriverToCarController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final CarService carService = (CarService) injector.getInstance(CarService.class); | ||
| private final DriverService driverService = (DriverService) injector | ||
| .getInstance(DriverService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| req.getRequestDispatcher("/WEB-INF/views/cars/driverToCar.jsp"); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws IOException { | ||
| Long driverId = Long.valueOf(req.getParameter("driver_id")); | ||
| Long carId = Long.valueOf(req.getParameter("car_id")); | ||
| Car car = carService.get(carId); | ||
| Driver driver = driverService.get(driverId); | ||
| carService.addDriverToCar(driver, car); | ||
| resp.sendRedirect(req.getContextPath() + "/cars/drivers/add"); | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
src/main/java/mate/controller/car/CreateCarController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package mate.controller.car; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.model.Car; | ||
| import mate.service.CarService; | ||
| import mate.service.ManufacturerService; | ||
|
|
||
| public class CreateCarController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final CarService carService = (CarService) injector.getInstance(CarService.class); | ||
| private final ManufacturerService manufacturerService = (ManufacturerService) injector | ||
| .getInstance(ManufacturerService.class); | ||
|
|
||
| @Override | ||
| public void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| req.getRequestDispatcher("/WEB-INF/views/cars/add.jsp").forward(req, resp); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws IOException { | ||
| Long manufacturerId = Long.valueOf(req.getParameter("manufacturer_id")); | ||
| Car car = new Car(); | ||
| car.setModel(req.getParameter("model")); | ||
| car.setManufacturer(manufacturerService.get(manufacturerId)); | ||
| car.setDrivers(new ArrayList<>()); | ||
| carService.create(car); | ||
| resp.sendRedirect(req.getContextPath() + "/cars/drivers/add"); | ||
| } | ||
| } | ||
22 changes: 22 additions & 0 deletions
22
src/main/java/mate/controller/car/DeleteCarController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package mate.controller.car; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.service.CarService; | ||
|
|
||
| public class DeleteCarController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final CarService carService = (CarService) injector.getInstance(CarService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| Long id = Long.valueOf(req.getParameter("id")); | ||
| carService.delete(id); | ||
| resp.sendRedirect(req.getContextPath() + "/cars"); | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
src/main/java/mate/controller/car/GetAllCarController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package mate.controller.car; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.model.Car; | ||
| import mate.service.CarService; | ||
|
|
||
| public class GetAllCarController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final CarService carService = (CarService) injector.getInstance(CarService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| List<Car> allCar = carService.getAll(); | ||
| req.setAttribute("cars", allCar); | ||
| req.getRequestDispatcher("/WEB-INF/views/cars/cars.jsp").forward(req, resp); | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
src/main/java/mate/controller/driver/CreateDriverController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package mate.controller.driver; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.model.Driver; | ||
| import mate.service.DriverService; | ||
|
|
||
| public class CreateDriverController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
|
|
||
| private final DriverService driverService = (DriverService) injector | ||
| .getInstance(DriverService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| req.getRequestDispatcher("/WEB-INF/views/drivers/add.jsp").forward(req, resp); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws IOException { | ||
| Driver driver = new Driver(); | ||
| driver.setName(req.getParameter("name")); | ||
| driver.setLicenseNumber(req.getParameter("licenseNumber")); | ||
| driverService.create(driver); | ||
| resp.sendRedirect(req.getContextPath() + "/drivers/add"); | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/main/java/mate/controller/driver/DeleteDriverController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package mate.controller.driver; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.service.DriverService; | ||
|
|
||
| public class DeleteDriverController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final DriverService driverService = (DriverService) injector | ||
| .getInstance(DriverService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| Long id = Long.valueOf(req.getParameter("id")); | ||
| driverService.delete(id); | ||
| resp.sendRedirect(req.getContextPath() + "/drivers"); | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/main/java/mate/controller/driver/GetAllDriversController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package mate.controller.driver; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.model.Driver; | ||
| import mate.service.DriverService; | ||
|
|
||
| public class GetAllDriversController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final DriverService driverService = (DriverService) injector | ||
| .getInstance(DriverService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| List<Driver> allDrivers = driverService.getAll(); | ||
| req.setAttribute("drivers", allDrivers); | ||
| req.getRequestDispatcher("/WEB-INF/views/drivers/drivers.jsp").forward(req, resp); | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/main/java/mate/controller/manufacturer/CreateManufacturerController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package mate.controller.manufacturer; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.model.Manufacturer; | ||
| import mate.service.ManufacturerService; | ||
|
|
||
| public class CreateManufacturerController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final ManufacturerService manufacturerService = (ManufacturerService) injector | ||
| .getInstance(ManufacturerService.class); | ||
|
|
||
| @Override | ||
| public void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| req.getRequestDispatcher("/WEB-INF/views/manufacturer/add.jsp").forward(req, resp); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws IOException { | ||
| Manufacturer manufacturer = new Manufacturer(); | ||
| manufacturer.setName(req.getParameter("name")); | ||
| manufacturer.setCountry(req.getParameter("country")); | ||
| manufacturerService.create(manufacturer); | ||
| resp.sendRedirect(req.getContextPath() + "/manufacturers/add"); | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/main/java/mate/controller/manufacturer/DeleteManufacturerController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package mate.controller.manufacturer; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.service.ManufacturerService; | ||
|
|
||
| public class DeleteManufacturerController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final ManufacturerService manufacturerService = (ManufacturerService) injector | ||
| .getInstance(ManufacturerService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| Long id = Long.valueOf(req.getParameter("id")); | ||
| manufacturerService.delete(id); | ||
| resp.sendRedirect(req.getContextPath() + "/manufacturers"); | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
src/main/java/mate/controller/manufacturer/GetAllManufacturerController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package mate.controller.manufacturer; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.model.Manufacturer; | ||
| import mate.service.ManufacturerService; | ||
|
|
||
| public class GetAllManufacturerController extends HttpServlet { | ||
| private static final Injector injector = Injector.getInstance("mate"); | ||
| private final ManufacturerService manufacturerService = (ManufacturerService) injector | ||
| .getInstance(ManufacturerService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| List<Manufacturer> allManufacturer = manufacturerService.getAll(); | ||
| req.setAttribute("manufacturer", allManufacturer); | ||
| req.getRequestDispatcher("/WEB-INF/views/manufacturer/manufacturers.jsp") | ||
| .forward(req, resp); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <html> | ||
| <head> | ||
| <title>New car</title> | ||
| </head> | ||
| <body> | ||
| <h1>Creat new car</h1> | ||
| <form method="post" action="${pageContext.request.contextPath}/cars/add"> | ||
| Model <input type="text" name="model"><br> | ||
| Manufacturer Id <input type="text" name="manufacturer_id"><br> | ||
|
|
||
| <button type="submit">Confirm</button> | ||
| </form> | ||
| </body> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> | ||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <html> | ||
| <head> | ||
| <title>Cars</title> | ||
| </head> | ||
| <body> | ||
| <h1>List of cars:</h1> | ||
| <table> | ||
| <tr> | ||
| <td>ID</td> | ||
| <td>MODEL</td> | ||
| <td>MANUFACTURER</td> | ||
| <td>DRIVERS</td> | ||
| <td>DELETE</td> | ||
| </tr> | ||
| <c:forEach items="${cars}" var="car"> | ||
| <tr> | ||
| <td><c:out value="${car.id}" /></td> | ||
| <td><c:out value="${car.model}" /></td> | ||
| <td><c:out value="${car.manufacturer.getName()}" /></td> | ||
| <td> | ||
| <c:forEach items="${car.drivers}" var="driver"> | ||
| <ul> | ||
| <li> | ||
| <c:out value="${driver.name}" /> | ||
| </li> | ||
| </ul> | ||
| </c:forEach> | ||
| </td> | ||
| <td><a href="${pageContext.request.contextPath}/cars/delete?id=${car.id}">delete</a></td> | ||
| </tr> | ||
| </c:forEach> | ||
| </table> | ||
| </body> | ||
| </html> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as Oleh commented before. After all doPost method we should redirect user to page where he may see result of his request (list of all cars, drivers etc) otherwise he will struggle to understand if his request is successful.
Please recheck all controllers for same issue