Author: olamy
Date: Tue Dec 18 17:51:54 2012
New Revision: 1423550
URL: http://svn.apache.org/viewvc?rev=1423550&view=rev
Log:
[MRM-1720] make pageSize and selectedPage configurable tru the REST request.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java?rev=1423550&r1=1423549&r2=1423550&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java
Tue Dec 18 17:51:54 2012
@@ -117,6 +117,15 @@ public class SearchRequest
*/
private boolean includePomArtifacts = false;
+ /**
+ * @since 1.4-M4
+ */
+ private int pageSize = 30;
+
+ /**
+ * @since 1.4-M4
+ */
+ private int selectedPage = 0;
public SearchRequest()
@@ -286,6 +295,26 @@ public class SearchRequest
this.bundleRequireBundle = bundleRequireBundle;
}
+ public int getPageSize()
+ {
+ return pageSize;
+ }
+
+ public void setPageSize( int pageSize )
+ {
+ this.pageSize = pageSize;
+ }
+
+ public int getSelectedPage()
+ {
+ return selectedPage;
+ }
+
+ public void setSelectedPage( int selectedPage )
+ {
+ this.selectedPage = selectedPage;
+ }
+
@Override
public String toString()
{
@@ -306,6 +335,8 @@ public class SearchRequest
sb.append( ", bundleRequireBundle='" ).append( bundleRequireBundle
).append( '\'' );
sb.append( ", classifier='" ).append( classifier ).append( '\'' );
sb.append( ", includePomArtifacts=" ).append( includePomArtifacts );
+ sb.append( ", pageSize=" ).append( pageSize );
+ sb.append( ", selectedPage=" ).append( selectedPage );
sb.append( '}' );
return sb.toString();
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java?rev=1423550&r1=1423549&r2=1423550&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
Tue Dec 18 17:51:54 2012
@@ -91,7 +91,8 @@ public class DefaultSearchService
{
repositories = getObservableRepos();
}
- SearchResultLimits limits = new SearchResultLimits( 0 );
+ SearchResultLimits limits =
+ new SearchResultLimits( searchRequest.getPageSize(),
searchRequest.getSelectedPage() );
try
{
SearchResults searchResults = repositorySearch.search(
getPrincipal(), repositories, queryString, limits,
