From 6208e6593923af91a2dc3d95180aa30416eed90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diana=20Gul=C4=8D=C3=ADkov=C3=A1?= <xgulcik@fi.muni.cz>
Date: Sun, 2 Apr 2023 18:01:29 +0200
Subject: [PATCH] renaming modules
---
{driver_manager => car}/pom.xml | 2 +-
.../src/main/java/cz/muni/pa165/car}/App.java | 2 +-
.../cz/muni/pa165/car}/data/repository/CarRepository.java | 2 +-
.../cz/muni/pa165/car}/facade/DriverManagerFacade.java | 6 +++---
.../cz/muni/pa165/car}/rest/DriverManagerController.java | 6 +++---
.../cz/muni/pa165/car}/service/DriverManagerService.java | 6 +++---
.../src/main/resources/application.yml | 0
.../pa165/car}/rest/DriverManagerControllerItTest.java | 4 ++--
.../pa165/car}/rest/DriverManagerControllerUnitTest.java | 5 ++---
{car_manager => component}/pom.xml | 2 +-
.../src/main/java/cz/muni/pa165/component}/App.java | 2 +-
.../component}/data/repository/ComponentRepository.java | 2 +-
.../muni/pa165/component}/facade/ComponentInitFacade.java | 4 ++--
.../pa165/component}/rest/ComponentInitController.java | 4 ++--
.../pa165/component}/service/ComponentInitService.java | 4 ++--
.../src/main/resources/application.yml | 0
.../component}/rest/ComponentInitControllerItTest.java | 4 ++--
.../component}/rest/ComponentInitControllerUnitTest.java | 4 ++--
{driver_init => driver}/pom.xml | 2 +-
.../src/main/java/cz/muni/pa165/driver}/App.java | 2 +-
.../driver}/data/repository/DriverInitRepository.java | 2 +-
.../cz/muni/pa165/driver}/facade/DriverInitFacade.java | 4 ++--
.../cz/muni/pa165/driver}/rest/DriverInitController.java | 4 ++--
.../cz/muni/pa165/driver}/service/DriverInitService.java | 4 ++--
.../src/main/resources/application.yml | 0
.../muni/pa165/driver}/rest/DriverInitControllerTest.java | 4 ++--
.../pa165/driver}/rest/DriverInitControllerUnitTest.java | 4 ++--
pom.xml | 8 ++++----
{component_init => race}/pom.xml | 2 +-
.../src/main/java/cz/muni/pa165/race}/App.java | 3 +--
.../pa165/race}/data/repository/ConfigRepository.java | 2 +-
.../java/cz/muni/pa165/race}/facade/CarManagerFacade.java | 4 ++--
.../cz/muni/pa165/race}/rest/CarManagerController.java | 4 ++--
.../cz/muni/pa165/race}/service/CarManagerService.java | 4 ++--
{car_manager => race}/src/main/resources/application.yml | 0
.../muni/pa165/race}/rest/CarManagerControllerItTest.java | 4 ++--
.../pa165/race}/rest/CarManagerControllerUnitTest.java | 4 ++--
37 files changed, 59 insertions(+), 61 deletions(-)
rename {driver_manager => car}/pom.xml (96%)
rename {driver_init/src/main/java/cz/muni/pa165/driverinit => car/src/main/java/cz/muni/pa165/car}/App.java (89%)
rename {driver_manager/src/main/java/cz/muni/pa165/drivermanager => car/src/main/java/cz/muni/pa165/car}/data/repository/CarRepository.java (95%)
rename {driver_manager/src/main/java/cz/muni/pa165/drivermanager => car/src/main/java/cz/muni/pa165/car}/facade/DriverManagerFacade.java (82%)
rename {driver_manager/src/main/java/cz/muni/pa165/drivermanager => car/src/main/java/cz/muni/pa165/car}/rest/DriverManagerController.java (90%)
rename {driver_manager/src/main/java/cz/muni/pa165/drivermanager => car/src/main/java/cz/muni/pa165/car}/service/DriverManagerService.java (84%)
rename {driver_manager => car}/src/main/resources/application.yml (100%)
rename {driver_manager/src/test/java/cz/muni/pa165/drivermanager => car/src/test/java/cz/muni/pa165/car}/rest/DriverManagerControllerItTest.java (93%)
rename {driver_manager/src/test/java/cz/muni/pa165/drivermanager => car/src/test/java/cz/muni/pa165/car}/rest/DriverManagerControllerUnitTest.java (91%)
rename {car_manager => component}/pom.xml (97%)
rename {car_manager/src/main/java/cz/muni/pa165/carmanager => component/src/main/java/cz/muni/pa165/component}/App.java (89%)
rename {component_init/src/main/java/cz/muni/pa165/componentinit => component/src/main/java/cz/muni/pa165/component}/data/repository/ComponentRepository.java (93%)
rename {component_init/src/main/java/cz/muni/pa165/componentinit => component/src/main/java/cz/muni/pa165/component}/facade/ComponentInitFacade.java (90%)
rename {component_init/src/main/java/cz/muni/pa165/componentinit => component/src/main/java/cz/muni/pa165/component}/rest/ComponentInitController.java (95%)
rename {component_init/src/main/java/cz/muni/pa165/componentinit => component/src/main/java/cz/muni/pa165/component}/service/ComponentInitService.java (95%)
rename {component_init => component}/src/main/resources/application.yml (100%)
rename {component_init/src/test/java/cz/muni/pa165/componentinit => component/src/test/java/cz/muni/pa165/component}/rest/ComponentInitControllerItTest.java (98%)
rename {component_init/src/test/java/cz/muni/pa165/componentinit => component/src/test/java/cz/muni/pa165/component}/rest/ComponentInitControllerUnitTest.java (98%)
rename {driver_init => driver}/pom.xml (96%)
rename {component_init/src/main/java/cz/muni/pa165/componentinit => driver/src/main/java/cz/muni/pa165/driver}/App.java (88%)
rename {driver_init/src/main/java/cz/muni/pa165/driverinit => driver/src/main/java/cz/muni/pa165/driver}/data/repository/DriverInitRepository.java (96%)
rename {driver_init/src/main/java/cz/muni/pa165/driverinit => driver/src/main/java/cz/muni/pa165/driver}/facade/DriverInitFacade.java (85%)
rename {driver_init/src/main/java/cz/muni/pa165/driverinit => driver/src/main/java/cz/muni/pa165/driver}/rest/DriverInitController.java (94%)
rename {driver_init/src/main/java/cz/muni/pa165/driverinit => driver/src/main/java/cz/muni/pa165/driver}/service/DriverInitService.java (92%)
rename {driver_init => driver}/src/main/resources/application.yml (100%)
rename {driver_init/src/test/java/cz/muni/pa165/driverinit => driver/src/test/java/cz/muni/pa165/driver}/rest/DriverInitControllerTest.java (97%)
rename {driver_init/src/test/java/cz/muni/pa165/driverinit => driver/src/test/java/cz/muni/pa165/driver}/rest/DriverInitControllerUnitTest.java (96%)
rename {component_init => race}/pom.xml (97%)
rename {driver_manager/src/main/java/cz/muni/pa165/drivermanager => race/src/main/java/cz/muni/pa165/race}/App.java (70%)
rename {car_manager/src/main/java/cz/muni/pa165/carmanager => race/src/main/java/cz/muni/pa165/race}/data/repository/ConfigRepository.java (90%)
rename {car_manager/src/main/java/cz/muni/pa165/carmanager => race/src/main/java/cz/muni/pa165/race}/facade/CarManagerFacade.java (85%)
rename {car_manager/src/main/java/cz/muni/pa165/carmanager => race/src/main/java/cz/muni/pa165/race}/rest/CarManagerController.java (94%)
rename {car_manager/src/main/java/cz/muni/pa165/carmanager => race/src/main/java/cz/muni/pa165/race}/service/CarManagerService.java (92%)
rename {car_manager => race}/src/main/resources/application.yml (100%)
rename {car_manager/src/test/java/cz/muni/pa165/carmanager => race/src/test/java/cz/muni/pa165/race}/rest/CarManagerControllerItTest.java (97%)
rename {car_manager/src/test/java/cz/muni/pa165/carmanager => race/src/test/java/cz/muni/pa165/race}/rest/CarManagerControllerUnitTest.java (96%)
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 8abc286d..bcfd5393 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 bb31e800..056b384a 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 ecaf41c5..d2beea3a 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 c15b8999..e83d54d4 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 c04ca2e8..028bf63b 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 e55fea77..44efb85a 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 f7286984..613d52e7 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 5871f577..db3f0d97 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 76e340a5..94a7eaa7 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 d9d79f57..5f87d5b0 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 d453a66e..d7b054b4 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 b7c2592f..9489c980 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 560601e4..365ca510 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 4a71f0c9..44b19c10 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 de55c239..ab80c1ae 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 a508ec53..84a1e96b 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 9b0e0ebc..675b0cbf 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 3270fade..b58d4deb 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 38750bb6..f41fd7e8 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 3a6c9b15..454f88ce 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 8a7ac614..e37899a3 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 3010a366..d2ab9960 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 7273907e..356ebb84 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 8f608ce3..29274d66 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 6860fa09..f6ad9869 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 771b8839..ac097ba1 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 4c29d98e..4900be08 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 9e0e7f6d..af544fb0 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 0d6dfe1c..a7b24156 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 f44af13e..3647b4cd 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 393313f8..3c5758d5 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 67e8bb01..7d65784c 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 4fe88ebd..ba299fd1 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;
--
GitLab