Merge pull request #5 from lvivJavaClub/fallback-support-added

feign Fallback support added

Author: banadiga

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

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

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

@@ -2,6 +2,7 @@
 
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.context.annotation.Import;
 import org.springframework.hateoas.config.EnableHypermediaSupport;
 
 import java.lang.annotation.Documented;
@@ -15,7 +16,8 @@
 @Documented
 
 @EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL)
-@EnableFeignClients(clients = StorageServiceClient.class)
+@EnableFeignClients(clients = {StorageServiceClient.class})
+@Import({FeignMappingDefaultConfiguration.class, StorageServiceClientConfiguration.class})
 @EnableDiscoveryClient
 public @interface EnableStorageServiceClient {
 }

…or/FeignMappingDefaultConfiguration.java …ge/FeignMappingDefaultConfiguration.javarealtor-service/src/main/java/com/lohika/jclub/realtor/FeignMappingDefaultConfiguration.java renamed to storage-service-client/src/main/java/com/lohika/jclub/storage/FeignMappingDefaultConfiguration.java realtor-service/src/main/java/com/lohika/jclub/realtor/FeignMappingDefaultConfiguration.java renamed to storage-service-client/src/main/java/com/lohika/jclub/storage/FeignMappingDefaultConfiguration.java

@@ -1,4 +1,4 @@
-package com.lohika.jclub.realtor;
+package com.lohika.jclub.storage;
 
 import feign.Feign;
 

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

@@ -0,0 +1,13 @@
+package com.lohika.jclub.storage;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class StorageServiceClientConfiguration {
+
+  @Bean
+  public StorageServiceClientFallback storageServiceClientFallback() {
+    return new StorageServiceClientFallback();
+  }
+}

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

@@ -4,13 +4,15 @@
 
 import org.springframework.hateoas.PagedResources;
 
+import static java.util.Collections.emptyList;
+
 @Slf4j
 public class StorageServiceClientFallback implements StorageServiceClient {
 
   @Override
   public PagedResources<Apartment> list() {
     log.error("Can not get list");
-    return null;
+    return new PagedResources<>(emptyList(), new PagedResources.PageMetadata(0, 0, 0));
   }
 
   @Override

storage-service-client/src/test/java/com/lohika/jclub/storage/StorageServiceClientApplicationTests.java

@@ -0,0 +1,15 @@
+package com.lohika.jclub.storage;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = StorageServiceClientTestApplication.class)
+public class StorageServiceClientApplicationTests {
+
+  @Test
+  public void contextLoads() {
+  }
+}

storage-service-client/src/test/java/com/lohika/jclub/storage/StorageServiceClientFallbackTest.java

@@ -0,0 +1,77 @@
+package com.lohika.jclub.storage;
+
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.hateoas.PagedResources;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.LogMessageWaitStrategy;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = StorageServiceClientTestApplication.class)
+public class StorageServiceClientFallbackTest {
+
+  @ClassRule
+  public static GenericContainer storageService = new GenericContainer("storage-service:latest")
+      .withExposedPorts(8091)
+      .waitingFor(new LogMessageWaitStrategy().withRegEx(".*Started StorageServiceApplication in.*\\s"));
+
+  @Autowired
+  private StorageServiceClient storageServiceClient;
+
+  @Autowired
+  private StorageServiceClientFallback storageServiceClientFallback;
+
+  private Apartment apartment = Apartment.builder()
+      .location("location")
+      .mail("mail")
+      .phone("phone")
+      .price(1.5d)
+      .realtorName("realtorName")
+      .sqft(1.3d)
+      .build();
+
+  @Test
+  public void list() {
+    PagedResources<Apartment> actual = storageServiceClient.list();
+
+    assertThat(actual, notNullValue());
+    assertThat(actual.getContent(), notNullValue());
+
+    assertThat(actual.getContent(), hasSize(0));
+  }
+
+  @Test
+  public void create() {
+    Apartment actual = storageServiceClient.create(apartment);
+
+    assertThat(actual, nullValue());
+  }
+
+  @Test
+  public void get() {
+    Apartment actual = storageServiceClient.get("not-existing-id");
+
+    assertThat(actual, nullValue());
+  }
+
+  @Test
+  public void update() {
+    Apartment actual = storageServiceClient.update("not-existing-id", apartment);
+
+    assertThat(actual, nullValue());
+  }
+
+  @Test
+  public void delete() {
+    storageServiceClient.delete("not-existing-id");
+  }
+}

storage-service-client/src/test/java/com/lohika/jclub/storage/StorageServiceClientTest.java

@@ -33,6 +33,9 @@ public class StorageServiceClientTest {
   @Autowired
   private StorageServiceClient storageServiceClient;
 
+  @Autowired
+  private StorageServiceClientFallback storageServiceClientFallback;
+
   private Apartment apartment = Apartment.builder()
       .location("location")
       .mail("mail")

storage-service-client/src/test/resources/application.properties

@@ -1 +1,3 @@
 spring.application.name=storage-service-client-testing
+feign.hystrix.enabled=true
+storage-service.ribbon.servers=http://localhost:6666/

storage-service-client/src/test/resources/banner.txt

@@ -1,7 +1,6 @@
-   _____ __                                                        _
-  / ___// /_____  _________ _____ ____       ________  ______   __(_)_______
-  \__ \/ __/ __ \/ ___/ __ `/ __ `/ _ \     / ___/ _ \/ ___/ | / / / ___/ _ \
- ___/ / /_/ /_/ / /  / /_/ / /_/ /  __/    (__  )  __/ /   | |/ / / /__/  __/
-/____/\__/\____/_/   \__,_/\__, /\___/    /____/\___/_/    |___/_/\___/\___/
-                          /____/
-v.${application.version}
+  _______________________   _____ __                                                        _                     ___            __
+ /_  __/ ____/ ___/_  __/  / ___// /_____  _________ _____ ____       ________  ______   __(_)_______       _____/ (_)__  ____  / /_
+  / / / __/  \__ \ / /     \__ \/ __/ __ \/ ___/ __ `/ __ `/ _ \     / ___/ _ \/ ___/ | / / / ___/ _ \     / ___/ / / _ \/ __ \/ __/
+ / / / /___ ___/ // /     ___/ / /_/ /_/ / /  / /_/ / /_/ /  __/    (__  )  __/ /   | |/ / / /__/  __/    / /__/ / /  __/ / / / /_
+/_/ /_____//____//_/     /____/\__/\____/_/   \__,_/\__, /\___/    /____/\___/_/    |___/_/\___/\___/     \___/_/_/\___/_/ /_/\__/
+                                                   /____/