IPTE-165: Refactoring Transfer to own packages

mairKi · mairKi · commit 6a99f80800f8 · 2023-11-23T10:03:46.000+01:00
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ColorDTO.java b/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ColorDTO.java
@@ -1,4 +1,4 @@
-package de.doubleslash.keeptime.REST_API.controller;
+package de.doubleslash.keeptime.REST_API.DTO;
 
 public class ColorDTO {
    private double red;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ProjectDTO.java b/src/main/java/de/doubleslash/keeptime/REST_API/DTO/ProjectDTO.java
@@ -1,4 +1,4 @@
-package de.doubleslash.keeptime.REST_API.controller;
+package de.doubleslash.keeptime.REST_API.DTO;
 
 public class ProjectDTO {
    private long id;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/DTO/WorkDTO.java b/src/main/java/de/doubleslash/keeptime/REST_API/DTO/WorkDTO.java
@@ -1,4 +1,4 @@
-package de.doubleslash.keeptime.REST_API.controller;
+package de.doubleslash.keeptime.REST_API.DTO;
 
 
 import java.time.LocalDateTime;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/ProjectColorDTO.java b/src/main/java/de/doubleslash/keeptime/REST_API/ProjectColorDTO.java
@@ -1,6 +1,6 @@
 package de.doubleslash.keeptime.REST_API;
 
-import de.doubleslash.keeptime.REST_API.controller.ColorDTO;
+import de.doubleslash.keeptime.REST_API.DTO.ColorDTO;
 
 public class ProjectColorDTO {
 
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/controller/ProjectController.java b/src/main/java/de/doubleslash/keeptime/REST_API/controller/ProjectController.java
@@ -1,13 +1,13 @@
 package de.doubleslash.keeptime.REST_API.controller;
 
 import de.doubleslash.keeptime.REST_API.ProjectColorDTO;
+import de.doubleslash.keeptime.REST_API.mapper.ProjectMapper;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.model.repos.ProjectRepository;
 import de.doubleslash.keeptime.model.repos.WorkRepository;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -17,7 +17,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @RestController
 @RequestMapping("/projects")
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/controller/WorksController.java b/src/main/java/de/doubleslash/keeptime/REST_API/controller/WorksController.java
@@ -1,8 +1,9 @@
 package de.doubleslash.keeptime.REST_API.controller;
 
+import de.doubleslash.keeptime.REST_API.DTO.WorkDTO;
+import de.doubleslash.keeptime.REST_API.mapper.WorkMapper;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
-import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.model.repos.WorkRepository;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/mapper/ColorMapper.java b/src/main/java/de/doubleslash/keeptime/REST_API/mapper/ColorMapper.java
@@ -1,5 +1,6 @@
-package de.doubleslash.keeptime.REST_API.controller;
+package de.doubleslash.keeptime.REST_API.mapper;
 
+import de.doubleslash.keeptime.REST_API.DTO.ColorDTO;
 import javafx.scene.paint.Color;
 import org.mapstruct.Mapper;
 
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/mapper/ProjectMapper.java b/src/main/java/de/doubleslash/keeptime/REST_API/mapper/ProjectMapper.java
@@ -1,8 +1,7 @@
-package de.doubleslash.keeptime.REST_API.controller;
+package de.doubleslash.keeptime.REST_API.mapper;
 import de.doubleslash.keeptime.REST_API.ProjectColorDTO;
 import de.doubleslash.keeptime.model.Project;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
 @Mapper(uses = ColorMapper.class)
diff --git a/src/main/java/de/doubleslash/keeptime/REST_API/mapper/WorkMapper.java b/src/main/java/de/doubleslash/keeptime/REST_API/mapper/WorkMapper.java
@@ -1,9 +1,9 @@
-package de.doubleslash.keeptime.REST_API.controller;
+package de.doubleslash.keeptime.REST_API.mapper;
 
 
+import de.doubleslash.keeptime.REST_API.DTO.WorkDTO;
 import de.doubleslash.keeptime.model.Work;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
 @Mapper
diff --git a/src/test/java/de/doubleslash/keeptime/REST_API/controller/ProjectMapperTest.java b/src/test/java/de/doubleslash/keeptime/REST_API/controller/ProjectMapperTest.java
@@ -1,6 +1,7 @@
 package de.doubleslash.keeptime.REST_API.controller;
 
 import de.doubleslash.keeptime.REST_API.ProjectColorDTO;
+import de.doubleslash.keeptime.REST_API.mapper.ProjectMapper;
 import de.doubleslash.keeptime.model.Project;
 import javafx.scene.paint.Color;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/de/doubleslash/keeptime/REST_API/controller/WorkMapperTest.java b/src/test/java/de/doubleslash/keeptime/REST_API/controller/WorkMapperTest.java
@@ -1,16 +1,11 @@
 package de.doubleslash.keeptime.REST_API.controller;
 
+import de.doubleslash.keeptime.REST_API.DTO.WorkDTO;
+import de.doubleslash.keeptime.REST_API.mapper.WorkMapper;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Work;
 import javafx.scene.paint.Color;
-import net.bytebuddy.asm.Advice;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.time.LocalDateTime;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.doubleslash.keeptime.REST_API.controller;`
	`1`	`+package de.doubleslash.keeptime.REST_API.DTO;`
`2`	`2`
`3`	`3`	`public class ColorDTO {`
`4`	`4`	`private double red;`