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

use collection instead of arrays

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-12-27 17:41:58 +01:00
parent c1e1695e28
commit f1a3f8885c
8 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
View File

@@ -204,8 +204,7 @@ public class ScmServletModule extends ServletModule
* params.put("com.sun.jersey.config.feature.Trace", "true");
* params.put("com.sun.jersey.config.feature.TracePerRequest", "true");
*/
params.put(JSONConfiguration.FEATURE_POJO_MAPPING,
Boolean.TRUE.toString());
params.put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE.toString());
params.put(ResourceConfig.FEATURE_REDIRECT, Boolean.TRUE.toString());
params.put(ServletContainer.RESOURCE_CONFIG_CLASS,
UriExtensionsConfig.class.getName());

11
scm-webapp/src/main/java/sonia/scm/api/rest/JsonJaxbContextResolver.java
View File

@@ -71,12 +71,11 @@ public class JsonJaxbContextResolver implements ContextResolver<JAXBContext>
*/
public JsonJaxbContextResolver() throws Exception
{
this.context = new JSONJAXBContext(
JSONConfiguration.mapped().rootUnwrapping(true).arrays(
"member", "groups", "permissions", "repositories", "repositoryTypes",
"users", "plugin-information").nonStrings(
"readable", "writeable", "groupPermission",
"admin").build(), types.toArray(new Class[0]));
this.context =
new JSONJAXBContext(JSONConfiguration.mapped().arrays("member", "groups",
"permissions", "repositories", "repositoryTypes", "users",
"plugin-information").nonStrings("readable", "writeable",
"groupPermission", "admin").build(), types.toArray(new Class[0]));
}
//~--- get methods ----------------------------------------------------------

5
scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractResource.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.api.rest.resources;
//~--- JDK imports ------------------------------------------------------------
import java.util.Collection;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
@@ -97,7 +98,7 @@ public abstract class AbstractResource<T>
*
* @return
*/
protected abstract T[] getAllItems();
protected abstract Collection<T> getAllItems();
/**
* Method description
@@ -248,7 +249,7 @@ public abstract class AbstractResource<T>
*/
@GET
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public T[] getAll()
public Collection<T> getAll()
{
return getAllItems();
}

6
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
View File

@@ -144,11 +144,9 @@ public class RepositoryResource extends AbstractResource<Repository>
* @return
*/
@Override
protected Repository[] getAllItems()
protected Collection<Repository> getAllItems()
{
Collection<Repository> repositoryCollection = repositoryManager.getAll();
Repository[] repositories =
repositoryCollection.toArray(new Repository[repositoryCollection.size()]);
Collection<Repository> repositories = repositoryManager.getAll();
for (Repository repository : repositories)
{

17
scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java
View File

@@ -149,24 +149,15 @@ public class UserResource extends AbstractResource<User>
* @return
*/
@Override
protected User[] getAllItems()
protected Collection<User> getAllItems()
{
User[] users = null;
Collection<User> userCollection = userManager.getAll();
Collection<User> users = userManager.getAll();
if (Util.isNotEmpty(userCollection))
if (Util.isNotEmpty(users))
{
int size = userCollection.size();
users = new User[size];
int i = 0;
for (User u : userCollection)
for (User u : users)
{
u.setPassword(DUMMY_PASSWORT);
users[i] = u;
i++;
}
}