From f0a15f6696abb13eff1f2bcaeb10fb9ac27fa6fd Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Thu, 10 Oct 2024 00:22:11 +0200 Subject: [PATCH] small changes Signed-off-by: Peter Siegmund --- Dockerfile | 4 ++-- .../{controller/web => web/controller}/RootController.java | 2 +- .../timezone/domain/model/request/TimeZoneRequest.java | 5 ----- .../timezone/service/impl/TimeZoneServiceImpl.java | 1 + 4 files changed, 4 insertions(+), 8 deletions(-) rename src/main/java/dev/mars3142/fhq/timezone_service/root/{controller/web => web/controller}/RootController.java (89%) delete mode 100644 src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/request/TimeZoneRequest.java diff --git a/Dockerfile b/Dockerfile index ee0c9ed..3f863e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ FROM eclipse-temurin:21-jre-jammy RUN useradd -m app USER app -COPY --chown=app --from=build /usr/src/app/target/*.jar /usr/app/app.jar +COPY --chown=app --from=build /usr/src/app/target/*.jar /usr/app/timezone.jar EXPOSE 8080 -CMD ["java", "-jar", "/usr/app/app.jar"] +CMD ["java", "-jar", "/usr/app/timezone.jar"] diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/root/controller/web/RootController.java b/src/main/java/dev/mars3142/fhq/timezone_service/root/web/controller/RootController.java similarity index 89% rename from src/main/java/dev/mars3142/fhq/timezone_service/root/controller/web/RootController.java rename to src/main/java/dev/mars3142/fhq/timezone_service/root/web/controller/RootController.java index 8d40e11..48f3c1f 100644 --- a/src/main/java/dev/mars3142/fhq/timezone_service/root/controller/web/RootController.java +++ b/src/main/java/dev/mars3142/fhq/timezone_service/root/web/controller/RootController.java @@ -1,4 +1,4 @@ -package dev.mars3142.fhq.timezone_service.root.controller.web; +package dev.mars3142.fhq.timezone_service.root.web.controller; import java.net.URI; import org.springframework.http.HttpStatus; diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/request/TimeZoneRequest.java b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/request/TimeZoneRequest.java deleted file mode 100644 index 8042ca8..0000000 --- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/request/TimeZoneRequest.java +++ /dev/null @@ -1,5 +0,0 @@ -package dev.mars3142.fhq.timezone_service.timezone.domain.model.request; - -public record TimeZoneRequest(String timezone) { - -} diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimeZoneServiceImpl.java b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimeZoneServiceImpl.java index c6a18a2..e857fab 100644 --- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimeZoneServiceImpl.java +++ b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimeZoneServiceImpl.java @@ -31,6 +31,7 @@ public class TimeZoneServiceImpl implements TimeZoneService { } @Override + @Cacheable(value = "externalIp", key = "{#ip}") public String getExternalIp(String ip) { var result = ip; if (ip.equals("127.0.0.1")) {