remove hal+json and add pageable

Signed-off-by: Peter Siegmund <developer@mars3142.org>

pom.xml

@@ -54,6 +54,10 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-commons</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.modulith</groupId>
 			<artifactId>spring-modulith-starter-test</artifactId>
@@ -82,10 +86,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-hateoas</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.github.ben-manes.caffeine</groupId>
 			<artifactId>caffeine</artifactId>

src/main/java/dev/mars3142/fhq/timezone_service/timezone/controllers/TimezoneController.java

@@ -1,19 +1,18 @@
 package dev.mars3142.fhq.timezone_service.timezone.controllers;
 
-import static org.springframework.beans.support.PagedListHolder.DEFAULT_PAGE_SIZE;
-import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
-
-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 lombok.RequiredArgsConstructor;
 import lombok.val;
-import org.springdoc.core.converters.models.Pageable;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -35,18 +34,20 @@ public class TimezoneController {
     val response = new TimezoneResponse();
     response.setTimezone(timezoneInfo.timezone());
     response.setPosix_tz(posix);
-    response.add(linkTo(TimezoneController.class).slash(ip).withSelfRel());
     return response;
   }
 
   @GetMapping("{area}")
   @ResponseStatus(HttpStatus.OK)
-  public LocationResponse getLocations(@PathVariable String area) {
+  public Page<String> getLocations(@PathVariable String area,
-    val locations = timeZoneService.getLocations(area);
+      @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize,
-    val result = new LocationResponse();
+      @RequestParam(value = "page", required = false, defaultValue = "0") int page,
-    result.setLocations(locations);
+      @RequestParam(value = "direction", required = false) String direction) {
-    result.add(linkTo(TimezoneController.class).slash(area).withSelfRel());
+    var pageRequest = PageRequest.of(page, pageSize);
-    return result;
+    if (direction != null && !direction.isEmpty()) {
+      pageRequest = PageRequest.of(page, pageSize, Direction.fromString(direction), "location");
+    }
+    return timeZoneService.getPagedLocations(area, pageRequest);
   }
 
   @GetMapping("{area}/{location}")
@@ -57,7 +58,6 @@ public class TimezoneController {
     val response = new TimezoneResponse();
     response.setTimezone(timezone);
     response.setPosix_tz(posix);
-    response.add(linkTo(TimezoneController.class).slash(area).slash(location).withSelfRel());
     return response;
   }
 }

src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/LocationResponse.java

@@ -1,17 +0,0 @@
-package dev.mars3142.fhq.timezone_service.timezone.domain.model.response;
-
-import java.util.List;
-import lombok.Getter;
-import org.springframework.hateoas.RepresentationModel;
-
-@Getter
-public class LocationResponse extends RepresentationModel<LocationResponse> {
-
-  private int count;
-  private List<String> locations;
-
-  public void setLocations(List<String> locations) {
-    this.count = locations.size();
-    this.locations = locations;
-  }
-}

src/main/java/dev/mars3142/fhq/timezone_service/timezone/domain/model/response/TimezoneResponse.java

@@ -2,11 +2,10 @@ package dev.mars3142.fhq.timezone_service.timezone.domain.model.response;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.hateoas.RepresentationModel;
 
 @Getter
 @Setter
-public class TimezoneResponse extends RepresentationModel<TimezoneResponse> {
+public class TimezoneResponse {
 
   private String timezone;
   private String posix_tz;

src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/TimezoneService.java

@@ -2,7 +2,8 @@ package dev.mars3142.fhq.timezone_service.timezone.service;
 
 import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.IPApiResponse;
 import dev.mars3142.fhq.timezone_service.timezone.domain.entities.response.TimeApiTimezoneZoneResponse;
-import java.util.List;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 
 public interface TimezoneService {
 
@@ -14,5 +15,5 @@ public interface TimezoneService {
 
   String getPosixTimeZone(String timezone);
 
-  List<String> getLocations(String area);
+  Page<String> getPagedLocations(String area, PageRequest pageRequest);
 }

src/main/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImpl.java

@@ -15,6 +15,9 @@ import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClient;
@@ -48,18 +51,18 @@ public class TimezoneServiceImpl implements TimezoneService {
   @Override
   @Cacheable(value = "TZInfoByIp", key = "{#ip}")
   public IPApiResponse getTimeZoneInfoByIp(String ip) {
-      return restClient
+    return restClient
-          .get()
+        .get()
-          .uri(builder -> builder
+        .uri(builder -> builder
-              .scheme("http")
+            .scheme("http")
-              .host("ip-api.com")
+            .host("ip-api.com")
-              .path("json/" + ip)
+            .path("json/" + ip)
-              .build())
+            .build())
-          .retrieve()
+        .retrieve()
-          .onStatus(HttpStatusCode::is4xxClientError, (request, response) -> {
+        .onStatus(HttpStatusCode::is4xxClientError, (request, response) -> {
-            throw new NotFoundException();
+          throw new NotFoundException();
-          })
+        })
-          .body(IPApiResponse.class);
+        .body(IPApiResponse.class);
   }
 
   @Override
@@ -97,19 +100,41 @@ public class TimezoneServiceImpl implements TimezoneService {
   }
 
   @Override
-  @Cacheable(value = "locations", key = "{#area}")
+  @Cacheable(value = "locations", key = "{#area, #pageRequest}")
-  public List<String> getLocations(String area) {
+  public Page<String> getPagedLocations(String area, PageRequest pageRequest) {
     val directory = new File("/usr/share/zoneinfo/" + area);
     if (!directory.exists()) {
       throw new NotFoundException();
     }
-    return Stream.of(Objects.requireNonNull(directory.listFiles()))
+    return toPage(Stream.of(Objects.requireNonNull(directory.listFiles()))
         .filter(file -> !file.isDirectory())
         .map(file -> {
           val path = file.getPath().split("/");
           return path[path.length - 2] + "/" + path[path.length - 1];
         })
-        .sorted()
+        .toList(), pageRequest);
-        .toList();
+  }
+
+  Page<String> toPage(List<String> list, PageRequest pageRequest) {
+    val pageSize = pageRequest.getPageSize();
+    val pageNumber = pageRequest.getPageNumber();
+    val totalPages = list.size() / pageSize;
+
+    int max = pageNumber >= totalPages ? list.size() : pageSize * (pageNumber + 1);
+    int min = pageNumber > totalPages ? max : pageSize * pageNumber;
+
+    var content = list.stream().sorted((left, right) -> {
+          if (!pageRequest.getSort().isSorted()) {
+            return 0;
+          }
+
+          if (Objects.requireNonNull(pageRequest.getSort().getOrderFor("location")).isAscending()) {
+            return left.compareTo(right);
+          } else {
+            return right.compareTo(left);
+          }
+        }
+    );
+    return new PageImpl<>(content.toList().subList(min, max), pageRequest, list.size());
   }
 }

src/test/java/dev/mars3142/fhq/timezone_service/timezone/service/impl/TimezoneServiceImplTest.java

@@ -59,6 +59,6 @@ class TimezoneServiceImplTest {
   }
 
   @Test
-  void getLocations() {
+  void getPagedLocations() {
   }
 }