diff --git a/driver_manager/pom.xml b/car/pom.xml
similarity index 96%
rename from driver_manager/pom.xml
rename to car/pom.xml
index 8abc286deb3493c53f7f6f1832d11e0761c52904..bcfd5393dcbfbc77c222c14e1a886dd42ec3b0d5 100644
--- a/driver_manager/pom.xml
+++ b/car/pom.xml
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>driver_manager</artifactId>
+ <artifactId>car</artifactId>
<dependencies>
<dependency>
diff --git a/driver_init/src/main/java/cz/muni/pa165/driverinit/App.java b/car/src/main/java/cz/muni/pa165/car/App.java
similarity index 89%
rename from driver_init/src/main/java/cz/muni/pa165/driverinit/App.java
rename to car/src/main/java/cz/muni/pa165/car/App.java
index bb31e80018b70dc4d5d1a01a69793432544e5dbf..056b384a5fd6ecb8253f238ea4dc9e14524a61a7 100644
--- a/driver_init/src/main/java/cz/muni/pa165/driverinit/App.java
+++ b/car/src/main/java/cz/muni/pa165/car/App.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.driverinit;
+package cz.muni.pa165.car;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/data/repository/CarRepository.java b/car/src/main/java/cz/muni/pa165/car/data/repository/CarRepository.java
similarity index 95%
rename from driver_manager/src/main/java/cz/muni/pa165/drivermanager/data/repository/CarRepository.java
rename to car/src/main/java/cz/muni/pa165/car/data/repository/CarRepository.java
index ecaf41c55cb5bbacf5c88ed7cf45fe64c666bafb..d2beea3ad986ed8802d02576a3885ece7e0399ba 100644
--- a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/data/repository/CarRepository.java
+++ b/car/src/main/java/cz/muni/pa165/car/data/repository/CarRepository.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.drivermanager.data.repository;
+package cz.muni.pa165.car.data.repository;
import cz.muni.pa165.common_library.racecomponents.Car;
diff --git a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/facade/DriverManagerFacade.java b/car/src/main/java/cz/muni/pa165/car/facade/DriverManagerFacade.java
similarity index 82%
rename from driver_manager/src/main/java/cz/muni/pa165/drivermanager/facade/DriverManagerFacade.java
rename to car/src/main/java/cz/muni/pa165/car/facade/DriverManagerFacade.java
index c15b8999d6a510d48ee5d8f45b649e5c63e9cfcf..e83d54d4d16892361ea029203615d529eda212eb 100644
--- a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/facade/DriverManagerFacade.java
+++ b/car/src/main/java/cz/muni/pa165/car/facade/DriverManagerFacade.java
@@ -1,7 +1,7 @@
-package cz.muni.pa165.drivermanager.facade;
+package cz.muni.pa165.car.facade;
+import cz.muni.pa165.car.service.DriverManagerService;
import cz.muni.pa165.common_library.racecomponents.Car;
-import cz.muni.pa165.drivermanager.service.DriverManagerService;
import org.springframework.stereotype.Service;
/**
@@ -20,7 +20,7 @@ public class DriverManagerFacade {
* Calls service to assign a driver to a car.
*
* @param driverId Id of the driver.
- * @param carId Id of the car.
+ * @param carId Id of the car.
* @return Car object that the driver was assigned to.
*/
public Car assignDriverToCar(Long driverId, Long carId) {
diff --git a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/rest/DriverManagerController.java b/car/src/main/java/cz/muni/pa165/car/rest/DriverManagerController.java
similarity index 90%
rename from driver_manager/src/main/java/cz/muni/pa165/drivermanager/rest/DriverManagerController.java
rename to car/src/main/java/cz/muni/pa165/car/rest/DriverManagerController.java
index c04ca2e83fd2ec07b4bcff45824ae14d59106929..028bf63b793e6cf1dbbf508b052586cf47bcae8e 100644
--- a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/rest/DriverManagerController.java
+++ b/car/src/main/java/cz/muni/pa165/car/rest/DriverManagerController.java
@@ -1,7 +1,7 @@
-package cz.muni.pa165.drivermanager.rest;
+package cz.muni.pa165.car.rest;
+import cz.muni.pa165.car.facade.DriverManagerFacade;
import cz.muni.pa165.common_library.racecomponents.Car;
-import cz.muni.pa165.drivermanager.facade.DriverManagerFacade;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@@ -29,7 +29,7 @@ public class DriverManagerController {
* Calls facade to assign a driver to a car.
*
* @param driverId Id of the driver.
- * @param carId Id of the car.
+ * @param carId Id of the car.
* @return Car entity.
*/
@Operation(summary = "Assign driver to a car")
diff --git a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/service/DriverManagerService.java b/car/src/main/java/cz/muni/pa165/car/service/DriverManagerService.java
similarity index 84%
rename from driver_manager/src/main/java/cz/muni/pa165/drivermanager/service/DriverManagerService.java
rename to car/src/main/java/cz/muni/pa165/car/service/DriverManagerService.java
index e55fea777cf0e6ac4be9134c9306bd4e9283ebb3..44efb85a0e3d31512a158921c0566106f7e22eb3 100644
--- a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/service/DriverManagerService.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/DriverManagerService.java
@@ -1,8 +1,8 @@
-package cz.muni.pa165.drivermanager.service;
+package cz.muni.pa165.car.service;
+import cz.muni.pa165.car.data.repository.CarRepository;
import cz.muni.pa165.common_library.exceptions.DatabaseException;
import cz.muni.pa165.common_library.racecomponents.Car;
-import cz.muni.pa165.drivermanager.data.repository.CarRepository;
import org.springframework.stereotype.Service;
/**
@@ -21,7 +21,7 @@ public class DriverManagerService {
* Calls repository to assign a driver to a car, if unsuccessful, throws exception.
*
* @param driverId Id of the diver.
- * @param carId Id of the car.
+ * @param carId Id of the car.
* @return Car object that the driver was assigned to.
*/
public Car assignDriverToCar(Long driverId, Long carId) {
diff --git a/driver_manager/src/main/resources/application.yml b/car/src/main/resources/application.yml
similarity index 100%
rename from driver_manager/src/main/resources/application.yml
rename to car/src/main/resources/application.yml
diff --git a/driver_manager/src/test/java/cz/muni/pa165/drivermanager/rest/DriverManagerControllerItTest.java b/car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerItTest.java
similarity index 93%
rename from driver_manager/src/test/java/cz/muni/pa165/drivermanager/rest/DriverManagerControllerItTest.java
rename to car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerItTest.java
index f72869844e852e6a37624484488ea3e776dba491..613d52e773f56877a75c97ffc22001bf8a5789ef 100644
--- a/driver_manager/src/test/java/cz/muni/pa165/drivermanager/rest/DriverManagerControllerItTest.java
+++ b/car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerItTest.java
@@ -1,11 +1,11 @@
-package cz.muni.pa165.drivermanager.rest;
+package cz.muni.pa165.car.rest;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
+import cz.muni.pa165.car.service.DriverManagerService;
import cz.muni.pa165.common_library.racecomponents.Car;
-import cz.muni.pa165.drivermanager.service.DriverManagerService;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/driver_manager/src/test/java/cz/muni/pa165/drivermanager/rest/DriverManagerControllerUnitTest.java b/car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerUnitTest.java
similarity index 91%
rename from driver_manager/src/test/java/cz/muni/pa165/drivermanager/rest/DriverManagerControllerUnitTest.java
rename to car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerUnitTest.java
index 5871f577a30cd5b73fc946286e2fc3103b2acce0..db3f0d97897b052a9a964dee0b957f3263a71cd9 100644
--- a/driver_manager/src/test/java/cz/muni/pa165/drivermanager/rest/DriverManagerControllerUnitTest.java
+++ b/car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerUnitTest.java
@@ -1,16 +1,15 @@
-package cz.muni.pa165.drivermanager.rest;
+package cz.muni.pa165.car.rest;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.BDDMockito.given;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
+import cz.muni.pa165.car.facade.DriverManagerFacade;
import cz.muni.pa165.common_library.racecomponents.Car;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.drivermanager.facade.DriverManagerFacade;
import java.util.ArrayList;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/car_manager/pom.xml b/component/pom.xml
similarity index 97%
rename from car_manager/pom.xml
rename to component/pom.xml
index 76e340a5fd5ae59f352a64bd37036714a43eb8ba..94a7eaa7b264d4421529645ec63deb6a28251d25 100644
--- a/car_manager/pom.xml
+++ b/component/pom.xml
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>car_manager</artifactId>
+ <artifactId>component</artifactId>
<dependencies>
<dependency>
diff --git a/car_manager/src/main/java/cz/muni/pa165/carmanager/App.java b/component/src/main/java/cz/muni/pa165/component/App.java
similarity index 89%
rename from car_manager/src/main/java/cz/muni/pa165/carmanager/App.java
rename to component/src/main/java/cz/muni/pa165/component/App.java
index d9d79f57fbb1fc3b4d5a97313327d7e1cc26f4fe..5f87d5b00817dc414a5ea4ed837d8894e72366ea 100644
--- a/car_manager/src/main/java/cz/muni/pa165/carmanager/App.java
+++ b/component/src/main/java/cz/muni/pa165/component/App.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.carmanager;
+package cz.muni.pa165.component;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/component_init/src/main/java/cz/muni/pa165/componentinit/data/repository/ComponentRepository.java b/component/src/main/java/cz/muni/pa165/component/data/repository/ComponentRepository.java
similarity index 93%
rename from component_init/src/main/java/cz/muni/pa165/componentinit/data/repository/ComponentRepository.java
rename to component/src/main/java/cz/muni/pa165/component/data/repository/ComponentRepository.java
index d453a66e51870ced74fd60a3d87323915c8dbcf4..d7b054b4ebe8e5d4cbd691ca2ddaea4f9413708d 100644
--- a/component_init/src/main/java/cz/muni/pa165/componentinit/data/repository/ComponentRepository.java
+++ b/component/src/main/java/cz/muni/pa165/component/data/repository/ComponentRepository.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.componentinit.data.repository;
+package cz.muni.pa165.component.data.repository;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Engine;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Gear;
diff --git a/component_init/src/main/java/cz/muni/pa165/componentinit/facade/ComponentInitFacade.java b/component/src/main/java/cz/muni/pa165/component/facade/ComponentInitFacade.java
similarity index 90%
rename from component_init/src/main/java/cz/muni/pa165/componentinit/facade/ComponentInitFacade.java
rename to component/src/main/java/cz/muni/pa165/component/facade/ComponentInitFacade.java
index b7c2592fde191acb302cd51fc5e317be87014c2c..9489c980813d530b6f7e401bed5ef341149b1093 100644
--- a/component_init/src/main/java/cz/muni/pa165/componentinit/facade/ComponentInitFacade.java
+++ b/component/src/main/java/cz/muni/pa165/component/facade/ComponentInitFacade.java
@@ -1,10 +1,10 @@
-package cz.muni.pa165.componentinit.facade;
+package cz.muni.pa165.component.facade;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Engine;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Gear;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Spoiler;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Tires;
-import cz.muni.pa165.componentinit.service.ComponentInitService;
+import cz.muni.pa165.component.service.ComponentInitService;
import org.springframework.stereotype.Service;
/**
diff --git a/component_init/src/main/java/cz/muni/pa165/componentinit/rest/ComponentInitController.java b/component/src/main/java/cz/muni/pa165/component/rest/ComponentInitController.java
similarity index 95%
rename from component_init/src/main/java/cz/muni/pa165/componentinit/rest/ComponentInitController.java
rename to component/src/main/java/cz/muni/pa165/component/rest/ComponentInitController.java
index 560601e44cf5d9176b9e8e6084f51389c1b2cd75..365ca510fe80f9ce9c8d6b50ad82db2d747b42cd 100644
--- a/component_init/src/main/java/cz/muni/pa165/componentinit/rest/ComponentInitController.java
+++ b/component/src/main/java/cz/muni/pa165/component/rest/ComponentInitController.java
@@ -1,10 +1,10 @@
-package cz.muni.pa165.componentinit.rest;
+package cz.muni.pa165.component.rest;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Engine;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Gear;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Spoiler;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Tires;
-import cz.muni.pa165.componentinit.facade.ComponentInitFacade;
+import cz.muni.pa165.component.facade.ComponentInitFacade;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
import org.springframework.http.MediaType;
diff --git a/component_init/src/main/java/cz/muni/pa165/componentinit/service/ComponentInitService.java b/component/src/main/java/cz/muni/pa165/component/service/ComponentInitService.java
similarity index 95%
rename from component_init/src/main/java/cz/muni/pa165/componentinit/service/ComponentInitService.java
rename to component/src/main/java/cz/muni/pa165/component/service/ComponentInitService.java
index 4a71f0c9915609beee1a590414fa60147cbc8b23..44b19c10688ba27a49d89d2831763892f057ae7f 100644
--- a/component_init/src/main/java/cz/muni/pa165/componentinit/service/ComponentInitService.java
+++ b/component/src/main/java/cz/muni/pa165/component/service/ComponentInitService.java
@@ -1,11 +1,11 @@
-package cz.muni.pa165.componentinit.service;
+package cz.muni.pa165.component.service;
import cz.muni.pa165.common_library.exceptions.DatabaseException;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Engine;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Gear;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Spoiler;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Tires;
-import cz.muni.pa165.componentinit.data.repository.ComponentRepository;
+import cz.muni.pa165.component.data.repository.ComponentRepository;
import org.springframework.stereotype.Service;
/**
diff --git a/component_init/src/main/resources/application.yml b/component/src/main/resources/application.yml
similarity index 100%
rename from component_init/src/main/resources/application.yml
rename to component/src/main/resources/application.yml
diff --git a/component_init/src/test/java/cz/muni/pa165/componentinit/rest/ComponentInitControllerItTest.java b/component/src/test/java/cz/muni/pa165/component/rest/ComponentInitControllerItTest.java
similarity index 98%
rename from component_init/src/test/java/cz/muni/pa165/componentinit/rest/ComponentInitControllerItTest.java
rename to component/src/test/java/cz/muni/pa165/component/rest/ComponentInitControllerItTest.java
index de55c23977cad5ebf279d46c7f3ae502b50c4482..ab80c1ae4e256f91bf52e4edd54f73a88463d844 100644
--- a/component_init/src/test/java/cz/muni/pa165/componentinit/rest/ComponentInitControllerItTest.java
+++ b/component/src/test/java/cz/muni/pa165/component/rest/ComponentInitControllerItTest.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.componentinit.rest;
+package cz.muni.pa165.component.rest;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -10,7 +10,7 @@ import cz.muni.pa165.common_library.racecomponents.carcomponents.Engine;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Gear;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Spoiler;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Tires;
-import cz.muni.pa165.componentinit.service.ComponentInitService;
+import cz.muni.pa165.component.service.ComponentInitService;
import java.math.BigDecimal;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/component_init/src/test/java/cz/muni/pa165/componentinit/rest/ComponentInitControllerUnitTest.java b/component/src/test/java/cz/muni/pa165/component/rest/ComponentInitControllerUnitTest.java
similarity index 98%
rename from component_init/src/test/java/cz/muni/pa165/componentinit/rest/ComponentInitControllerUnitTest.java
rename to component/src/test/java/cz/muni/pa165/component/rest/ComponentInitControllerUnitTest.java
index a508ec53612160eb91cdda6a81179401236fdf4f..84a1e96b31acdad26d330ea2e2266fdbe6e1c9fe 100644
--- a/component_init/src/test/java/cz/muni/pa165/componentinit/rest/ComponentInitControllerUnitTest.java
+++ b/component/src/test/java/cz/muni/pa165/component/rest/ComponentInitControllerUnitTest.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.componentinit.rest;
+package cz.muni.pa165.component.rest;
import static org.mockito.BDDMockito.given;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -10,7 +10,7 @@ import cz.muni.pa165.common_library.racecomponents.carcomponents.Engine;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Gear;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Spoiler;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Tires;
-import cz.muni.pa165.componentinit.facade.ComponentInitFacade;
+import cz.muni.pa165.component.facade.ComponentInitFacade;
import java.math.BigDecimal;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
diff --git a/driver_init/pom.xml b/driver/pom.xml
similarity index 96%
rename from driver_init/pom.xml
rename to driver/pom.xml
index 9b0e0ebc18deeacd7915459312debe8d6ac92731..675b0cbf6998c0a6b6d0af3a7b64207998c83755 100644
--- a/driver_init/pom.xml
+++ b/driver/pom.xml
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>driver_init</artifactId>
+ <artifactId>driver</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/component_init/src/main/java/cz/muni/pa165/componentinit/App.java b/driver/src/main/java/cz/muni/pa165/driver/App.java
similarity index 88%
rename from component_init/src/main/java/cz/muni/pa165/componentinit/App.java
rename to driver/src/main/java/cz/muni/pa165/driver/App.java
index 3270fadea6e32b193950decc75d09e2c36cbc508..b58d4debbdc6de93f475d606d070fe460ef40c51 100644
--- a/component_init/src/main/java/cz/muni/pa165/componentinit/App.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/App.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.componentinit;
+package cz.muni.pa165.driver;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/driver_init/src/main/java/cz/muni/pa165/driverinit/data/repository/DriverInitRepository.java b/driver/src/main/java/cz/muni/pa165/driver/data/repository/DriverInitRepository.java
similarity index 96%
rename from driver_init/src/main/java/cz/muni/pa165/driverinit/data/repository/DriverInitRepository.java
rename to driver/src/main/java/cz/muni/pa165/driver/data/repository/DriverInitRepository.java
index 38750bb6e2b4d7fd803690d61d9b5513c26a8ee6..f41fd7e84c57368435fc90272adf347fe8379383 100644
--- a/driver_init/src/main/java/cz/muni/pa165/driverinit/data/repository/DriverInitRepository.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/data/repository/DriverInitRepository.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.driverinit.data.repository;
+package cz.muni.pa165.driver.data.repository;
import cz.muni.pa165.common_library.racecomponents.Characteristic;
import cz.muni.pa165.common_library.racecomponents.Driver;
diff --git a/driver_init/src/main/java/cz/muni/pa165/driverinit/facade/DriverInitFacade.java b/driver/src/main/java/cz/muni/pa165/driver/facade/DriverInitFacade.java
similarity index 85%
rename from driver_init/src/main/java/cz/muni/pa165/driverinit/facade/DriverInitFacade.java
rename to driver/src/main/java/cz/muni/pa165/driver/facade/DriverInitFacade.java
index 3a6c9b15b8a1805dd7352bc93b4c84e01db59cf8..454f88ce22227d6f3ce0295da903778e8e43c8ad 100644
--- a/driver_init/src/main/java/cz/muni/pa165/driverinit/facade/DriverInitFacade.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/facade/DriverInitFacade.java
@@ -1,7 +1,7 @@
-package cz.muni.pa165.driverinit.facade;
+package cz.muni.pa165.driver.facade;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driverinit.service.DriverInitService;
+import cz.muni.pa165.driver.service.DriverInitService;
import org.springframework.stereotype.Service;
/**
diff --git a/driver_init/src/main/java/cz/muni/pa165/driverinit/rest/DriverInitController.java b/driver/src/main/java/cz/muni/pa165/driver/rest/DriverInitController.java
similarity index 94%
rename from driver_init/src/main/java/cz/muni/pa165/driverinit/rest/DriverInitController.java
rename to driver/src/main/java/cz/muni/pa165/driver/rest/DriverInitController.java
index 8a7ac614d7d0eae95fd21acca456879e8b283966..e37899a397b0d1002ffddb05ee74ffa9d44f6b70 100644
--- a/driver_init/src/main/java/cz/muni/pa165/driverinit/rest/DriverInitController.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/rest/DriverInitController.java
@@ -1,7 +1,7 @@
-package cz.muni.pa165.driverinit.rest;
+package cz.muni.pa165.driver.rest;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driverinit.facade.DriverInitFacade;
+import cz.muni.pa165.driver.facade.DriverInitFacade;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
import org.springframework.http.MediaType;
diff --git a/driver_init/src/main/java/cz/muni/pa165/driverinit/service/DriverInitService.java b/driver/src/main/java/cz/muni/pa165/driver/service/DriverInitService.java
similarity index 92%
rename from driver_init/src/main/java/cz/muni/pa165/driverinit/service/DriverInitService.java
rename to driver/src/main/java/cz/muni/pa165/driver/service/DriverInitService.java
index 3010a36666a46d851b2fe79e403b685cfffc5cc8..d2ab9960c4d68a5033fefe5eac05b0d52c0f28fd 100644
--- a/driver_init/src/main/java/cz/muni/pa165/driverinit/service/DriverInitService.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/service/DriverInitService.java
@@ -1,9 +1,9 @@
-package cz.muni.pa165.driverinit.service;
+package cz.muni.pa165.driver.service;
import cz.muni.pa165.common_library.exceptions.DatabaseException;
import cz.muni.pa165.common_library.exceptions.ResourceNotFoundException;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driverinit.data.repository.DriverInitRepository;
+import cz.muni.pa165.driver.data.repository.DriverInitRepository;
import org.springframework.stereotype.Service;
/**
diff --git a/driver_init/src/main/resources/application.yml b/driver/src/main/resources/application.yml
similarity index 100%
rename from driver_init/src/main/resources/application.yml
rename to driver/src/main/resources/application.yml
diff --git a/driver_init/src/test/java/cz/muni/pa165/driverinit/rest/DriverInitControllerTest.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerTest.java
similarity index 97%
rename from driver_init/src/test/java/cz/muni/pa165/driverinit/rest/DriverInitControllerTest.java
rename to driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerTest.java
index 7273907e0927eb102bf55fca768344b96c889dfa..356ebb84cd20af7ed3fe4989882b0ea3973168b6 100644
--- a/driver_init/src/test/java/cz/muni/pa165/driverinit/rest/DriverInitControllerTest.java
+++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerTest.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.driverinit.rest;
+package cz.muni.pa165.driver.rest;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -7,7 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import com.fasterxml.jackson.databind.ObjectMapper;
import cz.muni.pa165.common_library.racecomponents.Characteristic;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driverinit.service.DriverInitService;
+import cz.muni.pa165.driver.service.DriverInitService;
import java.util.Set;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/driver_init/src/test/java/cz/muni/pa165/driverinit/rest/DriverInitControllerUnitTest.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerUnitTest.java
similarity index 96%
rename from driver_init/src/test/java/cz/muni/pa165/driverinit/rest/DriverInitControllerUnitTest.java
rename to driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerUnitTest.java
index 8f608ce3bb2ea66737855e1edf2fa9ea88dd4167..29274d66f1b371cc18e38a1bfe5a0329c7736427 100644
--- a/driver_init/src/test/java/cz/muni/pa165/driverinit/rest/DriverInitControllerUnitTest.java
+++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverInitControllerUnitTest.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.driverinit.rest;
+package cz.muni.pa165.driver.rest;
import static org.mockito.BDDMockito.given;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
@@ -8,7 +8,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import com.fasterxml.jackson.databind.ObjectMapper;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driverinit.facade.DriverInitFacade;
+import cz.muni.pa165.driver.facade.DriverInitFacade;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/pom.xml b/pom.xml
index 6860fa09dcffc032b02be0aa94a1da8f0615795e..f6ad9869a9ae6bf2bed66b1726e620dc75b35a65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<modules>
- <module>driver_manager</module>
- <module>driver_init</module>
- <module>car_manager</module>
- <module>component_init</module>
+ <module>car</module>
+ <module>driver</module>
+ <module>race</module>
+ <module>component</module>
<module>common_library</module>
</modules>
<parent>
diff --git a/component_init/pom.xml b/race/pom.xml
similarity index 97%
rename from component_init/pom.xml
rename to race/pom.xml
index 771b883928480321ea354ffbb26fe64902e0eaff..ac097ba1f6e70c9017d3edee578abff09a3e9d86 100644
--- a/component_init/pom.xml
+++ b/race/pom.xml
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>component_init</artifactId>
+ <artifactId>race</artifactId>
<dependencies>
<dependency>
diff --git a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/App.java b/race/src/main/java/cz/muni/pa165/race/App.java
similarity index 70%
rename from driver_manager/src/main/java/cz/muni/pa165/drivermanager/App.java
rename to race/src/main/java/cz/muni/pa165/race/App.java
index 4c29d98e682d392c3a5d4541bbc1cb4358f845ed..4900be081bc8e33a00fc0ffef43caf0e74136fe6 100644
--- a/driver_manager/src/main/java/cz/muni/pa165/drivermanager/App.java
+++ b/race/src/main/java/cz/muni/pa165/race/App.java
@@ -1,8 +1,7 @@
-package cz.muni.pa165.drivermanager;
+package cz.muni.pa165.race;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/**
* Main app.
diff --git a/car_manager/src/main/java/cz/muni/pa165/carmanager/data/repository/ConfigRepository.java b/race/src/main/java/cz/muni/pa165/race/data/repository/ConfigRepository.java
similarity index 90%
rename from car_manager/src/main/java/cz/muni/pa165/carmanager/data/repository/ConfigRepository.java
rename to race/src/main/java/cz/muni/pa165/race/data/repository/ConfigRepository.java
index 9e0e7f6dc87f15f1b682a2035b7b5f8f70c82226..af544fb0f74db9670c863b73bf4bfcfca232e8ae 100644
--- a/car_manager/src/main/java/cz/muni/pa165/carmanager/data/repository/ConfigRepository.java
+++ b/race/src/main/java/cz/muni/pa165/race/data/repository/ConfigRepository.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.carmanager.data.repository;
+package cz.muni.pa165.race.data.repository;
import cz.muni.pa165.common_library.racecomponents.CarConfig;
import java.util.Optional;
diff --git a/car_manager/src/main/java/cz/muni/pa165/carmanager/facade/CarManagerFacade.java b/race/src/main/java/cz/muni/pa165/race/facade/CarManagerFacade.java
similarity index 85%
rename from car_manager/src/main/java/cz/muni/pa165/carmanager/facade/CarManagerFacade.java
rename to race/src/main/java/cz/muni/pa165/race/facade/CarManagerFacade.java
index 0d6dfe1c764b2f8eb2ec8ca8213b057c78711c51..a7b24156a0e10fb0fe7194a9a9b058d9b2976e7a 100644
--- a/car_manager/src/main/java/cz/muni/pa165/carmanager/facade/CarManagerFacade.java
+++ b/race/src/main/java/cz/muni/pa165/race/facade/CarManagerFacade.java
@@ -1,7 +1,7 @@
-package cz.muni.pa165.carmanager.facade;
+package cz.muni.pa165.race.facade;
-import cz.muni.pa165.carmanager.service.CarManagerService;
import cz.muni.pa165.common_library.racecomponents.CarConfig;
+import cz.muni.pa165.race.service.CarManagerService;
import org.springframework.stereotype.Service;
/**
diff --git a/car_manager/src/main/java/cz/muni/pa165/carmanager/rest/CarManagerController.java b/race/src/main/java/cz/muni/pa165/race/rest/CarManagerController.java
similarity index 94%
rename from car_manager/src/main/java/cz/muni/pa165/carmanager/rest/CarManagerController.java
rename to race/src/main/java/cz/muni/pa165/race/rest/CarManagerController.java
index f44af13ea3ef2e3137bac21be28fd57236ede834..3647b4cd41e29433621d19e6c2920f160da4e6fc 100644
--- a/car_manager/src/main/java/cz/muni/pa165/carmanager/rest/CarManagerController.java
+++ b/race/src/main/java/cz/muni/pa165/race/rest/CarManagerController.java
@@ -1,7 +1,7 @@
-package cz.muni.pa165.carmanager.rest;
+package cz.muni.pa165.race.rest;
-import cz.muni.pa165.carmanager.facade.CarManagerFacade;
import cz.muni.pa165.common_library.racecomponents.CarConfig;
+import cz.muni.pa165.race.facade.CarManagerFacade;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
import org.springframework.http.MediaType;
diff --git a/car_manager/src/main/java/cz/muni/pa165/carmanager/service/CarManagerService.java b/race/src/main/java/cz/muni/pa165/race/service/CarManagerService.java
similarity index 92%
rename from car_manager/src/main/java/cz/muni/pa165/carmanager/service/CarManagerService.java
rename to race/src/main/java/cz/muni/pa165/race/service/CarManagerService.java
index 393313f86309cb3f62f3a4f326e3c9d64cf02661..3c5758d591514f7f39381801b76ac3b8fbfc84ef 100644
--- a/car_manager/src/main/java/cz/muni/pa165/carmanager/service/CarManagerService.java
+++ b/race/src/main/java/cz/muni/pa165/race/service/CarManagerService.java
@@ -1,9 +1,9 @@
-package cz.muni.pa165.carmanager.service;
+package cz.muni.pa165.race.service;
-import cz.muni.pa165.carmanager.data.repository.ConfigRepository;
import cz.muni.pa165.common_library.exceptions.DatabaseException;
import cz.muni.pa165.common_library.exceptions.ResourceNotFoundException;
import cz.muni.pa165.common_library.racecomponents.CarConfig;
+import cz.muni.pa165.race.data.repository.ConfigRepository;
import org.springframework.stereotype.Service;
/**
diff --git a/car_manager/src/main/resources/application.yml b/race/src/main/resources/application.yml
similarity index 100%
rename from car_manager/src/main/resources/application.yml
rename to race/src/main/resources/application.yml
diff --git a/car_manager/src/test/java/cz/muni/pa165/carmanager/rest/CarManagerControllerItTest.java b/race/src/test/java/cz/muni/pa165/race/rest/CarManagerControllerItTest.java
similarity index 97%
rename from car_manager/src/test/java/cz/muni/pa165/carmanager/rest/CarManagerControllerItTest.java
rename to race/src/test/java/cz/muni/pa165/race/rest/CarManagerControllerItTest.java
index 67e8bb01478e125d71cf66bee4aecb22b67855d8..7d65784cc4f080f72fb3731bc00cc5cf3583bf34 100644
--- a/car_manager/src/test/java/cz/muni/pa165/carmanager/rest/CarManagerControllerItTest.java
+++ b/race/src/test/java/cz/muni/pa165/race/rest/CarManagerControllerItTest.java
@@ -1,15 +1,15 @@
-package cz.muni.pa165.carmanager.rest;
+package cz.muni.pa165.race.rest;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
-import cz.muni.pa165.carmanager.service.CarManagerService;
import cz.muni.pa165.common_library.racecomponents.CarConfig;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Engine;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Spoiler;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Tires;
+import cz.muni.pa165.race.service.CarManagerService;
import java.math.BigDecimal;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/car_manager/src/test/java/cz/muni/pa165/carmanager/rest/CarManagerControllerUnitTest.java b/race/src/test/java/cz/muni/pa165/race/rest/CarManagerControllerUnitTest.java
similarity index 96%
rename from car_manager/src/test/java/cz/muni/pa165/carmanager/rest/CarManagerControllerUnitTest.java
rename to race/src/test/java/cz/muni/pa165/race/rest/CarManagerControllerUnitTest.java
index 4fe88ebd69baeb6c518ad57ef8609e3c58764ba9..ba299fd1e17172ecc5581e6b47fa7e9870656fb3 100644
--- a/car_manager/src/test/java/cz/muni/pa165/carmanager/rest/CarManagerControllerUnitTest.java
+++ b/race/src/test/java/cz/muni/pa165/race/rest/CarManagerControllerUnitTest.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.carmanager.rest;
+package cz.muni.pa165.race.rest;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
@@ -6,11 +6,11 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
-import cz.muni.pa165.carmanager.facade.CarManagerFacade;
import cz.muni.pa165.common_library.racecomponents.CarConfig;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Engine;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Spoiler;
import cz.muni.pa165.common_library.racecomponents.carcomponents.Tires;
+import cz.muni.pa165.race.facade.CarManagerFacade;
import java.math.BigDecimal;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;