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/29 15:33:35 UTC
[1/2] camel git commit: Camel catalog - Fixed mistake in filter log
options.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 975e88084 -> e67d08c2e
refs/heads/master 7fc38807b -> 5e37c6deb
Camel catalog - Fixed mistake in filter log options.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e37c6de
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e37c6de
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e37c6de
Branch: refs/heads/master
Commit: 5e37c6deba0db8d4f8648c25dc1272375907f796
Parents: 7fc3880
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 29 15:33:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 29 15:33:06 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/catalog/DefaultCamelCatalog.java | 11 +++++------
.../java/org/apache/camel/catalog/CamelCatalogTest.java | 9 +++++++++
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5e37c6de/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 47af8b2..4e99524 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -1447,23 +1447,22 @@ public class DefaultCamelCatalog implements CamelCatalog {
*/
private Map<String, String> filterProperties(String scheme, Map<String, String> options) {
if ("log".equals(scheme)) {
- Map<String, String> answer = new LinkedHashMap<String, String>();
String showAll = options.get("showAll");
if ("true".equals(showAll)) {
+ Map<String, String> filtered = new LinkedHashMap<String, String>();
// remove all the other showXXX options when showAll=true
for (Map.Entry<String, String> entry : options.entrySet()) {
String key = entry.getKey();
boolean skip = key.startsWith("show") && !key.equals("showAll");
if (!skip) {
- answer.put(key, entry.getValue());
+ filtered.put(key, entry.getValue());
}
}
+ return filtered;
}
- return answer;
- } else {
- // use as-is
- return options;
}
+ // use as-is
+ return options;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/5e37c6de/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index ba85f25..830d0bd 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -343,6 +343,15 @@ public class CamelCatalogTest {
}
@Test
+ public void testAsEndpointUriLogShort() throws Exception {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("loggerName", "foo");
+ map.put("loggerLevel", "DEBUG");
+
+ assertEquals("log:foo?loggerLevel=DEBUG", catalog.asEndpointUri("log", map, false));
+ }
+
+ @Test
public void testAsEndpointUriWithplaceholder() throws Exception {
Map<String, String> map = new HashMap<String, String>();
map.put("query", "{{insert}}");
[2/2] camel git commit: Camel catalog - Fixed mistake in filter log
options.
Posted by da...@apache.org.
Camel catalog - Fixed mistake in filter log options.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e67d08c2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e67d08c2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e67d08c2
Branch: refs/heads/camel-2.16.x
Commit: e67d08c2e8e166a3f7eb0483208fc54355233579
Parents: 975e880
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 29 15:33:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 29 15:33:27 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/catalog/DefaultCamelCatalog.java | 11 +++++------
.../java/org/apache/camel/catalog/CamelCatalogTest.java | 9 +++++++++
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e67d08c2/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 47af8b2..4e99524 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -1447,23 +1447,22 @@ public class DefaultCamelCatalog implements CamelCatalog {
*/
private Map<String, String> filterProperties(String scheme, Map<String, String> options) {
if ("log".equals(scheme)) {
- Map<String, String> answer = new LinkedHashMap<String, String>();
String showAll = options.get("showAll");
if ("true".equals(showAll)) {
+ Map<String, String> filtered = new LinkedHashMap<String, String>();
// remove all the other showXXX options when showAll=true
for (Map.Entry<String, String> entry : options.entrySet()) {
String key = entry.getKey();
boolean skip = key.startsWith("show") && !key.equals("showAll");
if (!skip) {
- answer.put(key, entry.getValue());
+ filtered.put(key, entry.getValue());
}
}
+ return filtered;
}
- return answer;
- } else {
- // use as-is
- return options;
}
+ // use as-is
+ return options;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/e67d08c2/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index ba85f25..830d0bd 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -343,6 +343,15 @@ public class CamelCatalogTest {
}
@Test
+ public void testAsEndpointUriLogShort() throws Exception {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("loggerName", "foo");
+ map.put("loggerLevel", "DEBUG");
+
+ assertEquals("log:foo?loggerLevel=DEBUG", catalog.asEndpointUri("log", map, false));
+ }
+
+ @Test
public void testAsEndpointUriWithplaceholder() throws Exception {
Map<String, String> map = new HashMap<String, String>();
map.put("query", "{{insert}}");