Move new users resource to new package

scm-webapp/src/main/java/sonia/scm/ScmContextListener.java

@@ -43,7 +43,7 @@ import org.apache.shiro.guice.web.ShiroWebModule;
 import org.jboss.resteasy.plugins.guice.GuiceResteasyBootstrapServletContextListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.api.rest.resources.MapperModule;
+import sonia.scm.api.v2.resources.MapperModule;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.debug.DebugModule;
 import sonia.scm.filter.WebElementModule;

scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java

@@ -558,7 +558,7 @@ public abstract class AbstractManagerResource<T extends ModelObject,
    *
    * @return
    */
-  Collection<T> fetchItems(String sortby, boolean desc, int start,
+  protected Collection<T> fetchItems(String sortby, boolean desc, int start,
     int limit)
   {
     AssertUtil.assertPositive(start);

scm-webapp/src/main/java/sonia/scm/api/v2/resources/Link.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import lombok.Data;
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/LinkBuilder.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import com.google.common.collect.ImmutableList;
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import com.google.inject.AbstractModule;
 import org.mapstruct.factory.Mappers;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/User2UserDtoMapper.java

@@ -1,10 +1,11 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import org.apache.shiro.SecurityUtils;
 import org.mapstruct.AfterMapping;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
+import sonia.scm.api.rest.resources.UserResource;
 import sonia.scm.security.Role;
 import sonia.scm.user.User;
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -6,6 +6,7 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.ResponseHeader;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
+import sonia.scm.api.rest.resources.AbstractManagerResource;
 import sonia.scm.user.User;
 import sonia.scm.user.UserException;
 import sonia.scm.user.UserManager;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import lombok.Data;
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto2UserMapper.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import com.google.inject.Inject;
 import org.apache.shiro.authc.credential.PasswordService;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserNewResource.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -6,7 +6,7 @@ import com.google.inject.Singleton;
 import javax.ws.rs.Path;
 
 @Singleton
-@Path("usersnew")
+@Path("v2/users")
 public class UserNewResource {
 
   private final UserCollectionResource userCollectionResource;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java

@@ -1,10 +1,11 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import com.google.inject.Inject;
 import com.webcohesion.enunciate.metadata.rs.ResponseCode;
 import com.webcohesion.enunciate.metadata.rs.StatusCodes;
 import com.webcohesion.enunciate.metadata.rs.TypeHint;
 import org.apache.shiro.SecurityUtils;
+import sonia.scm.api.rest.resources.AbstractManagerResource;
 import sonia.scm.security.Role;
 import sonia.scm.user.User;
 import sonia.scm.user.UserException;

scm-webapp/src/test/java/sonia/scm/api/v2/resources/LinkBuilderTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import org.junit.Before;
 import org.junit.Test;

scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.support.SubjectThreadState;
@@ -6,6 +6,7 @@ import org.apache.shiro.util.ThreadState;
 import org.junit.Before;
 import org.junit.Test;
 import org.mapstruct.factory.Mappers;
+import sonia.scm.api.rest.resources.UserResource;
 import sonia.scm.user.User;
 
 import javax.ws.rs.core.UriInfo;
@@ -41,10 +42,10 @@ public class User2UserDtoMapperTest {
 
     UserDto userDto = mapper.userToUserDto(user, uriInfo);
 
-    assertEquals("expected map with self baseUri", baseUri.resolve("usersnew/abc"), userDto.getLinks().get("self").getHref());
-    assertEquals("expected map with delete baseUri", baseUri.resolve("usersnew/abc"), userDto.getLinks().get("delete").getHref());
-    assertEquals("expected map with update baseUri", baseUri.resolve("usersnew/abc"), userDto.getLinks().get("update").getHref());
-    assertEquals("expected map with create baseUri", baseUri.resolve("usersnew"), userDto.getLinks().get("create").getHref());
+    assertEquals("expected map with self baseUri", baseUri.resolve("v2/users/abc"), userDto.getLinks().get("self").getHref());
+    assertEquals("expected map with delete baseUri", baseUri.resolve("v2/users/abc"), userDto.getLinks().get("delete").getHref());
+    assertEquals("expected map with update baseUri", baseUri.resolve("v2/users/abc"), userDto.getLinks().get("update").getHref());
+    assertEquals("expected map with create baseUri", baseUri.resolve("v2/users"), userDto.getLinks().get("create").getHref());
   }
 
   @Test
@@ -55,7 +56,7 @@ public class User2UserDtoMapperTest {
 
     UserDto userDto = mapper.userToUserDto(user, uriInfo);
 
-    assertEquals("expected map with self baseUri", baseUri.resolve("usersnew/abc"), userDto.getLinks().get("self").getHref());
+    assertEquals("expected map with self baseUri", baseUri.resolve("v2/users/abc"), userDto.getLinks().get("self").getHref());
     assertNull("expected map without delete baseUri", userDto.getLinks().get("delete"));
     assertNull("expected map without update baseUri", userDto.getLinks().get("update"));
     assertNull("expected map without create baseUri", userDto.getLinks().get("create"));

scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserDto2UserMapperTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.api.rest.resources;
+package sonia.scm.api.v2.resources;
 
 import org.apache.shiro.authc.credential.PasswordService;
 import org.junit.Before;