You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2013/07/15 11:57:29 UTC
git commit: Added test case to ensure that CAMEL-6394 generates
properly formatted JSON which can actually be parsed;
and fixed bug in incorrect JSON encoding ; )
Updated Branches:
refs/heads/master 46a9c2b01 -> 4eed66cdf
Added test case to ensure that CAMEL-6394 generates properly formatted JSON which can actually be parsed; and fixed bug in incorrect JSON encoding ;)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4eed66cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4eed66cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4eed66cd
Branch: refs/heads/master
Commit: 4eed66cdf21ed2995e43ed9bbcf86d321f16fe0a
Parents: 46a9c2b
Author: James Strachan <ja...@gmail.com>
Authored: Mon Jul 15 10:57:05 2013 +0100
Committer: James Strachan <ja...@gmail.com>
Committed: Mon Jul 15 10:57:05 2013 +0100
----------------------------------------------------------------------
camel-core/pom.xml | 10 +++++++++-
.../apache/camel/impl/ComponentConfigurationSupport.java | 1 -
.../apache/camel/management/EndpointCompletionTest.java | 7 +++++++
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4eed66cd/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 143d1e8..1f6fbcc 100755
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -138,7 +138,14 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
-
+
+ <!-- for json tests -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson2-version}</version>
+ </dependency>
+
<!-- validator -->
<dependency>
<groupId>xml-resolver</groupId>
@@ -146,6 +153,7 @@
<version>${xml-resolver-version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/4eed66cd/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java b/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
index 4dae1b7..40f190c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
@@ -174,7 +174,6 @@ public abstract class ComponentConfigurationSupport implements ComponentConfigur
} else {
buffer.append(",");
}
- buffer.append(entry.getKey());
buffer.append("\n ");
buffer.append(entry.getValue().toJson());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4eed66cd/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java b/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
index b081380..1512914 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
@@ -23,6 +23,8 @@ import java.util.Map;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import org.apache.camel.builder.RouteBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,6 +81,11 @@ public class EndpointCompletionTest extends ManagementTestSupport {
mbeanServer.invoke(on, "componentParameterJsonSchema", params, signature));
LOG.info("Component " + componentName + " returned JSON: " + answer);
+
+ // now lets validate that the generated JSON parses correctly
+ ObjectMapper mapper = new ObjectMapper();
+ HashMap data = mapper.readValue(answer, HashMap.class);
+ LOG.info("Read JSON: " + data);
return answer;
}