Skip to content

Commit 6f1c071

Browse files
committed
work
1 parent b8dff78 commit 6f1c071

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

src/main/java/org/woehlke/simpleworklist/domain/context/ContextServiceImpl.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public ContextServiceImpl(ContextRepository contextRepository, TaskRepository ta
3636
@Override
3737
public List<Context> getAllForUser(UserAccount user) {
3838
log.debug("getAllForUser");
39+
//noinspection deprecation
3940
return contextRepository.findByUserAccount(user);
4041
}
4142

@@ -78,7 +79,9 @@ public boolean delete(Context context) {
7879
@Override
7980
public boolean contextHasItems(Context context) {
8081
log.debug("contextHasItems");
82+
//noinspection deprecation
8183
long numberOfTasks = taskRepository.findByContext(context).size();
84+
//noinspection deprecation
8285
int numberOfProjects = projectRepository.findByContext(context).size();
8386
return ((numberOfTasks + numberOfProjects) > 0);
8487
}

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectServiceImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public Page<Project> findAllProjectsByContext(Context context, Pageable pageRequ
7373
public Project findByProjectId(@Min(1L) long projectId) {
7474
log.debug("findByProjectId");
7575
if(projectRepository.existsById(projectId)){
76-
return projectRepository.getOne(projectId);
76+
return projectRepository.getReferenceById(projectId);
7777
} else {
7878
return null;
7979
}
@@ -120,6 +120,7 @@ public Project moveProjectToAnotherContext(@NotNull Project thisProject, @NotNul
120120
//TODO: remove Recursion, remove unbounded Recursion and List instead of Page.
121121
List<Project> listProject = getAllChildrenOfProject(thisProject);
122122
for(Project childProject : listProject){
123+
//noinspection deprecation
123124
List<Task> tasksOfChildProject = taskRepository.findByProject(childProject);
124125
for(Task task:tasksOfChildProject){
125126
task.setContext(newContext);

src/main/java/org/woehlke/simpleworklist/domain/task/TaskRepository.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.woehlke.simpleworklist.domain.context.Context;
1313
import org.woehlke.simpleworklist.domain.project.Project;
1414

15-
@SuppressWarnings("Deprecation")
1615
@Repository
1716
public interface TaskRepository extends JpaRepository<Task, Long> {
1817

src/main/java/org/woehlke/simpleworklist/domain/task/TaskServiceImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ public void moveAllCompletedToTrash(@NotNull Context context) {
200200
);
201201
long newOrderIdTaskState = maxOrderIdTaskState;
202202
//TODO: #244 change List<Task> to Page<Task>
203+
//noinspection deprecation
203204
List<Task> taskListCompleted = taskRepository.findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
204205
TaskState.COMPLETED,
205206
context
@@ -266,6 +267,7 @@ public void moveTasksUpByTaskState(@NotNull Task sourceTask, @NotNull Task desti
266267
final long lowerOrderIdTaskState = destinationTask.getOrderIdTaskState();
267268
final long higherOrderIdTaskState = sourceTask.getOrderIdTaskState();
268269
//TODO: #244 change List<Task> to Page<Task>
270+
//noinspection deprecation
269271
List<Task> tasks = taskRepository.getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
270272
lowerOrderIdTaskState,
271273
higherOrderIdTaskState,
@@ -300,6 +302,7 @@ public void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task des
300302
long lowerOrderIdTaskState = sourceTask.getOrderIdTaskState();
301303
long higherOrderIdTaskState = destinationTask.getOrderIdTaskState();
302304
//TODO: #244 change List<Task> to Page<Task>
305+
//noinspection deprecation
303306
List<Task> tasks = taskRepository.getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
304307
lowerOrderIdTaskState,
305308
higherOrderIdTaskState,
@@ -334,6 +337,7 @@ public void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task des
334337
long lowerOrderIdProject = destinationTask.getOrderIdProject();
335338
long higherOrderIdProject = sourceTask.getOrderIdProject();
336339
//TODO: #244 change List<Task> to Page<Task>
340+
//noinspection deprecation
337341
List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
338342
lowerOrderIdProject,
339343
higherOrderIdProject,
@@ -367,6 +371,7 @@ public void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task d
367371
final long lowerOrderIdProject = sourceTask.getOrderIdProject();
368372
final long higherOrderIdProject = destinationTask.getOrderIdProject();
369373
//TODO: #244 change List<Task> to Page<Task>
374+
//noinspection deprecation
370375
List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
371376
lowerOrderIdProject,
372377
higherOrderIdProject,
@@ -401,6 +406,7 @@ public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destina
401406
long lowerOrderIdProject = destinationTask.getOrderIdProject();
402407
long higherOrderIdProject = sourceTask.getOrderIdProject();
403408
//TODO: #244 change List<Task> to Page<Task>
409+
//noinspection deprecation
404410
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
405411
lowerOrderIdProject,
406412
higherOrderIdProject,

0 commit comments

Comments
 (0)