From e0c02461019a8564db1db52a1e59cac699649c12 Mon Sep 17 00:00:00 2001
From: Holger Hagen <19706592+holgerhagen@users.noreply.github.com>
Date: Mon, 12 Mar 2018 17:42:07 +0100
Subject: [PATCH] TSK-373: renamed relations and removed some duplicate links.

---
 .../pro/taskana/rest/resource/DistributionTargetResource.java  | 3 +++
 .../taskana/rest/resource/WorkbasketAccessItemResource.java    | 2 ++
 .../pro/taskana/rest/resource/WorkbasketSummaryResource.java   | 2 ++
 .../rest/resource/mapper/DistributionTargetListMapper.java     | 3 ---
 .../rest/resource/mapper/WorkbasketAccessItemListMapper.java   | 3 ---
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResource.java
index 5356f568a..6836247c2 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResource.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResource.java
@@ -1,8 +1,11 @@
 package pro.taskana.rest.resource;
 
+import org.springframework.hateoas.core.Relation;
+
 /**
  * Resource class for a distribution target based on {@link pro.taskana.WorkbasketSummary}.
  */
+@Relation(collectionRelation = "distributionTargets")
 public class DistributionTargetResource extends WorkbasketSummaryResource {
 
 }
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 e488f3b22..cdb992ef4 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
@@ -3,10 +3,12 @@ package pro.taskana.rest.resource;
 import javax.validation.constraints.NotNull;
 
 import org.springframework.hateoas.ResourceSupport;
+import org.springframework.hateoas.core.Relation;
 
 /**
  * Resource class for {@link pro.taskana.WorkbasketAccessItem}.
  */
+@Relation(collectionRelation = "accessItems")
 public class WorkbasketAccessItemResource extends ResourceSupport {
 
     public String accessItemId;
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 433c0c3a8..088c1dbc8 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
@@ -3,12 +3,14 @@ package pro.taskana.rest.resource;
 import javax.validation.constraints.NotNull;
 
 import org.springframework.hateoas.ResourceSupport;
+import org.springframework.hateoas.core.Relation;
 
 import pro.taskana.WorkbasketType;
 
 /**
  * Resource class for {@link pro.taskana.WorkbasketSummary}.
  */
+@Relation(collectionRelation = "workbaskets")
 public class WorkbasketSummaryResource extends ResourceSupport {
 
     public String workbasketId;
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/mapper/DistributionTargetListMapper.java
index 18d9071c2..b9b42fb9a 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/mapper/DistributionTargetListMapper.java
@@ -34,9 +34,6 @@ public class DistributionTargetListMapper {
         distributionTargetListResource
             .add(linkTo(methodOn(WorkbasketController.class).getDistributionTargets(workbasketId))
                 .withSelfRel());
-        distributionTargetListResource
-            .add(linkTo(methodOn(WorkbasketController.class).getDistributionTargets(workbasketId))
-                .withRel("distributionTargetResourceList"));
         distributionTargetListResource
             .add(linkTo(methodOn(WorkbasketController.class).getWorkbasket(workbasketId))
                 .withRel("workbasket"));
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/mapper/WorkbasketAccessItemListMapper.java
index f5e2f64af..8b7c82533 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/mapper/WorkbasketAccessItemListMapper.java
@@ -41,9 +41,6 @@ public class WorkbasketAccessItemListMapper {
         accessItemListResource
             .add(linkTo(methodOn(WorkbasketController.class).getWorkbasketAccessItems(workbasketId))
                 .withSelfRel());
-        accessItemListResource
-            .add(linkTo(methodOn(WorkbasketController.class).getWorkbasketAccessItems(workbasketId))
-                .withRel("setWorkbasketAccessItemResourceList"));
         accessItemListResource
             .add(linkTo(methodOn(WorkbasketController.class).getWorkbasket(workbasketId))
                 .withRel("workbasket"));