updated proxy

Author: Roman Tsypuk

api-gateway-service/src/main/resources/application.yml

@@ -8,5 +8,4 @@ zuul:
     client:
         path: /client-service/**
         serviceId: client-service
-
   ignored-services: '*'

client-service/pom.xml

@@ -54,7 +54,7 @@
 			<artifactId>storage-service-client</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
-	</dependencies>
+    </dependencies>
 
 	<dependencyManagement>
 		<dependencies>

client-service/src/main/java/com/lohika/jclub/client/ClientController.java

@@ -4,10 +4,14 @@
 import com.lohika.jclub.storage.client.StorageServiceClient;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PagedResourcesAssembler;
 import org.springframework.hateoas.PagedResources;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collection;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -19,6 +23,19 @@ public class ClientController {
 
     @GetMapping("/apartments")
     public PagedResources<Apartment> getApartments() {
-        return storageServiceClient.list();
+        PagedResources<Apartment> list = storageServiceClient.list();
+        Collection<Apartment> content = list.getContent();
+        return new PagedResources<>(content, list.getMetadata());
+        //TODO wrap appratments with resources. generate links to client service.
+    }
+
+
+    @GetMapping("/apartmentsPaged")
+    public PagedResources<Apartment> getApartmentsPaged(Pageable pageable,
+                                                        PagedResourcesAssembler assembler) {
+        PagedResources<Apartment> list = storageServiceClient.list();
+        Collection<Apartment> content = list.getContent();
+        return new PagedResources<>(content, list.getMetadata());
+
     }
 }

storage-service-client/src/main/java/com/lohika/jclub/storage/client/Apartment.java

@@ -1,5 +1,7 @@
 package com.lohika.jclub.storage.client;
 
+import org.springframework.hateoas.ResourceSupport;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;