From 6591bfc730af032ae7ec8990256c088b46c76e22 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Mon, 28 Oct 2024 14:46:52 +0100 Subject: [PATCH] rename TimeZone to Timezone Signed-off-by: Peter Siegmund --- .../timezone_service/config/OpenAPIConfig.java | 4 ++-- ...neController.java => TimezoneController.java} | 16 ++++++++-------- ...meZoneResponse.java => TimezoneResponse.java} | 2 +- ...TimeZoneService.java => TimezoneService.java} | 2 +- ...ServiceImpl.java => TimezoneServiceImpl.java} | 6 +++--- ...mplTest.java => TimezoneServiceImplTest.java} | 6 +++--- ...llerTest.java => TimezoneControllerTest.java} | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/{TimeZoneController.java => TimezoneController.java} (83%) rename src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/{TimeZoneResponse.java => TimezoneResponse.java} (85%) rename src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/{TimeZoneService.java => TimezoneService.java} (93%) rename src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/{TimeZoneServiceImpl.java => TimezoneServiceImpl.java} (94%) rename src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/{TimeZoneServiceImplTest.java => TimezoneServiceImplTest.java} (93%) rename src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/{TimeZoneControllerTest.java => TimezoneControllerTest.java} (98%) diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/config/OpenAPIConfig.java b/src/main/java/dev/mars3142/fhq/timezone_service/config/OpenAPIConfig.java index 658d21f..590d761 100644 --- a/src/main/java/dev/mars3142/fhq/timezone_service/config/OpenAPIConfig.java +++ b/src/main/java/dev/mars3142/fhq/timezone_service/config/OpenAPIConfig.java @@ -11,9 +11,9 @@ import org.springframework.context.annotation.Configuration; public class OpenAPIConfig { @Bean - public OpenAPI timeZoneOpenAPI() { + public OpenAPI timezoneOpenAPI() { return new OpenAPI() - .info(new Info().title("TimeZone API").version("1.0")) + .info(new Info().title("Timezone API").version("1.0")) .servers( List.of( new Server().url("https://api.firmware-hq.dev"), diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimeZoneController.java b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimezoneController.java similarity index 83% rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimeZoneController.java rename to src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimezoneController.java index 053af5f..2e4b6ca 100644 --- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimeZoneController.java +++ b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimezoneController.java @@ -2,8 +2,8 @@ package dev.mars3142.fhq.timezone_service.timezone.controllers; import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.TimeApiTimezoneZoneResponse; import dev.mars3142.fhq.timezone_service.timezone.domain.model.response.LocationResponse; -import dev.mars3142.fhq.timezone_service.timezone.domain.model.response.TimeZoneResponse; -import dev.mars3142.fhq.timezone_service.timezone.service.TimeZoneService; +import dev.mars3142.fhq.timezone_service.timezone.domain.model.response.TimezoneResponse; +import dev.mars3142.fhq.timezone_service.timezone.service.TimezoneService; import java.util.Objects; import lombok.RequiredArgsConstructor; import lombok.val; @@ -19,19 +19,19 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("v1/timezone") @RequiredArgsConstructor -public class TimeZoneController { +public class TimezoneController { - private final TimeZoneService timeZoneService; + private final TimezoneService timeZoneService; @GetMapping - public HttpEntity getTimeZone( + public HttpEntity getTimeZone( @RequestHeader(value = "X-Forwarded-For", defaultValue = "127.0.0.1") String header) { val clientIp = header.split(",")[0]; val ip = timeZoneService.getExternalIp(clientIp); val timezoneInfo = timeZoneService.getTimeZoneInfoByIp(ip); val posix = timeZoneService.getPosixTimeZone(timezoneInfo.timezone()); return new ResponseEntity<>( - TimeZoneResponse.builder().timezone(timezoneInfo.timezone()).abbreviation(timezoneInfo.abbreviation()) + TimezoneResponse.builder().timezone(timezoneInfo.timezone()).abbreviation(timezoneInfo.abbreviation()) .posix_tz(posix).build(), HttpStatus.OK); } @@ -42,14 +42,14 @@ public class TimeZoneController { } @GetMapping("{area}/{location}") - public HttpEntity getTimeZoneForLocation(@PathVariable String area, @PathVariable String location) { + public HttpEntity getTimeZoneForLocation(@PathVariable String area, @PathVariable String location) { val timezone = area + "/" + location; val timezoneInfo = timeZoneService.getTimeZoneInfo(timezone); val abbreviation = Objects.requireNonNullElse(timezoneInfo.dstInterval(), new TimeApiTimezoneZoneResponse.Interval(null)).dstName(); val posix = timeZoneService.getPosixTimeZone(timezone); return new ResponseEntity<>( - TimeZoneResponse.builder().timezone(timezone).abbreviation(abbreviation).posix_tz(posix).build(), + TimezoneResponse.builder().timezone(timezone).abbreviation(abbreviation).posix_tz(posix).build(), HttpStatus.OK); } } diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimeZoneResponse.java b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimezoneResponse.java similarity index 85% rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimeZoneResponse.java rename to src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimezoneResponse.java index 60f98cd..4c2318b 100644 --- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimeZoneResponse.java +++ b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimezoneResponse.java @@ -8,7 +8,7 @@ import org.springframework.hateoas.RepresentationModel; @Getter @Builder @RequiredArgsConstructor -public class TimeZoneResponse extends RepresentationModel { +public class TimezoneResponse extends RepresentationModel { private final String timezone; private final String abbreviation; diff --git a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimeZoneService.java b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimezoneService.java similarity index 93% rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimeZoneService.java rename to src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimezoneService.java index 238fc90..7bcc8d7 100644 --- a/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimeZoneService.java +++ b/src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimezoneService.java @@ -4,7 +4,7 @@ import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.TimeA import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.WorldTimeApiIpResponse; import java.util.List; -public interface TimeZoneService { +public interface TimezoneService { String getExternalIp(String ip); 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 similarity index 94% rename from src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimeZoneServiceImpl.java rename to src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImpl.java index eef23eb..6ccf2a2 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 @@ -4,7 +4,7 @@ import dev.mars3142.fhq.timezone_service.exceptions.NotFoundException; import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.IpifyResponse; import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.TimeApiTimezoneZoneResponse; import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.WorldTimeApiIpResponse; -import dev.mars3142.fhq.timezone_service.timezone.service.TimeZoneService; +import dev.mars3142.fhq.timezone_service.timezone.service.TimezoneService; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -21,11 +21,11 @@ import org.springframework.web.client.RestClient; @Service @Slf4j -public class TimeZoneServiceImpl implements TimeZoneService { +public class TimezoneServiceImpl implements TimezoneService { private final RestClient restClient; - public TimeZoneServiceImpl(RestClient.Builder restClientBuilder) { + public TimezoneServiceImpl(RestClient.Builder restClientBuilder) { restClient = restClientBuilder.build(); } diff --git a/src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimeZoneServiceImplTest.java b/src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImplTest.java similarity index 93% rename from src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimeZoneServiceImplTest.java rename to src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImplTest.java index 48777d1..a5186f2 100644 --- a/src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimeZoneServiceImplTest.java +++ b/src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImplTest.java @@ -14,11 +14,11 @@ import static org.springframework.test.web.client.match.MockRestRequestMatchers. import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; @DisplayName("Testing Timezone Service Default Implementation") -@RestClientTest(TimeZoneServiceImpl.class) -class TimeZoneServiceImplTest { +@RestClientTest(TimezoneServiceImpl.class) +class TimezoneServiceImplTest { @Autowired - private TimeZoneServiceImpl timeZoneService; + private TimezoneServiceImpl timeZoneService; @Autowired private MockRestServiceServer server; diff --git a/src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimeZoneControllerTest.java b/src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimezoneControllerTest.java similarity index 98% rename from src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimeZoneControllerTest.java rename to src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimezoneControllerTest.java index ce82552..c9c0ecc 100644 --- a/src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimeZoneControllerTest.java +++ b/src/test/java/dev/mars3142/fhq/timezone_service/timezone/web/controllers/TimezoneControllerTest.java @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @DisplayName("Testing Timezone RestController") -public class TimeZoneControllerTest { +public class TimezoneControllerTest { @LocalServerPort private int port;