From eaf15fd19c0b34abc699c6feedb1a216eeaade45 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 27 Feb 2018 15:32:01 +0100 Subject: [PATCH] TSK-311 fixed checkstyle --- rest/taskana-rest-spring/pom.xml | 4 --- .../rest/ClassificationController.java | 3 ++ .../ClassificationDefinitionController.java | 9 +++-- .../pro/taskana/rest/MonitorController.java | 3 ++ .../pro/taskana/rest/RestConfiguration.java | 3 ++ .../java/pro/taskana/rest/TaskController.java | 17 ++++++---- .../taskana/rest/WorkbasketController.java | 30 ++++++++++++---- .../rest/WorkbasketDefinitionController.java | 3 ++ .../pro/taskana/rest/query/TaskFilter.java | 15 ++++---- .../rest/resource/ClassificationResource.java | 3 ++ .../WorkbasketAccessItemResource.java | 3 ++ .../rest/resource/WorkbasketResource.java | 3 ++ .../resource/WorkbasketSummaryResource.java | 3 ++ .../resource/mapper/ClassificationMapper.java | 3 ++ .../mapper/WorkbasketAccessItemMapper.java | 3 ++ .../mapper/WorkbasketDefinitionMapper.java | 3 ++ .../resource/mapper/WorkbasketMapper.java | 3 ++ .../mapper/WorkbasketSummaryMapper.java | 3 ++ .../DistributionTargetDeserializer.java | 8 ++--- .../DistributionTargetSerializer.java | 34 +++++++++---------- .../rest/serialization/WorkbasketMixIn.java | 8 ++--- .../mapper/ClassificationMapperTest.java | 3 ++ .../WorkbasketAccessItemMapperTest.java | 3 ++ .../resource/mapper/WorkbasketMapperTest.java | 3 ++ .../mapper/WorkbasketSummaryMapperTest.java | 3 ++ 25 files changed, 124 insertions(+), 52 deletions(-) diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml index fc7143bf9..11a0bf426 100644 --- a/rest/taskana-rest-spring/pom.xml +++ b/rest/taskana-rest-spring/pom.xml @@ -177,10 +177,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - org.apache.maven.plugins maven-checkstyle-plugin 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 396295fe5..db4192a0c 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 @@ -28,6 +28,9 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.rest.resource.ClassificationResource; import pro.taskana.rest.resource.mapper.ClassificationMapper; +/** + * TODO. + */ @RestController @RequestMapping(path = "/v1/classifications", produces = {MediaType.APPLICATION_JSON_VALUE}) public class ClassificationController { 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 c45e31055..de3b8aa1d 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 @@ -28,6 +28,9 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.rest.resource.ClassificationResource; import pro.taskana.rest.resource.mapper.ClassificationMapper; +/** + * TODO. + */ @RestController @RequestMapping(path = "/v1/classificationdefinitions", produces = {MediaType.APPLICATION_JSON_VALUE}) public class ClassificationDefinitionController { @@ -69,10 +72,12 @@ public class ClassificationDefinitionController { for (ClassificationResource classificationResource : classificationResources) { Classification classification = classificationMapper.toModel(classificationResource); - if (systemIds.containsKey(classificationResource.key + "|||" + classificationResource.domain)) + if (systemIds.containsKey(classificationResource.key + "|||" + classificationResource.domain)) { classificationService.updateClassification(classification); - else + + } else { classificationService.createClassification(classification); + } } return new ResponseEntity<>(HttpStatus.OK); 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 e6dd8ba84..6a03d9573 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 @@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.RestController; import pro.taskana.TaskState; +/** + * TODO. + */ @RestController @RequestMapping(path = "/v1/monitor", produces = {MediaType.APPLICATION_JSON_VALUE}) public class MonitorController { 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 a1426b71f..f18b633a5 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 @@ -29,6 +29,9 @@ import pro.taskana.WorkbasketService; import pro.taskana.configuration.SpringTaskanaEngineConfiguration; import pro.taskana.configuration.TaskanaEngineConfiguration; +/** + * TODO. + */ @Configuration @ComponentScan @EnableTransactionManagement 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 ae9dc08de..269cb6562 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 @@ -33,11 +33,14 @@ import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.rest.query.TaskFilter; +/** + * TODO. + */ @RestController @RequestMapping(path = "/v1/tasks", produces = {MediaType.APPLICATION_JSON_VALUE}) public class TaskController { - private static final Logger logger = LoggerFactory.getLogger(TaskController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(TaskController.class); @Autowired private TaskService taskService; @@ -56,7 +59,7 @@ public class TaskController { } return ResponseEntity.status(HttpStatus.OK).body(taskLogic.inspectPrams(params)); } catch (NotAuthorizedException e) { - logger.error("Something went wrong with the Authorisation, while getting all Tasks.", e); + LOGGER.error("Something went wrong with the Authorisation, while getting all Tasks.", e); TransactionInterceptor.currentTransactionStatus().setRollbackOnly(); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); } @@ -69,7 +72,7 @@ public class TaskController { Task task = taskService.getTask(taskId); return ResponseEntity.status(HttpStatus.OK).body(task); } catch (TaskNotFoundException e) { - logger.error("The searched Task couldn´t be found or does not exist.", e); + LOGGER.error("The searched Task couldn´t be found or does not exist.", e); TransactionInterceptor.currentTransactionStatus().setRollbackOnly(); return ResponseEntity.status(HttpStatus.NOT_FOUND).build(); } @@ -103,11 +106,11 @@ public class TaskController { Task updatedTask = taskService.getTask(taskId); return ResponseEntity.status(HttpStatus.OK).body(updatedTask); } catch (TaskNotFoundException e) { - logger.error("The given Task coundn´t be found/claimd or does not Exist.", e); + LOGGER.error("The given Task coundn´t be found/claimd or does not Exist.", e); TransactionInterceptor.currentTransactionStatus().setRollbackOnly(); return ResponseEntity.status(HttpStatus.NOT_FOUND).build(); } catch (InvalidStateException | InvalidOwnerException e) { - logger.error("The given Task could not be claimed. Reason: {}", e); + LOGGER.error("The given Task could not be claimed. Reason: {}", e); TransactionInterceptor.currentTransactionStatus().setRollbackOnly(); return ResponseEntity.status(HttpStatus.CONFLICT).build(); } @@ -136,7 +139,7 @@ public class TaskController { Task createdTask = taskService.createTask(task); return ResponseEntity.status(HttpStatus.CREATED).body(createdTask); } catch (Exception e) { - logger.error("Something went wrong: ", e); + LOGGER.error("Something went wrong: ", e); TransactionInterceptor.currentTransactionStatus().setRollbackOnly(); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); } @@ -149,7 +152,7 @@ public class TaskController { Task updatedTask = taskService.transfer(taskId, workbasketKey); return ResponseEntity.status(HttpStatus.CREATED).body(updatedTask); } catch (Exception e) { - logger.error("Something went wrong: ", e); + LOGGER.error("Something went wrong: ", e); TransactionInterceptor.currentTransactionStatus().setRollbackOnly(); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); } 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 509fef84a..93f7f77be 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 @@ -41,6 +41,9 @@ import pro.taskana.rest.resource.mapper.WorkbasketAccessItemMapper; import pro.taskana.rest.resource.mapper.WorkbasketMapper; import pro.taskana.rest.resource.mapper.WorkbasketSummaryMapper; +/** + * TODO. + */ @RestController @RequestMapping(path = "/v1/workbaskets", produces = {MediaType.APPLICATION_JSON_VALUE}) public class WorkbasketController { @@ -343,6 +346,8 @@ public class WorkbasketController { case "CUSTOM_12": query.callerHasPermission(WorkbasketPermission.CUSTOM_12); break; + default: + throw new RuntimeException("should never occur"); } } catch (InvalidArgumentException e) { e.printStackTrace(); @@ -369,6 +374,8 @@ public class WorkbasketController { case TYPE: query.orderByType(sortDirection); break; + default: + throw new RuntimeException("should never occur"); } } @@ -384,20 +391,27 @@ public class WorkbasketController { String key, String keyLike, String descLike, String owner, String ownerLike, String type) { - if (name != null) + if (name != null) { query.nameIn(name); - if (nameLike != null) + } + if (nameLike != null) { query.nameLike(LIKE + nameLike + LIKE); - if (key != null) + } + if (key != null) { query.keyIn(key); - if (keyLike != null) + } + if (keyLike != null) { query.keyLike(LIKE + keyLike + LIKE); - if (owner != null) + } + if (owner != null) { query.ownerIn(owner); - if (ownerLike != null) + } + if (ownerLike != null) { query.ownerLike(LIKE + ownerLike + LIKE); - if (descLike != null) + } + if (descLike != null) { query.descriptionLike(LIKE + descLike + LIKE); + } if (type != null) { switch (type) { case "PERSONAL": @@ -412,6 +426,8 @@ public class WorkbasketController { case "TOPIC": query.typeIn(WorkbasketType.TOPIC); break; + default: + throw new RuntimeException("should never occur"); } } } 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 0449f90cb..14d055cb3 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 @@ -34,6 +34,9 @@ import pro.taskana.rest.resource.mapper.WorkbasketAccessItemMapper; import pro.taskana.rest.resource.mapper.WorkbasketDefinitionMapper; import pro.taskana.rest.resource.mapper.WorkbasketMapper; +/** + * TODO. + */ @RestController @RequestMapping(path = "/v1/workbasketdefinitions", produces = {MediaType.APPLICATION_JSON_VALUE}) public class WorkbasketDefinitionController { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/query/TaskFilter.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/query/TaskFilter.java index 01d9ec8b3..44869799c 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/query/TaskFilter.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/query/TaskFilter.java @@ -15,6 +15,9 @@ import pro.taskana.TaskSummary; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; +/** + * TODO. + */ @Component public class TaskFilter { @@ -131,18 +134,14 @@ public class TaskFilter { private String[] extractCommaSeperatedFields(List list) { List values = new ArrayList<>(); - list.stream().forEach(item -> { - Arrays.asList(item.split(COMMA)).stream().forEach(subItem -> { - values.add(subItem); - }); - }); + list.forEach(item -> values.addAll(Arrays.asList(item.split(COMMA)))); return values.toArray(new String[0]); } private TaskState[] extractStates(MultiValueMap params) { List states = new ArrayList<>(); - params.get(STATE).stream().forEach(item -> { - Arrays.asList(item.split(COMMA)).stream().forEach(state -> { + params.get(STATE).forEach(item -> { + Arrays.asList(item.split(COMMA)).forEach(state -> { switch (state) { case READY: states.add(TaskState.READY); @@ -153,6 +152,8 @@ public class TaskFilter { case CLAIMED: states.add(TaskState.CLAIMED); break; + default: + throw new RuntimeException("should never occur"); } }); }); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java index 956ebc061..a8a02bb23 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java @@ -2,6 +2,9 @@ package pro.taskana.rest.resource; import org.springframework.hateoas.ResourceSupport; +/** + * TODO. + */ public class ClassificationResource extends ResourceSupport { public String classificationId; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java index bd07636fb..eac481972 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java @@ -4,6 +4,9 @@ import javax.validation.constraints.NotNull; import org.springframework.hateoas.ResourceSupport; +/** + * TODO. + */ public class WorkbasketAccessItemResource extends ResourceSupport { public String accessItemId; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java index 1571dd1ea..fff1cdf0c 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java @@ -6,6 +6,9 @@ import org.springframework.hateoas.ResourceSupport; import pro.taskana.impl.WorkbasketType; +/** + * TODO. + */ public class WorkbasketResource extends ResourceSupport { public String workbasketId; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResource.java index 34f16578c..fc9ccd1f5 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResource.java @@ -6,6 +6,9 @@ import org.springframework.hateoas.ResourceSupport; import pro.taskana.impl.WorkbasketType; +/** + * TODO. + */ public class WorkbasketSummaryResource extends ResourceSupport { public String workbasketId; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationMapper.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationMapper.java index 97d29785b..0401ee849 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationMapper.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationMapper.java @@ -16,6 +16,9 @@ import pro.taskana.impl.ClassificationImpl; import pro.taskana.rest.ClassificationController; import pro.taskana.rest.resource.ClassificationResource; +/** + * TODO. + */ @Component public class ClassificationMapper { 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/mapper/WorkbasketAccessItemMapper.java index 35846f7cf..248018d7d 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/mapper/WorkbasketAccessItemMapper.java @@ -16,6 +16,9 @@ import pro.taskana.impl.WorkbasketAccessItemImpl; import pro.taskana.rest.WorkbasketController; import pro.taskana.rest.resource.WorkbasketAccessItemResource; +/** + * TODO. + */ @Component public class WorkbasketAccessItemMapper { 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/mapper/WorkbasketDefinitionMapper.java index a162f2a8f..cb31923c9 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/mapper/WorkbasketDefinitionMapper.java @@ -21,6 +21,9 @@ import pro.taskana.rest.WorkbasketDefinitionController; import pro.taskana.rest.resource.WorkbasketAccessItemResource; import pro.taskana.rest.resource.WorkbasketDefinition; +/** + * TODO. + */ @Component public class WorkbasketDefinitionMapper { 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/mapper/WorkbasketMapper.java index 33330db22..63e745f23 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/mapper/WorkbasketMapper.java @@ -16,6 +16,9 @@ import pro.taskana.impl.WorkbasketImpl; import pro.taskana.rest.WorkbasketController; import pro.taskana.rest.resource.WorkbasketResource; +/** + * TODO. + */ @Component public class WorkbasketMapper { 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/mapper/WorkbasketSummaryMapper.java index 8085691aa..1fe7fb812 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/mapper/WorkbasketSummaryMapper.java @@ -10,6 +10,9 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.rest.WorkbasketController; import pro.taskana.rest.resource.WorkbasketSummaryResource; +/** + * TODO. + */ @Component public class WorkbasketSummaryMapper { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java index 4dec6c1f2..2d4853d6f 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java @@ -21,13 +21,13 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketNotFoundException; /** - * This class deserializes the string list to real workbaskets + * This class deserializes the string list to real workbaskets. */ public class DistributionTargetDeserializer extends StdDeserializer> { private static final long serialVersionUID = 4226950057149602129L; - private static final Logger logger = LoggerFactory.getLogger(DistributionTargetDeserializer.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DistributionTargetDeserializer.class); @Autowired private WorkbasketService workbasketService; @@ -50,9 +50,9 @@ public class DistributionTargetDeserializer extends StdDeserializer> { - private static final long serialVersionUID = -4655804943794734821L; + private static final long serialVersionUID = -4655804943794734821L; - public DistributionTargetSerializer() { - this(null); - } + public DistributionTargetSerializer() { + this(null); + } - public DistributionTargetSerializer(Class> t) { - super(t); - } + public DistributionTargetSerializer(Class> t) { + super(t); + } - @Override - public void serialize(List workbaskets, JsonGenerator gen, SerializerProvider provider) - throws IOException { - List ids = new ArrayList<>(); + @Override + public void serialize(List workbaskets, JsonGenerator gen, SerializerProvider provider) + throws IOException { + List ids = new ArrayList<>(); - for (Workbasket item : workbaskets) { - ids.add(item.getId()); - } - gen.writeObject(ids); - } + for (Workbasket item : workbaskets) { + ids.add(item.getId()); + } + gen.writeObject(ids); + } } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java index 45569d795..9d27ca56f 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java @@ -9,12 +9,12 @@ import pro.taskana.Workbasket; /** * This class is used to override the distributiontargets with non standard - * serialization classes + * serialization classes. */ public abstract class WorkbasketMixIn { - @JsonSerialize(using = DistributionTargetSerializer.class) - @JsonDeserialize(using = DistributionTargetDeserializer.class) - abstract List getDistributionTargets(); + @JsonSerialize(using = DistributionTargetSerializer.class) + @JsonDeserialize(using = DistributionTargetDeserializer.class) + abstract List getDistributionTargets(); } 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/mapper/ClassificationMapperTest.java index 36f8e8116..737e47dc5 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/mapper/ClassificationMapperTest.java @@ -17,6 +17,9 @@ import pro.taskana.impl.ClassificationImpl; import pro.taskana.rest.RestConfiguration; import pro.taskana.rest.resource.ClassificationResource; +/** + * TODO. + */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {RestConfiguration.class}) @WebAppConfiguration 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/mapper/WorkbasketAccessItemMapperTest.java index cc4242fc5..406314cc1 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/mapper/WorkbasketAccessItemMapperTest.java @@ -14,6 +14,9 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.rest.RestConfiguration; import pro.taskana.rest.resource.WorkbasketAccessItemResource; +/** + * TODO. + */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {RestConfiguration.class}) @WebAppConfiguration 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/mapper/WorkbasketMapperTest.java index f02072d02..d4db3104c 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/mapper/WorkbasketMapperTest.java @@ -18,6 +18,9 @@ import pro.taskana.impl.WorkbasketType; import pro.taskana.rest.RestConfiguration; import pro.taskana.rest.resource.WorkbasketResource; +/** + * TODO. + */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {RestConfiguration.class}) @WebAppConfiguration 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/mapper/WorkbasketSummaryMapperTest.java index 42de2cb2d..dc4ef1ece 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/mapper/WorkbasketSummaryMapperTest.java @@ -14,6 +14,9 @@ import pro.taskana.impl.WorkbasketType; import pro.taskana.rest.RestConfiguration; import pro.taskana.rest.resource.WorkbasketSummaryResource; +/** + * TODO. + */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {RestConfiguration.class}) @WebAppConfiguration