From 62759f798f597209ad34ebf3a93a57c09cb5e0c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 14 Jun 2018 11:03:40 +0200
Subject: [PATCH] Use class for resource links

---
 .../scm/api/v2/resources/GroupCollectionResource.java     | 8 ++++----
 .../main/java/sonia/scm/api/v2/resources/LinkBuilder.java | 8 ++++----
 .../scm/api/v2/resources/UserCollectionResource.java      | 7 ++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
index 8c5fa93751..36eaa2fdc3 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
@@ -20,8 +20,11 @@ import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import java.io.IOException;
+import java.net.URI;
 import java.util.Collection;
 
+import static sonia.scm.api.v2.resources.ResourceLinks.group;
+
 @Produces(VndMediaType.GROUP_COLLECTION)
 public class GroupCollectionResource extends AbstractManagerResource<Group, GroupException> {
   public static final int DEFAULT_PAGE_SIZE = 10;
@@ -54,11 +57,8 @@ public class GroupCollectionResource extends AbstractManagerResource<Group, Grou
   @Consumes(VndMediaType.GROUP)
   public Response create(@Context UriInfo uriInfo, GroupDto groupDto) throws IOException, GroupException {
     Group group = dtoToGroupMapper.map(groupDto);
-    System.out.println(group);
     manager.create(group);
-
-    LinkBuilder builder = new LinkBuilder(uriInfo, GroupV2Resource.class, GroupSubResource.class);
-    return Response.created(builder.method("getGroupSubResource").parameters(group.getName()).method("get").parameters().create()).build();
+    return Response.created(URI.create(group(uriInfo).self(group.getName()))).build();
   }
 
   @Override
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/LinkBuilder.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/LinkBuilder.java
index 4071dc9342..0a893e11e1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/LinkBuilder.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/LinkBuilder.java
@@ -38,14 +38,14 @@ class LinkBuilder {
     this.calls = calls;
   }
 
-  public Parameters method(String method) {
+  Parameters method(String method) {
     if (calls.size() >= classes.length) {
       throw new IllegalStateException("no more classes for methods");
     }
     return new Parameters(method);
   }
 
-  public URI create() {
+  URI create() {
     if (calls.size() < classes.length) {
       throw new IllegalStateException("not enough methods for all classes");
     }
@@ -56,7 +56,7 @@ class LinkBuilder {
     return absoluteUri;
   }
 
-  public String href() {
+  String href() {
     return create().toString();
   }
 
@@ -95,7 +95,7 @@ class LinkBuilder {
       this.method = method;
     }
 
-    public LinkBuilder parameters(String... parameters) {
+    LinkBuilder parameters(String... parameters) {
       return LinkBuilder.this.add(method, parameters);
     }
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index 4a82ad0254..fadbf2dd81 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -24,8 +24,11 @@ import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import java.io.IOException;
+import java.net.URI;
 import java.util.Collection;
 
+import static sonia.scm.api.v2.resources.ResourceLinks.user;
+
 @Produces(VndMediaType.USER_COLLECTION)
 public class UserCollectionResource extends AbstractManagerResource<User, UserException> {
   public static final int DEFAULT_PAGE_SIZE = 10;
@@ -87,9 +90,7 @@ public class UserCollectionResource extends AbstractManagerResource<User, UserEx
   public Response create(@Context UriInfo uriInfo, UserDto userDto) throws IOException, UserException {
     User user = dtoToUserMapper.map(userDto, "");
     manager.create(user);
-
-    LinkBuilder builder = new LinkBuilder(uriInfo, UserV2Resource.class, UserSubResource.class);
-    return Response.created(builder.method("getUserSubResource").parameters(user.getName()).method("get").parameters().create()).build();
+    return Response.created(URI.create(user(uriInfo).self(user.getName()))).build();
   }
 
   @Override