camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [2/2] camel git commit: Fixed CS
Date Sun, 27 Dec 2015 08:52:44 GMT
Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f76dc69c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f76dc69c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f76dc69c

Branch: refs/heads/master
Commit: f76dc69c2ae792fe40c55fa9fb330084ffcb7e73
Parents: b8dbbf4
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Sun Dec 27 09:50:26 2015 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Sun Dec 27 09:50:26 2015 +0100

----------------------------------------------------------------------
 .../camel/component/git/producer/GitProducer.java   | 10 +++++-----
 .../component/git/producer/GitProducerTest.java     | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f76dc69c/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
index 9f38d17..0504e56 100644
--- a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
+++ b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
@@ -424,15 +424,15 @@ public class GitProducer extends DefaultProducer {
         CherryPickResult result = null;
         String commitId = null;
         try {
-        	if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(GitConstants.GIT_COMMIT_ID)))
{
+            if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(GitConstants.GIT_COMMIT_ID)))
{
                 commitId = exchange.getIn().getHeader(GitConstants.GIT_COMMIT_ID, String.class);
             } else {
                 throw new IllegalArgumentException("Commit id must be specified to execute
" + operation);
             }
-        	RevWalk walk = new RevWalk(repo);
-        	ObjectId id = repo.resolve(commitId);
-        	RevCommit commit = walk.parseCommit(id);
-        	walk.dispose();
+            RevWalk walk = new RevWalk(repo);
+            ObjectId id = repo.resolve(commitId);
+            RevCommit commit = walk.parseCommit(id);
+            walk.dispose();
             if (ObjectHelper.isNotEmpty(endpoint.getBranchName())) {
                 git.checkout().setCreateBranch(false).setName(endpoint.getBranchName()).call();
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/f76dc69c/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
index 00a234e..7bdb868 100755
--- a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
+++ b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
@@ -905,10 +905,10 @@ public class GitProducerTest extends GitTestSupport {
         String id = "";
         for (RevCommit rev : logs) {
             if (count == 0) { 
-            	id = rev.getName();
-            	assertEquals(rev.getShortMessage(), "Test second commit");
+                id = rev.getName();
+                assertEquals(rev.getShortMessage(), "Test second commit");
             }
-        	count++;
+            count++;
         }
         assertEquals(count, 2);
         
@@ -927,7 +927,7 @@ public class GitProducerTest extends GitTestSupport {
         count = 0;
         for (RevCommit rev : logs) {
             if (count == 0) {
-            	assertEquals(rev.getShortMessage(), "Test second commit");
+                assertEquals(rev.getShortMessage(), "Test second commit");
             }
             count++;
         }
@@ -1010,10 +1010,10 @@ public class GitProducerTest extends GitTestSupport {
         String id = "";
         for (RevCommit rev : logs) {
             if (count == 0) { 
-            	id = rev.getName();
-            	assertEquals(rev.getShortMessage(), "Test second commit");
+                id = rev.getName();
+                assertEquals(rev.getShortMessage(), "Test second commit");
             }
-        	count++;
+            count++;
         }
         assertEquals(count, 2);
         
@@ -1032,7 +1032,7 @@ public class GitProducerTest extends GitTestSupport {
         count = 0;
         for (RevCommit rev : logs) {
             if (count == 0) {
-            	assertEquals(rev.getShortMessage(), "Test second commit");
+                assertEquals(rev.getShortMessage(), "Test second commit");
             }
             count++;
         }


Mime
View raw message