diff --git a/core/Dockerfile b/core/Dockerfile index 153d2d324b38dd82fc551490743423e57df7db03..1f31dae7b5cc689c162ba44e6101a4c1172e0245 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -5,7 +5,6 @@ COPY ./.. /app RUN mvn clean install WORKDIR ./core -RUN mvn clean install EXPOSE 8080 CMD ["mvn", "spring-boot:run"] \ No newline at end of file diff --git a/microservice4/Dockerfile b/electricityTarifMicroservice/Dockerfile similarity index 74% rename from microservice4/Dockerfile rename to electricityTarifMicroservice/Dockerfile index 933651eeeb8a5be6e0ddc6d0dad7fb7f6e433bda..f23b63e6fb357b1146597dc6526a00d0e9258c53 100644 --- a/microservice4/Dockerfile +++ b/electricityTarifMicroservice/Dockerfile @@ -4,8 +4,7 @@ WORKDIR /app COPY ./.. /app RUN mvn clean install -WORKDIR ./microservice4 -RUN mvn clean install +WORKDIR ./electricityTarifMicroservice EXPOSE 8088 CMD ["mvn", "spring-boot:run"] \ No newline at end of file diff --git a/microservice4/mvnw b/electricityTarifMicroservice/mvnw similarity index 100% rename from microservice4/mvnw rename to electricityTarifMicroservice/mvnw diff --git a/microservice4/mvnw.cmd b/electricityTarifMicroservice/mvnw.cmd similarity index 100% rename from microservice4/mvnw.cmd rename to electricityTarifMicroservice/mvnw.cmd diff --git a/microservice4/pom.xml b/electricityTarifMicroservice/pom.xml similarity index 97% rename from microservice4/pom.xml rename to electricityTarifMicroservice/pom.xml index c19a999ae57634152b5a6a4e3c554245e3e38114..890e976aa48a23fab5db27e53f0a80a90b631f0a 100644 --- a/microservice4/pom.xml +++ b/electricityTarifMicroservice/pom.xml @@ -19,7 +19,7 @@ </dependencies> <modelVersion>4.0.0</modelVersion> - <artifactId>microservice4</artifactId> + <artifactId>electricityTarifMicroservice</artifactId> <properties> <maven.compiler.source>17</maven.compiler.source> diff --git a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/App.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/App.java similarity index 100% rename from microservice4/src/main/java/cz/muni/fi/pa165/microservice4/App.java rename to electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/App.java diff --git a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPrice.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPrice.java similarity index 100% rename from microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPrice.java rename to electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPrice.java diff --git a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceController.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceController.java similarity index 100% rename from microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceController.java rename to electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceController.java diff --git a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceService.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceService.java similarity index 100% rename from microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceService.java rename to electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceService.java diff --git a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceServiceImpl.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceServiceImpl.java similarity index 100% rename from microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceServiceImpl.java rename to electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceServiceImpl.java diff --git a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceSetRequest.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceSetRequest.java similarity index 100% rename from microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceSetRequest.java rename to electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceSetRequest.java diff --git a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/NoElectricityPriceForCompanyException.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/NoElectricityPriceForCompanyException.java similarity index 100% rename from microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/NoElectricityPriceForCompanyException.java rename to electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/NoElectricityPriceForCompanyException.java diff --git a/microservice4/src/main/resources/application.yml b/electricityTarifMicroservice/src/main/resources/application.yml similarity index 100% rename from microservice4/src/main/resources/application.yml rename to electricityTarifMicroservice/src/main/resources/application.yml diff --git a/microservice4/src/main/resources/banner.txt b/electricityTarifMicroservice/src/main/resources/banner.txt similarity index 100% rename from microservice4/src/main/resources/banner.txt rename to electricityTarifMicroservice/src/main/resources/banner.txt diff --git a/microservice4/src/microservice4docs.yaml b/electricityTarifMicroservice/src/microservice4docs.yaml similarity index 100% rename from microservice4/src/microservice4docs.yaml rename to electricityTarifMicroservice/src/microservice4docs.yaml diff --git a/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java b/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java similarity index 100% rename from microservice4/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java rename to electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java diff --git a/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/ElectricityPriceControllerTest.java b/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/microservice4/ElectricityPriceControllerTest.java similarity index 100% rename from microservice4/src/test/java/cz/muni/fi/pa165/microservice4/ElectricityPriceControllerTest.java rename to electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/microservice4/ElectricityPriceControllerTest.java diff --git a/emailmicroservice/Dockerfile b/emailmicroservice/Dockerfile index eaf92758a1bbdafb807d49c26c1b41f5b98e6d0e..87b557559225f2b878614f026f7cbc3af04ba637 100644 --- a/emailmicroservice/Dockerfile +++ b/emailmicroservice/Dockerfile @@ -5,7 +5,6 @@ COPY ./.. /app RUN mvn clean install WORKDIR ./emailmicroservice -RUN mvn clean install EXPOSE 8081 CMD ["mvn", "spring-boot:run"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 361e1d0059f1eac9f3c7d87b4140ce31da53e0b8..7c1baef612cc17b9a2f9fd9599e6408c958f237b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ <module>core</module> <module>statistics</module> <module>emailmicroservice</module> - <module>microservice4</module> + <module>electricityTarifMicroservice</module> <module>model</module> </modules> <parent> diff --git a/statistics/Dockerfile b/statistics/Dockerfile index d7eec908d6e765aaaf651bfee13d1572cbd8c62c..8c7e730abb2c932dbcf45c16421bf48db08b1c0c 100644 --- a/statistics/Dockerfile +++ b/statistics/Dockerfile @@ -5,7 +5,6 @@ COPY ./.. /app RUN mvn clean install WORKDIR ./statistics -RUN mvn clean install EXPOSE 8090 CMD ["mvn", "spring-boot:run"] \ No newline at end of file