You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2017/07/24 03:48:34 UTC
[1/6] maven-indexer git commit: add a jar with shaded lucene to avoid
version collision
Repository: maven-indexer
Updated Branches:
refs/heads/master e77d38862 -> 1a5d1560d
add a jar with shaded lucene to avoid version collision
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/7f093506
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/7f093506
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/7f093506
Branch: refs/heads/master
Commit: 7f0935061f5592545f04a7d65fd4d72f0203444a
Parents: e77d388
Author: olivier lamy <ol...@apache.org>
Authored: Fri Jul 7 17:20:00 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Fri Jul 7 17:20:00 2017 +1000
----------------------------------------------------------------------
indexer-core/pom.xml | 73 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/7f093506/indexer-core/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 0d6e26e..d14f44b 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -198,6 +198,79 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadedClassifierName>shaded-lucene</shadedClassifierName>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <!--finalName>${project.build.finalName}</finalName-->
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.lucene</pattern>
+ <shadedPattern>org.apache.maven.index.shaded.lucene</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.lucene.search</pattern>
+ <shadedPattern>org.apache.maven.index.shaded.lucene.search</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.tartarus</pattern>
+ <shadedPattern>org.apache.maven.index.shaded.lucene</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.bouncycastle</pattern>
+ <shadedPattern>org.apache.maven.index.shaded.lucene</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.compress</pattern>
+ <shadedPattern>org.apache.maven.index.shaded.lucene</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.maven.model</pattern>
+ <shadedPattern>org.apache.maven.index.shaded.maven</shadedPattern>
+ </relocation>
+ </relocations>
+ <artifactSet>
+ <excludes>
+ <exclude>org.slf4j:*</exclude>
+ <exclude>com.google.*:*</exclude>
+ <exclude>javax.*:*</exclude>
+ <exclude>javax.*:*</exclude>
+ <exclude>org.eclipse.*:*</exclude>
+ <exclude>org.sonatype.*:*</exclude>
+ <exclude>org.apache.maven.archetype:*</exclude>
+ <exclude>org.apache.maven.wagon:*</exclude>
+ <exclude>org.codehaus.*:*</exclude>
+ <exclude>de.schlichtherle.truezip:*</exclude>
+ </excludes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
[4/6] maven-indexer git commit: correctly close inputstream
Posted by ol...@apache.org.
correctly close inputstream
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/a354f5c7
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/a354f5c7
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/a354f5c7
Branch: refs/heads/master
Commit: a354f5c72a821e76e00486a407136630cf8d15b4
Parents: a49cfdc
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 24 11:54:21 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Jul 24 11:54:21 2017 +1000
----------------------------------------------------------------------
.../org/apache/maven/index/locator/ArtifactLocator.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a354f5c7/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java b/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
index d27d2a6..f4feb34 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
@@ -22,6 +22,8 @@ package org.apache.maven.index.locator;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
import org.apache.maven.index.artifact.ArtifactPackagingMapper;
import org.apache.maven.index.artifact.Gav;
@@ -48,16 +50,19 @@ public class ArtifactLocator
public File locate( File source, GavCalculator gavCalculator, Gav gav )
{
// if we don't have this data, nothing we can do
- if ( source == null || !source.exists() || gav == null || gav.getArtifactId() == null
+ if ( source == null //
+ || !source.exists() //
+ || gav == null //
+ || gav.getArtifactId() == null //
|| gav.getVersion() == null )
{
return null;
}
- try
+ try (InputStream inputStream = Files.newInputStream( source.toPath() ))
{
// need to read the pom model to get packaging
- final Model model = new MavenXpp3Reader().read( new FileInputStream( source ), false );
+ final Model model = new MavenXpp3Reader().read( inputStream, false );
if ( model == null )
{
[2/6] maven-indexer git commit: include old codecs to be able to read
central index
Posted by ol...@apache.org.
include old codecs to be able to read central index
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/8f5417f3
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/8f5417f3
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/8f5417f3
Branch: refs/heads/master
Commit: 8f5417f3f025fad94a83097f0310fc81081e477f
Parents: 7f09350
Author: olivier lamy <ol...@apache.org>
Authored: Thu Jul 13 22:51:54 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Thu Jul 13 22:51:54 2017 +1000
----------------------------------------------------------------------
indexer-core/pom.xml | 5 +++++
pom.xml | 7 +++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/8f5417f3/indexer-core/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index d14f44b..62c9492 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -98,6 +98,11 @@ under the License.
<dependency>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-backward-codecs</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/8f5417f3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 17b6fa6..50dc6ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,6 +224,13 @@ under the License.
<version>${lucene.version}</version>
</dependency>
+ <!-- including old codecs to read central index -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-backward-codecs</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+
<!-- Aether -->
<dependency>
<groupId>org.eclipse.aether</groupId>
[3/6] maven-indexer git commit: use some java 7
Posted by ol...@apache.org.
use some java 7
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/a49cfdc3
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/a49cfdc3
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/a49cfdc3
Branch: refs/heads/master
Commit: a49cfdc39a8fa0a33a388e768101b917aca5cf19
Parents: 8f5417f
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 17 18:40:27 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Jul 17 18:40:27 2017 +1000
----------------------------------------------------------------------
.../apache/maven/index/DefaultNexusIndexer.java | 1 +
.../index/context/DefaultIndexingContext.java | 1 +
.../index/context/MergedIndexingContext.java | 1 +
.../index/DefaultIndexNexusIndexerTest.java | 6 +-
.../maven/index/FullIndexNexusIndexerTest.java | 6 +-
.../maven/index/Nexus13NexusIndexerTest.java | 6 +-
.../apache/maven/index/NexusIndexerTest.java | 6 +-
.../updater/DefaultIndexUpdaterEmbeddingIT.java | 32 +-
.../index/updater/FullBootProofOfConcept.java | 1 +
.../apache/maven/index/reader/TestSupport.java | 298 ++++++++++---------
10 files changed, 188 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java
index 5453caa..3530edd 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java
@@ -270,6 +270,7 @@ public class DefaultNexusIndexer
// always use temporary context when reindexing
final File tmpFile = File.createTempFile( context.getId() + "-tmp", "" );
+ tmpFile.deleteOnExit();
final File tmpDir = new File( tmpFile.getParentFile(), tmpFile.getName() + ".dir" );
if ( !tmpDir.mkdirs() )
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
index c7ede33..9a01d4c 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
@@ -213,6 +213,7 @@ public class DefaultIndexingContext
{
// best effort, to have a directory thru the life of a ctx
File tmpFile = File.createTempFile( "mindexer-ctx" + id, "tmp" );
+ tmpFile.deleteOnExit();
tmpFile.delete();
tmpFile.mkdirs();
this.indexDirectoryFile = tmpFile;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
index 45d93c7..82cb3ab 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
@@ -308,6 +308,7 @@ public class MergedIndexingContext
{
// best effort, to have a directory thru the life of a ctx
File tmpFile = File.createTempFile( "mindexer-ctx" + id, "tmp" );
+ tmpFile.deleteOnExit();
tmpFile.delete();
tmpFile.mkdirs();
this.directoryFile = tmpFile;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
index 195b472..e049496 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.index;
*/
import java.io.File;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -160,9 +161,8 @@ public class DefaultIndexNexusIndexerTest
public void testIndexTimestamp()
throws Exception
{
- final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" );
- targetDir.delete();
- targetDir.mkdirs();
+ final File targetDir = Files.createTempDirectory( "testIndexTimestamp").toFile();
+ targetDir.deleteOnExit();
final IndexPacker indexPacker = lookup( IndexPacker.class );
final IndexSearcher indexSearcher = context.acquireIndexSearcher();
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
----------------------------------------------------------------------
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 b745237..0c5e140 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
@@ -22,6 +22,7 @@ package org.apache.maven.index;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -335,9 +336,8 @@ public class FullIndexNexusIndexerTest
public void testIndexTimestamp()
throws Exception
{
- final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" );
- targetDir.delete();
- targetDir.mkdirs();
+ final File targetDir = Files.createTempDirectory("testIndexTimestamp" ).toFile();
+ targetDir.deleteOnExit();
final IndexPacker indexPacker = lookup( IndexPacker.class );
final IndexSearcher indexSearcher = context.acquireIndexSearcher();
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java
index c93e9f5..f520a9e 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java
@@ -22,6 +22,7 @@ package org.apache.maven.index;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -111,9 +112,8 @@ public class Nexus13NexusIndexerTest
public void testIndexTimestamp()
throws Exception
{
- final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" );
- targetDir.delete();
- targetDir.mkdirs();
+ final File targetDir = Files.createTempDirectory( "testIndexTimestamp" ).toFile();
+ targetDir.deleteOnExit();
final IndexPacker indexPacker = lookup( IndexPacker.class );
final IndexSearcher indexSearcher = context.acquireIndexSearcher();
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
----------------------------------------------------------------------
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 52736a7..21d1f92 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
@@ -27,6 +27,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -567,9 +568,8 @@ public class NexusIndexerTest
List<IndexCreator> indexCreators = context.getIndexCreators();
// Directory directory = context.getIndexDirectory();
- final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" );
- targetDir.delete();
- targetDir.mkdirs();
+ final File targetDir = Files.createTempDirectory("testIndexTimestamp" ).toFile();
+ targetDir.deleteOnExit();
final IndexPacker indexPacker = lookup( IndexPacker.class );
final IndexSearcher indexSearcher = context.acquireIndexSearcher();
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
index c9e948c..83f719d 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
@@ -22,6 +22,7 @@ package org.apache.maven.index.updater;
import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
@@ -90,7 +91,7 @@ public class DefaultIndexUpdaterEmbeddingIT
public void testBasicIndexRetrieval()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
- File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
basedir.delete();
basedir.mkdirs();
@@ -121,9 +122,7 @@ public class DefaultIndexUpdaterEmbeddingIT
public void testBasicAuthenticatedIndexRetrieval()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
- File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
- basedir.delete();
- basedir.mkdirs();
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
try
{
@@ -160,9 +159,8 @@ public class DefaultIndexUpdaterEmbeddingIT
public void testAuthenticatedIndexRetrieval_LongAuthorizationHeader()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
- File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
- basedir.delete();
- basedir.mkdirs();
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
+
try
{
@@ -199,9 +197,7 @@ public class DefaultIndexUpdaterEmbeddingIT
public void testBasicHighLatencyIndexRetrieval()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
- File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
- basedir.delete();
- basedir.mkdirs();
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
try
{
@@ -239,9 +235,7 @@ public class DefaultIndexUpdaterEmbeddingIT
public void OFFtestHighLatencyIndexRetrieval_LowConnectionTimeout()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
- File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
- basedir.delete();
- basedir.mkdirs();
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
try
{
@@ -296,9 +290,7 @@ public class DefaultIndexUpdaterEmbeddingIT
public void OFFtestHighLatencyIndexRetrieval_LowTransactionTimeout()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
- File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
- basedir.delete();
- basedir.mkdirs();
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
try
{
@@ -352,9 +344,7 @@ public class DefaultIndexUpdaterEmbeddingIT
public void testIndexRetrieval_InfiniteRedirection()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
- File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
- basedir.delete();
- basedir.mkdirs();
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
try
{
@@ -396,9 +386,7 @@ public class DefaultIndexUpdaterEmbeddingIT
public void testIndexRetrieval_BadHostname()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
- File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
- basedir.delete();
- basedir.mkdirs();
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
try
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-core/src/test/java/org/apache/maven/index/updater/FullBootProofOfConcept.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/FullBootProofOfConcept.java b/indexer-core/src/test/java/org/apache/maven/index/updater/FullBootProofOfConcept.java
index aa32a26..8b55b24 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/updater/FullBootProofOfConcept.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/updater/FullBootProofOfConcept.java
@@ -49,6 +49,7 @@ public class FullBootProofOfConcept
for ( int i = 0; i < 1; i++ )
{
File basedir = File.createTempFile( "nexus-indexer.", ".dir" );
+ basedir.deleteOnExit();
try
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/a49cfdc3/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
----------------------------------------------------------------------
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 8edfbb7..957bf58 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
@@ -19,6 +19,12 @@ package org.apache.maven.index.reader;
* under the License.
*/
+import org.apache.maven.index.reader.Record.Type;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -26,12 +32,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.maven.index.reader.Record.Type;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
@@ -40,145 +40,171 @@ import static org.junit.Assert.assertThat;
*/
public class TestSupport
{
- @Rule
- public TestName testName = new TestName();
-
- private File tempDir;
-
- private List<DirectoryResourceHandler> directoryResourceHandlers;
-
- /**
- * Creates the temp directory and list for resource handlers.
- */
- @Before
- public void setup() throws IOException {
- this.tempDir = new File("target/tmp-" + getClass().getSimpleName());
- this.tempDir.delete();
- this.tempDir.mkdirs();
- this.directoryResourceHandlers = new ArrayList<>();
- }
-
- /**
- * Closes all the registered resources handlers and deletes the temp directory.
- */
- @After
- public void cleanup() throws IOException {
- for (DirectoryResourceHandler directoryResourceHandler : directoryResourceHandlers) {
- directoryResourceHandler.close();
+ @Rule
+ public TestName testName = new TestName();
+
+ private File tempDir;
+
+ private List<DirectoryResourceHandler> directoryResourceHandlers;
+
+ /**
+ * Creates the temp directory and list for resource handlers.
+ */
+ @Before
+ public void setup()
+ throws IOException
+ {
+ this.tempDir = new File( "target/tmp-" + getClass().getSimpleName() );
+ this.tempDir.delete();
+ this.tempDir.mkdirs();
+ this.directoryResourceHandlers = new ArrayList<>();
}
- // delete(tempDir);
- }
-
- /**
- * Creates a temp file within {@link #tempDir}.
- */
- protected File createTempFile() throws IOException {
- return File.createTempFile(testName.getMethodName() + "-file", "", tempDir);
- }
-
-
- /**
- * Creates a temp file within {@link #tempDir} with given name.
- */
- protected File createTempFile(final String name) throws IOException {
- return new File(tempDir, name);
- }
-
- /**
- * Creates a temp directory within {@link #tempDir}.
- */
- protected File createTempDirectory() throws IOException {
- File result = File.createTempFile(testName.getMethodName() + "-dir", "", tempDir);
- result.delete();
- result.mkdirs();
- return result;
- }
-
- /**
- * Creates an empty {@link DirectoryResourceHandler}.
- */
- protected WritableResourceHandler createWritableResourceHandler() throws IOException {
- DirectoryResourceHandler result = new DirectoryResourceHandler(createTempDirectory());
- directoryResourceHandlers.add(result);
- return result;
- }
-
- /**
- * Creates a "test" {@link ResourceHandler} that contains predefined files, is mapped to test resources under given
- * name.
- */
- protected ResourceHandler testResourceHandler(final String name) throws IOException {
- DirectoryResourceHandler result = new DirectoryResourceHandler(new File("src/test/resources/" + name));
- directoryResourceHandlers.add(result);
- return result;
- }
-
- /**
- * Consumes {@link ChunkReader} and creates a map "by type" with records.
- */
- protected Map<Type, List<Record>> loadRecordsByType(final ChunkReader chunkReader) throws IOException {
- HashMap<Type, List<Record>> stat = new HashMap<Type, List<Record>>();
- try {
- assertThat(chunkReader.getVersion(), equalTo(1));
- final RecordExpander recordExpander = new RecordExpander();
- for (Map<String, String> rec : chunkReader) {
- final Record record = recordExpander.apply(rec);
- if (!stat.containsKey(record.getType())) {
- stat.put(record.getType(), new ArrayList<Record>());
+
+ /**
+ * Closes all the registered resources handlers and deletes the temp directory.
+ */
+ @After
+ public void cleanup()
+ throws IOException
+ {
+ for ( DirectoryResourceHandler directoryResourceHandler : directoryResourceHandlers )
+ {
+ directoryResourceHandler.close();
}
- stat.get(record.getType()).add(record);
- }
+ // delete(tempDir);
}
- finally {
- chunkReader.close();
+
+ /**
+ * Creates a temp file within {@link #tempDir} with given name.
+ */
+ protected File createTempFile( final String name )
+ throws IOException
+ {
+ File file = new File( tempDir, name );
+ file.deleteOnExit();
+ return file;
}
- return stat;
- }
-
-
- /**
- * Consumes {@link ChunkReader} and creates a map "by type" with record type counts.
- */
- protected Map<Type, Integer> countRecordsByType(final ChunkReader chunkReader) throws IOException {
- HashMap<Type, Integer> stat = new HashMap<Type, Integer>();
- try {
- assertThat(chunkReader.getVersion(), equalTo(1));
- final RecordExpander recordExpander = new RecordExpander();
- for (Map<String, String> rec : chunkReader) {
- final Record record = recordExpander.apply(rec);
- if (!stat.containsKey(record.getType())) {
- stat.put(record.getType(), 0);
- }
- stat.put(record.getType(), stat.get(record.getType()) + 1);
- }
+
+ /**
+ * Creates a temp directory within {@link #tempDir}.
+ */
+ protected File createTempDirectory()
+ throws IOException
+ {
+ File result = File.createTempFile( testName.getMethodName() + "-dir", "", tempDir );
+ result.delete();
+ result.mkdirs();
+ return result;
+ }
+
+ /**
+ * Creates an empty {@link DirectoryResourceHandler}.
+ */
+ protected WritableResourceHandler createWritableResourceHandler()
+ throws IOException
+ {
+ DirectoryResourceHandler result = new DirectoryResourceHandler( createTempDirectory() );
+ directoryResourceHandlers.add( result );
+ return result;
}
- finally {
- chunkReader.close();
+
+ /**
+ * Creates a "test" {@link ResourceHandler} that contains predefined files, is mapped to test resources under given
+ * name.
+ */
+ protected ResourceHandler testResourceHandler( final String name )
+ throws IOException
+ {
+ DirectoryResourceHandler result = new DirectoryResourceHandler( new File( "src/test/resources/" + name ) );
+ directoryResourceHandlers.add( result );
+ return result;
}
- return stat;
- }
-
- /**
- * Delete recursively.
- */
- private static boolean delete(final File file) {
- if (file == null) {
- return false;
+
+ /**
+ * Consumes {@link ChunkReader} and creates a map "by type" with records.
+ */
+ protected Map<Type, List<Record>> loadRecordsByType( final ChunkReader chunkReader )
+ throws IOException
+ {
+ HashMap<Type, List<Record>> stat = new HashMap<Type, List<Record>>();
+ try
+ {
+ assertThat( chunkReader.getVersion(), equalTo( 1 ) );
+ final RecordExpander recordExpander = new RecordExpander();
+ for ( Map<String, String> rec : chunkReader )
+ {
+ final Record record = recordExpander.apply( rec );
+ if ( !stat.containsKey( record.getType() ) )
+ {
+ stat.put( record.getType(), new ArrayList<Record>() );
+ }
+ stat.get( record.getType() ).add( record );
+ }
+ }
+ finally
+ {
+ chunkReader.close();
+ }
+ return stat;
}
- if (!file.exists()) {
- return true;
+
+
+ /**
+ * Consumes {@link ChunkReader} and creates a map "by type" with record type counts.
+ */
+ protected Map<Type, Integer> countRecordsByType( final ChunkReader chunkReader )
+ throws IOException
+ {
+ HashMap<Type, Integer> stat = new HashMap<Type, Integer>();
+ try
+ {
+ assertThat( chunkReader.getVersion(), equalTo( 1 ) );
+ final RecordExpander recordExpander = new RecordExpander();
+ for ( Map<String, String> rec : chunkReader )
+ {
+ final Record record = recordExpander.apply( rec );
+ if ( !stat.containsKey( record.getType() ) )
+ {
+ stat.put( record.getType(), 0 );
+ }
+ stat.put( record.getType(), stat.get( record.getType() ) + 1 );
+ }
+ }
+ finally
+ {
+ chunkReader.close();
+ }
+ return stat;
}
- if (file.isDirectory()) {
- String[] list = file.list();
- if (list != null) {
- for (int i = 0; i < list.length; i++) {
- File entry = new File(file, list[i]);
- if (!delete(entry)) {
+
+ /**
+ * Delete recursively.
+ */
+ private static boolean delete( final File file )
+ {
+ if ( file == null )
+ {
return false;
- }
}
- }
+ if ( !file.exists() )
+ {
+ return true;
+ }
+ if ( file.isDirectory() )
+ {
+ String[] list = file.list();
+ if ( list != null )
+ {
+ for ( int i = 0; i < list.length; i++ )
+ {
+ File entry = new File( file, list[i] );
+ if ( !delete( entry ) )
+ {
+ return false;
+ }
+ }
+ }
+ }
+ return file.delete();
}
- return file.delete();
- }
}
[5/6] maven-indexer git commit: better logging
Posted by ol...@apache.org.
better logging
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/ce2f8317
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/ce2f8317
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/ce2f8317
Branch: refs/heads/master
Commit: ce2f8317d234ed1a4a9c1f49d4d79506ce933eaf
Parents: a354f5c
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 24 11:56:31 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Jul 24 11:56:31 2017 +1000
----------------------------------------------------------------------
.../apache/maven/index/locator/ArtifactLocator.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/ce2f8317/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java b/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
index f4feb34..d83b3a4 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
@@ -31,6 +31,8 @@ import org.apache.maven.index.artifact.GavCalculator;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Artifact locator.
@@ -40,6 +42,9 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class ArtifactLocator
implements GavHelpedLocator
{
+
+ private static final Logger LOGGER = LoggerFactory.getLogger( ArtifactLocator.class );
+
private final ArtifactPackagingMapper mapper;
public ArtifactLocator( ArtifactPackagingMapper mapper )
@@ -83,14 +88,9 @@ public class ArtifactLocator
return artifact;
}
- catch ( IOException e )
- {
- e.printStackTrace();
- return null;
- }
- catch ( XmlPullParserException e )
+ catch ( XmlPullParserException | IOException e )
{
- e.printStackTrace();
+ LOGGER.warn( "skip error reading pom from file:" + source, e );
return null;
}
}
[6/6] maven-indexer git commit: improve logging and close InputStream
Posted by ol...@apache.org.
improve logging and close InputStream
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/1a5d1560
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/1a5d1560
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/1a5d1560
Branch: refs/heads/master
Commit: 1a5d1560d165ccf136388816902712a604336c69
Parents: ce2f831
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 24 13:36:58 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Jul 24 13:36:58 2017 +1000
----------------------------------------------------------------------
.../org/apache/maven/index/ArtifactContext.java | 52 ++++++++------------
.../apache/maven/index/util/zip/ZipHandle.java | 2 +
.../examples/indexing/IndexerConfiguration.java | 10 ++--
.../examples/indexing/RepositoryIndexer.java | 1 -
.../indexing/RepositoryIndexerFactory.java | 2 -
5 files changed, 26 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/1a5d1560/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
----------------------------------------------------------------------
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 80ed236..45c70ff 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
@@ -22,6 +22,8 @@ package org.apache.maven.index;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
@@ -37,18 +39,22 @@ import org.apache.maven.index.util.zip.ZipHandle;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An artifact context used to provide information about artifact during scanning. It is passed to the
* {@link IndexCreator}, which can populate {@link ArtifactInfo} for the given artifact.
*
* @see IndexCreator#populateArtifactInfo(ArtifactContext)
- * @see Indexer#scan(IndexingContext)
* @author Jason van Zyl
* @author Tamas Cservenak
*/
public class ArtifactContext
{
+
+ private static final Logger LOGGER = LoggerFactory.getLogger( ArtifactContext.class );
+
private final File pom;
private final File artifact;
@@ -84,55 +90,39 @@ public class ArtifactContext
public Model getPomModel()
{
// First check for local pom file
- if ( getPom() != null && getPom().isFile() )
+ File pom = getPom();
+ if ( pom != null && pom.isFile() )
{
- try
- {
- return new MavenXpp3Reader().read( new FileInputStream( getPom() ), false );
- }
- catch ( IOException e )
+ try (InputStream inputStream = Files.newInputStream( pom.toPath() ))
{
- e.printStackTrace();
+ return new MavenXpp3Reader().read( inputStream, false );
}
- catch ( XmlPullParserException e )
+ catch ( IOException | XmlPullParserException e )
{
- e.printStackTrace();
+ LOGGER.warn( "skip error reading pom: " + pom, e );
}
}
// Otherwise, check for pom contained in maven generated artifact
else if ( getArtifact() != null && getArtifact().isFile() )
{
- ZipHandle handle = null;
-
- try
+ File artifact = getArtifact();
+ try(ZipHandle handle = ZipFacade.getZipHandle( artifact ))
{
- handle = ZipFacade.getZipHandle( getArtifact() );
final String embeddedPomPath =
"META-INF/maven/" + getGav().getGroupId() + "/" + getGav().getArtifactId() + "/pom.xml";
if ( handle.hasEntry( embeddedPomPath ) )
{
- return new MavenXpp3Reader().read( handle.getEntryContent( embeddedPomPath ), false );
+ try(InputStream inputStream = handle.getEntryContent( embeddedPomPath ))
+ {
+ return new MavenXpp3Reader().read( inputStream, false );
+ }
}
}
- catch ( IOException e )
+ catch ( IOException | XmlPullParserException e )
{
- e.printStackTrace();
- }
- catch ( XmlPullParserException e )
- {
- e.printStackTrace();
- }
- finally
- {
- try
- {
- ZipFacade.close( handle );
- }
- catch ( Exception e )
- {
- }
+ LOGGER.warn( "skip error reading pom withing artifact:" + artifact, e );
}
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/1a5d1560/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipHandle.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipHandle.java b/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipHandle.java
index 51dd876..c278a68 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipHandle.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipHandle.java
@@ -19,6 +19,7 @@ package org.apache.maven.index.util.zip;
* under the License.
*/
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -30,6 +31,7 @@ import java.util.List;
* @author cstamas
*/
public interface ZipHandle
+ extends Closeable
{
/**
* Returns true if Zip file this handle is pointing to contains an entry at given path.
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/1a5d1560/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/IndexerConfiguration.java
----------------------------------------------------------------------
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/IndexerConfiguration.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/IndexerConfiguration.java
index 814cd40..40717a3 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/IndexerConfiguration.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/IndexerConfiguration.java
@@ -58,13 +58,9 @@ public class IndexerConfiguration
public List<IndexCreator> getIndexersAsList()
{
- List<IndexCreator> indexersAsList = new ArrayList<>();
- for ( Map.Entry entry : indexers.entrySet() )
- {
- indexersAsList.add( (IndexCreator) entry.getValue() );
- }
-
- return indexersAsList;
+ return indexers == null ? //
+ new ArrayList<IndexCreator>( 0 ) //
+ : new ArrayList<>( indexers.values() );
}
public Indexer getIndexer()
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/1a5d1560/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexer.java
----------------------------------------------------------------------
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 4fd7047..fada90d 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
@@ -24,7 +24,6 @@ import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
-import org.apache.lucene.util.Version;
import org.apache.maven.index.ArtifactContext;
import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.ArtifactScanningListener;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/1a5d1560/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexerFactory.java
----------------------------------------------------------------------
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexerFactory.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexerFactory.java
index c74777b..40918f4 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexerFactory.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexerFactory.java
@@ -23,8 +23,6 @@ import org.apache.maven.index.Indexer;
import org.apache.maven.index.Scanner;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Singleton;