Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.22</version>
<version>8.0.28</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
</dependencies>

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/mate/controller/IndexController.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

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;

@WebServlet(urlPatterns = "/index")
public class IndexController extends HttpServlet {
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp)
Expand Down
37 changes: 37 additions & 0 deletions src/main/java/mate/controller/car/AddDriverToCarController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
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);
}
}
23 changes: 23 additions & 0 deletions src/main/java/mate/controller/car/DeleteCarController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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);
}
Comment on lines +21 to +23
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After deleting the car, it would be good to redirect the user to a confirmation page or back to the list of cars.

}
27 changes: 27 additions & 0 deletions src/main/java/mate/controller/car/GetAllCarsController.java
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);
}
}
41 changes: 41 additions & 0 deletions src/main/java/mate/controller/car/RegistrationCarController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
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);
}
Comment on lines +39 to +41
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

}
24 changes: 24 additions & 0 deletions src/main/java/mate/controller/driver/DeleteDriverController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
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);
}
Comment on lines +22 to +24
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

}
28 changes: 28 additions & 0 deletions src/main/java/mate/controller/driver/GetAllDriversController.java
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);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
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);
}
Comment on lines +34 to +36
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After creating a new driver, you could redirect to the list of drivers or display a success message.

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
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);
Copy link
Copy Markdown

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.

}
}
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);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
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);
}
Comment on lines +35 to +37
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

}
8 changes: 4 additions & 4 deletions src/main/java/mate/util/ConnectionUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
private static final String USERNAME = "root";
private static final String PASSWORD = "00000";
private static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver";

static {
try {
Expand Down
15 changes: 15 additions & 0 deletions src/main/webapp/WEB-INF/views/car/addCar.jsp
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>
15 changes: 15 additions & 0 deletions src/main/webapp/WEB-INF/views/car/addDriverToCar.jsp
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>Adding Driver to Car</title>
</head>
<body>
<h1>Please, fill the form for adding driver</h1>

<form method="post" action="${pageContext.request.contextPath}/cars/drivers/add">
Car ID <input type="text" name="car_id"><br>
Driver ID <input type="text" name="driver_id"><br>
<button type="submit">Add driver</button>
</form>
</body>
</html>
Loading