From 69fa280b668a89aee3a64996a4aaaf6eb6b5ba87 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Mon, 7 Aug 2023 00:21:09 +0300 Subject: [PATCH 01/10] realization jv-web-practice --- pom.xml | 5 +++ .../mate/controller/car/AddCarController.java | 42 +++++++++++++++++++ .../car/AddDriverToCarController.java | 42 +++++++++++++++++++ .../controller/car/DeleteCarController.java | 23 ++++++++++ .../controller/car/GetAllCarController.java | 26 ++++++++++++ .../driver/DeleteDriverController.java | 26 ++++++++++++ .../driver/GetAllDriversController.java | 24 +++++++++++ .../driver/addDriverController.java | 34 +++++++++++++++ .../addManufacturerController.java | 35 ++++++++++++++++ .../deleteManufacturersController.java | 22 ++++++++++ .../getAllManufacturersController.java | 29 +++++++++++++ src/main/java/mate/model/Manufacturer.java | 7 ++++ src/main/java/mate/util/ConnectionUtil.java | 8 ++-- src/main/webapp/WEB-INF/views/cars/add.jsp | 21 ++++++++++ src/main/webapp/WEB-INF/views/cars/all.jsp | 28 +++++++++++++ .../webapp/WEB-INF/views/cars/driver/add.jsp | 25 +++++++++++ src/main/webapp/WEB-INF/views/drivers/add.jsp | 16 +++++++ src/main/webapp/WEB-INF/views/drivers/all.jsp | 27 ++++++++++++ .../WEB-INF/views/manufacturers/add.jsp | 14 +++++++ .../WEB-INF/views/manufacturers/all.jsp | 27 ++++++++++++ src/main/webapp/web.xml | 20 +++++++++ 21 files changed, 497 insertions(+), 4 deletions(-) create mode 100644 src/main/java/mate/controller/car/AddCarController.java create mode 100644 src/main/java/mate/controller/car/AddDriverToCarController.java create mode 100644 src/main/java/mate/controller/car/DeleteCarController.java create mode 100644 src/main/java/mate/controller/car/GetAllCarController.java create mode 100644 src/main/java/mate/controller/driver/DeleteDriverController.java create mode 100644 src/main/java/mate/controller/driver/GetAllDriversController.java create mode 100644 src/main/java/mate/controller/driver/addDriverController.java create mode 100644 src/main/java/mate/controller/manufacturer/addManufacturerController.java create mode 100644 src/main/java/mate/controller/manufacturer/deleteManufacturersController.java create mode 100644 src/main/java/mate/controller/manufacturer/getAllManufacturersController.java create mode 100644 src/main/webapp/WEB-INF/views/cars/add.jsp create mode 100644 src/main/webapp/WEB-INF/views/cars/all.jsp create mode 100644 src/main/webapp/WEB-INF/views/cars/driver/add.jsp create mode 100644 src/main/webapp/WEB-INF/views/drivers/add.jsp create mode 100644 src/main/webapp/WEB-INF/views/drivers/all.jsp create mode 100644 src/main/webapp/WEB-INF/views/manufacturers/add.jsp create mode 100644 src/main/webapp/WEB-INF/views/manufacturers/all.jsp diff --git a/pom.xml b/pom.xml index 8f7cf6b7d..8a92f9485 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,11 @@ mysql-connector-java 8.0.22 + + jstl + jstl + 1.2 + javax.servlet javax.servlet-api diff --git a/src/main/java/mate/controller/car/AddCarController.java b/src/main/java/mate/controller/car/AddCarController.java new file mode 100644 index 000000000..2d31c8e4e --- /dev/null +++ b/src/main/java/mate/controller/car/AddCarController.java @@ -0,0 +1,42 @@ +package mate.controller.car; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import mate.lib.Injector; +import mate.model.Car; +import mate.model.Manufacturer; +import mate.service.CarService; +import mate.service.ManufacturerService; + +public class AddCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private static final ManufacturerService manufacturerService = (ManufacturerService) + injector.getInstance(ManufacturerService.class); + private static final CarService carService = (CarService) + injector.getInstance(CarService.class); + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List manufacturers = manufacturerService.getAll(); + req.setAttribute("manufacturers", manufacturers); + req.getRequestDispatcher("/WEB-INF/views/cars/add.jsp").forward(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + String model = req.getParameter("model"); + Manufacturer manufacturer = manufacturerService + .get(Long.valueOf(req.getParameter("manufacturer"))); + Car car = new Car(); + car.setModel(model); + car.setManufacturer(manufacturer); + car.setDrivers(new ArrayList<>()); + carService.create(car); + } +} diff --git a/src/main/java/mate/controller/car/AddDriverToCarController.java b/src/main/java/mate/controller/car/AddDriverToCarController.java new file mode 100644 index 000000000..c33dde20b --- /dev/null +++ b/src/main/java/mate/controller/car/AddDriverToCarController.java @@ -0,0 +1,42 @@ +package mate.controller.car; + +import mate.lib.Injector; +import mate.model.Car; +import mate.model.Driver; +import mate.service.CarService; +import mate.service.DriverService; + +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 java.io.IOException; +import java.util.List; + +@WebServlet(urlPatterns = "/cars/driver/add") +public class AddDriverToCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private static final CarService carService = (CarService) + injector.getInstance(CarService.class); + private static final DriverService driverService = (DriverService) + injector.getInstance(DriverService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List cars = carService.getAll(); + List drivers = driverService.getAll(); + req.setAttribute("cars",cars); + req.setAttribute("drivers", drivers); + req.getRequestDispatcher("/WEB-INF/views/cars/driver/add.jsp").forward(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + Car car = carService.get(Long.valueOf(req.getParameter("car"))); + Driver driver = driverService.get(Long.valueOf(req.getParameter("driver"))); + carService.addDriverToCar(driver,car); + } +} diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java new file mode 100644 index 000000000..6f377bd61 --- /dev/null +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -0,0 +1,23 @@ +package mate.controller.car; + +import mate.lib.Injector; +import mate.service.CarService; +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 java.io.IOException; +@WebServlet(urlPatterns = "/cars/delete") +public class DeleteCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private static 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); + } +} diff --git a/src/main/java/mate/controller/car/GetAllCarController.java b/src/main/java/mate/controller/car/GetAllCarController.java new file mode 100644 index 000000000..df8bf9f38 --- /dev/null +++ b/src/main/java/mate/controller/car/GetAllCarController.java @@ -0,0 +1,26 @@ +package mate.controller.car; + +import mate.lib.Injector; +import mate.model.Car; +import mate.service.CarService; +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 java.io.IOException; +import java.util.List; +@WebServlet(urlPatterns = "/cars/all") +public class GetAllCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private static final CarService + carService = (CarService) injector.getInstance(CarService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List carList = carService.getAll(); + req.setAttribute("cars", carList); + req.getRequestDispatcher("/WEB-INF/views/cars/all.jsp").forward(req, resp); + } +} diff --git a/src/main/java/mate/controller/driver/DeleteDriverController.java b/src/main/java/mate/controller/driver/DeleteDriverController.java new file mode 100644 index 000000000..4a9e28677 --- /dev/null +++ b/src/main/java/mate/controller/driver/DeleteDriverController.java @@ -0,0 +1,26 @@ +package mate.controller.driver; + +import mate.lib.Injector; +import mate.service.DriverService; + +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 java.io.IOException; + +@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 id = Long.valueOf(req.getParameter("id")); + driverService.delete(id); + } +} diff --git a/src/main/java/mate/controller/driver/GetAllDriversController.java b/src/main/java/mate/controller/driver/GetAllDriversController.java new file mode 100644 index 000000000..62f207ff0 --- /dev/null +++ b/src/main/java/mate/controller/driver/GetAllDriversController.java @@ -0,0 +1,24 @@ +package mate.controller.driver; + +import mate.lib.Injector; +import mate.model.Driver; +import mate.service.DriverService; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +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 driverAll = driverService.getAll(); + req.setAttribute("drivers", driverAll); + req.getRequestDispatcher("/WEB-INF/views/drivers/all.jsp").forward(req,resp); + } +} diff --git a/src/main/java/mate/controller/driver/addDriverController.java b/src/main/java/mate/controller/driver/addDriverController.java new file mode 100644 index 000000000..084b13de7 --- /dev/null +++ b/src/main/java/mate/controller/driver/addDriverController.java @@ -0,0 +1,34 @@ +package mate.controller.driver; + +import mate.lib.Injector; +import mate.model.Driver; +import mate.service.DriverService; + +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 java.io.IOException; +@WebServlet(urlPatterns = "/drivers/add") +public class addDriverController 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 ServletException, IOException { + String name = req.getParameter("name"); + String licenseNumber = req.getParameter("licenseNumber"); + Driver driver = new Driver(); + driver.setName(name); + driver.setLicenseNumber(licenseNumber); + driverService.create(driver); + } +} diff --git a/src/main/java/mate/controller/manufacturer/addManufacturerController.java b/src/main/java/mate/controller/manufacturer/addManufacturerController.java new file mode 100644 index 000000000..4d6c7b95e --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/addManufacturerController.java @@ -0,0 +1,35 @@ +package mate.controller.manufacturer; + +import mate.lib.Injector; +import mate.model.Manufacturer; +import mate.service.ManufacturerService; +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 java.io.IOException; + +@WebServlet(urlPatterns = "/manufacturers/add") +public class addManufacturerController 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/manufacturers/add.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); + } +} diff --git a/src/main/java/mate/controller/manufacturer/deleteManufacturersController.java b/src/main/java/mate/controller/manufacturer/deleteManufacturersController.java new file mode 100644 index 000000000..2315ccc00 --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/deleteManufacturersController.java @@ -0,0 +1,22 @@ +package mate.controller.manufacturer; + +import mate.lib.Injector; +import mate.service.ManufacturerService; +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 java.io.IOException; +@WebServlet(urlPatterns = "/manufacturers/delete") +public class deleteManufacturersController 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); + } +} diff --git a/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java b/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java new file mode 100644 index 000000000..13dec68d7 --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java @@ -0,0 +1,29 @@ +package mate.controller.manufacturer; + +import mate.lib.Injector; +import mate.model.Manufacturer; +import mate.service.ManufacturerService; + +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 java.io.IOException; +import java.util.List; + +@WebServlet(urlPatterns = "/manufacturers/all") + +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 manufacturersAll = manufacturerService.getAll(); + req.setAttribute("manufacturers", manufacturersAll); + req.getRequestDispatcher("/WEB-INF/views/manufacturers/all.jsp").forward(req, resp); + } +} diff --git a/src/main/java/mate/model/Manufacturer.java b/src/main/java/mate/model/Manufacturer.java index b3ff7b966..146cc9115 100644 --- a/src/main/java/mate/model/Manufacturer.java +++ b/src/main/java/mate/model/Manufacturer.java @@ -49,4 +49,11 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(id, name, country); } + + @Override + public String toString() { + return "id=" + id + + ", name='" + name + '\'' + + ", country='" + country ; + } } diff --git a/src/main/java/mate/util/ConnectionUtil.java b/src/main/java/mate/util/ConnectionUtil.java index a9249b004..de8de3468 100644 --- a/src/main/java/mate/util/ConnectionUtil.java +++ b/src/main/java/mate/util/ConnectionUtil.java @@ -6,10 +6,10 @@ import java.util.Properties; public class ConnectionUtil { - private static final String URL = "YOUR DATABASE URL"; - private static final String USERNAME = "YOUR USERNAME"; - private static final String PASSWORD = "YOUR PASSWORD"; - private static final String JDBC_DRIVER = "YOUR DRIVER"; + private static final String URL = "jdbc:mysql://localhost:3306/taxi?serverTimezone=Europe/Kiev"; + private static final String USERNAME = "root"; + private static final String PASSWORD = "1984"; + private static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver"; static { try { diff --git a/src/main/webapp/WEB-INF/views/cars/add.jsp b/src/main/webapp/WEB-INF/views/cars/add.jsp new file mode 100644 index 000000000..1a7b75bb0 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/add.jsp @@ -0,0 +1,21 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html;charset=UTF-8" %> + + + Creating a car + + +

Please the form below

+
+ model
+ + Select a Category:  + + +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cars/all.jsp b/src/main/webapp/WEB-INF/views/cars/all.jsp new file mode 100644 index 000000000..d065d71af --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/all.jsp @@ -0,0 +1,28 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Get all cars + + +

List of cars

+ + + + + + + + + + + + + + + + + +
IDMODELMANUFACTURERDRIVERSDELETE
delete this car
+ + diff --git a/src/main/webapp/WEB-INF/views/cars/driver/add.jsp b/src/main/webapp/WEB-INF/views/cars/driver/add.jsp new file mode 100644 index 000000000..0c492cec8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/driver/add.jsp @@ -0,0 +1,25 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html;charset=UTF-8" %> + + + Add driver to car + + +

Please the form below

+
+ + + + + +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/drivers/add.jsp b/src/main/webapp/WEB-INF/views/drivers/add.jsp new file mode 100644 index 000000000..1251738f8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/drivers/add.jsp @@ -0,0 +1,16 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + Creating a driver + + +

Please the form below

+
+ name +
+ licenseNumber +
+ +
+ + diff --git a/src/main/webapp/WEB-INF/views/drivers/all.jsp b/src/main/webapp/WEB-INF/views/drivers/all.jsp new file mode 100644 index 000000000..7ee5da45c --- /dev/null +++ b/src/main/webapp/WEB-INF/views/drivers/all.jsp @@ -0,0 +1,27 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Get all drivers + + +

List of drivers

+ + + + + + + + + + + + + + + +
IDNAMELICENSE NUMBERDELETE
delete this driver
+ + diff --git a/src/main/webapp/WEB-INF/views/manufacturers/add.jsp b/src/main/webapp/WEB-INF/views/manufacturers/add.jsp new file mode 100644 index 000000000..744085920 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/manufacturers/add.jsp @@ -0,0 +1,14 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + Creating a manufacturer + + +

Please the form below

+
+ name
+ country
+ +
+ + diff --git a/src/main/webapp/WEB-INF/views/manufacturers/all.jsp b/src/main/webapp/WEB-INF/views/manufacturers/all.jsp new file mode 100644 index 000000000..4ce6e22a9 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/manufacturers/all.jsp @@ -0,0 +1,27 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Get all manufacturers + + +

List of manufacturers

+ + + + + + + + + + + + + + + +
IDNAMECOUNTRYDELETE
delete this manufacturer
+ + diff --git a/src/main/webapp/web.xml b/src/main/webapp/web.xml index 00afaeb93..ebea4fa0a 100644 --- a/src/main/webapp/web.xml +++ b/src/main/webapp/web.xml @@ -6,9 +6,29 @@ index mate.controller.IndexController + index /index + + + getAllDriversController + mate.controller.driver.GetAllDriversController + + + getAllDriversController + /drivers/all + + + + addCarController + mate.controller.car.AddCarController + + + addCarController + /cars/add + + From 2a4d667ddfade1016080c98d9f33c868517ca740 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Mon, 7 Aug 2023 00:39:33 +0300 Subject: [PATCH 02/10] realization jv-web-practice --- ...iverController.java => AddDriverController.java} | 13 +++++++------ .../controller/driver/DeleteDriverController.java | 10 ++++------ .../controller/driver/GetAllDriversController.java | 8 ++++---- .../manufacturer/getAllManufacturersController.java | 2 -- src/main/java/mate/model/Manufacturer.java | 6 +++--- 5 files changed, 18 insertions(+), 21 deletions(-) rename src/main/java/mate/controller/driver/{addDriverController.java => AddDriverController.java} (95%) diff --git a/src/main/java/mate/controller/driver/addDriverController.java b/src/main/java/mate/controller/driver/AddDriverController.java similarity index 95% rename from src/main/java/mate/controller/driver/addDriverController.java rename to src/main/java/mate/controller/driver/AddDriverController.java index 084b13de7..1973f8f0f 100644 --- a/src/main/java/mate/controller/driver/addDriverController.java +++ b/src/main/java/mate/controller/driver/AddDriverController.java @@ -1,20 +1,21 @@ package mate.controller.driver; -import mate.lib.Injector; -import mate.model.Driver; -import mate.service.DriverService; - +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 java.io.IOException; +import mate.lib.Injector; +import mate.model.Driver; +import mate.service.DriverService; + @WebServlet(urlPatterns = "/drivers/add") -public class addDriverController extends HttpServlet { +public class AddDriverController 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 { diff --git a/src/main/java/mate/controller/driver/DeleteDriverController.java b/src/main/java/mate/controller/driver/DeleteDriverController.java index 4a9e28677..cbd0c15df 100644 --- a/src/main/java/mate/controller/driver/DeleteDriverController.java +++ b/src/main/java/mate/controller/driver/DeleteDriverController.java @@ -1,17 +1,15 @@ package mate.controller.driver; import mate.lib.Injector; -import mate.service.DriverService; - +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 java.io.IOException; +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) @@ -20,7 +18,7 @@ public class DeleteDriverController extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - Long id = Long.valueOf(req.getParameter("id")); - driverService.delete(id); + Long id = Long.valueOf(req.getParameter("id")); + driverService.delete(id); } } diff --git a/src/main/java/mate/controller/driver/GetAllDriversController.java b/src/main/java/mate/controller/driver/GetAllDriversController.java index 62f207ff0..6f85a15b8 100644 --- a/src/main/java/mate/controller/driver/GetAllDriversController.java +++ b/src/main/java/mate/controller/driver/GetAllDriversController.java @@ -2,14 +2,14 @@ import mate.lib.Injector; import mate.model.Driver; -import mate.service.DriverService; - +import java.util.List; +import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; +import mate.service.DriverService; + public class GetAllDriversController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); private final DriverService driverService = (DriverService) diff --git a/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java b/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java index 13dec68d7..ee59bccff 100644 --- a/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java +++ b/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java @@ -3,7 +3,6 @@ import mate.lib.Injector; import mate.model.Manufacturer; import mate.service.ManufacturerService; - import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -13,7 +12,6 @@ import java.util.List; @WebServlet(urlPatterns = "/manufacturers/all") - public class getAllManufacturersController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); private final ManufacturerService manufacturerService = (ManufacturerService) diff --git a/src/main/java/mate/model/Manufacturer.java b/src/main/java/mate/model/Manufacturer.java index 146cc9115..2089a72e0 100644 --- a/src/main/java/mate/model/Manufacturer.java +++ b/src/main/java/mate/model/Manufacturer.java @@ -52,8 +52,8 @@ public int hashCode() { @Override public String toString() { - return "id=" + id + - ", name='" + name + '\'' + - ", country='" + country ; + return "id=" + id + + ", name='" + name + '\'' + + ", country='" + country; } } From 76b295406781b04f096b1faff2e1577f5db38f37 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Mon, 7 Aug 2023 00:43:50 +0300 Subject: [PATCH 03/10] realization jv-web-practice --- .../java/mate/controller/driver/GetAllDriversController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/mate/controller/driver/GetAllDriversController.java b/src/main/java/mate/controller/driver/GetAllDriversController.java index 6f85a15b8..025b867b8 100644 --- a/src/main/java/mate/controller/driver/GetAllDriversController.java +++ b/src/main/java/mate/controller/driver/GetAllDriversController.java @@ -1,7 +1,5 @@ package mate.controller.driver; -import mate.lib.Injector; -import mate.model.Driver; import java.util.List; import java.io.IOException; import javax.servlet.ServletException; @@ -9,11 +7,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import mate.service.DriverService; +import mate.lib.Injector; +import mate.model.Driver; 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 { From 3c855055c9a45606247030e0d0bf072e03a39039 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Mon, 7 Aug 2023 00:46:44 +0300 Subject: [PATCH 04/10] realization jv-web-practice --- .../java/mate/controller/driver/GetAllDriversController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mate/controller/driver/GetAllDriversController.java b/src/main/java/mate/controller/driver/GetAllDriversController.java index 025b867b8..a96a4c84e 100644 --- a/src/main/java/mate/controller/driver/GetAllDriversController.java +++ b/src/main/java/mate/controller/driver/GetAllDriversController.java @@ -1,14 +1,14 @@ package mate.controller.driver; -import java.util.List; 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.model.Driver; import mate.service.DriverService; import mate.lib.Injector; -import mate.model.Driver; public class GetAllDriversController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); From 2d8d673b8a18725779448c5acc585be8b418ef88 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Mon, 7 Aug 2023 23:20:16 +0300 Subject: [PATCH 05/10] realization jv-web-practice --- src/main/java/mate/controller/car/AddCarController.java | 3 ++- .../java/mate/controller/car/AddDriverToCarController.java | 3 +-- src/main/java/mate/controller/car/DeleteCarController.java | 5 +++-- src/main/java/mate/controller/car/GetAllCarController.java | 3 ++- .../java/mate/controller/driver/DeleteDriverController.java | 2 +- .../java/mate/controller/driver/GetAllDriversController.java | 2 +- ...acturerController.java => AddManufacturerController.java} | 4 ++-- ...ersController.java => DeleteManufacturersController.java} | 5 +++-- ...ersController.java => GetAllManufacturersController.java} | 4 ++-- 9 files changed, 17 insertions(+), 14 deletions(-) rename src/main/java/mate/controller/manufacturer/{addManufacturerController.java => AddManufacturerController.java} (95%) rename src/main/java/mate/controller/manufacturer/{deleteManufacturersController.java => DeleteManufacturersController.java} (92%) rename src/main/java/mate/controller/manufacturer/{getAllManufacturersController.java => GetAllManufacturersController.java} (94%) diff --git a/src/main/java/mate/controller/car/AddCarController.java b/src/main/java/mate/controller/car/AddCarController.java index 2d31c8e4e..484797591 100644 --- a/src/main/java/mate/controller/car/AddCarController.java +++ b/src/main/java/mate/controller/car/AddCarController.java @@ -3,10 +3,10 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import javax.servlet.http.HttpServletResponse; import mate.lib.Injector; import mate.model.Car; import mate.model.Manufacturer; @@ -19,6 +19,7 @@ public class AddCarController extends HttpServlet { injector.getInstance(ManufacturerService.class); private static final CarService carService = (CarService) injector.getInstance(CarService.class); + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/src/main/java/mate/controller/car/AddDriverToCarController.java b/src/main/java/mate/controller/car/AddDriverToCarController.java index c33dde20b..2b8f3943d 100644 --- a/src/main/java/mate/controller/car/AddDriverToCarController.java +++ b/src/main/java/mate/controller/car/AddDriverToCarController.java @@ -4,8 +4,6 @@ import mate.model.Car; import mate.model.Driver; import mate.service.CarService; -import mate.service.DriverService; - import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -13,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; +import mate.service.DriverService; @WebServlet(urlPatterns = "/cars/driver/add") public class AddDriverToCarController extends HttpServlet { diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java index 6f377bd61..bf06c3543 100644 --- a/src/main/java/mate/controller/car/DeleteCarController.java +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -1,13 +1,14 @@ package mate.controller.car; import mate.lib.Injector; -import mate.service.CarService; 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 java.io.IOException; +import mate.service.CarService; +import javax.servlet.annotation.WebServlet; + @WebServlet(urlPatterns = "/cars/delete") public class DeleteCarController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); diff --git a/src/main/java/mate/controller/car/GetAllCarController.java b/src/main/java/mate/controller/car/GetAllCarController.java index df8bf9f38..a91889c00 100644 --- a/src/main/java/mate/controller/car/GetAllCarController.java +++ b/src/main/java/mate/controller/car/GetAllCarController.java @@ -2,7 +2,6 @@ import mate.lib.Injector; import mate.model.Car; -import mate.service.CarService; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -10,6 +9,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; +import mate.service.CarService; + @WebServlet(urlPatterns = "/cars/all") public class GetAllCarController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); diff --git a/src/main/java/mate/controller/driver/DeleteDriverController.java b/src/main/java/mate/controller/driver/DeleteDriverController.java index cbd0c15df..036ede515 100644 --- a/src/main/java/mate/controller/driver/DeleteDriverController.java +++ b/src/main/java/mate/controller/driver/DeleteDriverController.java @@ -1,6 +1,5 @@ package mate.controller.driver; -import mate.lib.Injector; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -8,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import mate.service.DriverService; +import mate.lib.Injector; @WebServlet(urlPatterns = "/drivers/delete") public class DeleteDriverController extends HttpServlet { diff --git a/src/main/java/mate/controller/driver/GetAllDriversController.java b/src/main/java/mate/controller/driver/GetAllDriversController.java index a96a4c84e..6b89111dd 100644 --- a/src/main/java/mate/controller/driver/GetAllDriversController.java +++ b/src/main/java/mate/controller/driver/GetAllDriversController.java @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import mate.model.Driver; -import mate.service.DriverService; import mate.lib.Injector; +import mate.service.DriverService; public class GetAllDriversController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); diff --git a/src/main/java/mate/controller/manufacturer/addManufacturerController.java b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java similarity index 95% rename from src/main/java/mate/controller/manufacturer/addManufacturerController.java rename to src/main/java/mate/controller/manufacturer/AddManufacturerController.java index 4d6c7b95e..f62b636d5 100644 --- a/src/main/java/mate/controller/manufacturer/addManufacturerController.java +++ b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java @@ -2,16 +2,16 @@ import mate.lib.Injector; import mate.model.Manufacturer; -import mate.service.ManufacturerService; 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 java.io.IOException; +import mate.service.ManufacturerService; @WebServlet(urlPatterns = "/manufacturers/add") -public class addManufacturerController extends HttpServlet { +public class AddManufacturerController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); private final ManufacturerService manufacturerService = (ManufacturerService) injector.getInstance(ManufacturerService.class); diff --git a/src/main/java/mate/controller/manufacturer/deleteManufacturersController.java b/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java similarity index 92% rename from src/main/java/mate/controller/manufacturer/deleteManufacturersController.java rename to src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java index 2315ccc00..795a74dc3 100644 --- a/src/main/java/mate/controller/manufacturer/deleteManufacturersController.java +++ b/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java @@ -1,15 +1,16 @@ package mate.controller.manufacturer; import mate.lib.Injector; -import mate.service.ManufacturerService; 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 java.io.IOException; +import mate.service.ManufacturerService; + @WebServlet(urlPatterns = "/manufacturers/delete") -public class deleteManufacturersController extends HttpServlet { +public class DeleteManufacturersController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); private final ManufacturerService manufacturerService = (ManufacturerService) injector.getInstance(ManufacturerService.class); diff --git a/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java b/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java similarity index 94% rename from src/main/java/mate/controller/manufacturer/getAllManufacturersController.java rename to src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java index ee59bccff..dcbaa4dfe 100644 --- a/src/main/java/mate/controller/manufacturer/getAllManufacturersController.java +++ b/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java @@ -2,7 +2,6 @@ import mate.lib.Injector; import mate.model.Manufacturer; -import mate.service.ManufacturerService; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -10,9 +9,10 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; +import mate.service.ManufacturerService; @WebServlet(urlPatterns = "/manufacturers/all") -public class getAllManufacturersController extends HttpServlet { +public class GetAllManufacturersController extends HttpServlet { private static final Injector injector = Injector.getInstance("mate"); private final ManufacturerService manufacturerService = (ManufacturerService) injector.getInstance(ManufacturerService.class); From f324af3cc286d0d3ffe4a6810e8aa26c139678e3 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Mon, 7 Aug 2023 23:36:14 +0300 Subject: [PATCH 06/10] realization jv-web-practice --- src/main/java/mate/controller/car/AddCarController.java | 1 + .../java/mate/controller/car/AddDriverToCarController.java | 1 + src/main/java/mate/controller/car/DeleteCarController.java | 7 ++++--- .../java/mate/controller/driver/AddDriverController.java | 1 + .../mate/controller/driver/DeleteDriverController.java | 1 + .../controller/manufacturer/AddManufacturerController.java | 1 + .../manufacturer/DeleteManufacturersController.java | 1 + 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/mate/controller/car/AddCarController.java b/src/main/java/mate/controller/car/AddCarController.java index 484797591..34e20c529 100644 --- a/src/main/java/mate/controller/car/AddCarController.java +++ b/src/main/java/mate/controller/car/AddCarController.java @@ -39,5 +39,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) car.setManufacturer(manufacturer); car.setDrivers(new ArrayList<>()); carService.create(car); + resp.sendRedirect(req.getContextPath() + "/cars/all"); } } diff --git a/src/main/java/mate/controller/car/AddDriverToCarController.java b/src/main/java/mate/controller/car/AddDriverToCarController.java index 2b8f3943d..86aa73c13 100644 --- a/src/main/java/mate/controller/car/AddDriverToCarController.java +++ b/src/main/java/mate/controller/car/AddDriverToCarController.java @@ -37,5 +37,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) Car car = carService.get(Long.valueOf(req.getParameter("car"))); Driver driver = driverService.get(Long.valueOf(req.getParameter("driver"))); carService.addDriverToCar(driver,car); + resp.sendRedirect(req.getContextPath() + "/cars/all"); } } diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java index bf06c3543..3fab4ff68 100644 --- a/src/main/java/mate/controller/car/DeleteCarController.java +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -1,13 +1,13 @@ package mate.controller.car; -import mate.lib.Injector; +import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import mate.service.CarService; +import mate.lib.Injector; import javax.servlet.annotation.WebServlet; +import mate.service.CarService; @WebServlet(urlPatterns = "/cars/delete") public class DeleteCarController extends HttpServlet { @@ -20,5 +20,6 @@ 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/all"); } } diff --git a/src/main/java/mate/controller/driver/AddDriverController.java b/src/main/java/mate/controller/driver/AddDriverController.java index 1973f8f0f..c6461c9cf 100644 --- a/src/main/java/mate/controller/driver/AddDriverController.java +++ b/src/main/java/mate/controller/driver/AddDriverController.java @@ -31,5 +31,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) driver.setName(name); driver.setLicenseNumber(licenseNumber); driverService.create(driver); + resp.sendRedirect(req.getContextPath() + "/drivers/all"); } } diff --git a/src/main/java/mate/controller/driver/DeleteDriverController.java b/src/main/java/mate/controller/driver/DeleteDriverController.java index 036ede515..3cdab60b0 100644 --- a/src/main/java/mate/controller/driver/DeleteDriverController.java +++ b/src/main/java/mate/controller/driver/DeleteDriverController.java @@ -20,5 +20,6 @@ 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/all"); } } diff --git a/src/main/java/mate/controller/manufacturer/AddManufacturerController.java b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java index f62b636d5..39006f4fe 100644 --- a/src/main/java/mate/controller/manufacturer/AddManufacturerController.java +++ b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java @@ -31,5 +31,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) manufacturer.setName(name); manufacturer.setCountry(country); manufacturerService.create(manufacturer); + resp.sendRedirect(req.getContextPath() + "/manufacturers/all"); } } diff --git a/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java b/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java index 795a74dc3..bbf8cbf11 100644 --- a/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java +++ b/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java @@ -19,5 +19,6 @@ 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/all"); } } From 078ca5a8a73d38c688790152ddc5ccb00fee3363 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Mon, 7 Aug 2023 23:56:41 +0300 Subject: [PATCH 07/10] realization jv-web-practice --- .../java/mate/controller/car/AddCarController.java | 6 +++--- .../controller/car/AddDriverToCarController.java | 14 +++++++------- .../mate/controller/car/DeleteCarController.java | 2 +- .../mate/controller/car/GetAllCarController.java | 8 ++++---- .../controller/driver/DeleteDriverController.java | 2 +- .../controller/driver/GetAllDriversController.java | 2 +- .../manufacturer/AddManufacturerController.java | 6 +++--- .../DeleteManufacturersController.java | 4 ++-- .../GetAllManufacturersController.java | 8 ++++---- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/mate/controller/car/AddCarController.java b/src/main/java/mate/controller/car/AddCarController.java index 34e20c529..785a94a51 100644 --- a/src/main/java/mate/controller/car/AddCarController.java +++ b/src/main/java/mate/controller/car/AddCarController.java @@ -1,11 +1,11 @@ package mate.controller.car; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.ArrayList; 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; diff --git a/src/main/java/mate/controller/car/AddDriverToCarController.java b/src/main/java/mate/controller/car/AddDriverToCarController.java index 86aa73c13..24b05cd3c 100644 --- a/src/main/java/mate/controller/car/AddDriverToCarController.java +++ b/src/main/java/mate/controller/car/AddDriverToCarController.java @@ -1,17 +1,17 @@ package mate.controller.car; -import mate.lib.Injector; -import mate.model.Car; -import mate.model.Driver; -import mate.service.CarService; +import java.io.IOException; +import java.util.List; +import mate.service.DriverService; 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 java.io.IOException; -import java.util.List; -import mate.service.DriverService; +import mate.lib.Injector; +import mate.model.Car; +import mate.model.Driver; +import mate.service.CarService; @WebServlet(urlPatterns = "/cars/driver/add") public class AddDriverToCarController extends HttpServlet { diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java index 3fab4ff68..78d6d43ac 100644 --- a/src/main/java/mate/controller/car/DeleteCarController.java +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -5,8 +5,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mate.lib.Injector; import javax.servlet.annotation.WebServlet; +import mate.lib.Injector; import mate.service.CarService; @WebServlet(urlPatterns = "/cars/delete") diff --git a/src/main/java/mate/controller/car/GetAllCarController.java b/src/main/java/mate/controller/car/GetAllCarController.java index a91889c00..502164e90 100644 --- a/src/main/java/mate/controller/car/GetAllCarController.java +++ b/src/main/java/mate/controller/car/GetAllCarController.java @@ -1,15 +1,15 @@ package mate.controller.car; -import mate.lib.Injector; -import mate.model.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 java.io.IOException; -import java.util.List; import mate.service.CarService; +import mate.lib.Injector; +import mate.model.Car; @WebServlet(urlPatterns = "/cars/all") public class GetAllCarController extends HttpServlet { diff --git a/src/main/java/mate/controller/driver/DeleteDriverController.java b/src/main/java/mate/controller/driver/DeleteDriverController.java index 3cdab60b0..c9bc450e8 100644 --- a/src/main/java/mate/controller/driver/DeleteDriverController.java +++ b/src/main/java/mate/controller/driver/DeleteDriverController.java @@ -6,8 +6,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mate.service.DriverService; import mate.lib.Injector; +import mate.service.DriverService; @WebServlet(urlPatterns = "/drivers/delete") public class DeleteDriverController extends HttpServlet { diff --git a/src/main/java/mate/controller/driver/GetAllDriversController.java b/src/main/java/mate/controller/driver/GetAllDriversController.java index 6b89111dd..cfa5a0416 100644 --- a/src/main/java/mate/controller/driver/GetAllDriversController.java +++ b/src/main/java/mate/controller/driver/GetAllDriversController.java @@ -6,8 +6,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mate.model.Driver; import mate.lib.Injector; +import mate.model.Driver; import mate.service.DriverService; public class GetAllDriversController extends HttpServlet { diff --git a/src/main/java/mate/controller/manufacturer/AddManufacturerController.java b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java index 39006f4fe..47505cb47 100644 --- a/src/main/java/mate/controller/manufacturer/AddManufacturerController.java +++ b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java @@ -1,14 +1,14 @@ package mate.controller.manufacturer; -import mate.lib.Injector; -import mate.model.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 java.io.IOException; import mate.service.ManufacturerService; +import mate.lib.Injector; +import mate.model.Manufacturer; @WebServlet(urlPatterns = "/manufacturers/add") public class AddManufacturerController extends HttpServlet { diff --git a/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java b/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java index bbf8cbf11..200c6a624 100644 --- a/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java +++ b/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java @@ -1,13 +1,13 @@ package mate.controller.manufacturer; -import mate.lib.Injector; +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 java.io.IOException; import mate.service.ManufacturerService; +import mate.lib.Injector; @WebServlet(urlPatterns = "/manufacturers/delete") public class DeleteManufacturersController extends HttpServlet { diff --git a/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java b/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java index dcbaa4dfe..b7c390a5e 100644 --- a/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java +++ b/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java @@ -1,15 +1,15 @@ package mate.controller.manufacturer; -import mate.lib.Injector; -import mate.model.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 java.io.IOException; -import java.util.List; import mate.service.ManufacturerService; +import mate.lib.Injector; +import mate.model.Manufacturer; @WebServlet(urlPatterns = "/manufacturers/all") public class GetAllManufacturersController extends HttpServlet { From df8c38a55ef6a653e86585697b30a2632174683c Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Tue, 8 Aug 2023 00:03:36 +0300 Subject: [PATCH 08/10] realization jv-web-practice --- .../java/mate/controller/car/AddDriverToCarController.java | 2 +- src/main/java/mate/controller/car/DeleteCarController.java | 2 +- src/main/java/mate/controller/car/GetAllCarController.java | 2 +- .../controller/manufacturer/AddManufacturerController.java | 2 +- .../controller/manufacturer/DeleteManufacturersController.java | 3 ++- .../controller/manufacturer/GetAllManufacturersController.java | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/mate/controller/car/AddDriverToCarController.java b/src/main/java/mate/controller/car/AddDriverToCarController.java index 24b05cd3c..e213d6381 100644 --- a/src/main/java/mate/controller/car/AddDriverToCarController.java +++ b/src/main/java/mate/controller/car/AddDriverToCarController.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.util.List; -import mate.service.DriverService; 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.service.DriverService; import mate.lib.Injector; import mate.model.Car; import mate.model.Driver; diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java index 78d6d43ac..0ecd81cd9 100644 --- a/src/main/java/mate/controller/car/DeleteCarController.java +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -4,8 +4,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServletResponse; import mate.lib.Injector; import mate.service.CarService; diff --git a/src/main/java/mate/controller/car/GetAllCarController.java b/src/main/java/mate/controller/car/GetAllCarController.java index 502164e90..4b7a02ff2 100644 --- a/src/main/java/mate/controller/car/GetAllCarController.java +++ b/src/main/java/mate/controller/car/GetAllCarController.java @@ -7,9 +7,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mate.service.CarService; import mate.lib.Injector; import mate.model.Car; +import mate.service.CarService; @WebServlet(urlPatterns = "/cars/all") public class GetAllCarController extends HttpServlet { diff --git a/src/main/java/mate/controller/manufacturer/AddManufacturerController.java b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java index 47505cb47..acae51c0f 100644 --- a/src/main/java/mate/controller/manufacturer/AddManufacturerController.java +++ b/src/main/java/mate/controller/manufacturer/AddManufacturerController.java @@ -6,9 +6,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mate.service.ManufacturerService; import mate.lib.Injector; import mate.model.Manufacturer; +import mate.service.ManufacturerService; @WebServlet(urlPatterns = "/manufacturers/add") public class AddManufacturerController extends HttpServlet { diff --git a/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java b/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java index 200c6a624..4d92c9b62 100644 --- a/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java +++ b/src/main/java/mate/controller/manufacturer/DeleteManufacturersController.java @@ -6,14 +6,15 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mate.service.ManufacturerService; import mate.lib.Injector; +import mate.service.ManufacturerService; @WebServlet(urlPatterns = "/manufacturers/delete") public class DeleteManufacturersController 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 { diff --git a/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java b/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java index b7c390a5e..e49ea5e8d 100644 --- a/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java +++ b/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java @@ -7,9 +7,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mate.service.ManufacturerService; import mate.lib.Injector; import mate.model.Manufacturer; +import mate.service.ManufacturerService; @WebServlet(urlPatterns = "/manufacturers/all") public class GetAllManufacturersController extends HttpServlet { From 499381c83271e05ea687646d282d8af3d726d740 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Tue, 8 Aug 2023 00:07:41 +0300 Subject: [PATCH 09/10] realization jv-web-practice --- src/main/java/mate/controller/car/AddDriverToCarController.java | 2 +- src/main/java/mate/controller/car/DeleteCarController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mate/controller/car/AddDriverToCarController.java b/src/main/java/mate/controller/car/AddDriverToCarController.java index e213d6381..87e01e68b 100644 --- a/src/main/java/mate/controller/car/AddDriverToCarController.java +++ b/src/main/java/mate/controller/car/AddDriverToCarController.java @@ -7,11 +7,11 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mate.service.DriverService; import mate.lib.Injector; import mate.model.Car; import mate.model.Driver; import mate.service.CarService; +import mate.service.DriverService; @WebServlet(urlPatterns = "/cars/driver/add") public class AddDriverToCarController extends HttpServlet { diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java index 0ecd81cd9..0a7be5d35 100644 --- a/src/main/java/mate/controller/car/DeleteCarController.java +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -3,8 +3,8 @@ import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import mate.lib.Injector; import mate.service.CarService; From 4b7341b236af4f4da1014a6b621066840a20adf0 Mon Sep 17 00:00:00 2001 From: Vershynin Kostia Date: Tue, 8 Aug 2023 00:09:50 +0300 Subject: [PATCH 10/10] realization jv-web-practice --- src/main/java/mate/controller/car/DeleteCarController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java index 0a7be5d35..f6e5d061b 100644 --- a/src/main/java/mate/controller/car/DeleteCarController.java +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -2,8 +2,8 @@ import java.io.IOException; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import mate.lib.Injector;