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

Fix Typo

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-28 17:01:51 +02:00
parent 861322ff9d
commit d29f9ea2d8
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ public abstract class AbstractManagerResource<T extends ModelObject,
catch (Exception ex)
{
logger.error("error during create", ex);
response = createErrorResonse(ex);
response = createErrorResponse(ex);
}
return response;
@@ -195,7 +195,7 @@ public abstract class AbstractManagerResource<T extends ModelObject,
catch (Exception ex)
{
logger.error("error during delete", ex);
response = createErrorResonse(ex);
response = createErrorResponse(ex);
}
}
@@ -227,13 +227,13 @@ public abstract class AbstractManagerResource<T extends ModelObject,
}
catch (AuthorizationException ex)
{
logger.warn("update not allowd", ex);
logger.warn("update not allowed", ex);
response = Response.status(Response.Status.FORBIDDEN).build();
}
catch (Exception ex)
{
logger.error("error during update", ex);
response = createErrorResonse(ex);
response = createErrorResponse(ex);
}
return response;
@@ -370,9 +370,9 @@ public abstract class AbstractManagerResource<T extends ModelObject,
*
* @return
*/
protected Response createErrorResonse(Throwable throwable)
protected Response createErrorResponse(Throwable throwable)
{
return createErrorResonse(Status.INTERNAL_SERVER_ERROR,
return createErrorResponse(Status.INTERNAL_SERVER_ERROR,
throwable.getMessage(), throwable);
}
@@ -385,9 +385,9 @@ public abstract class AbstractManagerResource<T extends ModelObject,
*
* @return
*/
protected Response createErrorResonse(Status status, Throwable throwable)
protected Response createErrorResponse(Status status, Throwable throwable)
{
return createErrorResonse(status, throwable.getMessage(), throwable);
return createErrorResponse(status, throwable.getMessage(), throwable);
}
/**
@@ -400,7 +400,7 @@ public abstract class AbstractManagerResource<T extends ModelObject,
*
* @return
*/
protected Response createErrorResonse(Status status, String message,
protected Response createErrorResponse(Status status, String message,
Throwable throwable)
{
return Response.status(status).entity(new RestExceptionResult(message,

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

@@ -42,12 +42,10 @@ 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.apache.shiro.authz.AuthorizationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.BlameResult;
import sonia.scm.repository.Branches;
@@ -76,13 +74,6 @@ import sonia.scm.util.HttpUtil;
import sonia.scm.util.IOUtil;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -101,7 +92,11 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.StreamingOutput;
import javax.ws.rs.core.UriInfo;
import org.apache.shiro.authz.AuthorizationException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
//~--- JDK imports ------------------------------------------------------------
/**
* Repository related RESTful Web Service Endpoint.
@@ -218,7 +213,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
catch (RepositoryException | IOException ex)
{
logger.error("error during create", ex);
response = createErrorResonse(ex);
response = createErrorResponse(ex);
}
}
else
@@ -823,7 +818,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
catch (Exception ex)
{
logger.error("could not retrive content", ex);
response = createErrorResonse(ex);
response = createErrorResponse(ex);
}
return response;
@@ -908,7 +903,7 @@ public class RepositoryResource extends AbstractManagerResource<Repository, Repo
catch (Exception ex)
{
logger.error("could not create diff", ex);
response = createErrorResonse(ex);
response = createErrorResponse(ex);
}
return response;