refactoring

ziyasal-archive · Jan 3, 2016 · d5996a0 · d5996a0
1 parent 7efbc81
commit d5996a0
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 28 deletions.
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -1,28 +1,26 @@
 import com.google.gson.Gson;
-import lib.TodoService;
-import lib.impl.InMemoryTodoRepositoryImpl;
+import lib.ITodoService;
+import lib.impl.InMemoryTodoRepository;
 import lib.models.TodoModel;
-import lib.impl.TodoServiceImpl;
+import lib.impl.TodoService;
 
 import java.util.Date;
 
-import static spark.Spark.*;
-
 public class Main {
 
     private static final String API_CONTEXT = "/api/v1";
 
     public static void main(String[] args) {
 
-        TodoService todoService = new TodoServiceImpl(new InMemoryTodoRepositoryImpl());
+        ITodoService todoService = new TodoService(new InMemoryTodoRepository());
         seedSampleData(todoService);
 
         final Gson gson = new Gson();
 
         new TodoResource(todoService, gson);
     }
 
-    private static void seedSampleData(TodoService todoService) {
+    private static void seedSampleData(ITodoService todoService) {
         TodoModel model = new TodoModel();
 
         model.setTitle("Clean your room!");

diff --git a/src/main/java/TodoResource.java b/src/main/java/TodoResource.java
@@ -1,5 +1,5 @@
 import com.google.gson.Gson;
-import lib.TodoService;
+import lib.ITodoService;
 import lib.models.TodoModel;
 
 import static spark.Spark.get;
@@ -9,7 +9,7 @@ public class TodoResource {
 
     private static final String API_CONTEXT = "/api/v1";
 
-    public TodoResource(TodoService todoService, Gson gson) {
+    public TodoResource(ITodoService todoService, Gson gson) {
 
         post(API_CONTEXT + "/todos", "application/json",
                 (request, response) -> {

diff --git a/src/main/java/lib/TodoRepository.java → src/main/java/lib/ITodoRepository.java b/src/main/java/lib/TodoRepository.java → src/main/java/lib/ITodoRepository.java
@@ -4,7 +4,7 @@
 
 import java.util.Set;
 
-public interface TodoRepository {
+public interface ITodoRepository {
 
     int create(TodoModel todoModel);
 

diff --git a/src/main/java/lib/TodoService.java → src/main/java/lib/ITodoService.java b/src/main/java/lib/TodoService.java → src/main/java/lib/ITodoService.java
@@ -4,7 +4,7 @@
 
 import java.util.Set;
 
-public interface TodoService {
+public interface ITodoService {
     int create(TodoModel todoModel);
 
     TodoModel find(int id);

diff --git a/.../lib/impl/InMemoryTodoRepositoryImpl.java → ...java/lib/impl/InMemoryTodoRepository.java b/.../lib/impl/InMemoryTodoRepositoryImpl.java → ...java/lib/impl/InMemoryTodoRepository.java
@@ -1,13 +1,13 @@
 package lib.impl;
 
 import lib.models.TodoModel;
-import lib.TodoRepository;
+import lib.ITodoRepository;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-public class InMemoryTodoRepositoryImpl implements TodoRepository {
+public class InMemoryTodoRepository implements ITodoRepository {
 
     Set<TodoModel> todoModels = new HashSet<TodoModel>();
 

diff --git a/src/main/java/lib/impl/TodoServiceImpl.java → src/main/java/lib/impl/TodoService.java b/src/main/java/lib/impl/TodoServiceImpl.java → src/main/java/lib/impl/TodoService.java
@@ -1,15 +1,15 @@
 package lib.impl;
 
 import lib.models.TodoModel;
-import lib.TodoRepository;
-import lib.TodoService;
+import lib.ITodoRepository;
+import lib.ITodoService;
 
 import java.util.Set;
 
-public class TodoServiceImpl implements TodoService {
-    private TodoRepository repository;
+public class TodoService implements ITodoService {
+    private ITodoRepository repository;
 
-    public TodoServiceImpl(TodoRepository repository) {
+    public TodoService(ITodoRepository repository) {
         this.repository = repository;
     }
 

diff --git a/src/test/java/TodoRepositoryTest.java b/src/test/java/TodoRepositoryTest.java
@@ -1,6 +1,6 @@
 import com.flextrade.jfixture.JFixture;
-import lib.TodoRepository;
-import lib.impl.InMemoryTodoRepositoryImpl;
+import lib.ITodoRepository;
+import lib.impl.InMemoryTodoRepository;
 import lib.models.TodoModel;
 import org.junit.Assert;
 import org.junit.Before;
@@ -12,11 +12,11 @@ public class TodoRepositoryTest {
 
     JFixture fixture = new JFixture();
 
-    TodoRepository todoRepository;
+    ITodoRepository todoRepository;
 
     @Before
     public void setUp() {
-        todoRepository = new InMemoryTodoRepositoryImpl();
+        todoRepository = new InMemoryTodoRepository();
     }
 
     @Test

diff --git a/src/test/java/TodoServiceTest.java b/src/test/java/TodoServiceTest.java
@@ -1,8 +1,8 @@
 import com.flextrade.jfixture.JFixture;
-import lib.TodoRepository;
-import lib.TodoService;
+import lib.ITodoRepository;
+import lib.ITodoService;
 import lib.models.TodoModel;
-import lib.impl.TodoServiceImpl;
+import lib.impl.TodoService;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -19,15 +19,15 @@
 @RunWith(MockitoJUnitRunner.class)
 public class TodoServiceTest {
     @Mock
-    TodoRepository todoRepositoryMock;
+    ITodoRepository todoRepositoryMock;
 
     JFixture fixture;
-    TodoService todoService;
+    ITodoService todoService;
 
     @Before
     public void setUp() {
         fixture = new JFixture();
-        todoService = new TodoServiceImpl(todoRepositoryMock);
+        todoService = new TodoService(todoRepositoryMock);
     }