Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reducing compiler warnings and adapting to redback changes

This commit is contained in:
Martin Stockhammer 2018-04-08 21:06:49 +02:00
parent 4175f2c2d7
commit ec8e6600ce
9 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
View File

@ -98,7 +98,7 @@ import java.util.Set;
public class DefaultArchivaConfiguration
implements ArchivaConfiguration, RegistryListener
{
private Logger log = LoggerFactory.getLogger( DefaultArchivaConfiguration.class );
private final Logger log = LoggerFactory.getLogger( DefaultArchivaConfiguration.class );
private static String FILE_ENCODING = "UTF-8";

4
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
View File

@ -46,9 +46,9 @@ public class ProxyConnectorSelectionPredicate
{
boolean satisfies = false;
if ( object instanceof ProxyConnectorConfiguration )
if ( object != null )
{
ProxyConnectorConfiguration connector = (ProxyConnectorConfiguration) object;
ProxyConnectorConfiguration connector = object;
return ( StringUtils.equals( sourceId, connector.getSourceRepoId() ) && StringUtils.equals( targetId,
connector.getTargetRepoId() ) );
}

1
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
View File

@ -212,7 +212,6 @@
<Import-Package>
javax.annotation,
javax.inject,
org.apache.archiva.admin.model*;version=${project.version},
org.apache.archiva.checksum;version=${project.version},
org.apache.archiva.common.utils;version=${project.version},
org.apache.archiva.configuration;version=${project.version},

1
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
View File

@ -157,7 +157,6 @@
<Import-Package>
javax.annotation,
javax.inject,
org.apache.archiva.admin.model*;version=${project.version},
org.apache.archiva.common.plexusbridge;version=${project.version},
org.apache.archiva.configuration;version=${project.version},
org.apache.archiva.consumers;version=${project.version},

4
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
View File

@ -33,10 +33,10 @@ import java.util.Date;
public class DefaultUrlFailureCache
implements UrlFailureCache
{
private Cache urlCache;
private Cache<String, Date> urlCache;
@Inject
public DefaultUrlFailureCache( @Named( "cache#url-failures-cache" ) Cache urlCache )
public DefaultUrlFailureCache( @Named( "cache#url-failures-cache" ) Cache<String, Date> urlCache )
{
this.urlCache = urlCache;
}

15
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java
View File

@ -195,7 +195,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
} catch (Throwable e) {
log.error("Could not initialize repositories from config: {}",e.getMessage(), e );
//noinspection unchecked
return Collections.EMPTY_MAP;
return Collections.emptyMap();
}
}
@ -209,6 +209,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
}
@SuppressWarnings( "unchecked" )
private void updateRepositoryReferences(RepositoryProvider provider, ManagedRepository repo, ManagedRepositoryConfiguration cfg, Configuration configuration) throws RepositoryException
{
log.debug("Updating references of repo {}",repo.getId());
@ -284,7 +285,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
if ( remoteRepoConfigs == null )
{
//noinspection unchecked
return Collections.EMPTY_MAP;
return Collections.emptyMap();
}
Map<String, RemoteRepository> remoteRepos = new LinkedHashMap<>( remoteRepoConfigs.size( ) );
@ -313,7 +314,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
} catch (Throwable e) {
log.error("Could not initialize remote repositories from config: {}", e.getMessage(), e);
//noinspection unchecked
return Collections.EMPTY_MAP;
return Collections.emptyMap();
}
}
@ -327,6 +328,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
}
@SuppressWarnings( "unchecked" )
private void updateRepositoryReferences( RepositoryProvider provider, RemoteRepository repo, RemoteRepositoryConfiguration cfg, Configuration configuration) throws RepositoryException
{
if ( repo instanceof EditableRemoteRepository && repo.getContent() == null)
@ -570,6 +572,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
* @return the new or updated repository
* @throws RepositoryException if the configuration cannot be saved or updated
*/
@SuppressWarnings( "unchecked" )
public ManagedRepository putRepository( ManagedRepositoryConfiguration managedRepositoryConfiguration, Configuration configuration) throws RepositoryException
{
rwLock.writeLock( ).lock( );
@ -751,6 +754,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
* @return the new or updated repository
* @throws RepositoryException if the configuration cannot be saved or updated
*/
@SuppressWarnings( "unchecked" )
public RemoteRepository putRepository( RemoteRepositoryConfiguration remoteRepositoryConfiguration, Configuration configuration) throws RepositoryException
{
rwLock.writeLock( ).lock( );
@ -791,6 +795,8 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
removeRepository(repo);
}
}
@SuppressWarnings( "unchecked" )
public void removeRepository(Repository repo) throws RepositoryException
{
if (repo instanceof RemoteRepository ) {
@ -946,6 +952,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
* @param repo
* @throws IndexUpdateFailedException
*/
@SuppressWarnings( "unchecked" )
public void resetIndexingContext(Repository repo) throws IndexUpdateFailedException {
if (repo.hasIndex() && repo instanceof EditableRepository) {
EditableRepository eRepo = (EditableRepository) repo;
@ -975,6 +982,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
return cloned;
}
@SuppressWarnings( "unchecked" )
public <T extends Repository> Repository clone(T repo, String newId) throws RepositoryException {
if (repo instanceof RemoteRepository ) {
return this.clone((RemoteRepository)repo, newId);
@ -1029,6 +1037,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
this.listeners.clear();
}
@SuppressWarnings( "unchecked" )
@Override
public <T> void raise(RepositoryEvent<T> event) {
if (event instanceof IndexCreationEvent ) {

2
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
View File

@ -73,7 +73,7 @@ public class DefaultRepositoryArchivaTaskScheduler
@Inject
@Named( value = "taskQueue#repository-scanning" )
private TaskQueue repositoryScanningQueue;
private TaskQueue<RepositoryTask> repositoryScanningQueue;
@Inject
private ArchivaConfiguration archivaConfiguration;

1
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
View File

@ -39,6 +39,7 @@ public class RepositoryTaskJob
* @param context
* @throws org.quartz.JobExecutionException
*/
@SuppressWarnings( "unchecked" )
@Override
public void execute( JobExecutionContext context )
throws JobExecutionException

12
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
View File

@ -270,7 +270,7 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
List<User> found = userManager.findUsersByEmailKey( emailKey, orderAscending );
List<? extends User> found = userManager.findUsersByEmailKey( emailKey, orderAscending );
if ( found != null )
{
users.addAll( found );
@ -287,7 +287,7 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
List<User> found = userManager.findUsersByFullNameKey( fullNameKey, orderAscending );
List<? extends User> found = userManager.findUsersByFullNameKey( fullNameKey, orderAscending );
if ( found != null )
{
users.addAll( found );
@ -304,7 +304,7 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
List<User> found = userManager.findUsersByQuery( query );
List<? extends User> found = userManager.findUsersByQuery( query );
if ( found != null )
{
users.addAll( found );
@ -321,7 +321,7 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
List<User> found = userManager.findUsersByUsernameKey( usernameKey, orderAscending );
List<? extends User> found = userManager.findUsersByUsernameKey( usernameKey, orderAscending );
if ( found != null )
{
users.addAll( found );
@ -344,7 +344,7 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
List<User> found = userManager.getUsers();
List<? extends User> found = userManager.getUsers();
if ( found != null )
{
users.addAll( found );
@ -361,7 +361,7 @@ public class ArchivaConfigurableUsersManager
for ( UserManager userManager : userManagerPerId.values() )
{
List<User> found = userManager.getUsers( orderAscending );
List<? extends User> found = userManager.getUsers( orderAscending );
if ( found != null )
{
users.addAll( found );