Codes are reformatted, application.yml is moved under resources.

yasinuygun · yasinuygun · commit 4cc0673faf71 · 2019-07-18T14:36:54.000+03:00
diff --git a/src/main/java/com/trendyol/recomengine/webservice/controller/RecommendationController.java b/src/main/java/com/trendyol/recomengine/webservice/controller/RecommendationController.java
@@ -1,8 +1,7 @@
-package com.trendyol.recomengine.webservice.controllers;
+package com.trendyol.recomengine.webservice.controller;
 
-import com.trendyol.recomengine.webservice.repositories.RecommendationRepository;
-import com.trendyol.recomengine.webservice.resource.Recommendation;
-import com.trendyol.recomengine.webservice.services.RecommendationService;
+import com.trendyol.recomengine.webservice.model.Recommendation;
+import com.trendyol.recomengine.webservice.service.RecommendationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/com/trendyol/recomengine/webservice/controller/ReviewController.java b/src/main/java/com/trendyol/recomengine/webservice/controller/ReviewController.java
@@ -1,9 +1,8 @@
-package com.trendyol.recomengine.webservice.controllers;
+package com.trendyol.recomengine.webservice.controller;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.trendyol.recomengine.webservice.engine.Producer;
-import com.trendyol.recomengine.webservice.resource.Review;
-import com.trendyol.recomengine.webservice.resource.ReviewWithoutUserId;
+import com.trendyol.recomengine.webservice.model.Review;
+import com.trendyol.recomengine.webservice.model.ReviewWithoutUserId;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/src/main/java/com/trendyol/recomengine/webservice/model/Recommendation.java b/src/main/java/com/trendyol/recomengine/webservice/model/Recommendation.java
@@ -1,4 +1,4 @@
-package com.trendyol.recomengine.webservice.resource;
+package com.trendyol.recomengine.webservice.model;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/src/main/java/com/trendyol/recomengine/webservice/model/Review.java b/src/main/java/com/trendyol/recomengine/webservice/model/Review.java
@@ -1,8 +1,7 @@
-package com.trendyol.recomengine.webservice.resource;
+package com.trendyol.recomengine.webservice.model;
 
 import javax.validation.constraints.NotBlank;
 import java.sql.Timestamp;
-import java.util.Date;
 
 /**
  * To keep reviews
diff --git a/src/main/java/com/trendyol/recomengine/webservice/model/ReviewWithoutUserId.java b/src/main/java/com/trendyol/recomengine/webservice/model/ReviewWithoutUserId.java
@@ -1,11 +1,10 @@
-package com.trendyol.recomengine.webservice.resource;
+package com.trendyol.recomengine.webservice.model;
 
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.sql.Timestamp;
-import java.util.Date;
 
 /**
  * To keep productId, score and timestamp without user id
diff --git a/src/main/java/com/trendyol/recomengine/webservice/repository/RecommendationRepository.java b/src/main/java/com/trendyol/recomengine/webservice/repository/RecommendationRepository.java
@@ -1,6 +1,6 @@
-package com.trendyol.recomengine.webservice.repositories;
+package com.trendyol.recomengine.webservice.repository;
 
-import com.trendyol.recomengine.webservice.resource.Recommendation;
+import com.trendyol.recomengine.webservice.model.Recommendation;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 /**
diff --git a/src/main/java/com/trendyol/recomengine/webservice/service/RecommendationService.java b/src/main/java/com/trendyol/recomengine/webservice/service/RecommendationService.java
@@ -0,0 +1,9 @@
+package com.trendyol.recomengine.webservice.service;
+
+import com.trendyol.recomengine.webservice.model.Recommendation;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface RecommendationService {
+    Recommendation getRecommendations(String userId);
+}
diff --git a/src/main/java/com/trendyol/recomengine/webservice/service/impl/RecommendationServiceImpl.java b/src/main/java/com/trendyol/recomengine/webservice/service/impl/RecommendationServiceImpl.java
@@ -1,8 +1,8 @@
-package com.trendyol.recomengine.webservice.services.impl;
+package com.trendyol.recomengine.webservice.service.impl;
 
-import com.trendyol.recomengine.webservice.repositories.RecommendationRepository;
-import com.trendyol.recomengine.webservice.resource.Recommendation;
-import com.trendyol.recomengine.webservice.services.RecommendationService;
+import com.trendyol.recomengine.webservice.model.Recommendation;
+import com.trendyol.recomengine.webservice.repository.RecommendationRepository;
+import com.trendyol.recomengine.webservice.service.RecommendationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/trendyol/recomengine/webservice/services/RecommendationService.java b/src/main/java/com/trendyol/recomengine/webservice/services/RecommendationService.java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
diff --git a/src/test/java/com/trendyol/recomengine/webservice/controller/RecommendationControllerTests.java b/src/test/java/com/trendyol/recomengine/webservice/controller/RecommendationControllerTests.java
@@ -1,7 +1,7 @@
-package com.trendyol.recomengine.webservice.controllers;
+package com.trendyol.recomengine.webservice.controller;
 
-import com.trendyol.recomengine.webservice.repositories.RecommendationRepository;
-import com.trendyol.recomengine.webservice.resource.Recommendation;
+import com.trendyol.recomengine.webservice.model.Recommendation;
+import com.trendyol.recomengine.webservice.repository.RecommendationRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +13,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.hasSize;
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.ResultMatcher.matchAll;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
diff --git a/src/test/java/com/trendyol/recomengine/webservice/controller/ReviewControllerTests.java b/src/test/java/com/trendyol/recomengine/webservice/controller/ReviewControllerTests.java
@@ -1,36 +1,24 @@
-package com.trendyol.recomengine.webservice.controllers;
+package com.trendyol.recomengine.webservice.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.trendyol.recomengine.webservice.resource.Review;
-import org.junit.Before;
+import com.trendyol.recomengine.webservice.model.Review;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.SendResult;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.util.concurrent.FailureCallback;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
-import org.springframework.util.concurrent.SuccessCallback;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
-import java.time.ZoneId;
 import java.util.TimeZone;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.ResultMatcher.matchAll;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -46,14 +34,22 @@ public class ReviewControllerTests {
     @MockBean
     private KafkaTemplate<String, String> kafkaTemplate;
 
+    public static String asJsonString(final Object obj) {
+        try {
+            return new ObjectMapper().writeValueAsString(obj);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Test
     public void createReviewShouldReturnTheGivenReviewBack() throws Exception {
         String userId = "3";
         Timestamp t = new Timestamp(10);
         String time = getTimeStringFormatted(t);
         Review review = new Review(userId, "5", 3.5F, t);
         given(kafkaTemplate.sendDefault("3,5,3.5,10")).willReturn(null);
-        this.mockMvc.perform(post("/users/"+userId+"/reviews")
+        this.mockMvc.perform(post("/users/" + userId + "/reviews")
                 .content(asJsonString(review))
                 .contentType(MediaType.APPLICATION_JSON_UTF8)
                 .accept(MediaType.APPLICATION_JSON_UTF8))
@@ -76,12 +72,4 @@ private String getTimeStringFormatted(Timestamp time) {
         timeStringFormatted = sdf.format(time);
         return timeStringFormatted;
     }
-
-    public static String asJsonString(final Object obj) {
-        try {
-            return new ObjectMapper().writeValueAsString(obj);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.trendyol.recomengine.webservice.resource;`
	`1`	`+package com.trendyol.recomengine.webservice.model;`
`2`	`2`
`3`	`3`	`import org.springframework.data.annotation.Id;`
`4`	`4`	`import org.springframework.data.mongodb.core.mapping.Document;`