From a2febcecd9aba01d5903525dbe32926866513e58 Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Mon, 2 Apr 2018 21:35:47 +0200 Subject: [PATCH] Generics and cleanup to reduce compiler warnings --- .../ArchivaConfigurationMRM789Test.java | 1 + .../ArchivaConfigurationTest.java | 1 + .../proxy/common/DefaultWagonFactory.java | 2 +- .../repository/StandardCapabilities.java | 2 +- .../repository/features/AbstractFeature.java | 2 +- .../repository/AbstractRepository.java | 2 ++ .../repository/RepositoryRegistry.java | 8 ++--- .../mock/RepositoryProviderMock.java | 1 + .../scanner/RepositoryScannerInstance.java | 5 +-- .../content/maven2/MavenContentProvider.java | 1 + .../maven2/MavenRemoteRepository.java | 1 + .../repository/cassandra/CassandraUtils.java | 8 ++--- .../file/FileMetadataRepository.java | 31 ++++++++----------- 13 files changed, 33 insertions(+), 32 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java index 5cc6617a9..eba0377c7 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java @@ -57,6 +57,7 @@ public class ArchivaConfigurationMRM789Test return Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), path ); } + @SuppressWarnings( "unchecked" ) protected T lookup( Class clazz, String hint ) { return (T) applicationContext.getBean( "archivaConfiguration#" + hint, ArchivaConfiguration.class ); diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java index e8af9a5af..a8dddadc5 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java @@ -63,6 +63,7 @@ public class ArchivaConfigurationTest return Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), path ); } + @SuppressWarnings( "unchecked" ) protected T lookup( Class clazz, String hint ) { return (T) applicationContext.getBean( "archivaConfiguration#" + hint, ArchivaConfiguration.class ); diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java index 417435029..975781306 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java +++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java @@ -85,7 +85,7 @@ public class DefaultWagonFactory { try { - Class clazz = wagon.getClass(); + Class clazz = wagon.getClass(); Method getHttpHeaders = clazz.getMethod( "getHttpHeaders" ); Properties headers = (Properties) getHttpHeaders.invoke( wagon ); diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/StandardCapabilities.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/StandardCapabilities.java index 0a41c0497..e61c67c85 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/StandardCapabilities.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/StandardCapabilities.java @@ -48,7 +48,7 @@ public class StandardCapabilities implements RepositoryCapabilities boolean indexable, boolean fileBased, boolean canBlockRedeployments, boolean scannable, boolean allowsFailover ) { - this.supportedReleaseSchemes = new HashSet(); + this.supportedReleaseSchemes = new HashSet<>(); for (ReleaseScheme scheme : supportedReleaseSchemes) { this.supportedReleaseSchemes.add(scheme); } diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/AbstractFeature.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/AbstractFeature.java index 2f5831fea..08d0bba4e 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/AbstractFeature.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/AbstractFeature.java @@ -56,7 +56,7 @@ public class AbstractFeature { this.listener.clear(); } - protected void raiseEvent(RepositoryEvent event) { + protected void raiseEvent(RepositoryEvent event) { for(RepositoryEventListener listr : listener) { listr.raise(event); } diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java index 448b1ba13..62d8168cc 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java @@ -182,6 +182,7 @@ public abstract class AbstractRepository implements EditableRepository, Reposito @Override public abstract RepositoryCapabilities getCapabilities( ); + @SuppressWarnings( "unchecked" ) @Override public > RepositoryFeature getFeature( Class clazz ) throws UnsupportedFeatureException { @@ -265,6 +266,7 @@ public abstract class AbstractRepository implements EditableRepository, Reposito this.schedulingDefinition = cronExpression; } + @SuppressWarnings( "unchecked" ) protected > void addFeature(RepositoryFeature feature) { featureMap.put( (Class>) feature.getClass(), feature); } diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java index f4e7ed66b..061133f1e 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java @@ -169,7 +169,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven if ( managedRepoConfigs == null ) { - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } Map managedRepos = new LinkedHashMap<>( managedRepoConfigs.size( ) ); @@ -332,9 +332,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven if ( repo instanceof EditableRemoteRepository && repo.getContent() == null) { EditableRemoteRepository editableRepo = (EditableRemoteRepository) repo; - if (repo.getContent()==null) { - editableRepo.setContent( repositoryContentFactory.getRemoteRepositoryContent( repo ) ); - } + editableRepo.setContent( repositoryContentFactory.getRemoteRepositoryContent( repo ) ); if (repo.supportsFeature(IndexCreationFeature.class) && repo.getIndexingContext()==null ) { createIndexingContext(editableRepo); } @@ -631,7 +629,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven } RemoteRepository originRepo = remoteRepositories.put( id, remoteRepository ); RemoteRepositoryConfiguration oldCfg=null; - RemoteRepositoryConfiguration newCfg=null; + RemoteRepositoryConfiguration newCfg; try { if (originRepo!=null) { diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java index 553471241..35490d367 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java @@ -144,6 +144,7 @@ public class RepositoryProviderMock implements RepositoryProvider return remoteRepository; } + @SuppressWarnings( "unchecked" ) @Override public void updateRemoteInstance( EditableRemoteRepository remoteRepository, RemoteRepositoryConfiguration configuration ) throws RepositoryException { diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java index cbe66d75f..302c623df 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java @@ -23,6 +23,7 @@ import org.apache.archiva.common.utils.BaseFile; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; +import org.apache.archiva.consumers.RepositoryContentConsumer; import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure; @@ -118,7 +119,7 @@ public class RepositoryScannerInstance stats = new RepositoryScanStatistics(); stats.setRepositoryId( repository.getId() ); - Closure triggerBeginScan = + Closure triggerBeginScan = new TriggerBeginScanClosure( repository, new Date( System.currentTimeMillis() ), true ); IterableUtils.forEach( knownConsumerList, triggerBeginScan ); @@ -240,7 +241,7 @@ public class RepositoryScannerInstance consumerProcessFile.setBasefile( basefile ); consumerWantsFile.setBasefile( basefile ); - Closure processIfWanted = IfClosure.ifClosure( consumerWantsFile, consumerProcessFile ); + Closure processIfWanted = IfClosure.ifClosure( consumerWantsFile, consumerProcessFile ); IterableUtils.forEach( this.knownConsumers, processIfWanted ); if ( consumerWantsFile.getWantedFileCount() <= 0 ) diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java index 423c4b17e..27e0592d7 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/MavenContentProvider.java @@ -105,6 +105,7 @@ public class MavenContentProvider implements RepositoryContentProvider return content; } + @SuppressWarnings( "unchecked" ) @Override public T createContent( Class clazz, V repository ) throws RepositoryException { diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java index 0dc66e182..1933554ac 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRemoteRepository.java @@ -84,6 +84,7 @@ public class MavenRemoteRepository extends AbstractRemoteRepository return CAPABILITIES; } + @SuppressWarnings( "unchecked" ) @Override public > RepositoryFeature getFeature( Class clazz ) throws UnsupportedFeatureException { diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java index ce2ab7c64..518104630 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java +++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java @@ -74,8 +74,8 @@ public class CassandraUtils return HFactory.createColumn( name, // value, // - (Serializer) SerializerTypeInferer.getSerializer( name ), // - (Serializer) SerializerTypeInferer.getSerializer( value ) ); + SerializerTypeInferer.getSerializer( name ), // + SerializerTypeInferer.getSerializer( value ) ); } public static String getStringValue( ColumnSlice columnSlice, ColumnNames columnName ) @@ -94,14 +94,14 @@ public class CassandraUtils return hColumn == null ? null : hColumn.getValue(); } - public static Long getLongValue( ColumnSlice columnSlice, String columnName ) + public static Long getLongValue( ColumnSlice columnSlice, String columnName ) { if ( StringUtils.isEmpty( columnName ) ) { return null; } - HColumn hColumn = (HColumn) columnSlice.getColumnByName( columnName ); + HColumn hColumn = columnSlice.getColumnByName( columnName ); return hColumn == null ? null : hColumn.getValue(); } diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java index 6f29d404c..a0b7a31fd 100644 --- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java +++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java @@ -149,7 +149,7 @@ public class FileMetadataRepository Properties properties = readOrCreateProperties( directory, PROJECT_VERSION_METADATA_KEY ); // remove properties that are not references or artifacts - for ( Object key : new ArrayList( properties.keySet() ) ) + for ( Object key : new ArrayList<>( properties.keySet() ) ) { String name = (String) key; if ( !name.contains( ":" ) && !name.equals( "facetIds" ) ) @@ -227,7 +227,7 @@ public class FileMetadataRepository i++; } - Set facetIds = new LinkedHashSet( versionMetadata.getFacetIds() ); + Set facetIds = new LinkedHashSet<>( versionMetadata.getFacetIds( ) ); facetIds.addAll( Arrays.asList( properties.getProperty( "facetIds", "" ).split( "," ) ) ); properties.setProperty( "facetIds", join( facetIds ) ); @@ -258,7 +258,7 @@ public class FileMetadataRepository List propsToRemove = new ArrayList<>(); for ( MetadataFacet facet : facetList ) { - for ( Object key : new ArrayList( properties.keySet() ) ) + for ( Object key : new ArrayList<>( properties.keySet() ) ) { String keyString = (String) key; if ( keyString.startsWith( prefix + facet.getFacetId() + ":" ) ) @@ -384,7 +384,7 @@ public class FileMetadataRepository { metadataFacet = metadataFacetFactory.createMetadataFacet( repositoryId, name ); Map map = new HashMap<>(); - for ( Object key : new ArrayList( properties.keySet() ) ) + for ( Object key : new ArrayList<>( properties.keySet() ) ) { String property = (String) key; map.put( property, properties.getProperty( property ) ); @@ -457,7 +457,7 @@ public class FileMetadataRepository { getArtifactsByDateRange( artifacts, repoId, ns, startTime, endTime ); } - Collections.sort( artifacts, new ArtifactComparator() ); + artifacts.sort(new ArtifactComparator() ); return artifacts; } catch ( MetadataResolutionException e ) @@ -577,7 +577,7 @@ public class FileMetadataRepository MetadataFacet facet = factory.createMetadataFacet(); String prefix = propertyPrefix + facet.getFacetId(); Map map = new HashMap<>(); - for ( Object key : new ArrayList( properties.keySet() ) ) + for ( Object key : new ArrayList<>( properties.keySet() ) ) { String property = (String) key; if ( property.startsWith( prefix ) ) @@ -726,7 +726,7 @@ public class FileMetadataRepository properties.remove( "artifact:facetIds:" + id ); String prefix = "artifact:facet:" + id + ":"; - for ( Object key : new ArrayList( properties.keySet() ) ) + for ( Object key : new ArrayList<>( properties.keySet() ) ) { String property = (String) key; if ( property.startsWith( prefix ) ) @@ -763,7 +763,7 @@ public class FileMetadataRepository properties.remove( "artifact:facetIds:" + id ); String prefix = "artifact:facet:" + id + ":"; - for ( Object key : new ArrayList( properties.keySet() ) ) + for ( Object key : new ArrayList<>( properties.keySet() ) ) { String property = (String) key; if ( property.startsWith( prefix ) ) @@ -928,7 +928,7 @@ public class FileMetadataRepository } properties.setProperty( "artifact:version:" + id, artifact.getVersion() ); - Set facetIds = new LinkedHashSet( artifact.getFacetIds() ); + Set facetIds = new LinkedHashSet<>( artifact.getFacetIds( ) ); String property = "artifact:facetIds:" + id; facetIds.addAll( Arrays.asList( properties.getProperty( property, "" ).split( "," ) ) ); properties.setProperty( property, join( facetIds ) ); @@ -1102,7 +1102,7 @@ public class FileMetadataRepository } else { - mailingList.setOtherArchives( Collections.emptyList() ); + mailingList.setOtherArchives( Collections.emptyList() ); } mailingList.setPostAddress( properties.getProperty( "mailingList." + i + ".post" ) ); mailingList.setSubscribeAddress( properties.getProperty( "mailingList." + i + ".subscribe" ) ); @@ -1159,7 +1159,7 @@ public class FileMetadataRepository { MetadataFacet facet = factory.createMetadataFacet(); Map map = new HashMap<>(); - for ( Object key : new ArrayList( properties.keySet() ) ) + for ( Object key : new ArrayList<>( properties.keySet() ) ) { String property = (String) key; if ( property.startsWith( facet.getFacetId() ) ) @@ -1195,7 +1195,7 @@ public class FileMetadataRepository Properties properties = readOrCreateProperties( directory, PROJECT_VERSION_METADATA_KEY ); - Set versions = new HashSet(); + Set versions = new HashSet<>( ); for ( Map.Entry entry : properties.entrySet() ) { String name = (String) entry.getKey(); @@ -1438,24 +1438,19 @@ public class FileMetadataRepository { for ( String version : getProjectVersions( repoId, ns, project ) ) { - for ( ArtifactMetadata artifact : getArtifacts( repoId, ns, project, version ) ) - { - artifacts.add( artifact ); - } + artifacts.addAll( getArtifacts( repoId, ns, project, version ) ); } } } @Override public List searchArtifacts( String text, String repositoryId, boolean exact ) - throws MetadataRepositoryException { throw new UnsupportedOperationException( "searchArtifacts not yet implemented in File backend" ); } @Override public List searchArtifacts( String key, String text, String repositoryId, boolean exact ) - throws MetadataRepositoryException { throw new UnsupportedOperationException( "searchArtifacts not yet implemented in File backend" ); } -- 2.39.5