You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/02/03 08:56:12 UTC
[1/4] camel git commit: CAMEL-9557: Facebook consumer throws
IllegalArgumentException with reading parameters
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 612ec99f8 -> d155bc500
refs/heads/master 6c857fd5e -> b121af112
CAMEL-9557: Facebook consumer throws IllegalArgumentException with reading parameters
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b5411f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b5411f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b5411f5
Branch: refs/heads/master
Commit: 5b5411f5feb002fe77a19c4a303f09d474494a26
Parents: 6c857fd
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 3 08:32:01 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 3 08:32:01 2016 +0100
----------------------------------------------------------------------
.../component/facebook/data/FacebookPropertiesHelper.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5b5411f5/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
index 1dd7079..d4d0b89 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
@@ -69,8 +69,6 @@ public final class FacebookPropertiesHelper {
options, FacebookConstants.READING_PREFIX);
if (!readingProperties.isEmpty()) {
try {
- configuration.setReadingOptions(readingProperties);
-
// add to an existing reading reference?
// NOTE Reading class does not support overwriting properties!!!
Reading reading = configuration.getReading();
@@ -78,19 +76,16 @@ public final class FacebookPropertiesHelper {
if (reading != null) {
Reading readingUpdate = new Reading();
ReadingBuilder.setProperties(readingUpdate, readingProperties);
-
reading = ReadingBuilder.merge(reading, readingUpdate);
} else {
reading = new Reading();
ReadingBuilder.setProperties(reading, readingProperties);
}
// set properties
- ReadingBuilder.setProperties(reading,
- readingProperties);
+ ReadingBuilder.setProperties(reading, readingProperties);
// update reading in configuration
configuration.setReading(reading);
-
} catch (Exception e) {
throw new IllegalArgumentException(readingProperties.toString(), e);
}
@@ -112,8 +107,7 @@ public final class FacebookPropertiesHelper {
int nProperties = 0;
for (Map.Entry<String, Object> entry : exchange.getIn().getHeaders().entrySet()) {
if (entry.getKey().startsWith(FacebookConstants.FACEBOOK_PROPERTY_PREFIX)) {
- properties.put(entry.getKey().substring(FacebookConstants.FACEBOOK_PROPERTY_PREFIX.length()),
- entry.getValue());
+ properties.put(entry.getKey().substring(FacebookConstants.FACEBOOK_PROPERTY_PREFIX.length()), entry.getValue());
nProperties++;
}
}
[2/4] camel git commit: CAMEL-9564:
EndpointHelper.resolveReferenceListParameter should not return immutable
lists
Posted by da...@apache.org.
CAMEL-9564: EndpointHelper.resolveReferenceListParameter should not return immutable lists
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b121af11
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b121af11
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b121af11
Branch: refs/heads/master
Commit: b121af11249cdd9c1f5c4e67a974fdc137daeaf1
Parents: 5b5411f
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 3 08:37:22 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 3 08:37:22 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/util/EndpointHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b121af11/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
index 93c2be2..eeb75ca 100644
--- a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
@@ -341,13 +341,13 @@ public final class EndpointHelper {
* @param context Camel context to use for lookup.
* @param value reference parameter value.
* @param elementType result list element type.
- * @return list of lookup results.
+ * @return list of lookup results, will always return a list.
* @throws IllegalArgumentException if any referenced object was not found in registry.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public static <T> List<T> resolveReferenceListParameter(CamelContext context, String value, Class<T> elementType) {
if (value == null) {
- return Collections.emptyList();
+ return new ArrayList<T>();
}
List<String> elements = Arrays.asList(value.split(","));
if (elements.size() == 1) {
[3/4] camel git commit: CAMEL-9557: Facebook consumer throws
IllegalArgumentException with reading parameters
Posted by da...@apache.org.
CAMEL-9557: Facebook consumer throws IllegalArgumentException with reading parameters
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2dd718d9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2dd718d9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2dd718d9
Branch: refs/heads/camel-2.16.x
Commit: 2dd718d95900463aa55b19bd37e4e8c104ee0949
Parents: 612ec99
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 3 08:32:01 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 3 08:55:53 2016 +0100
----------------------------------------------------------------------
.../component/facebook/data/FacebookPropertiesHelper.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2dd718d9/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
index 1dd7079..d4d0b89 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookPropertiesHelper.java
@@ -69,8 +69,6 @@ public final class FacebookPropertiesHelper {
options, FacebookConstants.READING_PREFIX);
if (!readingProperties.isEmpty()) {
try {
- configuration.setReadingOptions(readingProperties);
-
// add to an existing reading reference?
// NOTE Reading class does not support overwriting properties!!!
Reading reading = configuration.getReading();
@@ -78,19 +76,16 @@ public final class FacebookPropertiesHelper {
if (reading != null) {
Reading readingUpdate = new Reading();
ReadingBuilder.setProperties(readingUpdate, readingProperties);
-
reading = ReadingBuilder.merge(reading, readingUpdate);
} else {
reading = new Reading();
ReadingBuilder.setProperties(reading, readingProperties);
}
// set properties
- ReadingBuilder.setProperties(reading,
- readingProperties);
+ ReadingBuilder.setProperties(reading, readingProperties);
// update reading in configuration
configuration.setReading(reading);
-
} catch (Exception e) {
throw new IllegalArgumentException(readingProperties.toString(), e);
}
@@ -112,8 +107,7 @@ public final class FacebookPropertiesHelper {
int nProperties = 0;
for (Map.Entry<String, Object> entry : exchange.getIn().getHeaders().entrySet()) {
if (entry.getKey().startsWith(FacebookConstants.FACEBOOK_PROPERTY_PREFIX)) {
- properties.put(entry.getKey().substring(FacebookConstants.FACEBOOK_PROPERTY_PREFIX.length()),
- entry.getValue());
+ properties.put(entry.getKey().substring(FacebookConstants.FACEBOOK_PROPERTY_PREFIX.length()), entry.getValue());
nProperties++;
}
}
[4/4] camel git commit: CAMEL-9564:
EndpointHelper.resolveReferenceListParameter should not return immutable
lists
Posted by da...@apache.org.
CAMEL-9564: EndpointHelper.resolveReferenceListParameter should not return immutable lists
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d155bc50
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d155bc50
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d155bc50
Branch: refs/heads/camel-2.16.x
Commit: d155bc500b2ed8b7a86e7a82f6be6d0bc38c651a
Parents: 2dd718d
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 3 08:37:22 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 3 08:55:59 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/util/EndpointHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d155bc50/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
index 93c2be2..eeb75ca 100644
--- a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
@@ -341,13 +341,13 @@ public final class EndpointHelper {
* @param context Camel context to use for lookup.
* @param value reference parameter value.
* @param elementType result list element type.
- * @return list of lookup results.
+ * @return list of lookup results, will always return a list.
* @throws IllegalArgumentException if any referenced object was not found in registry.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public static <T> List<T> resolveReferenceListParameter(CamelContext context, String value, Class<T> elementType) {
if (value == null) {
- return Collections.emptyList();
+ return new ArrayList<T>();
}
List<String> elements = Arrays.asList(value.split(","));
if (elements.size() == 1) {