[MRM-1720] hard coded limitation of 30 for pageSize in SearchResultLimits

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1415201 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultLimits.java

@@ -49,11 +49,11 @@ public class SearchResultLimits
     /**
      * Set page size for maximum # of hits to return per page.
      *
-     * @param pageSize size of page by # of hits. (maximum value is 200)
+     * @param pageSize size of page by # of hits.
      */
     public void setPageSize( int pageSize )
     {
-        this.pageSize = Math.min( 200, pageSize );
+        this.pageSize = pageSize;
     }
 
     public int getSelectedPage()

archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java

@@ -64,6 +64,9 @@ public abstract class AbstractNexusRepositorySearch
 
     public static String TEST_REPO_2 = "nexus-search-test-repo-2";
 
+
+    public static String REPO_RELEASE = "repo-release";
+
     NexusRepositorySearch search;
 
     ArchivaConfiguration archivaConfig;
@@ -114,13 +117,13 @@ public abstract class AbstractNexusRepositorySearch
         config = new Configuration();
         config.addManagedRepository( createRepositoryConfig( TEST_REPO_1 ) );
         config.addManagedRepository( createRepositoryConfig( TEST_REPO_2 ) );
+        config.addManagedRepository( createRepositoryConfig( REPO_RELEASE ) );
     }
 
     @After
     public void tearDown()
         throws Exception
     {
-
         for ( IndexingContext indexingContext : nexusIndexer.getIndexingContexts().values() )
         {
             nexusIndexer.removeIndexingContext( indexingContext, true );
@@ -211,9 +214,6 @@ public abstract class AbstractNexusRepositorySearch
         }
         // force flushing
         context.getIndexWriter().commit();
-        //context.getIndexWriter().close( true );
-        // wait for io flush ....
-        //Thread.sleep( 2000 );
         context.setSearchable( true );
 
     }

archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java

@@ -21,6 +21,8 @@ package org.apache.archiva.indexer.search;
 
 import org.apache.archiva.common.utils.FileUtil;
 import org.apache.archiva.indexer.util.SearchUtil;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
+import org.codehaus.plexus.util.FileUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -29,12 +31,12 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 
 
-@RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@RunWith ( ArchivaSpringJUnit4ClassRunner.class )
+@ContextConfiguration ( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class NexusRepositorySearchTest
     extends AbstractNexusRepositorySearch
 {
@@ -852,4 +854,40 @@ public class NexusRepositorySearchTest
         assertNotNull( results );
         assertEquals( 0, results.getHits().size() );
     }
+
+    @Test
+    public void nolimitedResult()
+        throws Exception
+    {
+
+        File repo = new File( "target/repo-release" );
+        File indexDirectory = new File( repo, ".index" );
+        FileUtils.copyDirectoryStructure( new File( "src/test/repo-release" ), repo );
+
+        createIndex( repo.getPath(), Collections.<File>emptyList(), false );
+
+        nexusIndexer.addIndexingContext( REPO_RELEASE, REPO_RELEASE, repo, indexDirectory,
+                                         repo.toURI().toURL().toExternalForm(),
+                                         indexDirectory.toURI().toURL().toString(), search.getAllIndexCreators() );
+
+        SearchResultLimits limits = new SearchResultLimits( 0 );
+        limits.setPageSize( 300 );
+
+        SearchResults searchResults = search.search( null, Arrays.asList( REPO_RELEASE ), "org.example", limits,
+                                                     Collections.<String>emptyList() );
+
+        log.info( "results: {}", searchResults.getHits().size() );
+
+        assertEquals( 255, searchResults.getHits().size() );
+
+        SearchFields searchFields = new SearchFields();
+        searchFields.setGroupId( "org.example" );
+        searchFields.setRepositories( Arrays.asList( REPO_RELEASE ) );
+
+        searchResults = search.search( null, searchFields, limits );
+
+        log.info( "results: {}", searchResults.getHits().size() );
+
+        assertEquals( 255, searchResults.getHits().size() );
+    }
 }

archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm

@@ -0,0 +1,5 @@
+þÿÿÿ
+DESCRIPTOR
IDXINFO
u

m
i
g

a

v
groupId

+artifactId
version

p

1

c

+classnames
Bundle-SymbolicName
Bundle-Version
Export-Package
Export-Service
Bundle-Name
Import-Package
Require-Bundle

+rootGroups
rootGroupsList	allGroups

allGroupsList

archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/nexus-maven-repository-index-packer.properties

@@ -0,0 +1,36 @@
+#Thu Nov 29 13:00:04 CET 2012
+nexus.index.id=repo-release
+nexus.index.chain-id=1329326578955
+nexus.index.timestamp=20121129120004.673 +0000
+nexus.index.incremental-19=12112
+nexus.index.incremental-18=12113
+nexus.index.incremental-17=12114
+nexus.index.incremental-16=12115
+nexus.index.incremental-15=12116
+nexus.index.incremental-14=12117
+nexus.index.incremental-13=12118
+nexus.index.incremental-9=12122
+nexus.index.incremental-12=12119
+nexus.index.incremental-8=12123
+nexus.index.incremental-11=12120
+nexus.index.incremental-7=12124
+nexus.index.incremental-10=12121
+nexus.index.incremental-6=12125
+nexus.index.incremental-5=12126
+nexus.index.incremental-4=12127
+nexus.index.incremental-3=12128
+nexus.index.incremental-2=12129
+nexus.index.last-incremental=12131
+nexus.index.incremental-1=12130
+nexus.index.incremental-0=12131
+nexus.index.incremental-29=12102
+nexus.index.incremental-28=12103
+nexus.index.incremental-27=12104
+nexus.index.incremental-26=12105
+nexus.index.incremental-25=12106
+nexus.index.incremental-24=12107
+nexus.index.time=20121129120004.673 +0000
+nexus.index.incremental-23=12108
+nexus.index.incremental-22=12109
+nexus.index.incremental-21=12110
+nexus.index.incremental-20=12111

archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/nexus-maven-repository-index.properties

@@ -0,0 +1,36 @@
+#Thu Nov 29 13:00:04 CET 2012
+nexus.index.id=repo-release
+nexus.index.chain-id=1329326578955
+nexus.index.timestamp=20121129120004.673 +0000
+nexus.index.incremental-19=12112
+nexus.index.incremental-18=12113
+nexus.index.incremental-17=12114
+nexus.index.incremental-16=12115
+nexus.index.incremental-15=12116
+nexus.index.incremental-14=12117
+nexus.index.incremental-13=12118
+nexus.index.incremental-9=12122
+nexus.index.incremental-12=12119
+nexus.index.incremental-8=12123
+nexus.index.incremental-11=12120
+nexus.index.incremental-7=12124
+nexus.index.incremental-10=12121
+nexus.index.incremental-6=12125
+nexus.index.incremental-5=12126
+nexus.index.incremental-4=12127
+nexus.index.incremental-3=12128
+nexus.index.incremental-2=12129
+nexus.index.last-incremental=12131
+nexus.index.incremental-1=12130
+nexus.index.incremental-0=12131
+nexus.index.incremental-29=12102
+nexus.index.incremental-28=12103
+nexus.index.incremental-27=12104
+nexus.index.incremental-26=12105
+nexus.index.incremental-25=12106
+nexus.index.incremental-24=12107
+nexus.index.time=20121129120004.673 +0000
+nexus.index.incremental-23=12108
+nexus.index.incremental-22=12109
+nexus.index.incremental-21=12110
+nexus.index.incremental-20=12111