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

Merge branch 2.0.0-M3 into bugfix_illegal_sortby AGAIN

Browse Source
This commit is contained in:
Johannes Schnatterer
2018-07-04 13:18:31 +02:00
parent 537006e455 d1d183df32
commit 31c71e5d23
15 changed files with 84 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
View File

@@ -40,12 +40,13 @@ import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.io.Files;
import com.google.inject.Inject;
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 org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.NotSupportedFeatuerException;
import sonia.scm.Type;
import sonia.scm.api.rest.RestActionUploadResult;
@@ -65,26 +66,6 @@ import sonia.scm.repository.api.UnbundleCommandBuilder;
import sonia.scm.security.Role;
import sonia.scm.util.IOUtil;
import static com.google.common.base.Preconditions.*;
//~--- JDK imports ------------------------------------------------------------
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 java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.FormParam;
@@ -100,10 +81,22 @@ import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
//~--- JDK imports ------------------------------------------------------------
/**
* Rest resource for importing repositories.
@@ -564,10 +557,6 @@ public class RepositoryImportResource
{
handleGenericCreationFailure(ex, type, name);
}
catch (IOException ex)
{
handleGenericCreationFailure(ex, type, name);
}
return repository;
}
@@ -716,10 +705,6 @@ public class RepositoryImportResource
{
manager.delete(repository);
}
catch (IOException e)
{
logger.error("can not delete repository", e);
}
catch (RepositoryException e)
{
logger.error("can not delete repository", e);

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

@@ -210,9 +210,9 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
logger.warn("delete not allowed", ex);
response = Response.status(Response.Status.FORBIDDEN).build();
}
catch (RepositoryException | IOException ex)
catch (RepositoryException ex)
{
logger.error("error during create", ex);
logger.error("error during delete", ex);
response = createErrorResponse(ex);
}
}

23
scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
View File

@@ -51,7 +51,12 @@ import sonia.scm.util.CollectionAppender;
import sonia.scm.util.Util;
import java.io.IOException;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
//~--- JDK imports ------------------------------------------------------------
@@ -106,7 +111,7 @@ public class DefaultGroupManager extends AbstractGroupManager
* @throws IOException
*/
@Override
public void create(Group group) throws GroupException, IOException
public void create(Group group) throws GroupException
{
String type = group.getType();
@@ -127,7 +132,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (groupDAO.contains(name))
{
throw new GroupAlreadyExistsException(name.concat(" group already exists"));
throw new GroupAlreadyExistsException(name);
}
removeDuplicateMembers(group);
@@ -147,7 +152,7 @@ public class DefaultGroupManager extends AbstractGroupManager
* @throws IOException
*/
@Override
public void delete(Group group) throws GroupException, IOException
public void delete(Group group) throws GroupException
{
if (logger.isInfoEnabled())
{
@@ -166,7 +171,7 @@ public class DefaultGroupManager extends AbstractGroupManager
}
else
{
throw new GroupNotFoundException("user does not exists");
throw new GroupNotFoundException();
}
}
@@ -189,7 +194,7 @@ public class DefaultGroupManager extends AbstractGroupManager
* @throws IOException
*/
@Override
public void modify(Group group) throws GroupException, IOException
public void modify(Group group) throws GroupException
{
if (logger.isInfoEnabled())
{
@@ -212,7 +217,7 @@ public class DefaultGroupManager extends AbstractGroupManager
}
else
{
throw new GroupNotFoundException("group does not exists");
throw new GroupNotFoundException();
}
}
@@ -226,7 +231,7 @@ public class DefaultGroupManager extends AbstractGroupManager
* @throws IOException
*/
@Override
public void refresh(Group group) throws GroupException, IOException
public void refresh(Group group) throws GroupException
{
String name = group.getName();
if (logger.isInfoEnabled())
@@ -239,7 +244,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (fresh == null)
{
throw new GroupNotFoundException("group does not exists");
throw new GroupNotFoundException();
}
fresh.copyProperties(group);

10
scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
View File

@@ -139,7 +139,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
* @throws RepositoryException
*/
public void create(Repository repository, boolean initRepository)
throws RepositoryException, IOException {
throws RepositoryException {
logger.info("create repository {} of type {}", repository.getName(),
repository.getType());
@@ -174,7 +174,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
*/
@Override
public void create(Repository repository)
throws RepositoryException, IOException {
throws RepositoryException {
create(repository, true);
}
@@ -189,7 +189,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
*/
@Override
public void delete(Repository repository)
throws RepositoryException, IOException {
throws RepositoryException {
if (logger.isInfoEnabled()) {
logger.info("delete repository {} of type {}", repository.getName(),
repository.getType());
@@ -249,7 +249,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
*/
@Override
public void modify(Repository repository)
throws RepositoryException, IOException {
throws RepositoryException {
if (logger.isInfoEnabled()) {
logger.info("modify repository {} of type {}", repository.getName(),
repository.getType());
@@ -284,7 +284,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
*/
@Override
public void refresh(Repository repository)
throws RepositoryException, IOException {
throws RepositoryException {
AssertUtil.assertIsNotNull(repository);
RepositoryPermissions.read(repository).check();

6
scm-webapp/src/main/java/sonia/scm/repository/LastModifiedUpdateListener.java
View File

@@ -35,10 +35,8 @@ package sonia.scm.repository;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.EagerSingleton;
import sonia.scm.plugin.Extension;
import sonia.scm.web.security.AdministrationContext;
@@ -46,8 +44,6 @@ import sonia.scm.web.security.PrivilegedAction;
//~--- JDK imports ------------------------------------------------------------
import java.io.IOException;
/**
*
* @author Sebastian Sdorra
@@ -154,7 +150,7 @@ public final class LastModifiedUpdateListener
{
repositoryManager.modify(dbr);
}
catch (RepositoryException | IOException ex)
catch (RepositoryException ex)
{
logger.error("could not modify repository", ex);
}

16
scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
View File

@@ -137,7 +137,7 @@ public class DefaultUserManager extends AbstractUserManager
* @throws UserException
*/
@Override
public void create(User user) throws UserException, IOException
public void create(User user) throws UserException
{
String type = user.getType();
@@ -155,7 +155,7 @@ public class DefaultUserManager extends AbstractUserManager
if (userDAO.contains(user.getName()))
{
throw new UserAlreadyExistsException(user.getName().concat(" user already exists"));
throw new UserAlreadyExistsException(user.getName());
}
AssertUtil.assertIsValid(user);
@@ -175,7 +175,7 @@ public class DefaultUserManager extends AbstractUserManager
* @throws UserException
*/
@Override
public void delete(User user) throws UserException, IOException
public void delete(User user) throws UserException
{
if (logger.isInfoEnabled())
{
@@ -193,7 +193,7 @@ public class DefaultUserManager extends AbstractUserManager
}
else
{
throw new UserNotFoundException("user does not exists");
throw new UserNotFoundException();
}
}
@@ -224,7 +224,7 @@ public class DefaultUserManager extends AbstractUserManager
* @throws UserException
*/
@Override
public void modify(User user) throws UserException, IOException
public void modify(User user) throws UserException
{
String name = user.getName();
if (logger.isInfoEnabled())
@@ -245,7 +245,7 @@ public class DefaultUserManager extends AbstractUserManager
}
else
{
throw new UserNotFoundException("user does not exists");
throw new UserNotFoundException();
}
}
@@ -259,7 +259,7 @@ public class DefaultUserManager extends AbstractUserManager
* @throws UserException
*/
@Override
public void refresh(User user) throws UserException, IOException
public void refresh(User user) throws UserException
{
if (logger.isInfoEnabled())
{
@@ -271,7 +271,7 @@ public class DefaultUserManager extends AbstractUserManager
if (fresh == null)
{
throw new UserNotFoundException("user does not exists");
throw new UserNotFoundException();
}
fresh.copyProperties(user);