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

Renames User resource classes

Browse Source
This commit is contained in:
Johannes Schnatterer
2018-06-21 10:24:02 +02:00
parent 26b3608c5d
commit 0df7156da0
8 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
View File

@@ -59,19 +59,19 @@ class ResourceLinks {
private final LinkBuilder userLinkBuilder;
private UserLinks(UriInfo uriInfo) {
userLinkBuilder = new LinkBuilder(uriInfo, UserV2Resource.class, UserSubResource.class);
userLinkBuilder = new LinkBuilder(uriInfo, UserRootResource.class, UserResource.class);
}
String self(String name) {
return userLinkBuilder.method("getUserSubResource").parameters(name).method("get").parameters().href();
return userLinkBuilder.method("getUserResource").parameters(name).method("get").parameters().href();
}
String delete(String name) {
return userLinkBuilder.method("getUserSubResource").parameters(name).method("delete").parameters().href();
return userLinkBuilder.method("getUserResource").parameters(name).method("delete").parameters().href();
}
String update(String name) {
return userLinkBuilder.method("getUserSubResource").parameters(name).method("update").parameters().href();
return userLinkBuilder.method("getUserResource").parameters(name).method("update").parameters().href();
}
}
@@ -83,7 +83,7 @@ class ResourceLinks {
private final LinkBuilder collectionLinkBuilder;
private UserCollectionLinks(UriInfo uriInfo) {
collectionLinkBuilder = new LinkBuilder(uriInfo, UserV2Resource.class, UserCollectionResource.class);
collectionLinkBuilder = new LinkBuilder(uriInfo, UserRootResource.class, UserCollectionResource.class);
}
String self() {

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapper.java
View File

@@ -36,8 +36,6 @@ public class UserCollectionToDtoMapper {
public UserCollectionToDtoMapper() {
}
public UserCollectionDto map(int pageNumber, int pageSize, PageResult<User> pageResult) {
NumberedPaging paging = zeroBasedNumberedPaging(pageNumber, pageSize, pageResult.hasMore());
List<UserDto> dtos = pageResult.getEntities().stream().map(userToDtoMapper::map).collect(Collectors.toList());

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

@@ -27,12 +27,12 @@ import java.util.Collection;
@Produces(VndMediaType.USER)
public class UserSubResource extends AbstractManagerResource<User, UserException> {
public class UserResource extends AbstractManagerResource<User, UserException> {
private final UserDtoToUserMapper dtoToUserMapper;
private final UserToUserDtoMapper userToDtoMapper;
@Inject
public UserSubResource(UserDtoToUserMapper dtoToUserMapper, UserToUserDtoMapper userToDtoMapper, UserManager manager) {
public UserResource(UserDtoToUserMapper dtoToUserMapper, UserToUserDtoMapper userToDtoMapper, UserManager manager) {
super(manager);
this.dtoToUserMapper = dtoToUserMapper;
this.userToDtoMapper = userToDtoMapper;

14
scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserV2Resource.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserRootResource.java
View File

@@ -4,17 +4,17 @@ import com.google.inject.Inject;
import javax.ws.rs.Path;
@Path(UserV2Resource.USERS_PATH_V2)
public class UserV2Resource {
@Path(UserRootResource.USERS_PATH_V2)
public class UserRootResource {
public static final String USERS_PATH_V2 = "v2/users/";
private final UserCollectionResource userCollectionResource;
private final UserSubResource userSubResource;
private final UserResource userResource;
@Inject
public UserV2Resource(UserCollectionResource userCollectionResource, UserSubResource userSubResource) {
public UserRootResource(UserCollectionResource userCollectionResource, UserResource userResource) {
this.userCollectionResource = userCollectionResource;
this.userSubResource = userSubResource;
this.userResource = userResource;
}
@Path("")
@@ -23,7 +23,7 @@ public class UserV2Resource {
}
@Path("{id}")
public UserSubResource getUserSubResource() {
return userSubResource;
public UserResource getUserResource() {
return userResource;
}
}

10
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ResourceLinksTest.java
View File

@@ -22,31 +22,31 @@ public class ResourceLinksTest {
@Test
public void shouldCreateCorrectUserSelfUrl() {
String url = user(uriInfo).self("ich");
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2 + "ich", url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserDeleteUrl() {
String url = user(uriInfo).delete("ich");
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2 + "ich", url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserUpdateUrl() {
String url = user(uriInfo).update("ich");
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2 + "ich", url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2 + "ich", url);
}
@Test
public void shouldCreateCorrectUserCreateUrl() {
String url = userCollection(uriInfo).create();
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2, url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2, url);
}
@Test
public void shouldCreateCorrectUserCollectionUrl() {
String url = userCollection(uriInfo).self();
assertEquals(BASE_URL + UserV2Resource.USERS_PATH_V2, url);
assertEquals(BASE_URL + UserRootResource.USERS_PATH_V2, url);
}
@Test

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapperTest.java
View File

@@ -48,7 +48,7 @@ public class UserCollectionToDtoMapperTest {
public void init() throws URISyntaxException {
initMocks(this);
URI baseUri = new URI("http://example.com/base/");
expectedBaseUri = baseUri.resolve(UserV2Resource.USERS_PATH_V2 + "/");
expectedBaseUri = baseUri.resolve(UserRootResource.USERS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri);
when(uriInfoStore.get()).thenReturn(uriInfo);
subjectThreadState.bind();

18
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserV2ResourceTest.java → scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
View File

@@ -43,7 +43,7 @@ import static org.mockito.MockitoAnnotations.initMocks;
password = "secret",
configuration = "classpath:sonia/scm/repository/shiro.ini"
)
public class UserV2ResourceTest {
public class UserRootResourceTest {
@Rule
public ShiroRule shiro = new ShiroRule();
@@ -78,17 +78,17 @@ public class UserV2ResourceTest {
userCollectionToDtoMapper = new UserCollectionToDtoMapper(userToDtoMapper, uriInfoStore);
UserCollectionResource userCollectionResource = new UserCollectionResource(userManager, dtoToUserMapper, userToDtoMapper, userCollectionToDtoMapper);
UserSubResource userSubResource = new UserSubResource(dtoToUserMapper, userToDtoMapper, userManager);
UserV2Resource userV2Resource = new UserV2Resource(userCollectionResource, userSubResource);
UserResource userResource = new UserResource(dtoToUserMapper, userToDtoMapper, userManager);
UserRootResource userRootResource = new UserRootResource(userCollectionResource, userResource);
dispatcher.getRegistry().addSingletonResource(userV2Resource);
dispatcher.getRegistry().addSingletonResource(userRootResource);
when(uriInfo.getBaseUri()).thenReturn(URI.create("/"));
when(uriInfoStore.get()).thenReturn(uriInfo);
}
@Test
public void shouldCreateFullResponseForAdmin() throws URISyntaxException {
MockHttpRequest request = MockHttpRequest.get("/" + UserV2Resource.USERS_PATH_V2 + "Neo");
MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
@@ -104,7 +104,7 @@ public class UserV2ResourceTest {
@Test
@SubjectAware(username = "unpriv")
public void shouldCreateLimitedResponseForSimpleUser() throws URISyntaxException {
MockHttpRequest request = MockHttpRequest.get("/" + UserV2Resource.USERS_PATH_V2);
MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2);
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
@@ -119,7 +119,7 @@ public class UserV2ResourceTest {
@Test
@SubjectAware(username = "unpriv")
public void shouldNotGetSingleUserForSimpleUser() throws URISyntaxException {
MockHttpRequest request = MockHttpRequest.get("/" + UserV2Resource.USERS_PATH_V2 + "Neo");
MockHttpRequest request = MockHttpRequest.get("/" + UserRootResource.USERS_PATH_V2 + "Neo");
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
@@ -133,7 +133,7 @@ public class UserV2ResourceTest {
byte[] userJson = Resources.toByteArray(url);
MockHttpRequest request = MockHttpRequest
.post("/" + UserV2Resource.USERS_PATH_V2)
.post("/" + UserRootResource.USERS_PATH_V2)
.contentType(VndMediaType.USER)
.content(userJson);
MockHttpResponse response = new MockHttpResponse();
@@ -150,7 +150,7 @@ public class UserV2ResourceTest {
@Test
public void shouldFailForMissingContent() throws URISyntaxException {
MockHttpRequest request = MockHttpRequest
.post("/" + UserV2Resource.USERS_PATH_V2)
.post("/" + UserRootResource.USERS_PATH_V2)
.contentType(VndMediaType.USER)
.content(new byte[] {});
MockHttpResponse response = new MockHttpResponse();

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
View File

@@ -42,7 +42,7 @@ public class UserToUserDtoMapperTest {
public void init() throws URISyntaxException {
initMocks(this);
URI baseUri = new URI("http://example.com/base/");
expectedBaseUri = baseUri.resolve(UserV2Resource.USERS_PATH_V2 + "/");
expectedBaseUri = baseUri.resolve(UserRootResource.USERS_PATH_V2 + "/");
when(uriInfo.getBaseUri()).thenReturn(baseUri);
when(uriInfoStore.get()).thenReturn(uriInfo);
subjectThreadState.bind();