From 143fc9d357c174a56340052618d481617686fc72 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 07 Nov 2011 21:21:28 -0500
Subject: [PATCH] Unit testing
---
src/com/gitblit/utils/SyndicationUtils.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/utils/SyndicationUtils.java b/src/com/gitblit/utils/SyndicationUtils.java
index 85d5f8d..6919cd2 100644
--- a/src/com/gitblit/utils/SyndicationUtils.java
+++ b/src/com/gitblit/utils/SyndicationUtils.java
@@ -22,13 +22,11 @@
import java.net.URLConnection;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import com.gitblit.Constants;
import com.gitblit.GitBlitException;
import com.gitblit.models.SyndicatedEntryModel;
-import com.gitblit.utils.JGitUtils.SearchType;
import com.sun.syndication.feed.synd.SyndCategory;
import com.sun.syndication.feed.synd.SyndCategoryImpl;
import com.sun.syndication.feed.synd.SyndContent;
@@ -102,7 +100,7 @@
content.setType(entryModel.contentType);
content.setValue(entryModel.content);
entry.setDescription(content);
-
+
entries.add(entry);
}
feed.setEntries(entries);
@@ -125,17 +123,22 @@
* @param numberOfEntries
* the number of entries to retrieve. if <= 0 the server default
* is used.
+ * @param page
+ * 0-indexed. used to paginate the results.
* @param username
* @param password
* @return a list of SyndicationModel entries
* @throws {@link IOException}
*/
public static List<SyndicatedEntryModel> readFeed(String url, String repository, String branch,
- int numberOfEntries, String username, char[] password) throws IOException {
+ int numberOfEntries, int page, String username, char[] password) throws IOException {
// build feed url
List<String> parameters = new ArrayList<String>();
if (numberOfEntries > 0) {
parameters.add("l=" + numberOfEntries);
+ }
+ if (page > 0) {
+ parameters.add("pg=" + page);
}
if (!StringUtils.isEmpty(branch)) {
parameters.add("h=" + branch);
@@ -157,20 +160,25 @@
* @param numberOfEntries
* the number of entries to retrieve. if <= 0 the server default
* is used.
+ * @param page
+ * 0-indexed. used to paginate the results.
* @param username
* @param password
* @return a list of SyndicationModel entries
* @throws {@link IOException}
*/
public static List<SyndicatedEntryModel> readSearchFeed(String url, String repository,
- String branch, String fragment, SearchType searchType, int numberOfEntries,
- String username, char[] password) throws IOException {
+ String branch, String fragment, Constants.SearchType searchType, int numberOfEntries,
+ int page, String username, char[] password) throws IOException {
// determine parameters
List<String> parameters = new ArrayList<String>();
parameters.add("s=" + StringUtils.encodeURL(fragment));
if (numberOfEntries > 0) {
parameters.add("l=" + numberOfEntries);
}
+ if (page > 0) {
+ parameters.add("pg=" + page);
+ }
if (!StringUtils.isEmpty(branch)) {
parameters.add("h=" + branch);
}
--
Gitblit v1.9.1