You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2006/01/05 08:26:05 UTC
svn commit: r366107 - in
/maven/repository-manager/trunk/maven-repository-indexer/src:
main/java/org/apache/maven/repository/indexing/
main/java/org/apache/maven/repository/indexing/query/
test/java/org/apache/maven/repository/indexing/ test/java/org/a...
Author: epunzalan
Date: Wed Jan 4 23:25:47 2006
New Revision: 366107
URL: http://svn.apache.org/viewcvs?rev=366107&view=rev
Log:
reformat code by IntelliJ code formatter using maven codestyle xml
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexSearcher.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexingFactory.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/AbstractCompoundQuery.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/OptionalQuery.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RequiredQuery.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SinglePhraseQuery.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java Wed Jan 4 23:25:47 2006
@@ -32,7 +32,7 @@
implements RepositoryIndex
{
private String indexPath;
-
+
private boolean indexOpen;
private IndexReader indexReader;
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexSearcher.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexSearcher.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexSearcher.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexSearcher.java Wed Jan 4 23:25:47 2006
@@ -16,22 +16,22 @@
* limitations under the License.
*/
+import org.apache.lucene.document.Document;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Hits;
-import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.maven.repository.indexing.query.AbstractCompoundQuery;
import org.apache.maven.repository.indexing.query.OptionalQuery;
import org.apache.maven.repository.indexing.query.Query;
import org.apache.maven.repository.indexing.query.RequiredQuery;
import org.apache.maven.repository.indexing.query.SinglePhraseQuery;
-import org.apache.maven.repository.indexing.query.AbstractCompoundQuery;
import java.io.IOException;
-import java.util.List;
-import java.util.Iterator;
import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
*
@@ -50,7 +50,7 @@
/**
* Constructor
*
- * @param index the index object
+ * @param index the index object
*/
public AbstractRepositoryIndexSearcher( ArtifactRepositoryIndex index )
{
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java Wed Jan 4 23:25:47 2006
@@ -21,6 +21,7 @@
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.repository.digest.Digester;
import java.io.FileNotFoundException;
@@ -30,7 +31,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-import org.apache.maven.artifact.repository.ArtifactRepository;
/**
@@ -64,7 +64,7 @@
private Analyzer analyzer;
private Digester digester;
-
+
private ArtifactRepository repository;
public ArtifactRepositoryIndex( String indexPath, ArtifactRepository repository, Digester digester )
@@ -72,7 +72,7 @@
{
this.repository = repository;
this.digester = digester;
-
+
open( indexPath );
}
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/DefaultRepositoryIndexingFactory.java Wed Jan 4 23:25:47 2006
@@ -22,19 +22,22 @@
import org.apache.maven.repository.digest.Digester;
/**
- *
* @author Edwin Punzalan
* @plexus.component role="org.apache.maven.repository.indexing.RepositoryIndexingFactory"
*/
public class DefaultRepositoryIndexingFactory
implements RepositoryIndexingFactory
{
- /** @plexus.requirement */
+ /**
+ * @plexus.requirement
+ */
private Digester digester;
-
- /** @plexus.requirement */
+
+ /**
+ * @plexus.requirement
+ */
private ArtifactFactory artifactFactory;
-
+
public ArtifactRepositoryIndexSearcher createArtifactRepositoryIndexSearcher( ArtifactRepositoryIndex index )
{
return new ArtifactRepositoryIndexSearcher( index, artifactFactory );
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java Wed Jan 4 23:25:47 2006
@@ -38,6 +38,7 @@
/* void open( String indexPath )
throws RepositoryIndexException;
*/
+
void optimize()
throws RepositoryIndexException;
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearcher.java Wed Jan 4 23:25:47 2006
@@ -16,11 +16,9 @@
* limitations under the License.
*/
-import java.util.List;
-
import org.apache.maven.repository.indexing.query.Query;
-import org.apache.maven.artifact.Artifact;
-import org.apache.lucene.document.Document;
+
+import java.util.List;
/**
* @author Maria Odea Ching
@@ -29,10 +27,12 @@
{
/**
* Search the artifact based on the search criteria specified in the query object. Returns a list of
- * artifact objects.
+ * artifact objects.
+ *
* @param query The query object that contains the search criteria.
* @return List
- * @exception RepositoryIndexSearchException
+ * @throws RepositoryIndexSearchException
*/
- List search(Query query) throws RepositoryIndexSearchException;
+ List search( Query query )
+ throws RepositoryIndexSearchException;
}
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexingFactory.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexingFactory.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexingFactory.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexingFactory.java Wed Jan 4 23:25:47 2006
@@ -21,7 +21,6 @@
/**
- *
* @author Edwin Punzalan
*/
public interface RepositoryIndexingFactory
@@ -29,6 +28,7 @@
String ROLE = RepositoryIndexingFactory.class.getName();
ArtifactRepositoryIndexSearcher createArtifactRepositoryIndexSearcher( ArtifactRepositoryIndex index );
+
ArtifactRepositoryIndex createArtifactRepositoryIndex( String indexPath, ArtifactRepository repository )
throws RepositoryIndexException;
}
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/AbstractCompoundQuery.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/AbstractCompoundQuery.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/AbstractCompoundQuery.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/AbstractCompoundQuery.java Wed Jan 4 23:25:47 2006
@@ -21,24 +21,23 @@
import java.util.List;
/**
- *
* @author Edwin Punzalan
*/
public abstract class AbstractCompoundQuery
implements Query
{
protected List queries;
-
+
public AbstractCompoundQuery()
{
queries = new ArrayList();
}
-
+
public void add( Query query )
{
queries.add( query );
}
-
+
public List getQueryList()
{
return queries;
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/OptionalQuery.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/OptionalQuery.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/OptionalQuery.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/OptionalQuery.java Wed Jan 4 23:25:47 2006
@@ -17,11 +17,7 @@
* limitations under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
/**
- *
* @author Edwin Punzalan
*/
public class OptionalQuery
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java Wed Jan 4 23:25:47 2006
@@ -18,7 +18,6 @@
*/
/**
- *
* @author Edwin Punzalan
*/
public interface Query
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RequiredQuery.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RequiredQuery.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RequiredQuery.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RequiredQuery.java Wed Jan 4 23:25:47 2006
@@ -18,7 +18,6 @@
*/
/**
- *
* @author Edwin Punzalan
*/
public class RequiredQuery
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SinglePhraseQuery.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SinglePhraseQuery.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SinglePhraseQuery.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SinglePhraseQuery.java Wed Jan 4 23:25:47 2006
@@ -18,13 +18,13 @@
*/
/**
- *
* @author Edwin Punzalan
*/
public class SinglePhraseQuery
implements Query
{
private String field;
+
private String value;
public SinglePhraseQuery( String field, String value )
@@ -37,7 +37,7 @@
{
return field;
}
-
+
public String getValue()
{
return value;
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java Wed Jan 4 23:25:47 2006
@@ -153,7 +153,7 @@
/**
* Create an index that will be used for testing.
- *
+ *
* @throws Exception
*/
public void createTestIndex()
@@ -180,7 +180,7 @@
/**
* Test the ArtifactRepositoryIndexSearcher using a single-phrase search.
- *
+ *
* @throws Exception
*/
public void testSearchSingle()
@@ -297,7 +297,7 @@
/**
* Test the ArtifactRepositoryIndexSearcher using compound search (AND, OR).
- *
+ *
* @throws Exception
*/
public void testSearchCompound()
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java?rev=366107&r1=366106&r2=366107&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java Wed Jan 4 23:25:47 2006
@@ -1,6 +1,6 @@
package org.apache.maven.repository.indexing.query;
-import junit.framework.*;
+import junit.framework.TestCase;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@@ -20,10 +20,10 @@
*/
/**
- *
* @author Edwin Punzalan
*/
-public class QueryTest extends TestCase
+public class QueryTest
+ extends TestCase
{
public void testSinglePhraseQueryObject()
{
@@ -32,23 +32,23 @@
assertEquals( "Field", query.getField() );
assertEquals( "Value", query.getValue() );
}
-
+
public void testCompoundQueries()
{
RequiredQuery rQuery = new RequiredQuery();
assertTrue( rQuery instanceof Query );
rQuery.add( new SinglePhraseQuery( "r1Field", "r1Value" ) );
rQuery.add( new SinglePhraseQuery( "r2Field", "r2Value" ) );
-
+
OptionalQuery oQuery = new OptionalQuery();
oQuery.add( new SinglePhraseQuery( "oField", "oValue" ) );
-
+
RequiredQuery all = new RequiredQuery();
all.add( rQuery );
all.add( oQuery );
assertEquals( 2, all.getQueryList().size() );
-
- for( int ctr = 0; ctr < all.getQueryList().size(); ctr++ )
+
+ for ( int ctr = 0; ctr < all.getQueryList().size(); ctr++ )
{
Query query = (Query) all.getQueryList().get( ctr );
switch ( ctr )