From 30f72604c96b1312af763aa9d0bbfb38f875ec0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Leo=20Gr=C3=A4tz?= <23726273+LarsLeo@users.noreply.github.com> Date: Sun, 13 May 2018 12:09:04 +0200 Subject: [PATCH] TSK-482 --- .../rest/ClassificationController.java | 4 +- .../ClassificationDefinitionController.java | 10 ++--- .../pro/taskana/rest/MonitorController.java | 6 +-- .../pro/taskana/rest/RestConfiguration.java | 2 +- .../java/pro/taskana/rest/TaskController.java | 4 +- .../taskana/rest/WorkbasketController.java | 38 +++++++++---------- .../rest/WorkbasketDefinitionController.java | 20 +++++----- .../AbstractRessourcesAssembler.java | 2 +- .../ClassificationResourceAssembler.java | 2 +- ...lassificationSummaryResourceAssembler.java | 2 +- ...assificationSummaryResourcesAssembler.java | 2 +- .../DistributionTargetAssembler.java} | 4 +- .../DistributionTargetListAssembler.java} | 8 ++-- .../ReportAssembler.java} | 4 +- .../TaskResourceAssembler.java | 2 +- .../TaskSummaryResourceAssembler.java | 2 +- .../TaskSummaryResourcesAssembler.java | 2 +- .../WorkbasketAccessItemAssembler.java} | 4 +- .../WorkbasketAccessItemListAssembler.java} | 8 ++-- .../WorkbasketAssembler.java} | 4 +- .../WorkbasketDefinitionAssembler.java} | 12 +++--- .../WorkbasketSummaryAssembler.java} | 4 +- .../WorkbasketSummaryResourceAssembler.java | 2 +- .../WorkbasketSummaryResourcesAssembler.java | 2 +- .../ClassificationAssemblerTest.java} | 10 ++--- .../WorkbasketAccessItemAssemblerTest.java} | 12 +++--- .../WorkbasketAssemblerTest.java} | 12 +++--- .../WorkbasketSummaryAssemblerTest.java} | 10 ++--- 28 files changed, 97 insertions(+), 97 deletions(-) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/AbstractRessourcesAssembler.java (98%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/ClassificationResourceAssembler.java (98%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/ClassificationSummaryResourceAssembler.java (97%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/ClassificationSummaryResourcesAssembler.java (98%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper/DistributionTargetMapper.java => assembler/DistributionTargetAssembler.java} (94%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper/DistributionTargetListMapper.java => assembler/DistributionTargetListAssembler.java} (87%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper/ReportMapper.java => assembler/ReportAssembler.java} (97%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/TaskResourceAssembler.java (98%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/TaskSummaryResourceAssembler.java (97%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/TaskSummaryResourcesAssembler.java (96%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper/WorkbasketAccessItemMapper.java => assembler/WorkbasketAccessItemAssembler.java} (96%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper/WorkbasketAccessItemListMapper.java => assembler/WorkbasketAccessItemListAssembler.java} (86%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper/WorkbasketMapper.java => assembler/WorkbasketAssembler.java} (97%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper/WorkbasketDefinitionMapper.java => assembler/WorkbasketDefinitionAssembler.java} (88%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper/WorkbasketSummaryMapper.java => assembler/WorkbasketSummaryAssembler.java} (94%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/WorkbasketSummaryResourceAssembler.java (97%) rename rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/{mapper => assembler}/WorkbasketSummaryResourcesAssembler.java (98%) rename rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/{mapper/ClassificationMapperTest.java => assembler/ClassificationAssemblerTest.java} (95%) rename rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/{mapper/WorkbasketAccessItemMapperTest.java => assembler/WorkbasketAccessItemAssemblerTest.java} (93%) rename rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/{mapper/WorkbasketMapperTest.java => assembler/WorkbasketAssemblerTest.java} (93%) rename rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/{mapper/WorkbasketSummaryMapperTest.java => assembler/WorkbasketSummaryAssemblerTest.java} (91%) diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java index b0ebae56e..1c223ff71 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java @@ -35,8 +35,8 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.rest.resource.ClassificationResource; import pro.taskana.rest.resource.ClassificationSummaryResource; -import pro.taskana.rest.resource.mapper.ClassificationResourceAssembler; -import pro.taskana.rest.resource.mapper.ClassificationSummaryResourcesAssembler; +import pro.taskana.rest.resource.assembler.ClassificationResourceAssembler; +import pro.taskana.rest.resource.assembler.ClassificationSummaryResourcesAssembler; /** * Controller for all {@link Classification} related endpoints. diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java index 35996dd6c..4b240d31f 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java @@ -23,7 +23,7 @@ import pro.taskana.exceptions.DomainNotFoundException; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.rest.resource.ClassificationResource; -import pro.taskana.rest.resource.mapper.ClassificationResourceAssembler; +import pro.taskana.rest.resource.assembler.ClassificationResourceAssembler; import java.util.ArrayList; import java.util.List; @@ -41,7 +41,7 @@ public class ClassificationDefinitionController { private ClassificationService classificationService; @Autowired - private ClassificationResourceAssembler classificationMapper; + private ClassificationResourceAssembler classificationResourceAssembler; @GetMapping @Transactional(readOnly = true, rollbackFor = Exception.class) @@ -55,7 +55,7 @@ public class ClassificationDefinitionController { for (ClassificationSummary summary : summaries) { Classification classification = classificationService.getClassification(summary.getKey(), summary.getDomain()); - export.add(classificationMapper.toResource(classification)); + export.add(classificationResourceAssembler.toResource(classification)); } return new ResponseEntity<>(export, HttpStatus.OK); } @@ -72,11 +72,11 @@ public class ClassificationDefinitionController { try { for (ClassificationResource classificationResource : classificationResources) { if (systemIds.containsKey(classificationResource.key + "|" + classificationResource.domain)) { - classificationService.updateClassification(classificationMapper.toModel(classificationResource)); + classificationService.updateClassification(classificationResourceAssembler.toModel(classificationResource)); } else { classificationResource.classificationId = null; - classificationService.createClassification(classificationMapper.toModel(classificationResource)); + classificationService.createClassification(classificationResourceAssembler.toModel(classificationResource)); } } } catch (NotAuthorizedException e) { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java index 49ee844dd..a33f60268 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java @@ -15,7 +15,7 @@ import pro.taskana.TaskMonitorService; import pro.taskana.TaskState; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.rest.resource.ReportResource; -import pro.taskana.rest.resource.mapper.ReportMapper; +import pro.taskana.rest.resource.assembler.ReportAssembler; /** * Controller for all monitoring endpoints. @@ -28,7 +28,7 @@ public class MonitorController { private TaskMonitorService taskMonitorService; @Autowired - private ReportMapper reportMapper; + private ReportAssembler reportAssembler; @GetMapping(path = "/countByState") @Transactional(readOnly = true, rollbackFor = Exception.class) @@ -73,6 +73,6 @@ public class MonitorController { public ResponseEntity getTaskStatusReport(@RequestParam(required = false) List domains, @RequestParam(required = false) List states) throws NotAuthorizedException { return ResponseEntity.status(HttpStatus.OK) - .body(reportMapper.toResource(taskMonitorService.getTaskStatusReport(domains, states), domains, states)); + .body(reportAssembler.toResource(taskMonitorService.getTaskStatusReport(domains, states), domains, states)); } } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java index 593a06e74..ccdc49c1a 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java @@ -73,7 +73,7 @@ public class RestConfiguration { return b; } - //Needed for injection into jackson deserilizer. + //Needed for injection into jackson deserializer. @Bean public HandlerInstantiator handlerInstantiator(ApplicationContext context) { return new SpringHandlerInstantiator(context.getAutowireCapableBeanFactory()); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java index 034c3f7b0..4432a9ebe 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java @@ -44,8 +44,8 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskSummaryResource; -import pro.taskana.rest.resource.mapper.TaskResourceAssembler; -import pro.taskana.rest.resource.mapper.TaskSummaryResourcesAssembler; +import pro.taskana.rest.resource.assembler.TaskResourceAssembler; +import pro.taskana.rest.resource.assembler.TaskSummaryResourcesAssembler; /** * Controller for all {@link Task} related endpoints. diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java index 74c6d2940..9df03799b 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java @@ -43,11 +43,11 @@ import pro.taskana.rest.resource.DistributionTargetResource; import pro.taskana.rest.resource.WorkbasketAccessItemResource; import pro.taskana.rest.resource.WorkbasketResource; import pro.taskana.rest.resource.WorkbasketSummaryResource; -import pro.taskana.rest.resource.mapper.DistributionTargetListMapper; -import pro.taskana.rest.resource.mapper.WorkbasketAccessItemListMapper; -import pro.taskana.rest.resource.mapper.WorkbasketAccessItemMapper; -import pro.taskana.rest.resource.mapper.WorkbasketMapper; -import pro.taskana.rest.resource.mapper.WorkbasketSummaryResourcesAssembler; +import pro.taskana.rest.resource.assembler.DistributionTargetListAssembler; +import pro.taskana.rest.resource.assembler.WorkbasketAccessItemListAssembler; +import pro.taskana.rest.resource.assembler.WorkbasketAccessItemAssembler; +import pro.taskana.rest.resource.assembler.WorkbasketAssembler; +import pro.taskana.rest.resource.assembler.WorkbasketSummaryResourcesAssembler; /** * Controller for all {@link Workbasket} related endpoints. @@ -79,16 +79,16 @@ public class WorkbasketController extends AbstractPagingController { private WorkbasketService workbasketService; @Autowired - private WorkbasketMapper workbasketMapper; + private WorkbasketAssembler workbasketAssembler; @Autowired - private DistributionTargetListMapper distributionTargetListMapper; + private DistributionTargetListAssembler distributionTargetListAssembler; @Autowired - private WorkbasketAccessItemListMapper accessItemListMapper; + private WorkbasketAccessItemListAssembler accessItemListAssembler; @Autowired - private WorkbasketAccessItemMapper workbasketAccessItemMapper; + private WorkbasketAccessItemAssembler workbasketAccessItemAssembler; @GetMapping @Transactional(readOnly = true, rollbackFor = Exception.class) @@ -132,7 +132,7 @@ public class WorkbasketController extends AbstractPagingController { throws WorkbasketNotFoundException, NotAuthorizedException { ResponseEntity result; Workbasket workbasket = workbasketService.getWorkbasket(workbasketId); - result = new ResponseEntity<>(workbasketMapper.toResource(workbasket), HttpStatus.OK); + result = new ResponseEntity<>(workbasketAssembler.toResource(workbasket), HttpStatus.OK); return result; } @@ -150,9 +150,9 @@ public class WorkbasketController extends AbstractPagingController { public ResponseEntity createWorkbasket(@RequestBody WorkbasketResource workbasketResource) throws InvalidWorkbasketException, NotAuthorizedException, WorkbasketAlreadyExistException, WorkbasketNotFoundException, DomainNotFoundException { - Workbasket workbasket = workbasketMapper.toModel(workbasketResource); + Workbasket workbasket = workbasketAssembler.toModel(workbasketResource); workbasket = workbasketService.createWorkbasket(workbasket); - return new ResponseEntity<>(workbasketMapper.toResource(workbasket), HttpStatus.CREATED); + return new ResponseEntity<>(workbasketAssembler.toResource(workbasket), HttpStatus.CREATED); } @PutMapping(path = "/{workbasketId}") @@ -163,9 +163,9 @@ public class WorkbasketController extends AbstractPagingController { throws InvalidWorkbasketException, WorkbasketNotFoundException, NotAuthorizedException { ResponseEntity result; if (workbasketId.equals(workbasketResource.workbasketId)) { - Workbasket workbasket = workbasketMapper.toModel(workbasketResource); + Workbasket workbasket = workbasketAssembler.toModel(workbasketResource); workbasket = workbasketService.updateWorkbasket(workbasket); - result = ResponseEntity.ok(workbasketMapper.toResource(workbasket)); + result = ResponseEntity.ok(workbasketAssembler.toResource(workbasket)); } else { throw new InvalidWorkbasketException( "Target-WB-ID('" + workbasketId @@ -185,7 +185,7 @@ public class WorkbasketController extends AbstractPagingController { ResponseEntity> result; List accessItems = workbasketService.getWorkbasketAccessItems(workbasketId); - Resources accessItemListResource = accessItemListMapper + Resources accessItemListResource = accessItemListAssembler .toResource(workbasketId, accessItems); result = new ResponseEntity<>(accessItemListResource, HttpStatus.OK); return result; @@ -202,11 +202,11 @@ public class WorkbasketController extends AbstractPagingController { } List wbAccessItems = new ArrayList<>(); - workbasketAccessResourceItems.forEach(item -> wbAccessItems.add(workbasketAccessItemMapper.toModel(item))); + workbasketAccessResourceItems.forEach(item -> wbAccessItems.add(workbasketAccessItemAssembler.toModel(item))); workbasketService.setWorkbasketAccessItems(workbasketId, wbAccessItems); List updatedWbAccessItems = workbasketService.getWorkbasketAccessItems(workbasketId); - Resources accessItemListResource = accessItemListMapper + Resources accessItemListResource = accessItemListAssembler .toResource(workbasketId, updatedWbAccessItems); return new ResponseEntity<>(accessItemListResource, HttpStatus.OK); @@ -220,7 +220,7 @@ public class WorkbasketController extends AbstractPagingController { ResponseEntity> result; List distributionTargets = workbasketService.getDistributionTargets(workbasketId); - Resources distributionTargetListResource = distributionTargetListMapper + Resources distributionTargetListResource = distributionTargetListAssembler .toResource(workbasketId, distributionTargets); result = new ResponseEntity<>(distributionTargetListResource, HttpStatus.OK); return result; @@ -234,7 +234,7 @@ public class WorkbasketController extends AbstractPagingController { workbasketService.setDistributionTargets(sourceWorkbasketId, targetWorkbasketIds); List distributionTargets = workbasketService.getDistributionTargets(sourceWorkbasketId); - Resources distributionTargetListResource = distributionTargetListMapper + Resources distributionTargetListResource = distributionTargetListAssembler .toResource(sourceWorkbasketId, distributionTargets); return new ResponseEntity<>(distributionTargetListResource, HttpStatus.OK); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java index 48cec17dc..dcd53685d 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java @@ -26,9 +26,9 @@ import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.rest.resource.WorkbasketAccessItemResource; import pro.taskana.rest.resource.WorkbasketDefinition; import pro.taskana.rest.resource.WorkbasketResource; -import pro.taskana.rest.resource.mapper.WorkbasketAccessItemMapper; -import pro.taskana.rest.resource.mapper.WorkbasketDefinitionMapper; -import pro.taskana.rest.resource.mapper.WorkbasketMapper; +import pro.taskana.rest.resource.assembler.WorkbasketAccessItemAssembler; +import pro.taskana.rest.resource.assembler.WorkbasketDefinitionAssembler; +import pro.taskana.rest.resource.assembler.WorkbasketAssembler; import java.util.ArrayList; import java.util.HashMap; @@ -47,13 +47,13 @@ public class WorkbasketDefinitionController { private WorkbasketService workbasketService; @Autowired - private WorkbasketDefinitionMapper workbasketDefinitionMapper; + private WorkbasketDefinitionAssembler workbasketDefinitionAssembler; @Autowired - private WorkbasketMapper workbasketMapper; + private WorkbasketAssembler workbasketAssembler; @Autowired - private WorkbasketAccessItemMapper workbasketAccessItemMapper; + private WorkbasketAccessItemAssembler workbasketAccessItemAssembler; @GetMapping @Transactional(readOnly = true, rollbackFor = Exception.class) @@ -66,7 +66,7 @@ public class WorkbasketDefinitionController { List basketExports = new ArrayList<>(); for (WorkbasketSummary summary : workbasketSummaryList) { Workbasket workbasket = workbasketService.getWorkbasket(summary.getId()); - basketExports.add(workbasketDefinitionMapper.toResource(workbasket)); + basketExports.add(workbasketDefinitionAssembler.toResource(workbasket)); } return new ResponseEntity<>(basketExports, HttpStatus.OK); } catch (WorkbasketNotFoundException e) { @@ -110,11 +110,11 @@ public class WorkbasketDefinitionController { if (systemIds.containsKey(logicalId(res))) { res.workbasketId = systemIds.get(logicalId(res)); workbasket = workbasketService.updateWorkbasket( - workbasketMapper.toModel(res)); + workbasketAssembler.toModel(res)); } else { res.workbasketId = null; workbasket = workbasketService.createWorkbasket( - workbasketMapper.toModel(res)); + workbasketAssembler.toModel(res)); } res.workbasketId = oldId; @@ -125,7 +125,7 @@ public class WorkbasketDefinitionController { } for (WorkbasketAccessItemResource authorization : definition.authorizations) { workbasketService.createWorkbasketAccessItem( - workbasketAccessItemMapper.toModel(authorization)); + workbasketAccessItemAssembler.toModel(authorization)); } idConversion.put(definition.workbasketResource.workbasketId, workbasket.getId()); } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/AbstractRessourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/AbstractRessourcesAssembler.java similarity index 98% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/AbstractRessourcesAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/AbstractRessourcesAssembler.java index c92544168..4a8dee845 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/AbstractRessourcesAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/AbstractRessourcesAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import java.util.Map; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationResourceAssembler.java similarity index 98% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationResourceAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationResourceAssembler.java index c31650b61..4dbf76fad 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationResourceAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourceAssembler.java similarity index 97% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourceAssembler.java index ebcd897e7..4e76287d1 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourceAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourcesAssembler.java similarity index 98% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourcesAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourcesAssembler.java index 8d0a0fb69..e1fdd5d01 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourcesAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourcesAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/DistributionTargetMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/DistributionTargetAssembler.java similarity index 94% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/DistributionTargetMapper.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/DistributionTargetAssembler.java index b3469697f..299cd17d8 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/DistributionTargetMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/DistributionTargetAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; @@ -16,7 +16,7 @@ import pro.taskana.rest.resource.DistributionTargetResource; * Transforms WorkbasketSummary to its resource counterpart DistributionTargerResource and vice versa. */ @Component -public class DistributionTargetMapper { +public class DistributionTargetAssembler { public DistributionTargetResource toResource(WorkbasketSummary summary) throws WorkbasketNotFoundException, NotAuthorizedException { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/DistributionTargetListMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/DistributionTargetListAssembler.java similarity index 87% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/DistributionTargetListMapper.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/DistributionTargetListAssembler.java index eae16e6a6..ce13ebd8b 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/DistributionTargetListMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/DistributionTargetListAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; @@ -21,16 +21,16 @@ import pro.taskana.rest.resource.DistributionTargetResource; * Mapper to convert from a list of WorkbasketSummary to a workbasket list resource. */ @Component -public class DistributionTargetListMapper { +public class DistributionTargetListAssembler { @Autowired - private DistributionTargetMapper distributionTargetMapper; + private DistributionTargetAssembler distributionTargetAssembler; public Resources toResource(String workbasketId, Collection distributionTargets) throws WorkbasketNotFoundException, NotAuthorizedException { List resourceList = new ArrayList<>(); for (WorkbasketSummary wb : distributionTargets) { - resourceList.add(distributionTargetMapper.toResource(wb)); + resourceList.add(distributionTargetAssembler.toResource(wb)); } Resources distributionTargetListResource = new Resources<>(resourceList); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ReportMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ReportAssembler.java similarity index 97% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ReportMapper.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ReportAssembler.java index ca6f81956..c1a40ae66 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ReportMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ReportAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; @@ -25,7 +25,7 @@ import pro.taskana.rest.resource.ReportResource; * Transforms any {@link Report} into its {@link ReportResource}. */ @Component -public class ReportMapper { +public class ReportAssembler { public ReportResource toResource(TaskStatusReport report, List domains, List states) throws NotAuthorizedException { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskResourceAssembler.java similarity index 98% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskResourceAssembler.java index 7d398efd2..3a7580924 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskResourceAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import java.time.Instant; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskSummaryResourceAssembler.java similarity index 97% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskSummaryResourceAssembler.java index 8a7134d10..7f8649a17 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskSummaryResourceAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import org.springframework.beans.BeanUtils; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskSummaryResourcesAssembler.java similarity index 96% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskSummaryResourcesAssembler.java index 96249fcbc..861afa20a 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskSummaryResourcesAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemAssembler.java similarity index 96% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapper.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemAssembler.java index a07be9cf1..897c53693 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; @@ -20,7 +20,7 @@ import pro.taskana.rest.resource.WorkbasketAccessItemResource; * versa. */ @Component -public class WorkbasketAccessItemMapper { +public class WorkbasketAccessItemAssembler { @Autowired private WorkbasketService workbasketService; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemListMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemListAssembler.java similarity index 86% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemListMapper.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemListAssembler.java index 7d23e8054..8f3d59db4 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemListMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemListAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; @@ -21,16 +21,16 @@ import pro.taskana.rest.resource.WorkbasketAccessItemResource; * Mapper to convert from a list of WorkbasketAccessItem to a WorkbasketAccessItemResource. */ @Component -public class WorkbasketAccessItemListMapper { +public class WorkbasketAccessItemListAssembler { @Autowired - private WorkbasketAccessItemMapper workbasketAccessItemMapper; + private WorkbasketAccessItemAssembler workbasketAccessItemAssembler; public Resources toResource(String workbasketId, Collection accessItems) throws NotAuthorizedException, WorkbasketNotFoundException { List resourceList = new ArrayList<>(); for (WorkbasketAccessItem accessItem : accessItems) { - resourceList.add(workbasketAccessItemMapper.toResource(accessItem)); + resourceList.add(workbasketAccessItemAssembler.toResource(accessItem)); } Resources accessItemListResource = new Resources<>(resourceList); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAssembler.java similarity index 97% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketMapper.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAssembler.java index 149733d5a..8061c0f3b 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; @@ -21,7 +21,7 @@ import pro.taskana.rest.resource.WorkbasketResource; * Transforms {@link Workbasket} to its resource counterpart {@link WorkbasketResource} and vice versa. */ @Component -public class WorkbasketMapper { +public class WorkbasketAssembler { @Autowired private WorkbasketService workbasketService; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketDefinitionMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketDefinitionAssembler.java similarity index 88% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketDefinitionMapper.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketDefinitionAssembler.java index 3d67b4688..7a7131a37 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketDefinitionMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketDefinitionAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; @@ -27,16 +27,16 @@ import pro.taskana.rest.resource.WorkbasketDefinition; * containing all additional information about that workbasket. */ @Component -public class WorkbasketDefinitionMapper { +public class WorkbasketDefinitionAssembler { @Autowired private WorkbasketService workbasketService; @Autowired - private WorkbasketMapper workbasketMapper; + private WorkbasketAssembler workbasketAssembler; @Autowired - private WorkbasketAccessItemMapper workbasketAccessItemMapper; + private WorkbasketAccessItemAssembler workbasketAccessItemAssembler; /** * maps the distro targets to their id to remove overhead. @@ -54,13 +54,13 @@ public class WorkbasketDefinitionMapper { throws NotAuthorizedException, WorkbasketNotFoundException { List authorizations = new ArrayList<>(); for (WorkbasketAccessItem accessItem : workbasketService.getWorkbasketAccessItems(basket.getKey())) { - authorizations.add(workbasketAccessItemMapper.toResource(accessItem)); + authorizations.add(workbasketAccessItemAssembler.toResource(accessItem)); } Set distroTargets = workbasketService.getDistributionTargets(basket.getId()) .stream() .map(WorkbasketSummary::getId) .collect(Collectors.toSet()); - WorkbasketDefinition resource = new WorkbasketDefinition(workbasketMapper.toResource(basket), distroTargets, + WorkbasketDefinition resource = new WorkbasketDefinition(workbasketAssembler.toResource(basket), distroTargets, authorizations); return addLinks(resource, basket); } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryAssembler.java similarity index 94% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryMapper.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryAssembler.java index 07158a697..cc1721af6 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; @@ -16,7 +16,7 @@ import pro.taskana.rest.resource.WorkbasketSummaryResource; * Transforms {@link WorkbasketSummary} to its resource counterpart {@link WorkbasketSummaryResource} and vice versa. */ @Component -public class WorkbasketSummaryMapper { +public class WorkbasketSummaryAssembler { public WorkbasketSummaryResource toResource(WorkbasketSummary summary) throws WorkbasketNotFoundException, NotAuthorizedException { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourceAssembler.java similarity index 97% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryResourceAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourceAssembler.java index bf563f2b7..5c0f50e00 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourceAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryResourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourcesAssembler.java similarity index 98% rename from rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryResourcesAssembler.java rename to rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourcesAssembler.java index 1cac65151..d40efafb9 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryResourcesAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourcesAssembler.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/ClassificationMapperTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/ClassificationAssemblerTest.java similarity index 95% rename from rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/ClassificationMapperTest.java rename to rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/ClassificationAssemblerTest.java index 9d5a91e50..712e22b8e 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/ClassificationMapperTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/ClassificationAssemblerTest.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import java.time.Instant; @@ -28,10 +28,10 @@ import pro.taskana.rest.resource.ClassificationResource; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class ClassificationMapperTest { +public class ClassificationAssemblerTest { @Autowired - private ClassificationResourceAssembler classificationMapper; + private ClassificationResourceAssembler classificationResourceAssembler; @Autowired private ClassificationService classificationService; @@ -62,7 +62,7 @@ public class ClassificationMapperTest { classification.setCreated(Instant.parse("2010-01-01T12:00:00Z")); classification.setModified(Instant.parse("2011-11-11T11:00:00Z")); // when - ClassificationResource classificationResource = classificationMapper.toResource(classification); + ClassificationResource classificationResource = classificationResourceAssembler.toResource(classification); // then testEquality(classification, classificationResource); } @@ -95,7 +95,7 @@ public class ClassificationMapperTest { classificationResource.setServiceLevel("P1D"); classificationResource.setDescription("Test"); // when - ClassificationImpl classification = (ClassificationImpl) classificationMapper.toModel(classificationResource); + ClassificationImpl classification = (ClassificationImpl) classificationResourceAssembler.toModel(classificationResource); // then testEquality(classification, classificationResource); } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapperTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemAssemblerTest.java similarity index 93% rename from rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapperTest.java rename to rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemAssemblerTest.java index f3eedb501..e1cab0af7 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapperTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemAssemblerTest.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import org.junit.Assert; import org.junit.Test; @@ -16,15 +16,15 @@ import pro.taskana.rest.TestConfiguration; import pro.taskana.rest.resource.WorkbasketAccessItemResource; /** - * Test for {@link WorkbasketAccessItemMapper}. + * Test for {@link WorkbasketAccessItemAssembler}. */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class WorkbasketAccessItemMapperTest { +public class WorkbasketAccessItemAssemblerTest { @Autowired - WorkbasketAccessItemMapper workbasketAccessItemMapper; + WorkbasketAccessItemAssembler workbasketAccessItemAssembler; @Autowired WorkbasketService workbasketService; @@ -51,7 +51,7 @@ public class WorkbasketAccessItemMapperTest { accessItem.setPermCustom11(true); accessItem.setPermCustom12(true); // when - WorkbasketAccessItemResource resource = workbasketAccessItemMapper.toResource( + WorkbasketAccessItemResource resource = workbasketAccessItemAssembler.toResource( accessItem); // then testEquality(accessItem, resource); @@ -82,7 +82,7 @@ public class WorkbasketAccessItemMapperTest { resource.setPermCustom11(true); resource.setPermCustom12(false); // when - WorkbasketAccessItem accessItem = workbasketAccessItemMapper.toModel(resource); + WorkbasketAccessItem accessItem = workbasketAccessItemAssembler.toModel(resource); // then testEquality(accessItem, resource); } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketMapperTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketAssemblerTest.java similarity index 93% rename from rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketMapperTest.java rename to rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketAssemblerTest.java index 3603e4c06..33ccdab48 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketMapperTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketAssemblerTest.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import java.time.Instant; @@ -20,17 +20,17 @@ import pro.taskana.rest.TestConfiguration; import pro.taskana.rest.resource.WorkbasketResource; /** - * Test for {@link WorkbasketMapper}. + * Test for {@link WorkbasketAssembler}. */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class WorkbasketMapperTest { +public class WorkbasketAssemblerTest { @Autowired WorkbasketService workbasketService; @Autowired - WorkbasketMapper workbasketMapper; + WorkbasketAssembler workbasketAssembler; @Test public void workbasketToResource() throws NotAuthorizedException, WorkbasketNotFoundException { @@ -52,7 +52,7 @@ public class WorkbasketMapperTest { ((WorkbasketImpl) workbasket).setCreated(Instant.parse("2010-01-01T12:00:00Z")); ((WorkbasketImpl) workbasket).setModified(Instant.parse("2010-01-01T12:00:00Z")); // when - WorkbasketResource workbasketResource = workbasketMapper.toResource(workbasket); + WorkbasketResource workbasketResource = workbasketAssembler.toResource(workbasket); // then testEquality(workbasket, workbasketResource); } @@ -79,7 +79,7 @@ public class WorkbasketMapperTest { workbasketResource.setOwner("Lars"); workbasketResource.setType(WorkbasketType.PERSONAL); // when - Workbasket workbasket = workbasketMapper.toModel(workbasketResource); + Workbasket workbasket = workbasketAssembler.toModel(workbasketResource); // then testEquality(workbasket, workbasketResource); } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryMapperTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryAssemblerTest.java similarity index 91% rename from rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryMapperTest.java rename to rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryAssemblerTest.java index 3881f28dc..e3b859aea 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryMapperTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryAssemblerTest.java @@ -1,4 +1,4 @@ -package pro.taskana.rest.resource.mapper; +package pro.taskana.rest.resource.assembler; import org.junit.Assert; import org.junit.Test; @@ -17,15 +17,15 @@ import pro.taskana.rest.TestConfiguration; import pro.taskana.rest.resource.WorkbasketSummaryResource; /** - * Test for {@link WorkbasketSummaryMapper}. + * Test for {@link WorkbasketSummaryAssembler}. */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class WorkbasketSummaryMapperTest { +public class WorkbasketSummaryAssemblerTest { @Autowired - WorkbasketSummaryMapper workbasketSummaryMapper; + WorkbasketSummaryAssembler workbasketSummaryAssembler; @Autowired WorkbasketService workbasketService; @@ -44,7 +44,7 @@ public class WorkbasketSummaryMapperTest { workbasketSummary.setOwner("Lars"); workbasketSummary.setType(WorkbasketType.PERSONAL); // when - WorkbasketSummaryResource workbasketSummaryResource = workbasketSummaryMapper.toResource(workbasketSummary); + WorkbasketSummaryResource workbasketSummaryResource = workbasketSummaryAssembler.toResource(workbasketSummary); // then Assert.assertEquals(workbasketSummary.getDescription(), workbasketSummaryResource.description); Assert.assertEquals(workbasketSummary.getDomain(), workbasketSummaryResource.domain);