nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-482

This commit is contained in:
Lars Leo Grätz 2018-05-13 12:09:04 +02:00 committed by Mustapha Zorgati
parent 52e0a01202
commit 30f72604c9
28 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java
View File

@ -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.

10
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java
View File

@ -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) {

6
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java
View File

@ -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<ReportResource> getTaskStatusReport(@RequestParam(required = false) List<String> domains,
@RequestParam(required = false) List<TaskState> 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));
}
}

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java
View File

@ -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());

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java
View File

@ -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.

38
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java
View File

@ -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<WorkbasketResource> 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<WorkbasketResource> 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<WorkbasketResource> 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<Resources<WorkbasketAccessItemResource>> result;
List<WorkbasketAccessItem> accessItems = workbasketService.getWorkbasketAccessItems(workbasketId);
Resources<WorkbasketAccessItemResource> accessItemListResource = accessItemListMapper
Resources<WorkbasketAccessItemResource> accessItemListResource = accessItemListAssembler
.toResource(workbasketId, accessItems);
result = new ResponseEntity<>(accessItemListResource, HttpStatus.OK);
return result;
@ -202,11 +202,11 @@ public class WorkbasketController extends AbstractPagingController {
}
List<WorkbasketAccessItem> wbAccessItems = new ArrayList<>();
workbasketAccessResourceItems.forEach(item -> wbAccessItems.add(workbasketAccessItemMapper.toModel(item)));
workbasketAccessResourceItems.forEach(item -> wbAccessItems.add(workbasketAccessItemAssembler.toModel(item)));
workbasketService.setWorkbasketAccessItems(workbasketId, wbAccessItems);
List<WorkbasketAccessItem> updatedWbAccessItems = workbasketService.getWorkbasketAccessItems(workbasketId);
Resources<WorkbasketAccessItemResource> accessItemListResource = accessItemListMapper
Resources<WorkbasketAccessItemResource> accessItemListResource = accessItemListAssembler
.toResource(workbasketId, updatedWbAccessItems);
return new ResponseEntity<>(accessItemListResource, HttpStatus.OK);
@ -220,7 +220,7 @@ public class WorkbasketController extends AbstractPagingController {
ResponseEntity<Resources<DistributionTargetResource>> result;
List<WorkbasketSummary> distributionTargets = workbasketService.getDistributionTargets(workbasketId);
Resources<DistributionTargetResource> distributionTargetListResource = distributionTargetListMapper
Resources<DistributionTargetResource> 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<WorkbasketSummary> distributionTargets = workbasketService.getDistributionTargets(sourceWorkbasketId);
Resources<DistributionTargetResource> distributionTargetListResource = distributionTargetListMapper
Resources<DistributionTargetResource> distributionTargetListResource = distributionTargetListAssembler
.toResource(sourceWorkbasketId, distributionTargets);
return new ResponseEntity<>(distributionTargetListResource, HttpStatus.OK);

20
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java
View File

@ -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<WorkbasketDefinition> 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());
}

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/AbstractRessourcesAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/AbstractRessourcesAssembler.java
View File

@ -1,4 +1,4 @@
package pro.taskana.rest.resource.mapper;
package pro.taskana.rest.resource.assembler;
import java.util.Map;

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationResourceAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationResourceAssembler.java
View File

@ -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;

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourceAssembler.java
View File

@ -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;

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourcesAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ClassificationSummaryResourcesAssembler.java
View File

@ -1,4 +1,4 @@
package pro.taskana.rest.resource.mapper;
package pro.taskana.rest.resource.assembler;
import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/DistributionTargetMapper.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/DistributionTargetAssembler.java
View File

@ -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 {

8
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/DistributionTargetListMapper.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/DistributionTargetListAssembler.java
View File

@ -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<DistributionTargetResource> toResource(String workbasketId,
Collection<WorkbasketSummary> distributionTargets) throws WorkbasketNotFoundException, NotAuthorizedException {
List<DistributionTargetResource> resourceList = new ArrayList<>();
for (WorkbasketSummary wb : distributionTargets) {
resourceList.add(distributionTargetMapper.toResource(wb));
resourceList.add(distributionTargetAssembler.toResource(wb));
}
Resources<DistributionTargetResource> distributionTargetListResource = new Resources<>(resourceList);

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ReportMapper.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/ReportAssembler.java
View File

@ -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<String> domains, List<TaskState> states)
throws NotAuthorizedException {

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskResourceAssembler.java
View File

@ -1,4 +1,4 @@
package pro.taskana.rest.resource.mapper;
package pro.taskana.rest.resource.assembler;
import java.time.Instant;

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskSummaryResourceAssembler.java
View File

@ -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;

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/TaskSummaryResourcesAssembler.java
View File

@ -1,4 +1,4 @@
package pro.taskana.rest.resource.mapper;
package pro.taskana.rest.resource.assembler;
import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapper.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemAssembler.java
View File

@ -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;

8
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemListMapper.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemListAssembler.java
View File

@ -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<WorkbasketAccessItemResource> toResource(String workbasketId,
Collection<WorkbasketAccessItem> accessItems) throws NotAuthorizedException, WorkbasketNotFoundException {
List<WorkbasketAccessItemResource> resourceList = new ArrayList<>();
for (WorkbasketAccessItem accessItem : accessItems) {
resourceList.add(workbasketAccessItemMapper.toResource(accessItem));
resourceList.add(workbasketAccessItemAssembler.toResource(accessItem));
}
Resources<WorkbasketAccessItemResource> accessItemListResource = new Resources<>(resourceList);

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketMapper.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketAssembler.java
View File

@ -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;

12
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketDefinitionMapper.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketDefinitionAssembler.java
View File

@ -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<WorkbasketAccessItemResource> authorizations = new ArrayList<>();
for (WorkbasketAccessItem accessItem : workbasketService.getWorkbasketAccessItems(basket.getKey())) {
authorizations.add(workbasketAccessItemMapper.toResource(accessItem));
authorizations.add(workbasketAccessItemAssembler.toResource(accessItem));
}
Set<String> 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);
}

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryMapper.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryAssembler.java
View File

@ -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 {

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryResourceAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourceAssembler.java
View File

@ -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;

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryResourcesAssembler.java → rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryResourcesAssembler.java
View File

@ -1,4 +1,4 @@
package pro.taskana.rest.resource.mapper;
package pro.taskana.rest.resource.assembler;
import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;

10
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/ClassificationMapperTest.java → rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/ClassificationAssemblerTest.java
View File

@ -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);
}

12
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapperTest.java → rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketAccessItemAssemblerTest.java
View File

@ -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);
}

12
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketMapperTest.java → rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketAssemblerTest.java
View File

@ -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);
}

10
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/mapper/WorkbasketSummaryMapperTest.java → rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/assembler/WorkbasketSummaryAssemblerTest.java
View File

@ -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);