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 2017/07/22 07:35:00 UTC
[1/2] camel git commit: CAMEL-11574 - Switch lumberjack from Gson to
Jackson in order to support long JSon values
Repository: camel
Updated Branches:
refs/heads/master 25529cbd0 -> 6236e5efd
CAMEL-11574 - Switch lumberjack from Gson to Jackson in order to support long JSon values
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bdada3d5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bdada3d5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bdada3d5
Branch: refs/heads/master
Commit: bdada3d51288202c0c8ec2da24147bd9147edf3b
Parents: 25529cb
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Fri Jul 21 15:13:18 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 22 09:33:20 2017 +0200
----------------------------------------------------------------------
components/camel-lumberjack/pom.xml | 7 +++----
.../component/lumberjack/io/LumberjackFrameDecoder.java | 10 +++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bdada3d5/components/camel-lumberjack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/pom.xml b/components/camel-lumberjack/pom.xml
index 94d16ac..4e3e8d1 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -57,9 +57,8 @@
<version>${netty-version}</version>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson-version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<!-- test dependencies -->
@@ -72,7 +71,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/bdada3d5/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackFrameDecoder.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackFrameDecoder.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackFrameDecoder.java
index c3fa454..97d639e 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackFrameDecoder.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/io/LumberjackFrameDecoder.java
@@ -16,13 +16,14 @@
*/
package org.apache.camel.component.lumberjack.io;
+import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.zip.Inflater;
-import com.google.gson.Gson;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
@@ -55,11 +56,10 @@ final class LumberjackFrameDecoder extends ByteToMessageDecoder {
private static final Logger LOG = LoggerFactory.getLogger(LumberjackFrameDecoder.class);
private final LumberjackSessionHandler sessionHandler;
- private final Gson gson;
+ private final ObjectMapper jackson = new ObjectMapper();
LumberjackFrameDecoder(LumberjackSessionHandler sessionHandler) {
this.sessionHandler = sessionHandler;
- gson = new Gson();
}
@Override
@@ -104,7 +104,7 @@ final class LumberjackFrameDecoder extends ByteToMessageDecoder {
}
}
- private boolean handleJsonFrame(ByteBuf in, List<Object> out) {
+ private boolean handleJsonFrame(ByteBuf in, List<Object> out) throws IOException {
if (!in.isReadable(FRAME_JSON_HEADER_LENGTH)) {
return false;
}
@@ -117,7 +117,7 @@ final class LumberjackFrameDecoder extends ByteToMessageDecoder {
return false;
}
- Object jsonMessage = gson.fromJson(jsonStr, Object.class);
+ Object jsonMessage = jackson.readValue(jsonStr, Object.class);
// put message in the pipeline
out.add(new LumberjackMessage(sequenceNumber, jsonMessage));
[2/2] camel git commit: CAMEL-11574 - Update karaf features
Posted by da...@apache.org.
CAMEL-11574 - Update karaf features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6236e5ef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6236e5ef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6236e5ef
Branch: refs/heads/master
Commit: 6236e5efd3e2755aa3192abfaeb9d79a979cf35d
Parents: bdada3d
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Fri Jul 21 20:54:15 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 22 09:33:21 2017 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6236e5ef/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index ab40858..5f045dd 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -135,7 +135,7 @@
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle>mvn:org.apache.camel/camel-atom/${project.version}</bundle>
</feature>
- <feature name='camel-atomix' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature name='camel-atomix' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
@@ -1302,7 +1302,9 @@
<bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
- <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle>mvn:org.apache.camel/camel-lumberjack/${project.version}</bundle>
</feature>
<feature name='camel-lzf' version='${project.version}' resolver='(obr)' start-level='50'>