svn commit: r367162 - in /maven/repository-manager/trunk/maven-repository-indexer/src: main/java/org/apache/maven/repository/indexing/ test/java/org/apache/maven/repository/indexing/

[brett]

Author: brett
Date: Sun Jan  8 18:22:14 2006
New Revision: 367162

URL: http://svn.apache.org/viewcvs?rev=367162&view=rev
Log:
some cleanup

Modified:
    
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
    
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/PomRepositoryIndex.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/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java

Modified: 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
URL: 
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java?rev=367162&r1=367161&r2=367162&view=diff
==============================================================================
--- 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
 (original)
+++ 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexSearcher.java
 Sun Jan  8 18:22:14 2006
@@ -17,7 +17,6 @@
  */
 
 import org.apache.lucene.document.Document;
-import org.apache.lucene.search.BooleanQuery;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 
@@ -33,12 +32,6 @@
     extends AbstractRepositoryIndexSearcher
 {
     private ArtifactFactory factory;
-
-    private BooleanQuery bQry;
-
-    private BooleanQuery mainQry;
-
-    private boolean isRequired = true;
 
     /**
      * Constructor

Modified: 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/PomRepositoryIndex.java
URL: 
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/PomRepositoryIndex.java?rev=367162&r1=367161&r2=367162&view=diff
==============================================================================
--- 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/PomRepositoryIndex.java
 (original)
+++ 
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/PomRepositoryIndex.java
 Sun Jan  8 18:22:14 2006
@@ -35,6 +35,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -75,6 +76,9 @@
 
     private ArtifactFactory artifactFactory;
 
+    private static final List KEYWORD_FIELDS = Arrays.asList(
+        new String[]{FLD_LICENSE_URLS, FLD_DEPENDENCIES, FLD_PLUGINS_BUILD, 
FLD_PLUGINS_REPORT, FLD_PLUGINS_ALL} );
+
     public PomRepositoryIndex( String indexPath, ArtifactRepository 
repository, Digester digester,
                                ArtifactFactory artifactFactory )
         throws RepositoryIndexException
@@ -172,34 +176,7 @@
 
     public boolean isKeywordField( String field )
     {
-        boolean keyword;
-
-        if ( field.equals( PomRepositoryIndex.FLD_LICENSE_URLS ) )
-        {
-            keyword = true;
-        }
-        else if ( field.equals( PomRepositoryIndex.FLD_DEPENDENCIES ) )
-        {
-            keyword = true;
-        }
-        else if ( field.equals( PomRepositoryIndex.FLD_PLUGINS_BUILD ) )
-        {
-            keyword = true;
-        }
-        else if ( field.equals( PomRepositoryIndex.FLD_PLUGINS_REPORT ) )
-        {
-            keyword = true;
-        }
-        else if ( field.equals( PomRepositoryIndex.FLD_PLUGINS_ALL ) )
-        {
-            keyword = true;
-        }
-        else
-        {
-            keyword = false;
-        }
-
-        return keyword;
+        return KEYWORD_FIELDS.contains( field );
     }
 
     private void indexLicenseUrls( Document doc, Model pom )

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=367162&r1=367161&r2=367162&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
 Sun Jan  8 18:22:14 2006
@@ -35,5 +35,5 @@
     PomRepositoryIndex createPomRepositoryIndex( String indexPath, 
ArtifactRepository repository )
         throws RepositoryIndexException;
 
-    public PomRepositoryIndexSearcher createPomRepositoryIndexSearcher( 
PomRepositoryIndex index );
+    PomRepositoryIndexSearcher createPomRepositoryIndexSearcher( 
PomRepositoryIndex index );
 }

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=367162&r1=367161&r2=367162&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
 Sun Jan  8 18:22:14 2006
@@ -84,7 +84,6 @@
     public void testIndexerExceptions()
         throws Exception
     {
-        ArtifactRepositoryIndex indexer;
         RepositoryIndexingFactory factory = (RepositoryIndexingFactory) 
lookup( RepositoryIndexingFactory.ROLE );
 
         try
@@ -112,7 +111,7 @@
         Artifact artifact = getArtifact( "test", "test-artifactId", "1.0" );
         artifact.setFile( new File( repository.getBasedir(), 
repository.pathOf( artifact ) ) );
 
-        indexer = factory.createArtifactRepositoryIndex( indexPath, repository 
);
+        ArtifactRepositoryIndex indexer = 
factory.createArtifactRepositoryIndex( indexPath, repository );
         indexer.close();
 
         try