RF Storage service

banadiga · banadiga · commit e4d02953c5dd · 2017-07-03T13:14:46.000+03:00
diff --git a/api-gateway-service/pom.xml b/api-gateway-service/pom.xml
@@ -22,7 +22,7 @@
 		<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.SR1</spring-cloud.version>
+		<spring-cloud.version>Dalston.RELEASE</spring-cloud.version>
 	</properties>
 
 	<dependencies>
diff --git a/realtor-service/pom.xml b/realtor-service/pom.xml
@@ -8,7 +8,7 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>realtor-service</name>
+	<name>Realtor service</name>
 	<description>Demo project for Spring Boot</description>
 
 	<parent>
@@ -50,7 +50,7 @@
 			<artifactId>spring-cloud-starter-feign</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.lohika.jclub.storage</groupId>
+			<groupId>com.lohika.jclub.storage.client</groupId>
 			<artifactId>storage-service-client</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
diff --git a/realtor-service/src/main/java/com/lohika/jclub/realtor/RealtorController.java b/realtor-service/src/main/java/com/lohika/jclub/realtor/RealtorController.java
@@ -2,8 +2,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.lohika.jclub.storage.Apartment;
-import com.lohika.jclub.storage.StorageServiceClient;
+import com.lohika.jclub.storage.client.Apartment;
+import com.lohika.jclub.storage.client.StorageServiceClient;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
diff --git a/realtor-service/src/main/java/com/lohika/jclub/realtor/RealtorServiceApplication.java b/realtor-service/src/main/java/com/lohika/jclub/realtor/RealtorServiceApplication.java
@@ -1,7 +1,7 @@
 package com.lohika.jclub.realtor;
 
 
-import com.lohika.jclub.storage.EnableStorageServiceClient;
+import com.lohika.jclub.storage.client.EnableStorageServiceClient;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/storage-service-client/pom.xml b/storage-service-client/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.lohika.jclub.storage</groupId>
+	<groupId>com.lohika.jclub.storage.client</groupId>
 	<artifactId>storage-service-client</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
@@ -61,7 +61,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.lohika.jclub.storage</groupId>
+			<groupId>com.lohika.jclub.storage.service</groupId>
 			<artifactId>storage-service</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 			<scope>test</scope>
diff --git a/storage-service-client/src/main/java/com/lohika/jclub/storage/client/Apartment.java b/storage-service-client/src/main/java/com/lohika/jclub/storage/client/Apartment.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/storage-service-client/src/main/java/com/lohika/jclub/storage/client/EnableStorageServiceClient.java b/storage-service-client/src/main/java/com/lohika/jclub/storage/client/EnableStorageServiceClient.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
diff --git a/storage-service-client/src/main/java/com/lohika/jclub/storage/client/FeignMappingDefaultConfiguration.java b/storage-service-client/src/main/java/com/lohika/jclub/storage/client/FeignMappingDefaultConfiguration.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 import feign.Feign;
 
diff --git a/storage-service-client/src/main/java/com/lohika/jclub/storage/client/StorageServiceClient.java b/storage-service-client/src/main/java/com/lohika/jclub/storage/client/StorageServiceClient.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.hateoas.PagedResources;
diff --git a/storage-service-client/src/main/java/com/lohika/jclub/storage/client/StorageServiceClientConfiguration.java b/storage-service-client/src/main/java/com/lohika/jclub/storage/client/StorageServiceClientConfiguration.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/storage-service-client/src/main/java/com/lohika/jclub/storage/client/StorageServiceClientFallback.java b/storage-service-client/src/main/java/com/lohika/jclub/storage/client/StorageServiceClientFallback.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/storage-service-client/src/test/java/com/lohika/jclub/storage/client/StorageServiceClientApplicationTests.java b/storage-service-client/src/test/java/com/lohika/jclub/storage/client/StorageServiceClientApplicationTests.java
@@ -1,14 +1,18 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 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.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = StorageServiceClientTestApplication.class)
 public class StorageServiceClientApplicationTests {
 
+  @Autowired
+  private StorageServiceClientFallback storageServiceClientFallback;
+
   @Test
   public void contextLoads() {
   }
diff --git a/storage-service-client/src/test/java/com/lohika/jclub/storage/client/StorageServiceClientFallbackTest.java b/storage-service-client/src/test/java/com/lohika/jclub/storage/client/StorageServiceClientFallbackTest.java
@@ -1,14 +1,11 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
-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;
@@ -19,17 +16,9 @@
 @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")
diff --git a/storage-service-client/src/test/java/com/lohika/jclub/storage/client/StorageServiceClientTest.java b/storage-service-client/src/test/java/com/lohika/jclub/storage/client/StorageServiceClientTest.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -33,9 +33,6 @@ public class StorageServiceClientTest {
   @Autowired
   private StorageServiceClient storageServiceClient;
 
-  @Autowired
-  private StorageServiceClientFallback storageServiceClientFallback;
-
   private Apartment apartment = Apartment.builder()
       .location("location")
       .mail("mail")
diff --git a/storage-service-client/src/test/java/com/lohika/jclub/storage/client/StorageServiceClientTestApplication.java b/storage-service-client/src/test/java/com/lohika/jclub/storage/client/StorageServiceClientTestApplication.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.client;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/storage-service/pom.xml b/storage-service/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.lohika.jclub.storage</groupId>
+	<groupId>com.lohika.jclub.storage.service</groupId>
 	<artifactId>storage-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/storage-service/src/main/java/com/lohika/jclub/storage/service/ApartmentRecord.java b/storage-service/src/main/java/com/lohika/jclub/storage/service/ApartmentRecord.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.service;
 
 import lombok.*;
 
diff --git a/storage-service/src/main/java/com/lohika/jclub/storage/service/ApartmentRepository.java b/storage-service/src/main/java/com/lohika/jclub/storage/service/ApartmentRepository.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.service;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
diff --git a/storage-service/src/main/java/com/lohika/jclub/storage/service/RepositoryConfig.java b/storage-service/src/main/java/com/lohika/jclub/storage/service/RepositoryConfig.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.service;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
diff --git a/storage-service/src/main/java/com/lohika/jclub/storage/service/StorageServiceApplication.java b/storage-service/src/main/java/com/lohika/jclub/storage/service/StorageServiceApplication.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.service;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/storage-service/src/test/java/com/lohika/jclub/storage/service/StorageServiceApplicationTests.java b/storage-service/src/test/java/com/lohika/jclub/storage/service/StorageServiceApplicationTests.java
@@ -1,4 +1,4 @@
-package com.lohika.jclub.storage;
+package com.lohika.jclub.storage.service;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.lohika.jclub.storage;`
	`1`	`+package com.lohika.jclub.storage.client;`
`2`	`2`
`3`	`3`	`import lombok.AllArgsConstructor;`
`4`	`4`	`import lombok.Builder;`