generated from mate-academy/jv-homework-template
-
Notifications
You must be signed in to change notification settings - Fork 619
Completed task. #656
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
AntonU91
wants to merge
6
commits into
mate-academy:master
Choose a base branch
from
AntonU91:web-practise
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
Completed task. #656
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0f90502
Initial commit
AntonU91 02e4e0a
Implement first part of task (before advanced)
AntonU91 654145a
Add features for displaying all manufacturers with posibility to dele…
AntonU91 64034c0
Add features to delete driver by id using jsp representation
AntonU91 91952dc
Add feature to display all cars information using jsp
AntonU91 78fb920
--amend
AntonU91 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
39 changes: 39 additions & 0 deletions
39
src/main/java/mate/controller/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,39 @@ | ||
| package mate.controller; | ||
|
|
||
| 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; | ||
| import mate.util.Properties; | ||
|
|
||
| @WebServlet("/cars/drivers/add") | ||
| 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/addDriverToCar.jsp").forward(req, resp); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest request, HttpServletResponse response) | ||
| throws ServletException, IOException { | ||
| Long driverId = Long.valueOf(request.getParameter("driver_id")); | ||
| Long carId = Long.valueOf(request.getParameter("car_id")); | ||
| Car car = carService.get(carId); | ||
| Driver driver = driverService.get(driverId); | ||
| carService.addDriverToCar(driver, car); | ||
| response.sendRedirect(request.getContextPath() + Properties.INDEX_PAGE); | ||
| } | ||
| } |
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,45 @@ | ||
| package mate.controller; | ||
|
|
||
| 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.Manufacturer; | ||
| import mate.service.CarService; | ||
| import mate.service.DriverService; | ||
| import mate.service.ManufacturerService; | ||
| import mate.util.Properties; | ||
|
|
||
| @WebServlet("/cars/add") | ||
| 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); | ||
| 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/createCar.jsp").forward(req, resp); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest req, | ||
| HttpServletResponse resp) throws ServletException, IOException { | ||
| String model = req.getParameter("model"); | ||
| Long manufacturerId = Long.valueOf(req.getParameter("manufacturer_id")); | ||
|
|
||
| Manufacturer manufacturer = manufacturerService.get(manufacturerId); | ||
| Car newCar = new Car(); | ||
| newCar.setModel(model); | ||
| newCar.setManufacturer(manufacturer); | ||
| carService.create(newCar); | ||
| resp.sendRedirect(req.getContextPath() + Properties.INDEX_PAGE); | ||
| } | ||
| } |
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; | ||
|
|
||
| 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; | ||
| import mate.util.Properties; | ||
|
|
||
| @WebServlet("/drivers/add") | ||
| 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 { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected void doPost(HttpServletRequest req, | ||
| HttpServletResponse resp) throws ServletException, IOException { | ||
| String name = req.getParameter("name"); | ||
| String licenseNumber = req.getParameter("license_number"); | ||
| Driver newDriver = new Driver(); | ||
| newDriver.setName(name); | ||
| newDriver.setLicenseNumber(licenseNumber); | ||
| driverService.create(newDriver); | ||
| resp.sendRedirect(req.getContextPath() + Properties.INDEX_PAGE); | ||
| } | ||
| } | ||
38 changes: 38 additions & 0 deletions
38
src/main/java/mate/controller/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,38 @@ | ||||
| package mate.controller; | ||||
|
|
||||
| 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; | ||||
| import mate.util.Properties; | ||||
|
|
||||
| @WebServlet("/manufacturers/add") | ||||
| public class CreateManufacturerController 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 { | ||||
| req.getRequestDispatcher("/WEB-INF/views/createManufacturer.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() + Properties.INDEX_PAGE); | ||||
| } | ||||
| } | ||||
|
|
||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
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; | ||
|
|
||
| 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; | ||
| import mate.util.Properties; | ||
|
|
||
| @WebServlet("/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 id = Long.valueOf(req.getParameter("id")); | ||
| driverService.delete(id); | ||
| resp.sendRedirect(req.getContextPath() + Properties.INDEX_PAGE); | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
src/main/java/mate/controller/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,26 @@ | ||
| package mate.controller; | ||
|
|
||
| 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; | ||
| import mate.util.Properties; | ||
|
|
||
| @WebServlet("/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 id = Long.valueOf(req.getParameter("id")); | ||
| manufacturerService.delete(id); | ||
| resp.sendRedirect(req.getContextPath() + Properties.INDEX_PAGE); | ||
| } | ||
| } |
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; | ||
|
|
||
| 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("/cars") | ||
| public class GetAllCarsController 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> cars = carService.getAll(); | ||
| req.setAttribute("cars", cars); | ||
| req.getRequestDispatcher("/WEB-INF/views/getAllCars.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
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
| @@ -0,0 +1,29 @@ | ||||
| package mate.controller; | ||||
|
|
||||
| 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("/drivers") | ||||
| public class GetAllDriverController 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> driverList = driverService.getAll(); | ||||
| req.setAttribute("drivers", driverList); | ||||
| req.getRequestDispatcher("/WEB-INF/views/getAllDrivers.jsp").forward(req, resp); | ||||
| } | ||||
| } | ||||
|
|
||||
|
|
||||
|
Comment on lines
+28
to
+29
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
27 changes: 27 additions & 0 deletions
27
src/main/java/mate/controller/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,27 @@ | ||
| package mate.controller; | ||
|
|
||
| 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("/manufacturers") | ||
| public class GetAllManufacturersController 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> manufacturers = manufacturerService.getAll(); | ||
| req.setAttribute("manufacturers", manufacturers); | ||
| req.getRequestDispatcher("/WEB-INF/views/getAllManufacturers.jsp").forward(req, resp); | ||
| } | ||
| } |
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.