Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
</dependencies>

<build>
Expand Down
36 changes: 36 additions & 0 deletions src/main/java/mate/controller/car/AddDriverToCarController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package mate.controller.car;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.model.Car;
import mate.model.Driver;
import mate.service.CarService;
import mate.service.DriverService;

public class AddDriverToCarController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final CarService carService = (CarService) injector.getInstance(CarService.class);
private final DriverService driverService = (DriverService) injector
.getInstance(DriverService.class);

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getRequestDispatcher("/WEB-INF/views/cars/driverToCar.jsp");
}

@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
Long driverId = Long.valueOf(req.getParameter("driver_id"));
Long carId = Long.valueOf(req.getParameter("car_id"));
Car car = carService.get(carId);
Driver driver = driverService.get(driverId);
carService.addDriverToCar(driver, car);
resp.sendRedirect(req.getContextPath() + "/cars/drivers/add");
}
}
37 changes: 37 additions & 0 deletions src/main/java/mate/controller/car/CreateCarController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package mate.controller.car;

import java.io.IOException;
import java.util.ArrayList;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.model.Car;
import mate.service.CarService;
import mate.service.ManufacturerService;

public class CreateCarController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final CarService carService = (CarService) injector.getInstance(CarService.class);
private final ManufacturerService manufacturerService = (ManufacturerService) injector
.getInstance(ManufacturerService.class);

@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getRequestDispatcher("/WEB-INF/views/cars/add.jsp").forward(req, resp);
}

@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
Long manufacturerId = Long.valueOf(req.getParameter("manufacturer_id"));
Car car = new Car();
car.setModel(req.getParameter("model"));
car.setManufacturer(manufacturerService.get(manufacturerId));
car.setDrivers(new ArrayList<>());
carService.create(car);
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 as Oleh commented before. After all doPost method we should redirect user to page where he may see result of his request (list of all cars, drivers etc) otherwise he will struggle to understand if his request is successful.
Please recheck all controllers for same issue

resp.sendRedirect(req.getContextPath() + "/cars/drivers/add");
}
}
22 changes: 22 additions & 0 deletions src/main/java/mate/controller/car/DeleteCarController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package mate.controller.car;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.service.CarService;

public class DeleteCarController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final CarService carService = (CarService) injector.getInstance(CarService.class);

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
Long id = Long.valueOf(req.getParameter("id"));
carService.delete(id);
resp.sendRedirect(req.getContextPath() + "/cars");
}
}
24 changes: 24 additions & 0 deletions src/main/java/mate/controller/car/GetAllCarController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package mate.controller.car;

import java.io.IOException;
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.model.Car;
import mate.service.CarService;

public class GetAllCarController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final CarService carService = (CarService) injector.getInstance(CarService.class);

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
List<Car> allCar = carService.getAll();
req.setAttribute("cars", allCar);
req.getRequestDispatcher("/WEB-INF/views/cars/cars.jsp").forward(req, resp);
}
}
33 changes: 33 additions & 0 deletions src/main/java/mate/controller/driver/CreateDriverController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package mate.controller.driver;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.model.Driver;
import mate.service.DriverService;

public class CreateDriverController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");

private final DriverService driverService = (DriverService) injector
.getInstance(DriverService.class);

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getRequestDispatcher("/WEB-INF/views/drivers/add.jsp").forward(req, resp);
}

@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
Driver driver = new Driver();
driver.setName(req.getParameter("name"));
driver.setLicenseNumber(req.getParameter("licenseNumber"));
driverService.create(driver);
resp.sendRedirect(req.getContextPath() + "/drivers/add");
}
}
23 changes: 23 additions & 0 deletions src/main/java/mate/controller/driver/DeleteDriverController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package mate.controller.driver;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.service.DriverService;

public class DeleteDriverController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final DriverService driverService = (DriverService) injector
.getInstance(DriverService.class);

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
Long id = Long.valueOf(req.getParameter("id"));
driverService.delete(id);
resp.sendRedirect(req.getContextPath() + "/drivers");
}
}
25 changes: 25 additions & 0 deletions src/main/java/mate/controller/driver/GetAllDriversController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package mate.controller.driver;

