This commit is contained in:
Sebastian Sdorra
2016-12-07 22:28:06 +01:00
parent 2a6f51fa6d
commit 3709ce7602
11 changed files with 18 additions and 18 deletions

View File

@@ -39,7 +39,7 @@ package sonia.scm.group;
* *
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
public class GroupAllreadyExistExeption extends GroupException public class GroupAlreadyExistsException extends GroupException
{ {
/** Field description */ /** Field description */
@@ -50,7 +50,7 @@ public class GroupAllreadyExistExeption extends GroupException
* *
* @param message exception message * @param message exception message
*/ */
public GroupAllreadyExistExeption(String message) { public GroupAlreadyExistsException(String message) {
super(message); super(message);
} }
} }

View File

@@ -115,7 +115,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
if (directory.exists()) if (directory.exists())
{ {
throw new RepositoryAllreadyExistExeption(); throw new RepositoryAlreadyExistsException();
} }
checkPath(directory); checkPath(directory);
@@ -411,9 +411,9 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
* *
* @param directory repository target directory * @param directory repository target directory
* *
* @throws RepositoryAllreadyExistExeption * @throws RepositoryAlreadyExistsException
*/ */
private void checkPath(File directory) throws RepositoryAllreadyExistExeption private void checkPath(File directory) throws RepositoryAlreadyExistsException
{ {
File repositoryDirectory = config.getRepositoryDirectory(); File repositoryDirectory = config.getRepositoryDirectory();
File parent = directory.getParentFile(); File parent = directory.getParentFile();
@@ -432,7 +432,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
logger.error("parent path {} is a repository", parent); logger.error("parent path {} is a repository", parent);
} }
throw new RepositoryAllreadyExistExeption(); throw new RepositoryAlreadyExistsException();
} }
parent = parent.getParentFile(); parent = parent.getParentFile();

View File

@@ -37,7 +37,7 @@ package sonia.scm.repository;
* *
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
public class RepositoryAllreadyExistExeption extends RepositoryException public class RepositoryAlreadyExistsException extends RepositoryException
{ {
/** Field description */ /** Field description */

View File

@@ -41,7 +41,7 @@ import sonia.scm.util.Util;
* *
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
public class UserAllreadyExistException extends UserException public class UserAlreadyExistsException extends UserException
{ {
/** Field description */ /** Field description */
@@ -53,7 +53,7 @@ public class UserAllreadyExistException extends UserException
* Constructs ... * Constructs ...
* *
*/ */
public UserAllreadyExistException() {} public UserAlreadyExistsException() {}
/** /**
* Constructs ... * Constructs ...
@@ -62,7 +62,7 @@ public class UserAllreadyExistException extends UserException
* @param username * @param username
* @since 1.5 * @since 1.5
*/ */
public UserAllreadyExistException(String username) public UserAlreadyExistsException(String username)
{ {
super("user \"".concat(Util.nonNull(username)).concat( super("user \"".concat(Util.nonNull(username)).concat(
"\" allready exists")); "\" allready exists"));

View File

@@ -110,7 +110,7 @@ public abstract class RepositoryManagerTestBase
* @throws IOException * @throws IOException
* @throws RepositoryException * @throws RepositoryException
*/ */
@Test(expected = RepositoryAllreadyExistExeption.class) @Test(expected = RepositoryAlreadyExistsException.class)
public void testCreateExisting() throws RepositoryException, IOException public void testCreateExisting() throws RepositoryException, IOException
{ {
createTestRepository(); createTestRepository();

View File

@@ -96,7 +96,7 @@ public abstract class SimpleRepositoryHandlerTestBase extends AbstractTestBase
* @throws IOException * @throws IOException
* @throws RepositoryException * @throws RepositoryException
*/ */
@Test(expected = RepositoryAllreadyExistExeption.class) @Test(expected = RepositoryAlreadyExistsException.class)
public void testCreateExisitingRepository() public void testCreateExisitingRepository()
throws RepositoryException, IOException throws RepositoryException, IOException
{ {

View File

@@ -94,7 +94,7 @@ public abstract class UserManagerTestBase
* @throws IOException * @throws IOException
* @throws UserException * @throws UserException
*/ */
@Test(expected = UserAllreadyExistException.class) @Test(expected = UserAlreadyExistsException.class)
public void testCreateExisting() throws UserException, IOException public void testCreateExisting() throws UserException, IOException
{ {
User zaphod = UserTestData.createZaphod(); User zaphod = UserTestData.createZaphod();

View File

@@ -56,7 +56,7 @@ import sonia.scm.repository.AdvancedImportHandler;
import sonia.scm.repository.ImportHandler; import sonia.scm.repository.ImportHandler;
import sonia.scm.repository.ImportResult; import sonia.scm.repository.ImportResult;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryAllreadyExistExeption; import sonia.scm.repository.RepositoryAlreadyExistsException;
import sonia.scm.repository.RepositoryException; import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.RepositoryHandler; import sonia.scm.repository.RepositoryHandler;
import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.RepositoryManager;
@@ -551,7 +551,7 @@ public class RepositoryImportResource
repository = new Repository(null, type, name); repository = new Repository(null, type, name);
manager.create(repository); manager.create(repository);
} }
catch (RepositoryAllreadyExistExeption ex) catch (RepositoryAlreadyExistsException ex)
{ {
logger.warn("a {} repository with the name {} already exists", ex); logger.warn("a {} repository with the name {} already exists", ex);

View File

@@ -135,7 +135,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (groupDAO.contains(name)) if (groupDAO.contains(name))
{ {
throw new GroupAllreadyExistExeption(name.concat(" group already exists")); throw new GroupAlreadyExistsException(name.concat(" group already exists"));
} }
removeDuplicateMembers(group); removeDuplicateMembers(group);

View File

@@ -171,7 +171,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
if (repositoryDAO.contains(repository)) if (repositoryDAO.contains(repository))
{ {
throw new RepositoryAllreadyExistExeption(); throw new RepositoryAlreadyExistsException();
} }
repository.setId(keyGenerator.createKey()); repository.setId(keyGenerator.createKey());

View File

@@ -159,7 +159,7 @@ public class DefaultUserManager extends AbstractUserManager
if (userDAO.contains(user.getName())) if (userDAO.contains(user.getName()))
{ {
throw new UserAllreadyExistException(user.getName()); throw new UserAlreadyExistsException(user.getName());
} }
AssertUtil.assertIsValid(user); AssertUtil.assertIsValid(user);