Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 16:05:44 +01:00
Code Issues Packages Projects Releases Activity

Move new users resource to new package

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-01 08:56:11 +02:00
parent c7e59a4fbd
commit 9ac4c6744a
14 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
View File

@@ -43,7 +43,7 @@ import org.apache.shiro.guice.web.ShiroWebModule;
import org.jboss.resteasy.plugins.guice.GuiceResteasyBootstrapServletContextListener; import org.jboss.resteasy.plugins.guice.GuiceResteasyBootstrapServletContextListener;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; 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.cache.CacheManager;
import sonia.scm.debug.DebugModule; import sonia.scm.debug.DebugModule;
import sonia.scm.filter.WebElementModule; import sonia.scm.filter.WebElementModule;

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

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

2
scm-webapp/src/main/java/sonia/scm/api/rest/resources/Link.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/Link.java
View File

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

2
scm-webapp/src/main/java/sonia/scm/api/rest/resources/LinkBuilder.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/LinkBuilder.java
View File

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

2
scm-webapp/src/main/java/sonia/scm/api/rest/resources/MapperModule.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
View File

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

3
scm-webapp/src/main/java/sonia/scm/api/rest/resources/User2UserDtoMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/User2UserDtoMapper.java
View File

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

3
scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserCollectionResource.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
View File

@@ -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.Inject;
import com.google.inject.Singleton; 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.ResponseHeader;
import com.webcohesion.enunciate.metadata.rs.StatusCodes; import com.webcohesion.enunciate.metadata.rs.StatusCodes;
import com.webcohesion.enunciate.metadata.rs.TypeHint; import com.webcohesion.enunciate.metadata.rs.TypeHint;
import sonia.scm.api.rest.resources.AbstractManagerResource;
import sonia.scm.user.User; import sonia.scm.user.User;
import sonia.scm.user.UserException; import sonia.scm.user.UserException;
import sonia.scm.user.UserManager; import sonia.scm.user.UserManager;

2
scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserDto.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java
View File

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

2
scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserDto2UserMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto2UserMapper.java
View File

@@ -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.Inject;
import org.apache.shiro.authc.credential.PasswordService; import org.apache.shiro.authc.credential.PasswordService;

4
scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserNewResource.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserNewResource.java
View File

@@ -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.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@@ -6,7 +6,7 @@ import com.google.inject.Singleton;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@Singleton @Singleton
@Path("usersnew") @Path("v2/users")
public class UserNewResource { public class UserNewResource {
private final UserCollectionResource userCollectionResource; private final UserCollectionResource userCollectionResource;

3
scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserSubResource.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java
View File

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

2
scm-webapp/src/test/java/sonia/scm/api/rest/resources/LinkBuilderTest.java → scm-webapp/src/test/java/sonia/scm/api/v2/resources/LinkBuilderTest.java
View File

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

13
scm-webapp/src/test/java/sonia/scm/api/rest/resources/User2UserDtoMapperTest.java → scm-webapp/src/test/java/sonia/scm/api/v2/resources/User2UserDtoMapperTest.java
View File

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

2
scm-webapp/src/test/java/sonia/scm/api/rest/resources/UserDto2UserMapperTest.java → scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserDto2UserMapperTest.java
View File

@@ -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.apache.shiro.authc.credential.PasswordService;
import org.junit.Before; import org.junit.Before;