import java.io.IOException;
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.model.Driver;
import mate.service.DriverService;

public class GetAllDriversController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final DriverService driverService = (DriverService) injector
.getInstance(DriverService.class);

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
List<Driver> allDrivers = driverService.getAll();
req.setAttribute("drivers", allDrivers);
req.getRequestDispatcher("/WEB-INF/views/drivers/drivers.jsp").forward(req, resp);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package mate.controller.manufacturer;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.model.Manufacturer;
import mate.service.ManufacturerService;

public class CreateManufacturerController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final ManufacturerService manufacturerService = (ManufacturerService) injector
.getInstance(ManufacturerService.class);

@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getRequestDispatcher("/WEB-INF/views/manufacturer/add.jsp").forward(req, resp);
}

@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
Manufacturer manufacturer = new Manufacturer();
manufacturer.setName(req.getParameter("name"));
manufacturer.setCountry(req.getParameter("country"));
manufacturerService.create(manufacturer);
resp.sendRedirect(req.getContextPath() + "/manufacturers/add");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package mate.controller.manufacturer;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.service.ManufacturerService;

public class DeleteManufacturerController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final ManufacturerService manufacturerService = (ManufacturerService) injector
.getInstance(ManufacturerService.class);

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
Long id = Long.valueOf(req.getParameter("id"));
manufacturerService.delete(id);
resp.sendRedirect(req.getContextPath() + "/manufacturers");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package mate.controller.manufacturer;

import java.io.IOException;
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import mate.lib.Injector;
import mate.model.Manufacturer;
import mate.service.ManufacturerService;

public class GetAllManufacturerController extends HttpServlet {
private static final Injector injector = Injector.getInstance("mate");
private final ManufacturerService manufacturerService = (ManufacturerService) injector
.getInstance(ManufacturerService.class);

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
List<Manufacturer> allManufacturer = manufacturerService.getAll();
req.setAttribute("manufacturer", allManufacturer);
req.getRequestDispatcher("/WEB-INF/views/manufacturer/manufacturers.jsp")
.forward(req, resp);
}
}
11 changes: 11 additions & 0 deletions src/main/java/mate/model/Car.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package mate.model;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

Expand All @@ -9,6 +10,16 @@ public class Car {
private Manufacturer manufacturer;
private List<Driver> drivers;

public Car() {

}

public Car(String model, Manufacturer manufacturer) {
this.model = model;
this.manufacturer = manufacturer;
drivers = new ArrayList<>();
}

public Long getId() {
return id;
}
Expand Down
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 = "A251745A";
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/cars/add.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>New car</title>
</head>
<body>
<h1>Creat new car</h1>
<form method="post" action="${pageContext.request.contextPath}/cars/add">
Model <input type="text" name="model"><br>
Manufacturer Id <input type="text" name="manufacturer_id"><br>

<button type="submit">Confirm</button>
</form>
</body>
</html>
36 changes: 36 additions & 0 deletions src/main/webapp/WEB-INF/views/cars/cars.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Cars</title>
</head>
<body>
<h1>List of cars:</h1>
<table>
<tr>
<td>ID</td>
<td>MODEL</td>
<td>MANUFACTURER</td>
<td>DRIVERS</td>
<td>DELETE</td>
</tr>
<c:forEach items="${cars}" var="car">
<tr>
<td><c:out value="${car.id}" /></td>
<td><c:out value="${car.model}" /></td>
<td><c:out value="${car.manufacturer.getName()}" /></td>
<td>
<c:forEach items="${car.drivers}" var="driver">
<ul>
<li>
<c:out value="${driver.name}" />
</li>
</ul>
</c:forEach>
</td>
<td><a href="${pageContext.request.contextPath}/cars/delete?id=${car.id}">delete</a></td>
</tr>
</c:forEach>
</table>
</body>
</html>
Loading