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 2015/03/27 03:45:13 UTC
[1/2] camel git commit: Fixed the CS errors of camel-core
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 4caeec56c -> b7d50009a
Fixed the CS errors of camel-core
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e1650c35
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e1650c35
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e1650c35
Branch: refs/heads/camel-2.15.x
Commit: e1650c35473767a5b59b19d880da47b7abd279c8
Parents: 4caeec5
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Mar 27 10:43:56 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 27 10:43:56 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/model/ChoiceDefinition.java | 3 ++-
.../apache/camel/component/bean/issues/SingleMethodService.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e1650c35/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
index a27502b..837364e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
@@ -147,7 +147,8 @@ public class ChoiceDefinition extends ProcessorDefinition<ChoiceDefinition> {
// okay we are adding a when or otherwise so allow any kind of output after this again
onlyWhenOrOtherwise = false;
} else {
- throw new IllegalArgumentException("A new choice clause should start with a when() or otherwise(). If you intend to end the entire choice and are using endChoice() then use end() instead.");
+ throw new IllegalArgumentException("A new choice clause should start with a when() or otherwise()."
+ + " If you intend to end the entire choice and are using endChoice() then use end() instead.");
}
}
super.addOutput(output);
http://git-wip-us.apache.org/repos/asf/camel/blob/e1650c35/camel-core/src/test/java/org/apache/camel/component/bean/issues/SingleMethodService.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/issues/SingleMethodService.java b/camel-core/src/test/java/org/apache/camel/component/bean/issues/SingleMethodService.java
index f3fe2e0..8bfc823 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/issues/SingleMethodService.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/issues/SingleMethodService.java
@@ -18,5 +18,5 @@ package org.apache.camel.component.bean.issues;
public interface SingleMethodService<S, T> {
- public T doSomething(S foo);
+ T doSomething(S foo);
}
[2/2] camel git commit: Fixed other CS errors
Posted by ni...@apache.org.
Fixed other CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7d50009
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7d50009
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7d50009
Branch: refs/heads/camel-2.15.x
Commit: b7d50009a65f28e54ccfff3ecae37648771b846d
Parents: e1650c3
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Mar 27 10:44:17 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 27 10:44:33 2015 +0800
----------------------------------------------------------------------
.../camel/component/google/calendar/GoogleCalendarEndpoint.java | 3 ++-
.../apache/camel/component/google/drive/GoogleDriveEndpoint.java | 3 ++-
.../org/apache/camel/component/sjms/jms/JmsMessageHelper.java | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b7d50009/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index f8d1cb4..838415c 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -35,7 +35,8 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
* Represents a GoogleCalendar endpoint.
*/
-@UriEndpoint(scheme = "google-calendar", title = "Google Calendar", syntax = "google-calendar:apiName/methodName", consumerClass = GoogleCalendarConsumer.class, consumerPrefix = "consumer", label = "api,cloud")
+@UriEndpoint(scheme = "google-calendar", title = "Google Calendar", syntax = "google-calendar:apiName/methodName",
+consumerClass = GoogleCalendarConsumer.class, consumerPrefix = "consumer", label = "api,cloud")
public class GoogleCalendarEndpoint extends AbstractApiEndpoint<GoogleCalendarApiName, GoogleCalendarConfiguration> {
@UriParam
http://git-wip-us.apache.org/repos/asf/camel/blob/b7d50009/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index d9cc550..fe2fc92 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -35,7 +35,8 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
* Represents a GoogleDrive endpoint.
*/
-@UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax = "google:drive:apiName/methodName", consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label = "api,cloud,file")
+@UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax = "google:drive:apiName/methodName",
+consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label = "api,cloud,file")
public class GoogleDriveEndpoint extends AbstractApiEndpoint<GoogleDriveApiName, GoogleDriveConfiguration> {
private Object apiProxy;
http://git-wip-us.apache.org/repos/asf/camel/blob/b7d50009/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
index f065bbe..dcccd9b 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
@@ -204,6 +204,7 @@ public final class JmsMessageHelper implements JmsConstants {
} else {
throw new JMSException("Null body is not allowed");
}
+ break;
default:
break;
}