zuul updated; services working

Author: Roman Tsypuk

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

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

client-service/pom.xml

@@ -8,23 +8,28 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>client-service</name>
+	<name>Client service</name>
 	<description>Client service for Spring Boot</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.4.RELEASE</version>
+		<version>1.5.3.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<spring-cloud.version>Dalston.RELEASE</spring-cloud.version>
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-eureka</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -35,8 +40,34 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.16.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-feign</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.lohika.jclub.storage.client</groupId>
+			<artifactId>storage-service-client</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -47,4 +78,4 @@
 	</build>
 
 
-</project>
+</project>

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

@@ -0,0 +1,28 @@
+package com.lohika.jclub.client;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.ToString;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+@ToString
+public class ApartmentRecord {
+  @NonNull
+  private String location;
+  @NonNull
+  private double price;
+  @NonNull
+  private double sqft;
+  @NonNull
+  private String phone;
+  @NonNull
+  private String realtorName;
+  @NonNull
+  private String mail;
+}

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

@@ -0,0 +1,24 @@
+package com.lohika.jclub.client;
+
+import com.lohika.jclub.storage.client.Apartment;
+import com.lohika.jclub.storage.client.StorageServiceClient;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.hateoas.PagedResources;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+public class ClientController {
+
+    @Autowired
+    private StorageServiceClient storageServiceClient;
+
+    @GetMapping("/apartments")
+    public PagedResources<Apartment> getApartments() {
+        return storageServiceClient.list();
+    }
+}

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

@@ -1,12 +1,19 @@
 package com.lohika.jclub.client;
 
+import com.lohika.jclub.storage.client.EnableStorageServiceClient;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
+@EnableStorageServiceClient
 public class ClientServiceApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(ClientServiceApplication.class, args);
 	}
+
 }

client-service/src/main/resources/application.properties

@@ -1,4 +1,2 @@
 spring.application.name=client-service
-server.port=8083
-spring.data.rest.return-body-on-create=true
-spring.data.rest.return-body-on-update=true
+server.port=8083

realtor-service/pom.xml

@@ -9,7 +9,7 @@
 	<packaging>jar</packaging>
 
 	<name>Realtor service</name>
-	<description>Demo project for Spring Boot</description>
+	<description>Realtor for Spring Boot</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>

realtor-service/src/main/java/com/lohika/jclub/realtor/RealtorController.java

@@ -16,7 +16,7 @@
 import java.util.List;
 
 @Slf4j
-@RestController()
+@RestController
 public class RealtorController {
 
     @Autowired

realtor-service/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 spring.application.name=realtor-service
-feign.hystrix.enabled=true
+feign.hystrix.enabled=true