-
Notifications
You must be signed in to change notification settings - Fork 616
web-practice. Pochtalon #650
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
pochtalon
wants to merge
2
commits into
mate-academy:master
Choose a base branch
from
pochtalon:pocht
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
2 commits
Select commit
Hold shift + click to select a range
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
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
38 changes: 38 additions & 0 deletions
38
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,38 @@ | ||
| package mate.controller.car; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| 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; | ||
|
|
||
| @WebServlet(urlPatterns = "/cars/drivers/add") | ||
| public class AddDriverToCarController extends HttpServlet { | ||
| private static final Injector INJECTOR = Injector.getInstance("mate"); | ||
| private static final String ADD_Driver_TO_CAR_JSP = "/WEB-INF/views/car/addDriverToCar.jsp"; | ||
| 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(ADD_Driver_TO_CAR_JSP).forward(req, resp); | ||
| } | ||
|
|
||
| protected void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| Long carID = Long.valueOf(req.getParameter("car_id")); | ||
| Long driverID = Long.valueOf(req.getParameter("driver_id")); | ||
| Car car = carService.get(carID); | ||
| Driver driver = driverService.get(driverID); | ||
| carService.addDriverToCar(driver, car); | ||
| resp.sendRedirect(req.getContextPath() + "/cars"); | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
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,24 @@ | ||
| package mate.controller.car; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.service.CarService; | ||
|
|
||
| @WebServlet(urlPatterns = "/cars/delete") | ||
| 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 carID = Long.valueOf(req.getParameter("id")); | ||
| carService.delete(carID); | ||
| resp.sendRedirect(req.getContextPath() + "/cars"); | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/main/java/mate/controller/car/GetAllCarsController.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,27 @@ | ||
| package mate.controller.car; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| 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; | ||
|
|
||
| @WebServlet(urlPatterns = "/cars") | ||
| public class GetAllCarsController extends HttpServlet { | ||
| private static final Injector INJECTOR = Injector.getInstance("mate"); | ||
| private static final String ALL_CARS_JSP = "/WEB-INF/views/car/allCars.jsp"; | ||
| private final CarService carService = (CarService) INJECTOR.getInstance(CarService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| List<Car> allCars = carService.getAll(); | ||
| req.setAttribute("cars", allCars); | ||
| req.getRequestDispatcher(ALL_CARS_JSP).forward(req, resp); | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
src/main/java/mate/controller/car/RegistrationCarController.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,42 @@ | ||
| package mate.controller.car; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| 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.Manufacturer; | ||
| import mate.service.CarService; | ||
| import mate.service.ManufacturerService; | ||
|
|
||
| @WebServlet(urlPatterns = "/cars/add") | ||
| public class RegistrationCarController extends HttpServlet { | ||
| private static final Injector INJECTOR = Injector.getInstance("mate"); | ||
| private static final String ADD_CAR_JSP = "/WEB-INF/views/car/addCar.jsp"; | ||
| private final CarService carService = (CarService) INJECTOR.getInstance(CarService.class); | ||
| private final ManufacturerService manufacturerService = | ||
| (ManufacturerService) INJECTOR.getInstance(ManufacturerService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| req.getRequestDispatcher(ADD_CAR_JSP).forward(req, resp); | ||
| } | ||
|
|
||
| protected void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| String model = req.getParameter("model"); | ||
| String manufacturerID = req.getParameter("manufacturer_id"); | ||
| Manufacturer manufacturer = manufacturerService.get(Long.valueOf(manufacturerID)); | ||
| Car car = new Car(); | ||
| car.setModel(model); | ||
| car.setManufacturer(manufacturer); | ||
| car.setDrivers(Collections.emptyList()); | ||
| carService.create(car); | ||
| resp.sendRedirect(req.getContextPath() + "/cars"); | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
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,25 @@ | ||
| package mate.controller.driver; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.service.DriverService; | ||
|
|
||
| @WebServlet(urlPatterns = "/drivers/delete") | ||
| 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 driverID = Long.valueOf(req.getParameter("id")); | ||
| driverService.delete(driverID); | ||
| resp.sendRedirect(req.getContextPath() + "/drivers"); | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
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,28 @@ | ||
| package mate.controller.driver; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| 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; | ||
|
|
||
| @WebServlet(urlPatterns = "/drivers") | ||
| public class GetAllDriversController extends HttpServlet { | ||
| private static final Injector INJECTOR = Injector.getInstance("mate"); | ||
| private static final String ALL_DRIVERS_JSP = "/WEB-INF/views/driver/allDrivers.jsp"; | ||
| 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(ALL_DRIVERS_JSP).forward(req, resp); | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
src/main/java/mate/controller/driver/RegistrationDriverController.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.driver; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| 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; | ||
|
|
||
| @WebServlet(urlPatterns = "/drivers/add") | ||
| public class RegistrationDriverController extends HttpServlet { | ||
| private static final Injector INJECTOR = Injector.getInstance("mate"); | ||
| private static final String ADD_DRIVER_JSP = "/WEB-INF/views/driver/addDriver.jsp"; | ||
| private final DriverService driverService = | ||
| (DriverService) INJECTOR.getInstance(DriverService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| req.getRequestDispatcher(ADD_DRIVER_JSP).forward(req, resp); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| String name = req.getParameter("name"); | ||
| String licenseNumber = req.getParameter("license_number"); | ||
| Driver driver = new Driver(); | ||
| driver.setName(name); | ||
| driver.setLicenseNumber(licenseNumber); | ||
| driverService.create(driver); | ||
| resp.sendRedirect(req.getContextPath() + "/drivers"); | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
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,25 @@ | ||
| package mate.controller.manufacturer; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import mate.lib.Injector; | ||
| import mate.service.ManufacturerService; | ||
|
|
||
| @WebServlet(urlPatterns = "/manufacturers/delete") | ||
| 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 manufacturerID = Long.valueOf(req.getParameter("id")); | ||
| manufacturerService.delete(manufacturerID); | ||
| resp.sendRedirect(req.getContextPath() + "/manufacturers"); | ||
| } | ||
| } | ||
29 changes: 29 additions & 0 deletions
29
src/main/java/mate/controller/manufacturer/GetAllManufacturersController.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,29 @@ | ||
| package mate.controller.manufacturer; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| 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; | ||
|
|
||
| @WebServlet(urlPatterns = "/manufacturers") | ||
| public class GetAllManufacturersController extends HttpServlet { | ||
| private static final Injector INJECTOR = Injector.getInstance("mate"); | ||
| private static final String ALL_MANUFACTURERS_JSP = | ||
| "/WEB-INF/views/manufacturer/allManufacturers.jsp"; | ||
| private final ManufacturerService manufacturerService = | ||
| (ManufacturerService) INJECTOR.getInstance(ManufacturerService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| List<Manufacturer> allManufacturers = manufacturerService.getAll(); | ||
| req.setAttribute("manufacturers", allManufacturers); | ||
| req.getRequestDispatcher(ALL_MANUFACTURERS_JSP).forward(req, resp); | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
src/main/java/mate/controller/manufacturer/RegistrationManufacturerController.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,38 @@ | ||
| package mate.controller.manufacturer; | ||
|
|
||
| import java.io.IOException; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.annotation.WebServlet; | ||
| 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; | ||
|
|
||
| @WebServlet(urlPatterns = "/manufacturers/add") | ||
| public class RegistrationManufacturerController extends HttpServlet { | ||
| private static final Injector INJECTOR = Injector.getInstance("mate"); | ||
| private static final String ADD_MANUFACTURER_JSP = | ||
| "/WEB-INF/views/manufacturer/addManufacturer.jsp"; | ||
| private final ManufacturerService manufacturerService = | ||
| (ManufacturerService) INJECTOR.getInstance(ManufacturerService.class); | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| req.getRequestDispatcher(ADD_MANUFACTURER_JSP).forward(req, resp); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws ServletException, IOException { | ||
| String name = req.getParameter("name"); | ||
| String country = req.getParameter("country"); | ||
| Manufacturer manufacturer = new Manufacturer(); | ||
| manufacturer.setName(name); | ||
| manufacturer.setCountry(country); | ||
| manufacturerService.create(manufacturer); | ||
| resp.sendRedirect(req.getContextPath() + "/manufacturers"); | ||
| } | ||
| } |
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>Car registration</title> | ||
| </head> | ||
| <body> | ||
| <h1>Please, fill the form with car's data</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">Add car</button> | ||
| </form> | ||
| </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.
After the deletion of the manufacturer, there is no redirection or response being sent to the client. You should redirect to a confirmation or another relevant page.