Compare commits

..

No commits in common. "01742240896f2ab9ed4447fceae3f9a1f4177d2d" and "da878ec81c454c9291df6548711e109d6c96e4aa" have entirely different histories.

4 changed files with 17 additions and 13 deletions

View File

@ -3,13 +3,12 @@ package ru.kamask.pet.todo;
import java.io.IOException; import java.io.IOException;
import ru.kamask.pet.todo.cli.CliEngine; import ru.kamask.pet.todo.cli.CliEngine;
import ru.kamask.pet.todo.model.SimpleTask; import ru.kamask.pet.todo.repo.InMemoryTaskRepository;
import ru.kamask.pet.todo.repo.InMemoryRepository;
import ru.kamask.pet.todo.service.TaskService; import ru.kamask.pet.todo.service.TaskService;
public class TodoApp { public class TodoApp {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
var service = new TaskService(new InMemoryRepository<SimpleTask>()); var service = new TaskService(new InMemoryTaskRepository());
var cli = new CliEngine(service); var cli = new CliEngine(service);
cli.start(); cli.start();

View File

@ -6,23 +6,23 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import ru.kamask.pet.todo.model.Identifiable; import ru.kamask.pet.todo.model.SimpleTask;
public class InMemoryRepository<T extends Identifiable> implements Repository<T> { public class InMemoryTaskRepository implements TaskRepository {
private Map<Integer, T> storage = new HashMap<>(); private Map<Integer, SimpleTask> storage = new HashMap<>();
@Override @Override
public void save(T obj) { public void save(SimpleTask task) {
storage.put(obj.getId(), obj); storage.put(task.id(), task);
} }
@Override @Override
public Optional<T> findById(int id) { public Optional<SimpleTask> findById(int id) {
return Optional.ofNullable(storage.get(id)); return Optional.ofNullable(storage.get(id));
} }
@Override @Override
public List<T> findAll() { public List<SimpleTask> findAll() {
return new ArrayList<>(storage.values()); return new ArrayList<>(storage.values());
} }

View File

@ -0,0 +1,5 @@
package ru.kamask.pet.todo.repo;
import ru.kamask.pet.todo.model.SimpleTask;
public interface TaskRepository extends Repository<SimpleTask> {}

View File

@ -4,12 +4,12 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import ru.kamask.pet.todo.model.SimpleTask; import ru.kamask.pet.todo.model.SimpleTask;
import ru.kamask.pet.todo.repo.InMemoryRepository; import ru.kamask.pet.todo.repo.TaskRepository;
public class TaskService { public class TaskService {
private final InMemoryRepository<SimpleTask> repo; private final TaskRepository repo;
public TaskService(InMemoryRepository<SimpleTask> repo) { public TaskService(TaskRepository repo) {
this.repo = repo; this.repo = repo;
} }