You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2014/04/11 23:53:56 UTC
[06/10] one move for all remaining override annotation
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java b/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java
index 47ca211..b741587 100644
--- a/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java
+++ b/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java
@@ -34,75 +34,89 @@ import java.util.List;
public class MockInvalidRepositoryContentConsumer
implements InvalidRepositoryContentConsumer
{
+ @Override
public String getId()
{
return "foo";
}
+ @Override
public String getDescription()
{
return "the foo";
}
+ @Override
public boolean isPermanent()
{
return false;
}
+ @Override
public void addConsumerMonitor( ConsumerMonitor monitor )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void removeConsumerMonitor( ConsumerMonitor monitor )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<String> getIncludes()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<String> getExcludes()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
throws ConsumerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void processFile( String path )
throws ConsumerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void processFile( String path, boolean executeOnEntireRepo )
throws Exception
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void completeScan()
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void completeScan( boolean executeOnEntireRepo )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isProcessUnmodified()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java
index 1210f13..2faac2a 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java
@@ -50,6 +50,7 @@ public class DefaultDataValidatorService
private RepositoryGroupAdmin repositoryGroupAdmin;
+ @Override
public Boolean managedRepositoryIdNotExists( String id )
throws ArchivaRestServiceException
{
@@ -60,7 +61,8 @@ public class DefaultDataValidatorService
catch ( RepositoryAdminException e )
{
throw new ArchivaRestServiceException( e.getMessage(), e );
- }
+ @Override
+ }
}
public Boolean remoteRepositoryIdNotExists( String id )
@@ -72,7 +74,8 @@ public class DefaultDataValidatorService
}
catch ( RepositoryAdminException e )
{
- throw new ArchivaRestServiceException( e.getMessage(), e );
+ throw new ArchivaRestServiceException( e.getMessa @Override
+ge(), e );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
index 936e159..4b97ab9 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
@@ -117,6 +117,7 @@ public class DefaultFileUploadService
return attachment == null ? "" : IOUtils.toString( attachment.getDataHandler().getInputStream() );
}
+ @Override
public FileMetadata post( MultipartBody multipartBody )
throws ArchivaRestServiceException
{
@@ -175,7 +176,8 @@ public class DefaultFileUploadService
fileMetadatas = new CopyOnWriteArrayList<FileMetadata>();
httpServletRequest.getSession().setAttribute( FILES_SESSION_KEY, fileMetadatas );
}
- return fileMetadatas;
+ return fileMeta @Override
+datas;
}
public Boolean deleteFile( String fileName )
@@ -193,7 +195,8 @@ public class DefaultFileUploadService
{
return file.delete();
}
- return Boolean.FALSE;
+ r @Override
+eturn Boolean.FALSE;
}
public Boolean clearUploadedFiles()
@@ -204,7 +207,8 @@ public class DefaultFileUploadService
{
deleteFile( new File( fileMetadata.getServerFileName() ).getPath() );
}
- getSessionFileMetadatas().clear();
+ getSessionFileMetadatas().cle @Override
+ar();
return Boolean.TRUE;
}
@@ -214,7 +218,8 @@ public class DefaultFileUploadService
List<FileMetadata> fileMetadatas =
(List<FileMetadata>) httpServletRequest.getSession().getAttribute( FILES_SESSION_KEY );
- return fileMetadatas == null ? Collections.<FileMetadata>emptyList() : fileMetadatas;
+ return fileMetadatas == null ? Collec @Override
+tions.<FileMetadata>emptyList() : fileMetadatas;
}
public Boolean save( String repositoryId, String groupId, String artifactId, String version, String packaging,
@@ -260,7 +265,8 @@ public class DefaultFileUploadService
// get from the session file with groupId/artifactId
- Iterable<FileMetadata> filesToAdd = Iterables.filter( fileMetadatas, new Predicate<FileMetadata>()
+ Iterable<FileMetadata> filesToAdd = Ite @Override
+rables.filter( fileMetadatas, new Predicate<FileMetadata>()
{
public boolean apply( FileMetadata fileMetadata )
{
@@ -279,7 +285,8 @@ public class DefaultFileUploadService
deleteFile( fileMetadata.getServerFileName() );
}
- filesToAdd = Iterables.filter( fileMetadatas, new Predicate<FileMetadata>()
+ @Override
+ filesToAdd = Iterables.filter( fileMetadatas, new Predicate<FileMetadata>()
{
public boolean apply( FileMetadata fileMetadata )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java
index 37a320a..e2c3478 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java
@@ -33,6 +33,7 @@ public class DefaultJavascriptLogger
{
private Logger logger = LoggerFactory.getLogger( getClass() );
+ @Override
public Boolean trace( JavascriptLog javascriptLog )
{
Logger toUse =
@@ -42,7 +43,8 @@ public class DefaultJavascriptLogger
return Boolean.TRUE;
}
toUse.trace( javascriptLog.getMessage() );
- return Boolean.TRUE;
+ return Boolean @Override
+.TRUE;
}
public Boolean debug( JavascriptLog javascriptLog )
@@ -56,7 +58,8 @@ public class DefaultJavascriptLogger
}
toUse.debug( javascriptLog.getMessage() );
- return Boolean.TRUE;
+ @Override
+return Boolean.TRUE;
}
public Boolean info( JavascriptLog javascriptLog )
@@ -69,7 +72,8 @@ public class DefaultJavascriptLogger
return Boolean.TRUE;
}
- toUse.info( javascriptLog.getMessage() );
+ toUse.info( javascriptLog.getMessage @Override
+() );
return Boolean.TRUE;
}
@@ -83,7 +87,8 @@ public class DefaultJavascriptLogger
return Boolean.TRUE;
}
- toUse.warn( javascriptLog.getMessage() );
+ toUse.warn( javascript @Override
+Log.getMessage() );
return Boolean.TRUE;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
index 7642411..2594551 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java
@@ -62,6 +62,7 @@ public class DefaultRuntimeInfoService
this.archivaRuntimeInfo = archivaRuntimeInfo;
}
+ @Override
public ApplicationRuntimeInfo getApplicationRuntimeInfo( String locale )
throws ArchivaRestServiceException
{
@@ -101,7 +102,8 @@ public class DefaultRuntimeInfoService
{
return req.getScheme() + "://" + req.getServerName() + ( req.getServerPort() == 80
? ""
- : ":" + req.getServerPort() ) + req.getContextPath();
+ : ":" + req.getServerPort() ) + req.getContextP @Override
+ath();
}
public Boolean logMissingI18n( String key )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
index ddbae53..3e639e0 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
@@ -93,6 +93,7 @@ public class RssFeedServlet
*/
private RepositorySessionFactory repositorySessionFactory;
+ @Override
public void init( ServletConfig servletConfig )
throws ServletException
{
@@ -102,7 +103,8 @@ public class RssFeedServlet
servletAuth = wac.getBean( ServletAuthenticator.class );
httpAuth = wac.getBean( "httpAuthenticator#basic", HttpAuthenticator.class );
// TODO: what if there are other types?
- repositorySessionFactory = wac.getBean( "repositorySessionFactory", RepositorySessionFactory.class );
+ repositorySessionFactory = wac.getBean( "repositorySessionFactory", RepositorySessionFactory.cl @Override
+ass );
}
public void doGet( HttpServletRequest req, HttpServletResponse res )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
index 43607e9..cd15b1e 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
@@ -46,6 +46,7 @@ public class ArchivaLdapConnectionFactory
private LdapConnectionConfiguration ldapConnectionConfiguration;
@PostConstruct
+ @Override
public void initialize()
{
try
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
index d2aae47..6fed380 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
@@ -64,6 +64,7 @@ public class ArchivaConfigurableUsersManager
private boolean useUsersCache;
@PostConstruct
+ @Override
public void initialize()
{
try
@@ -92,7 +93,8 @@ public class ArchivaConfigurableUsersManager
protected boolean useUsersCache()
{
- return this.useUsersCache;
+ return this.useUsers @Override
+Cache;
}
public User addUser( User user )
@@ -105,6 +107,7 @@ public class ArchivaConfigurableUsersManager
usersCache.put( user.getUsername(), user );
}
+ @Override
return user;
}
@@ -115,7 +118,8 @@ public class ArchivaConfigurableUsersManager
if ( useUsersCache() )
{
- usersCache.put( user.getUsername(), user );
+ usersCache.put( use @Override
+r.getUsername(), user );
}
}
@@ -142,14 +146,16 @@ public class ArchivaConfigurableUsersManager
}
if ( lastException != null && allFailed )
{
- throw new UserManagerException( lastException.getMessage(), lastException );
+ throw new UserManagerException( lastException.getMessage(), @Override
+ lastException );
}
return user;
}
public UserQuery createUserQuery()
{
- return userManagerPerId.values().iterator().next().createUserQuery();
+ return u @Override
+serManagerPerId.values().iterator().next().createUserQuery();
}
@@ -176,7 +182,8 @@ public class ArchivaConfigurableUsersManager
}
if ( lastException != null && allFailed )
{
- throw new UserManagerException( lastException.getMessage(), lastException );
+ throw new @Override
+UserManagerException( lastException.getMessage(), lastException );
}
}
@@ -235,7 +242,8 @@ public class ArchivaConfigurableUsersManager
{
throw (UserNotFoundException) lastException;
}
- throw new UserManagerException( lastException.getMessage(), lastException );
+ throw new UserManagerException( @Override
+lastException.getMessage(), lastException );
}
}
@@ -251,7 +259,8 @@ public class ArchivaConfigurableUsersManager
@Override
public User getGuestUser()
- throws UserNotFoundException, UserManagerException
+ @Override
+ throws UserNotFoundException, UserManagerException
{
return findUser( GUEST_USERNAME );
}
@@ -264,7 +273,8 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
List<User> found = userManager.findUsersByEmailKey( emailKey, orderAscending );
- if ( found != null )
+ i @Override
+f ( found != null )
{
users.addAll( found );
}
@@ -279,7 +289,8 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
- List<User> found = userManager.findUsersByFullNameKey( fullNameKey, orderAscending );
+ List<User> found = userManager.findUsersByFullNameKey( fullNameKey, orderAscending ); @Override
+
if ( found != null )
{
users.addAll( found );
@@ -295,7 +306,8 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
- List<User> found = userManager.findUsersByQuery( query );
+ List<User> found = userManager.findUsersByQ @Override
+uery( query );
if ( found != null )
{
users.addAll( found );
@@ -311,8 +323,10 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
- List<User> found = userManager.findUsersByUsernameKey( usernameKey, orderAscending );
- if ( found != null )
+ List<User> found = userManager.findUsersByUsernameKey( us @Override
+ernameKey, orderAscending );
+ if ( @Override
+found != null )
{
users.addAll( found );
}
@@ -331,7 +345,8 @@ public class ArchivaConfigurableUsersManager
List<User> users = new ArrayList<>();
for ( UserManager userManager : userManagerPerId.values() )
- {
+ @Override
+{
List<User> found = userManager.getUsers();
if ( found != null )
{
@@ -348,6 +363,7 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
+ @Override
List<User> found = userManager.getUsers( orderAscending );
if ( found != null )
{
@@ -357,7 +373,8 @@ public class ArchivaConfigurableUsersManager
return users;
}
- public boolean isReadOnly()
+ public boolean isReadOnly( @Override
+)
{
boolean readOnly = false;
@@ -372,7 +389,8 @@ public class ArchivaConfigurableUsersManager
throws UserNotFoundException, UserManagerException
{
- UserManager userManager = userManagerPerId.get( user.getUserManagerId() );
+ UserManager userManage @Override
+r = userManagerPerId.get( user.getUserManagerId() );
user = userManager.updateUser( user );
@@ -421,7 +439,8 @@ public class ArchivaConfigurableUsersManager
}
}
catch ( Exception e )
- {
+ @Override
+ {
lastException = e;
}
}
@@ -456,7 +475,8 @@ public class ArchivaConfigurableUsersManager
lastException = e;
}
}
- if ( lastException != null && allFailed )
+ if ( las @Override
+tException != null && allFailed )
{
throw new UserManagerException( lastException.getMessage(), lastException );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java
index ab87199..2ce5835 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java
@@ -52,6 +52,7 @@ public class ArchivaLdapRoleMapperConfiguration
@Named( value = "redbackRuntimeConfigurationAdmin#default" )
private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
+ @Override
public void addLdapMapping( String ldapGroup, List<String> roles )
throws MappingException
{
@@ -69,7 +70,8 @@ public class ArchivaLdapRoleMapperConfiguration
catch ( RepositoryAdminException e )
{
throw new MappingException( e.getMessage(), e );
- }
+ @Override
+ }
}
@@ -94,7 +96,8 @@ public class ArchivaLdapRoleMapperConfiguration
}
catch ( RepositoryAdminException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessa @Override
+ge(), e );
}
}
@@ -112,7 +115,8 @@ public class ArchivaLdapRoleMapperConfiguration
}
catch ( RepositoryAdminException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingExceptio @Override
+n( e.getMessage(), e );
}
}
@@ -143,7 +147,8 @@ public class ArchivaLdapRoleMapperConfiguration
}
catch ( RepositoryAdminException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new @Override
+MappingException( e.getMessage(), e );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
index 2b14fe2..8c1f4d7 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
@@ -89,6 +89,7 @@ public class ArchivaLockedAdminEnvironmentCheck
*
* @param violations
*/
+ @Override
public void validateEnvironment( List<String> violations )
{
if ( !checked )
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
index 8ecc97c..607d2da 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
@@ -100,7 +100,7 @@ public class ArchivaRbacManager
log.info( "use rbacManagerIds: '{}'", rbacManagerIds );
- this.rbacManagersPerId = new LinkedHashMap<String, RBACManager>( rbacManagerIds.size() );
+ this.rbacManagersPerId = new LinkedHashMap<>( rbacManagerIds.size() );
for ( String id : rbacManagerIds )
{
@@ -129,9 +129,11 @@ public class ArchivaRbacManager
return this.rbacManagersPerId.values().iterator().next();
}
+ @Override
public Role createRole( String name )
{
- return getRbacManagerForWrite().createRole( name );
+ return getRbacManagerForWrite().createRole( n @Override
+ame );
}
public Role saveRole( Role role )
@@ -158,6 +160,7 @@ public class ArchivaRbacManager
{
throw new RbacManagerException( lastException.getMessage(), lastException );
}
+ @Override
return role;
}
@@ -183,7 +186,8 @@ public class ArchivaRbacManager
}
if ( lastException != null && allFailed )
{
- throw new RbacManagerException( lastException.getMessage(), lastException );
+ throw new RbacManagerException( lastException.getMes @Override
+sage(), lastException );
}
}
@@ -217,7 +221,8 @@ public class ArchivaRbacManager
log.debug( "cannot find role for name: ‘{}", roleName );
if ( lastException != null )
{
- throw new RbacManagerException( lastException.getMessage(), lastException );
+ throw new RbacManagerException( lastException.getMessage(), @Override
+ lastException );
}
return null;
}
@@ -248,7 +253,8 @@ public class ArchivaRbacManager
if ( lastException != null && allFailed )
{
throw new RbacManagerException( lastException.getMessage(), lastException );
- }
+ @Override
+ }
return new ArrayList<>( allRoles.values() );
}
@@ -274,19 +280,22 @@ public class ArchivaRbacManager
if ( lastException != null && allFailed )
{
- throw new RbacManagerException( lastException.getMessage(), lastException );
+ throw new @Override
+RbacManagerException( lastException.getMessage(), lastException );
}
}
public Permission createPermission( String name )
- throws RbacManagerException
+ throws Rb @Override
+acManagerException
{
return getRbacManagerForWrite().createPermission( name );
}
public Permission createPermission( String name, String operationName, String resourceIdentifier )
throws RbacManagerException
- {
+ @Override
+ {
return getRbacManagerForWrite().createPermission( name, operationName, resourceIdentifier );
}
@@ -313,7 +322,8 @@ public class ArchivaRbacManager
if ( lastException != null && allFailed )
{
- throw new RbacManagerException( lastException.getMessage(), lastException );
+ @Override
+ throw new RbacManagerException( lastException.getMessage(), lastException );
}
return permission;
@@ -347,7 +357,8 @@ public class ArchivaRbacManager
}
}
- if ( lastException != null )
+ if ( lastException != null @Override
+ )
{
throw new RbacManagerException( lastException.getMessage(), lastException );
}
@@ -379,7 +390,8 @@ public class ArchivaRbacManager
if ( lastException != null && allFailed )
{
- throw new RbacManagerException( lastException.getMessage(), lastException );
+ @Override
+ throw new RbacManagerException( lastException.getMessage(), lastException );
}
return new ArrayList<>( allPermissions.values() );
}
@@ -401,12 +413,14 @@ public class ArchivaRbacManager
{
lastException = e;
}
- }
+ } @Override
+
if ( lastException != null && allFailed )
{
throw new RbacManagerException( lastException.getMessage(), lastException );
- }
+ @Override
+ }
}
public Operation createOperation( String name )
@@ -434,7 +448,8 @@ public class ArchivaRbacManager
{
lastException = e;
}
- }
+ @Override
+ }
if ( lastException != null && allFailed )
{
@@ -467,7 +482,8 @@ public class ArchivaRbacManager
}
catch ( Exception e )
{
- lastException = e;
+ lastExce @Override
+ption = e;
}
}
@@ -501,6 +517,7 @@ public class ArchivaRbacManager
}
}
+ @Override
if ( lastException != null && allFailed )
{
throw new RbacManagerException( lastException.getMessage(), lastException );
@@ -522,14 +539,16 @@ public class ArchivaRbacManager
allFailed = false;
}
catch ( Exception e )
- {
+ @Override
+ {
lastException = e;
}
}
if ( lastException != null && allFailed )
{
- throw new RbacManagerException( lastException.getMessage(), lastException );
+ throw new RbacMan @Override
+agerException( lastException.getMessage(), lastException );
}
}
@@ -554,7 +573,8 @@ public class ArchivaRbacManager
allFailed = false;
}
}
- catch ( Exception e )
+ catch ( Exception e ) @Override
+
{
lastException = e;
}
@@ -589,7 +609,8 @@ public class ArchivaRbacManager
return r;
}
}
- catch ( Exception e )
+ @Override
+ catch ( Exception e )
{
lastException = e;
}
@@ -620,7 +641,8 @@ public class ArchivaRbacManager
allFailed = false;
}
catch ( Exception e )
- {
+ @Override
+ {
lastException = e;
}
}
@@ -643,7 +665,8 @@ public class ArchivaRbacManager
{
rbacManager.removeResource( resource );
resourcesCache.remove( resource.getIdentifier() );
- allFailed = false;
+ @Override
+ allFailed = false;
}
catch ( Exception e )
{
@@ -651,7 +674,8 @@ public class ArchivaRbacManager
}
}
- if ( lastException != null && allFailed )
+ if ( lastException != null @Override
+&& allFailed )
{
throw new RbacManagerException( lastException.getMessage(), lastException );
}
@@ -676,7 +700,8 @@ public class ArchivaRbacManager
{
userAssignment = rbacManager.saveUserAssignment( userAssignment );
allFailed = false;
- }
+ @Override
+ }
}
catch ( Exception e )
{
@@ -768,7 +793,8 @@ public class ArchivaRbacManager
{
for ( RBACManager rbacManager : rbacManagersPerId.values() )
{
- try
+ @Override
+ try
{
boolean exists = rbacManager.userAssignmentExists( assignment );
if ( exists )
@@ -808,7 +834,8 @@ public class ArchivaRbacManager
}
allUserAssignments.put( ua.getPrincipal(), ua );
}
- allFailed = false;
+ allFai @Override
+led = false;
}
catch ( Exception e )
{
@@ -835,7 +862,8 @@ public class ArchivaRbacManager
{
List<UserAssignment> userAssignments = rbacManager.getUserAssignmentsForRoles( roleNames );
- allUserAssignments.addAll( userAssignments );
+ allUserAssignments.addAll( @Override
+userAssignments );
allFailed = false;
}
@@ -901,19 +929,22 @@ public class ArchivaRbacManager
}
catch ( Exception e )
{
- lastException = e;
+ @Override
+ lastException = e;
}
}
if ( lastException != null && allFailed )
{
- throw new RbacManagerException( lastException.getMessage(), lastException );
+ throw new RbacManagerException( lastException.getMe @Override
+ssage(), lastException );
}
return false;
}
@Override
- public boolean roleExists( Role role )
+ public b @Override
+oolean roleExists( Role role )
throws RbacManagerException
{
return roleExists( role.getName() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
index 4707c32..4d93253 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
@@ -34,7 +34,6 @@ import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
-import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,6 +91,7 @@ public class ArchivaUserManagerAuthenticator
}
+ @Override
public AuthenticationResult authenticate( AuthenticationDataSource ds )
throws AuthenticationException, AccountLockedException, MustChangePasswordException
{
@@ -214,11 +214,13 @@ public class ArchivaUserManagerAuthenticator
return new AuthenticationResult( authenticationSuccess, username, resultException, authnResultErrors );
}
+ @Override
public boolean supportsDataSource( AuthenticationDataSource source )
{
return ( source instanceof PasswordBasedAuthenticationDataSource );
}
+ @Override
public String getId()
{
return "ArchivaUserManagerAuthenticator";
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
index 8e00506..f823042 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
@@ -57,6 +57,7 @@ public class ArchivaStartup
private NexusIndexer nexusIndexer;
+ @Override
public void contextInitialized( ServletContextEvent contextEvent )
{
WebApplicationContext wac =
@@ -95,6 +96,7 @@ public class ArchivaStartup
}
}
+ @Override
public void contextDestroyed( ServletContextEvent contextEvent )
{
WebApplicationContext applicationContext =
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
index bf942cb..7a7c87d 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
@@ -96,6 +96,7 @@ public class SecuritySynchronization
return beans;
}
+ @Override
public void afterConfigurationChange( org.apache.archiva.redback.components.registry.Registry registry,
String propertyName, Object propertyValue )
{
@@ -105,7 +106,8 @@ public class SecuritySynchronization
{
syncRepoConfiguration( (String) propertyValue );
}
- }
+ @Override
+ }
}
public void beforeConfigurationChange( org.apache.archiva.redback.components.registry.Registry registry,
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java
index 2e35ba6..70ae9dd 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java
@@ -153,6 +153,7 @@ public abstract class AbstractDownloadTest
@After
+ @Override
public void tearDown()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
index 4775a88..14e5f1b 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
@@ -84,10 +84,12 @@ public class DownloadArtifactsTest
System.setProperty( "appserver.base", previousAppServerBase );
}
+ @Override
protected String getSpringConfigLocation()
{
return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml";
- }
+ } @Override
+
@Before
public void startServer()
@@ -122,7 +124,8 @@ public class DownloadArtifactsTest
redirectServer.setHandler( contextRedirect );
redirectServer.start();
this.redirectPort = redirectServer.getConnectors()[0].getLocalPort();
- log.info( "redirect server port {}", redirectPort );
+ log.info( "redirect server port {}", redirec @Override
+tPort );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java
index 40f3ed8..6eec7f8 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java
@@ -65,6 +65,7 @@ public class DownloadMergedIndexNonDefaultPathTest
System.setProperty( "appserver.base", previousAppServerBase );
}
+ @Override
protected String getSpringConfigLocation()
{
return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-merge-index-download.xml";
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
index 04c51fb..d338de5 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
@@ -70,6 +70,7 @@ public class DownloadMergedIndexTest
System.setProperty( "appserver.base", previousAppServerBase );
}
+ @Override
protected String getSpringConfigLocation()
{
return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-merge-index-download.xml";
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java
index 9b969ed..e53403e 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadSnapshotTest.java
@@ -62,6 +62,7 @@ public class DownloadSnapshotTest
System.setProperty( "appserver.base", previousAppServerBase );
}
+ @Override
protected String getSpringConfigLocation()
{
return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml";
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
index 8f7c5fb..1b15f06 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
@@ -58,6 +58,7 @@ public class RemoteRepositoryConnectivityCheckTest
System.setProperty( "appserver.base", previousAppServerBase );
}
+ @Override
protected String getSpringConfigLocation()
{
return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml";
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
index ae0750a..485d4a7 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
@@ -34,11 +34,13 @@ public class UserRepositoriesStub
{
private List<String> repoIds = Collections.singletonList( "test-repo" );
+ @Override
public void createMissingRepositoryRoles( String repoId )
throws ArchivaSecurityException
{
}
+ @Override
public List<String> getObservableRepositoryIds( String principal )
throws ArchivaSecurityException
{
@@ -50,17 +52,20 @@ public class UserRepositoriesStub
this.repoIds = repoIds;
}
+ @Override
public boolean isAuthorizedToUploadArtifacts( String principal, String repoId )
throws ArchivaSecurityException
{
return true;
}
+ @Override
public boolean isAuthorizedToDeleteArtifacts( String principal, String repoId )
{
return true;
}
+ @Override
public List<String> getManagableRepositoryIds( String principal )
throws ArchivaSecurityException
{
@@ -77,6 +82,7 @@ public class UserRepositoriesStub
this.repoIds = repoIds;
}
+ @Override
public List<ManagedRepository> getAccessibleRepositories( String principal )
throws ArchivaSecurityException, AccessDeniedException, PrincipalNotFoundException
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java
index 8cccde1..d3b9bb1 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java
@@ -32,89 +32,104 @@ import java.net.URL;
public class RoleManagerStub
implements RoleManager
{
+ @Override
public void loadRoleModel( URL resourceLocation )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void loadRoleModel( RedbackRoleModel model )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void createTemplatedRole( String templateId, String resource )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void removeTemplatedRole( String templateId, String resource )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void updateRole( String templateId, String oldResource, String newResource )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void assignRole( String roleId, String principal )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void assignRoleByName( String roleName, String principal )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void assignTemplatedRole( String templateId, String resource, String principal )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void unassignRole( String roleId, String principal )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void unassignRoleByName( String roleName, String principal )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean roleExists( String roleId )
throws RoleManagerException
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean templatedRoleExists( String templateId, String resource )
throws RoleManagerException
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public RedbackRoleModel getModel()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void verifyTemplatedRole( String templateID, String resource )
throws RoleManagerException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void initialize()
{
//To change body of implemented methods use File | Settings | File Templates.
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
index ef42aad..9641483 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
@@ -89,6 +89,7 @@ public class RssFeedServletTest
}
@Before
+ @Override
public void setUp()
throws Exception
{
@@ -113,6 +114,7 @@ public class RssFeedServletTest
}
@After
+ @Override
public void tearDown()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
index 20f624a..5a66698 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
@@ -63,6 +63,7 @@ public class SecuritySystemStub
repoIds.add( "test-repo" );
}
+ @Override
public SecuritySession authenticate( AuthenticationDataSource source )
throws AuthenticationException, UserNotFoundException, AccountLockedException
{
@@ -87,12 +88,14 @@ public class SecuritySystemStub
return session;
}
+ @Override
public AuthorizationResult authorize( SecuritySession arg0, String arg1 )
throws AuthorizationException
{
return null;
}
+ @Override
public AuthorizationResult authorize( SecuritySession arg0, String arg1, String arg2 )
throws AuthorizationException
{
@@ -111,11 +114,13 @@ public class SecuritySystemStub
return null;
}
+ @Override
public KeyManager getKeyManager()
{
return null;
}
+ @Override
public UserSecurityPolicy getPolicy()
{
return null;
@@ -126,201 +131,241 @@ public class SecuritySystemStub
return null;
}
+ @Override
public UserManager getUserManager()
{
return new UserManager()
{
+ @Override
public String getDescriptionKey()
{
return "French wine is better than Australian wine !";
}
+ @Override
public boolean isFinalImplementation()
{
return false;
}
+ @Override
public void initialize()
{
// no op
}
+ @Override
public boolean isReadOnly()
{
return false;
}
+ @Override
public String getId()
{
return null;
}
+ @Override
public void addUserManagerListener( UserManagerListener listener )
{
// no op
}
+ @Override
public void removeUserManagerListener( UserManagerListener listener )
{
// no op
}
+ @Override
public User createUser( String username, String fullName, String emailAddress )
{
return null;
}
+ @Override
public User createGuestUser()
{
return new User()
{
+ @Override
public String getUsername()
{
return "guest";
}
+ @Override
public void setUsername( String name )
{
}
+ @Override
public String getFullName()
{
return null;
}
+ @Override
public void setFullName( String name )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public String getEmail()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setEmail( String address )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public String getPassword()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setPassword( String rawPassword )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public String getEncodedPassword()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setEncodedPassword( String encodedPassword )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Date getLastPasswordChange()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setLastPasswordChange( Date passwordChangeDate )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<String> getPreviousEncodedPasswords()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setPreviousEncodedPasswords( List<String> encodedPasswordList )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void addPreviousEncodedPassword( String encodedPassword )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isPermanent()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setPermanent( boolean permanent )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isLocked()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setLocked( boolean locked )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isPasswordChangeRequired()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setPasswordChangeRequired( boolean changeRequired )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isValidated()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setValidated( boolean valid )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public int getCountFailedLoginAttempts()
{
return 0; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setCountFailedLoginAttempts( int count )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Date getAccountCreationDate()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setAccountCreationDate( Date date )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Date getLastLoginDate()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setLastLoginDate( Date date )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public String getUserManagerId()
{
return "mock";
@@ -328,32 +373,38 @@ public class SecuritySystemStub
};
}
+ @Override
public UserQuery createUserQuery()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<User> getUsers()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<User> getUsers( boolean orderAscending )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public User addUser( User user )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public User updateUser( User user )
throws UserNotFoundException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public User findUser( String username )
throws UserNotFoundException
{
@@ -367,157 +418,188 @@ public class SecuritySystemStub
return null;
}
+ @Override
public User getGuestUser()
throws UserNotFoundException
{
return new User()
{
+ @Override
public String getUsername()
{
return "guest";
}
+ @Override
public void setUsername( String name )
{
}
+ @Override
public String getFullName()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setFullName( String name )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public String getEmail()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setEmail( String address )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public String getPassword()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setPassword( String rawPassword )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public String getEncodedPassword()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setEncodedPassword( String encodedPassword )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Date getLastPasswordChange()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setLastPasswordChange( Date passwordChangeDate )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<String> getPreviousEncodedPasswords()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setPreviousEncodedPasswords( List<String> encodedPasswordList )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void addPreviousEncodedPassword( String encodedPassword )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isPermanent()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setPermanent( boolean permanent )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isLocked()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setLocked( boolean locked )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isPasswordChangeRequired()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setPasswordChangeRequired( boolean changeRequired )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isValidated()
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setValidated( boolean valid )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public int getCountFailedLoginAttempts()
{
return 0; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setCountFailedLoginAttempts( int count )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Date getAccountCreationDate()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setAccountCreationDate( Date date )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public Date getLastLoginDate()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void setLastLoginDate( Date date )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public String getUserManagerId()
{
return "mock";
@@ -525,47 +607,56 @@ public class SecuritySystemStub
};
}
+ @Override
public List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<User> findUsersByFullNameKey( String fullNameKey, boolean orderAscending )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<User> findUsersByEmailKey( String emailKey, boolean orderAscending )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public List<User> findUsersByQuery( UserQuery query )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean userExists( String principal )
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void deleteUser( String username )
throws UserNotFoundException
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void addUserUnchecked( User user )
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public void eraseDatabase()
{
//To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public User updateUser( User user, boolean passwordChangeRequired )
throws UserNotFoundException
{
@@ -574,18 +665,21 @@ public class SecuritySystemStub
};
}
+ @Override
public boolean isAuthenticated( AuthenticationDataSource arg0 )
throws AuthenticationException, UserNotFoundException, AccountLockedException
{
return false;
}
+ @Override
public boolean isAuthorized( SecuritySession arg0, String arg1 )
throws AuthorizationException
{
return false;
}
+ @Override
public boolean isAuthorized( SecuritySession arg0, String arg1, String arg2 )
throws AuthorizationException
{
@@ -597,6 +691,7 @@ public class SecuritySystemStub
return false;
}
+ @Override
public boolean userManagerReadOnly()
{
return true;
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
index 940fa6e..855f600 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
@@ -74,97 +74,118 @@ public class TestMetadataRepository
versions.add( projectVersion );
}
+ @Override
public ProjectMetadata getProject( String repoId, String namespace, String projectId )
{
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationExcept @Override
+ion();
}
public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId,
String projectVersion )
{
- throw new UnsupportedOperationException();
+ throw new UnsupportedO @Override
+perationException();
}
public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId,
String projectVersion )
{
- throw new UnsupportedOperationException();
+ throw ne @Override
+w UnsupportedOperationException();
}
public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId,
String projectVersion )
{
- throw new UnsupportedOperationException();
+ @Override
+ throw new UnsupportedOperationException();
}
- public Collection<String> getRootNamespaces( String repoId )
+ public Collection<String> getRootNamespaces( String rep @Override
+oId )
{
throw new UnsupportedOperationException();
}
- public Collection<String> getNamespaces( String repoId, String namespace )
+ public Collection<String> getNamespaces( String repoId, @Override
+ String namespace )
{
throw new UnsupportedOperationException();
}
- public Collection<String> getProjects( String repoId, String namespace )
+ public Collection<String> getProjects( @Override
+String repoId, String namespace )
{
throw new UnsupportedOperationException();
}
- public Collection<String> getProjectVersions( String repoId, String namespace, String projectId )
+ public Collection<String @Override
+> getProjectVersions( String repoId, String namespace, String projectId )
{
return versions;
}
- public void updateProject( String repoId, ProjectMetadata project )
+ public @Override
+ void updateProject( String repoId, ProjectMetadata project )
{
throw new UnsupportedOperationException();
}
- public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion,
+ public void updateArtifact( String repoId, String namespace, String projectId, String proj @Override
+ectVersion,
ArtifactMetadata artifactMeta )
{
throw new UnsupportedOperationException();
}
- public void updateProjectVersion( String repoId, String namespace, String projectId,
+ public void updateProjectVersion( String repoId, String namespace, String @Override
+projectId,
ProjectVersionMetadata versionMetadata )
{
- throw new UnsupportedOperationException();
+ throw new Uns @Override
+upportedOperationException();
}
public void updateNamespace( String repoId, String namespace )
{
- throw new UnsupportedOperationException();
+ @Override
+ throw new UnsupportedOperationException();
}
public List<String> getMetadataFacets( String repodId, String facetId )
{
- return Collections.emptyList();
+ r @Override
+eturn Collections.emptyList();
}
public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name )
- {
+ @Override
+ {
throw new UnsupportedOperationException();
}
- public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet )
+ public void addMetadataFacet( String repositoryId, MetadataFa @Override
+cet metadataFacet )
{
throw new UnsupportedOperationException();
}
public void removeMetadataFacets( String repositoryId, String facetId )
{
- throw new UnsupportedOperationException();
+ @Override
+ throw new UnsupportedOperationException();
}
- public void removeMetadataFacet( String repoId, String facetId, String name )
+ public void removeMetadataFacet( String repoId, String facetId, Strin @Override
+g name )
{
//To change body of implemented methods use File | Settings | File Templates.
- }
+ @Override
+ }
public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime )
+ @Override
{
return artifacts;
}
@@ -174,35 +195,45 @@ public class TestMetadataRepository
return Collections.singletonList( TEST_REPO );
}
- public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum )
+ public @Override
+ List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum )
{
return null;
}
public void removeArtifact( String repositoryId, String namespace, String project, String version, String id )
{
- throw new UnsupportedOperationException();
+ throw new Unsu @Override
+pportedOperationException();
}
- public void removeArtifact( String repositoryId, String namespace, String project, String version,
+ public void removeArtifact( String repositoryId, String name @Override
+space, String project, String version,
MetadataFacet metadataFacet )
throws MetadataRepositoryException
{
throw new UnsupportedOperationException();
}
- public void removeRepository( String repoId )
+ @Override
+ public void remove @Override
+Repository( String repo @Override
+Id )
{
throw new UnsupportedOperationException();
}
- public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId,
- String projectVersion )
+ pu @Override
+blic Collection<ArtifactMetadata> getArtifacts( String repoId, String names @Override
+pace, String projectId,
+ @Override
+ String projectVersion )
{
return artifacts;
}
- public void save()
+ public void save() @Override
+
{
}
@@ -215,14 +246,16 @@ public class TestMetadataRepository
throw new UnsupportedOperationException();
}
- public boolean canObtainAccess( Class<?> aClass )
+ public boolean canObtainAccess( Class @Override
+<?> aClass )
{
return false;
}
public <T>T obtainAccess( Class<T> aClass )
{
- return null;
+ return @Override
+ null;
}
public List<ArtifactMetadata> getArtifacts( String repositoryId )
@@ -230,13 +263,15 @@ public class TestMetadataRepository
return artifacts;
}
- public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion )
+ public void removeArtifact( A @Override
+rtifactMetadata artifactMetadata, String baseVersion )
throws MetadataRepositoryException
{
throw new UnsupportedOperationException();
}
- public void removeNamespace( String repositoryId, String namespace )
+ public void remov @Override
+eNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java
index e5a06f5..b0edd24 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataResolver.java
@@ -49,12 +49,14 @@ public class TestMetadataResolver
private Map<String, Collection<String>> versionsInProject = new HashMap<>();
+ @Override
public ProjectVersionMetadata resolveProjectVersion( RepositorySession repositorySession, String repoId,
String namespace, String projectId, String projectVersion )
{
return projectVersions.get( createMapKey( repoId, namespace, projectId, projectVersion ) );
}
+ @Override
public Collection<ProjectVersionReference> resolveProjectReferences( RepositorySession repositorySession,
String repoId, String namespace,
String projectId, String projectVersion )
@@ -64,11 +66,13 @@ public class TestMetadataResolver
return projectVersionReferences;
}
+ @Override
public Collection<String> resolveRootNamespaces( RepositorySession repositorySession, String repoId )
{
return resolveNamespaces( repositorySession, repoId, null );
}
+ @Override
public Collection<String> resolveNamespaces( RepositorySession repositorySession, String repoId,
String baseNamespace )
{
@@ -92,12 +96,14 @@ public class TestMetadataResolver
return namespaces;
}
+ @Override
public Collection<String> resolveProjects( RepositorySession repositorySession, String repoId, String namespace )
{
Collection<String> list = projectsInNamespace.get( namespace );
return list != null ? list : Collections.<String>emptyList();
}
+ @Override
public Collection<String> resolveProjectVersions( RepositorySession repositorySession, String repoId,
String namespace, String projectId )
{
@@ -105,6 +111,7 @@ public class TestMetadataResolver
return list != null ? list : Collections.<String>emptyList();
}
+ @Override
public Collection<ArtifactMetadata> resolveArtifacts( RepositorySession repositorySession, String repoId,
String namespace, String projectId, String projectVersion )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java
index ff159f4..0e10a52 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java
@@ -36,6 +36,7 @@ public class TestRepositorySessionFactory
this.repositorySession = repositorySession;
}
+ @Override
public RepositorySession createSession()
{
return repositorySession != null ? repositorySession : new RepositorySession( new TestMetadataRepository(),