You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/10/24 14:35:03 UTC
[2/2] git commit: CAMEL-7919 Clean up code and fix some CS issues.
CAMEL-7919 Clean up code and fix some CS issues.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/007403ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/007403ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/007403ac
Branch: refs/heads/master
Commit: 007403ac45b36b16b6dfd977f1960e9b4e5793b7
Parents: 07b432c
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Oct 24 20:34:25 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Oct 24 20:34:25 2014 +0800
----------------------------------------------------------------------
.../camel/component/jira/JIRAEndpoint.java | 10 +++++++++
.../jira/consumer/AbstractJIRAConsumer.java | 6 ++---
.../component/jira/CommentConsumerTest.java | 23 ++++++++++----------
.../camel/component/jira/IssueConsumerTest.java | 21 ++++++------------
.../jira/mocks/MockSearchRestClient.java | 15 +++++++------
5 files changed, 39 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/007403ac/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java
index dd8e8bf..3ea31c8 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java
@@ -57,6 +57,8 @@ public class JIRAEndpoint extends DefaultEndpoint {
private String password;
@UriParam
private String jql;
+ @UriParam
+ private int delay = 6000;
public JIRAEndpoint(String uri, JIRAComponent component) {
super(uri, component);
@@ -143,4 +145,12 @@ public class JIRAEndpoint extends DefaultEndpoint {
public void setJql(String jql) {
this.jql = jql;
}
+
+ public int getDelay() {
+ return delay;
+ }
+
+ public void setDelay(int delay) {
+ this.delay = delay;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/007403ac/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java
index 2ee7bc4..3efd06f 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java
@@ -46,8 +46,8 @@ public abstract class AbstractJIRAConsumer extends ScheduledPollConsumer {
super(endpoint, processor);
this.endpoint = endpoint;
- // Use a more reasonable default.
- setDelay(6000);
+ // support to set the delay from JIRA Endpoint
+ setDelay(endpoint.getDelay());
JerseyJiraRestClientFactory factory;
Registry registry = endpoint.getCamelContext().getRegistry();
@@ -76,7 +76,7 @@ public abstract class AbstractJIRAConsumer extends ScheduledPollConsumer {
List<BasicIssue> issues = new ArrayList<BasicIssue>();
while (true) {
SearchRestClient searchRestClient = client.getSearchClient();
- SearchResult searchResult = searchRestClient.searchJqlWithFullIssues(jql, maxPerQuery,start, null);
+ SearchResult searchResult = searchRestClient.searchJqlWithFullIssues(jql, maxPerQuery, start, null);
for (BasicIssue issue : searchResult.getIssues()) {
issues.add(issue);
http://git-wip-us.apache.org/repos/asf/camel/blob/007403ac/components/camel-jira/src/test/java/org/apache/camel/component/jira/CommentConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/CommentConsumerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/CommentConsumerTest.java
index e70b083..e852ae3 100644
--- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/CommentConsumerTest.java
+++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/CommentConsumerTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.jira;
+import java.util.Date;
+
import com.atlassian.jira.rest.client.domain.BasicIssue;
import com.atlassian.jira.rest.client.domain.Comment;
import org.apache.camel.Exchange;
@@ -32,15 +34,15 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Date;
-
public class CommentConsumerTest extends CamelTestSupport {
public static final Logger LOG = LoggerFactory.getLogger(CommentConsumerTest.class);
private static final String URL = "https://somerepo.atlassian.net";
private static final String USERNAME = "someguy";
private static final String PASSWORD = "xU3xjhay9yjEaZq";
- private String JIRA_CREDENTIALS = URL + "&username=" + USERNAME + "&password=" + PASSWORD;
+ private static final String JIRA_CREDENTIALS = URL + "&username=" + USERNAME + "&password=" + PASSWORD;
protected MockJerseyJiraRestClientFactory factory;
+
+
@Override
@@ -59,26 +61,24 @@ public class CommentConsumerTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
from("jira://newComment?serverUrl=" + JIRA_CREDENTIALS
- + "&jql=RAW(project=CAMELJIRA)")
+ + "&jql=RAW(project=CAMELJIRA)" + "&delay=500")
.process(new NewCommentProcessor())
.to("mock:result");
}
};
}
-
-
- @Test(timeout=60*1000)
+
+ @Test
public void emptyAtStartupTest() throws Exception {
MockEndpoint mockResultEndpoint = getMockEndpoint("mock:result");
mockResultEndpoint.expectedMessageCount(0);
- Thread.sleep(8 * 1000); // delay is 6 seconds
-
+
mockResultEndpoint.assertIsSatisfied();
}
- @Test(timeout=60*1000)
+ @Test
public void singleIssueTest() throws Exception {
MockEndpoint mockResultEndpoint = getMockEndpoint("mock:result");
@@ -89,7 +89,7 @@ public class CommentConsumerTest extends CamelTestSupport {
Comment comment1 = searchRestClient.addCommentToIssue(issue1, commentText);
mockResultEndpoint.expectedBodiesReceived(comment1);
- Thread.sleep(8 * 1000); // delay is 6 seconds
+
mockResultEndpoint.assertIsSatisfied();
}
@@ -107,7 +107,6 @@ public class CommentConsumerTest extends CamelTestSupport {
Comment comment2 = searchRestClient.addCommentToIssue(issue2, "Comment added at " + new Date());
mockResultEndpoint.expectedBodiesReceivedInAnyOrder(comment1, comment2);
- Thread.sleep(8 * 1000); // delay is 6 seconds
mockResultEndpoint.assertIsSatisfied();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/007403ac/components/camel-jira/src/test/java/org/apache/camel/component/jira/IssueConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/IssueConsumerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/IssueConsumerTest.java
index 57fb1f0..e2195c5 100644
--- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/IssueConsumerTest.java
+++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/IssueConsumerTest.java
@@ -36,7 +36,7 @@ public class IssueConsumerTest extends CamelTestSupport {
private static final String URL = "https://somerepo.atlassian.net";
private static final String USERNAME = "someguy";
private static final String PASSWORD = "xU3xjhay9yjEaZq";
- private String JIRA_CREDENTIALS = URL + "&username=" + USERNAME + "&password=" + PASSWORD;
+ private static final String JIRA_CREDENTIALS = URL + "&username=" + USERNAME + "&password=" + PASSWORD;
private static final String PROJECT = "camel-jira-component";
protected MockJerseyJiraRestClientFactory factory;
@@ -57,28 +57,24 @@ public class IssueConsumerTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
context.addComponent("jira", new JIRAComponent());
- from("jira://newIssue?serverUrl=" + JIRA_CREDENTIALS + "&jql=project=" + PROJECT)
+ from("jira://newIssue?serverUrl=" + JIRA_CREDENTIALS + "&jql=project=" + PROJECT + "&delay=500")
.process(new NewIssueProcessor())
.to("mock:result");
}
};
}
-
- @Test(timeout=60*1000)
+ @Test
public void emptyAtStartupTest() throws Exception {
MockEndpoint mockResultEndpoint = getMockEndpoint("mock:result");
-
- MockJiraRestClient client = (MockJiraRestClient) factory.getClient();
- MockSearchRestClient restClient = (MockSearchRestClient) client.getSearchClient();
+
mockResultEndpoint.expectedMessageCount(0);
- Thread.sleep(8 * 1000); // delay is 6 seconds
mockResultEndpoint.assertIsSatisfied();
}
- @Test(timeout=60*1000)
+ @Test
public void singleIssueTest() throws Exception {
MockEndpoint mockResultEndpoint = getMockEndpoint("mock:result");
@@ -87,13 +83,12 @@ public class IssueConsumerTest extends CamelTestSupport {
BasicIssue issue1 = restClient.addIssue();
mockResultEndpoint.expectedBodiesReceived(issue1);
- Thread.sleep(8 * 1000); // delay is 6 seconds
-
+
mockResultEndpoint.assertIsSatisfied();
}
- @Test(timeout=60*1000)
+ @Test
public void multipleIssuesTest() throws Exception {
MockEndpoint mockResultEndpoint = getMockEndpoint("mock:result");
@@ -105,8 +100,6 @@ public class IssueConsumerTest extends CamelTestSupport {
mockResultEndpoint.expectedBodiesReceived(issue3, issue2, issue1);
- Thread.sleep(8 * 1000); // delay is 6 seconds
-
mockResultEndpoint.assertIsSatisfied();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/007403ac/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
index ba872ff..8eb5463 100644
--- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
+++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
@@ -16,6 +16,12 @@
*/
package org.apache.camel.component.jira.mocks;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+
import com.atlassian.jira.rest.client.NullProgressMonitor;
import com.atlassian.jira.rest.client.ProgressMonitor;
import com.atlassian.jira.rest.client.SearchRestClient;
@@ -25,17 +31,13 @@ import com.atlassian.jira.rest.client.domain.FavouriteFilter;
import com.atlassian.jira.rest.client.domain.SearchResult;
import org.joda.time.DateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
public class MockSearchRestClient implements SearchRestClient {
+ private static final String KEY_BASE = "CAMELJIRA-";
private final List<BasicIssue> issues = new ArrayList<>();
private final Map<Long, List<Comment>> comments = new HashMap<>();
private AtomicLong basicIssueId = new AtomicLong(0);
- private String KEY_BASE = "CAMELJIRA-";
+
@Override
public SearchResult searchJql(String s, ProgressMonitor progressMonitor) {
@@ -88,7 +90,6 @@ public class MockSearchRestClient implements SearchRestClient {
}
public List<Comment> getCommentsForIssue(Long issueId) {
- List<Comment> commentsForIssue = comments.get(issueId);
return comments.get(issueId);
}