some java 7 sugar syntax
Signed-off-by: olivier lamy <olamy@apache.org>
diff --git a/indexer-core/src/main/java/org/apache/maven/index/AbstractMultiArtifactInfoFilter.java b/indexer-core/src/main/java/org/apache/maven/index/AbstractMultiArtifactInfoFilter.java
index 9508e2c..e0e5e9a 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/AbstractMultiArtifactInfoFilter.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/AbstractMultiArtifactInfoFilter.java
@@ -44,7 +44,7 @@
}
else
{
- this.filters = new ArrayList<ArtifactInfoFilter>( filters );
+ this.filters = new ArrayList<>( filters );
}
}
diff --git a/indexer-core/src/main/java/org/apache/maven/index/AbstractSearchRequest.java b/indexer-core/src/main/java/org/apache/maven/index/AbstractSearchRequest.java
index 85fa50d..a93b29d 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/AbstractSearchRequest.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/AbstractSearchRequest.java
@@ -96,7 +96,7 @@
{
if ( contexts == null )
{
- contexts = new ArrayList<IndexingContext>();
+ contexts = new ArrayList<>();
}
return contexts;
@@ -192,7 +192,7 @@
{
if ( matchHighlightRequests == null )
{
- matchHighlightRequests = new ArrayList<MatchHighlightRequest>();
+ matchHighlightRequests = new ArrayList<>();
}
return matchHighlightRequests;
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
index bd148a6..80ed236 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
@@ -59,7 +59,7 @@
private final Gav gav;
- private final List<Exception> errors = new ArrayList<Exception>();
+ private final List<Exception> errors = new ArrayList<>();
public ArtifactContext( File pom, File artifact, File metadata, ArtifactInfo artifactInfo, Gav gav )
throws IllegalArgumentException
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
index 277eda9..cadd0ad 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
@@ -332,7 +332,7 @@
private final Map<String, String> attributes = new HashMap<String, String>();
- private final List<MatchHighlight> matchHighlights = new ArrayList<MatchHighlight>();
+ private final List<MatchHighlight> matchHighlights = new ArrayList<>();
private final transient VersionScheme versionScheme;
@@ -437,7 +437,7 @@
return result.toString();
}
- private static final List<Field> DEFAULT_FIELDS = new ArrayList<Field>();
+ private static final List<Field> DEFAULT_FIELDS = new ArrayList<>();
static
{
DEFAULT_FIELDS.add( MAVEN.GROUP_ID );
@@ -458,7 +458,7 @@
{
if ( fields == null )
{
- fields = new ArrayList<Field>( DEFAULT_FIELDS.size() );
+ fields = new ArrayList<>( DEFAULT_FIELDS.size() );
fields.addAll( DEFAULT_FIELDS );
}
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
index d8d7120..c6a4e58 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
@@ -111,7 +111,7 @@
this.matchHighlightRequests = request.getMatchHighlightRequests();
- List<MatchHighlightRequest> matchHighlightRequests = new ArrayList<MatchHighlightRequest>();
+ List<MatchHighlightRequest> matchHighlightRequests = new ArrayList<>();
for ( MatchHighlightRequest hr : request.getMatchHighlightRequests() )
{
Query rewrittenQuery = hr.getQuery().rewrite( indexSearcher.getIndexReader() );
@@ -403,7 +403,7 @@
TextFragment[] frag;
// Get text
- ArrayList<String> fragTexts = new ArrayList<String>( maxNumFragments );
+ ArrayList<String> fragTexts = new ArrayList<>( maxNumFragments );
try
{
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
index 6da05f2..8767dbf 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java
@@ -60,7 +60,7 @@
private final Set<String> groups = new HashSet<String>();
- private final List<Exception> exceptions = new ArrayList<Exception>();
+ private final List<Exception> exceptions = new ArrayList<>();
private int count = 0;
diff --git a/indexer-core/src/main/java/org/apache/maven/index/Field.java b/indexer-core/src/main/java/org/apache/maven/index/Field.java
index b7b1c93..bd8e816 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/Field.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/Field.java
@@ -48,7 +48,7 @@
this.description = description;
- this.indexerFields = new ArrayList<IndexerField>();
+ this.indexerFields = new ArrayList<>();
}
public Field getParent()
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ScanningResult.java b/indexer-core/src/main/java/org/apache/maven/index/ScanningResult.java
index d538f67..c1a29aa 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ScanningResult.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ScanningResult.java
@@ -33,7 +33,7 @@
private int deletedFiles = 0;
- private List<Exception> exceptions = new ArrayList<Exception>();
+ private List<Exception> exceptions = new ArrayList<>();
private final ScanningRequest request;
diff --git a/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java b/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java
index 60e605a..de1285e 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java
@@ -56,6 +56,6 @@
@Override
protected List<IndexingContext> getIndexingContexts()
{
- return new ArrayList<IndexingContext>( nexusIndexer.getIndexingContexts().values() );
+ return new ArrayList<>( nexusIndexer.getIndexingContexts().values() );
}
}
diff --git a/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java b/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
index a6b8b9a..bef2f2c 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
@@ -100,7 +100,7 @@
// If we have local properties, will parse and see what we need to download
if ( canRetrieveAllChunks( localProperties, remoteProperties ) )
{
- filenames = new ArrayList<String>();
+ filenames = new ArrayList<>();
int maxCounter = Integer.parseInt( remoteProperties.getProperty( IndexingContext.INDEX_CHUNK_COUNTER ) );
int currentCounter = Integer.parseInt( localProperties.getProperty( IndexingContext.INDEX_CHUNK_COUNTER ) );
@@ -156,7 +156,7 @@
private List<Integer> getIndexChunk( IndexPackingRequest request, Date timestamp )
throws IOException
{
- final List<Integer> chunk = new ArrayList<Integer>();
+ final List<Integer> chunk = new ArrayList<>();
final IndexReader r = request.getIndexReader();
Bits liveDocs = MultiFields.getLiveDocs( r );
for ( int i = 0; i < r.maxDoc(); i++ )
@@ -186,8 +186,8 @@
private void updateProperties( Properties properties, IndexPackingRequest request )
throws IOException
{
- Set<Object> keys = new HashSet<Object>( properties.keySet() );
- Map<Integer, String> dataMap = new TreeMap<Integer, String>();
+ Set<Object> keys = new HashSet<>( properties.keySet() );
+ Map<Integer, String> dataMap = new TreeMap<>();
// First go through and retrieve all keys and their values
for ( Object key : keys )
@@ -204,7 +204,7 @@
}
}
- String val = (String) properties.getProperty( IndexingContext.INDEX_CHUNK_COUNTER );
+ String val = properties.getProperty( IndexingContext.INDEX_CHUNK_COUNTER );
int i = 0;
// Next put the items back in w/ proper keys
diff --git a/indexer-core/src/main/java/org/apache/maven/index/treeview/AbstractTreeNode.java b/indexer-core/src/main/java/org/apache/maven/index/treeview/AbstractTreeNode.java
index ea8285e..75a509f 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/treeview/AbstractTreeNode.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/treeview/AbstractTreeNode.java
@@ -262,7 +262,7 @@
{
if ( children == null && !isLeaf() )
{
- children = new ArrayList<TreeNode>();
+ children = new ArrayList<>();
}
return children;
diff --git a/indexer-core/src/main/java/org/apache/maven/index/util/IndexCreatorSorter.java b/indexer-core/src/main/java/org/apache/maven/index/util/IndexCreatorSorter.java
index 2a3ca10..4c48116 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/util/IndexCreatorSorter.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/util/IndexCreatorSorter.java
@@ -53,7 +53,7 @@
List<String> sortedIds = TopologicalSorter.sort( dag );
- final ArrayList<IndexCreator> sortedCreators = new ArrayList<IndexCreator>( creators.size() );
+ final ArrayList<IndexCreator> sortedCreators = new ArrayList<>( creators.size() );
for ( String id : sortedIds )
{
diff --git a/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
index 7e2751e..1af94e4 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
@@ -105,7 +105,7 @@
assertEquals( 2, r.size() );
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( r );
+ List<ArtifactInfo> list = new ArrayList<>( r );
assertEquals( 2, list.size() );
@@ -140,7 +140,7 @@
assertEquals( 2, ig.getArtifactInfos().size() );
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( ig.getArtifactInfos() );
+ List<ArtifactInfo> list = new ArrayList<>( ig.getArtifactInfos() );
assertEquals( 2, list.size() );
diff --git a/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
index 3d006ff..b745237 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
@@ -262,7 +262,7 @@
{
ArtifactInfoGroup ig = r.values().iterator().next();
- ArrayList<ArtifactInfo> list1 = new ArrayList<ArtifactInfo>( ig.getArtifactInfos() );
+ ArrayList<ArtifactInfo> list1 = new ArrayList<>( ig.getArtifactInfos() );
assertEquals( r.toString(), 2, list1.size() );
ArtifactInfo ai1 = list1.get( 0 );
@@ -379,7 +379,7 @@
assertEquals( 2, r.size() );
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( r );
+ List<ArtifactInfo> list = new ArrayList<>( r );
assertEquals( 2, list.size() );
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java
index fc23b79..a764c38 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java
@@ -58,7 +58,7 @@
assertEquals( 4, r.size() );
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( r );
+ List<ArtifactInfo> list = new ArrayList<>( r );
ArtifactInfo ai = null;
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java
index f49d3c4..f150666 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java
@@ -51,7 +51,7 @@
assertEquals( 1, r.size() );
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( r );
+ List<ArtifactInfo> list = new ArrayList<>( r );
ArtifactInfo ai = null;
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java
index a386723..c72ec39 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java
@@ -50,7 +50,7 @@
assertEquals( 3, r.size() );
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( r );
+ List<ArtifactInfo> list = new ArrayList<>( r );
ArtifactInfo ai = null;
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java
index 8f7872a..a7872c4 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java
@@ -49,7 +49,7 @@
Collection<ArtifactInfo> r = response.getResults();
assertEquals( r.toString(), 4, r.size() );
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( r );
+ List<ArtifactInfo> list = new ArrayList<>( r );
// g a v p c #1
ArtifactInfo ai1 = list.get( 0 );
diff --git a/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
index 98dbd9b..52736a7 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
@@ -409,7 +409,7 @@
ArtifactInfoGroup gi0 = r.values().iterator().next();
assertEquals( "qdox : qdox", gi0.getGroupKey() );
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( gi0.getArtifactInfos() );
+ List<ArtifactInfo> list = new ArrayList<>( gi0.getArtifactInfos() );
ArtifactInfo ai0 = list.get( 0 );
assertEquals( "1.6.1", ai0.getVersion() );
ArtifactInfo ai1 = list.get( 1 );
diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java b/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
index 6a3b108..11f671a 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
@@ -155,7 +155,7 @@
IteratorSearchResponse response = indexer.searchIterator( req );
- ArrayList<ArtifactInfo> ais = new ArrayList<ArtifactInfo>( response.getTotalHits() );
+ ArrayList<ArtifactInfo> ais = new ArrayList<>( response.getTotalHits() );
for ( ArtifactInfo ai : response )
{
diff --git a/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java b/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java
index 4ac1eeb..ef6976c 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java
@@ -38,7 +38,7 @@
final List<IndexCreator> sortedCreators = IndexCreatorSorter.sort( creators );
// we are interested in IDs only
- final List<String> sortedCreatorIds = new ArrayList<String>();
+ final List<String> sortedCreatorIds = new ArrayList<>();
for ( IndexCreator creator : sortedCreators )
{
sortedCreatorIds.add( creator.getId() );
@@ -60,11 +60,11 @@
throws Exception
{
final List<IndexCreator> creators =
- new ArrayList<IndexCreator>( getContainer().lookupList( IndexCreator.class ) );
+ new ArrayList<>( getContainer().lookupList( IndexCreator.class ) );
// now we add spoofs to it, this one depends on ALL creators. Note: we add it as 1st intentionally
creators.add( 0,
- new SpoofIndexCreator( "depend-on-all", new ArrayList<String>(
+ new SpoofIndexCreator( "depend-on-all", new ArrayList<>(
getContainer().lookupMap( IndexCreator.class ).keySet() ) ) );
// now we add spoofs to it, this one depends on only one, the "depend-on-all" creator Note: we add it as 1st
@@ -74,7 +74,7 @@
final List<IndexCreator> sortedCreators = IndexCreatorSorter.sort( creators );
// we are interested in IDs only
- final List<String> sortedCreatorIds = new ArrayList<String>();
+ final List<String> sortedCreatorIds = new ArrayList<>();
for ( IndexCreator creator : sortedCreators )
{
sortedCreatorIds.add( creator.getId() );
@@ -98,7 +98,7 @@
throws Exception
{
final List<IndexCreator> creators =
- new ArrayList<IndexCreator>( getContainer().lookupList( IndexCreator.class ) );
+ new ArrayList<>( getContainer().lookupList( IndexCreator.class ) );
// now we add spoofs to it, this one depends on non existent creator. Note: we add it as 1st intentionally
creators.add( 0,
diff --git a/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/indexer/examples/BasicUsageExample.java b/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/indexer/examples/BasicUsageExample.java
index b1a63bc..ba463f4 100644
--- a/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/indexer/examples/BasicUsageExample.java
+++ b/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/indexer/examples/BasicUsageExample.java
@@ -123,7 +123,7 @@
File centralIndexDir = new File( "target/central-index" );
// Creators we want to use (search for fields it defines)
- List<IndexCreator> indexers = new ArrayList<IndexCreator>();
+ List<IndexCreator> indexers = new ArrayList<>();
indexers.add( plexusContainer.lookup( IndexCreator.class, "min" ) );
indexers.add( plexusContainer.lookup( IndexCreator.class, "jarContent" ) );
indexers.add( plexusContainer.lookup( IndexCreator.class, "maven-plugin" ) );
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexer.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexer.java
index 88f9a27..4fd7047 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexer.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexer.java
@@ -100,7 +100,7 @@
public void delete( final Collection<ArtifactInfo> artifacts )
throws IOException
{
- final List<ArtifactContext> delete = new ArrayList<ArtifactContext>();
+ final List<ArtifactContext> delete = new ArrayList<>();
for ( final ArtifactInfo artifact : artifacts )
{
LOGGER.debug( "Deleting artifact: {}; ctx id: {}; idx dir: {}",
diff --git a/indexer-reader/src/main/java/org/apache/maven/index/reader/IndexReader.java b/indexer-reader/src/main/java/org/apache/maven/index/reader/IndexReader.java
index 85c5409..1f75864 100644
--- a/indexer-reader/src/main/java/org/apache/maven/index/reader/IndexReader.java
+++ b/indexer-reader/src/main/java/org/apache/maven/index/reader/IndexReader.java
@@ -178,7 +178,7 @@
*/
private List<String> calculateChunkNames() {
if (incremental) {
- ArrayList<String> chunkNames = new ArrayList<String>();
+ ArrayList<String> chunkNames = new ArrayList<>();
int maxCounter = Integer.parseInt(remoteIndexProperties.getProperty("nexus.index.last-incremental"));
int currentCounter = Integer.parseInt(localIndexProperties.getProperty("nexus.index.last-incremental"));
currentCounter++;
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
index 8794be0..8edfbb7 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
@@ -55,7 +55,7 @@
this.tempDir = new File("target/tmp-" + getClass().getSimpleName());
this.tempDir.delete();
this.tempDir.mkdirs();
- this.directoryResourceHandlers = new ArrayList<DirectoryResourceHandler>();
+ this.directoryResourceHandlers = new ArrayList<>();
}
/**