You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/11/10 14:20:01 UTC
[camel] branch master updated: Camel-Git: Better structure for
consumer returned object - Branch consumer
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7b148e6 Camel-Git: Better structure for consumer returned object - Branch consumer
7b148e6 is described below
commit 7b148e6ee23cd8fbed5e2f752ca3e3f9317020da
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 10 15:18:41 2020 +0100
Camel-Git: Better structure for consumer returned object - Branch consumer
---
.../src/main/java/org/apache/camel/component/git/GitConstants.java | 2 ++
.../org/apache/camel/component/git/consumer/GitBranchConsumer.java | 5 ++++-
.../org/apache/camel/component/git/consumer/GitConsumerTest.java | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/components/camel-git/src/main/java/org/apache/camel/component/git/GitConstants.java b/components/camel-git/src/main/java/org/apache/camel/component/git/GitConstants.java
index d4bce85..6b6a48f 100644
--- a/components/camel-git/src/main/java/org/apache/camel/component/git/GitConstants.java
+++ b/components/camel-git/src/main/java/org/apache/camel/component/git/GitConstants.java
@@ -27,4 +27,6 @@ public interface GitConstants {
String GIT_COMMIT_AUTHOR_NAME = "CamelGitAuthorName";
String GIT_COMMIT_COMMITTER_NAME = "CamelGitCommiterName";
String GIT_COMMIT_TIME = "CamelGitCommitTime";
+ String GIT_BRANCH_LEAF = "CamelGitBranchLeaf";
+ String GIT_BRANCH_OBJECT_ID = "CamelGitBranchObjectId";
}
diff --git a/components/camel-git/src/main/java/org/apache/camel/component/git/consumer/GitBranchConsumer.java b/components/camel-git/src/main/java/org/apache/camel/component/git/consumer/GitBranchConsumer.java
index e06a839..49d9456 100644
--- a/components/camel-git/src/main/java/org/apache/camel/component/git/consumer/GitBranchConsumer.java
+++ b/components/camel-git/src/main/java/org/apache/camel/component/git/consumer/GitBranchConsumer.java
@@ -21,6 +21,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.component.git.GitConstants;
import org.apache.camel.component.git.GitEndpoint;
import org.eclipse.jgit.api.ListBranchCommand.ListMode;
import org.eclipse.jgit.lib.Ref;
@@ -40,7 +41,9 @@ public class GitBranchConsumer extends AbstractGitConsumer {
for (Ref ref : call) {
if (!branchesConsumed.contains(ref.getName())) {
Exchange e = getEndpoint().createExchange();
- e.getMessage().setBody(ref);
+ e.getMessage().setBody(ref.getName());
+ e.getMessage().setHeader(GitConstants.GIT_BRANCH_LEAF, ref.getLeaf().getName());
+ e.getMessage().setHeader(GitConstants.GIT_BRANCH_OBJECT_ID, ref.getObjectId().getName());
getProcessor().process(e);
branchesConsumed.add(ref.getName());
count++;
diff --git a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
index aee3312..4cbf6af 100644
--- a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
+++ b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
@@ -155,8 +155,8 @@ public class GitConsumerTest extends GitTestSupport {
// Check
List<Exchange> exchanges = mockResultBranch.getExchanges();
- assertEquals("refs/heads/master", exchanges.get(0).getMessage().getBody(ObjectIdRef.Unpeeled.class).getName());
- assertEquals("refs/heads/" + branchTest, exchanges.get(1).getMessage().getBody(ObjectIdRef.Unpeeled.class).getName());
+ assertEquals("refs/heads/master", exchanges.get(0).getMessage().getBody(String.class));
+ assertEquals("refs/heads/" + branchTest, exchanges.get(1).getMessage().getBody(String.class));
git.close();
}