This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new acdc6bafd4d [CAMEL-18072] mongodb: add a type converter to convert
from byte[] to Document (#7562)
acdc6bafd4d is described below
commit acdc6bafd4d8e92d7265bcb51eaf16068292bbb2
Author: Luca Burgazzoli <[email protected]>
AuthorDate: Tue May 10 10:58:32 2022 +0200
[CAMEL-18072] mongodb: add a type converter to convert from byte[] to
Document (#7562)
---
.../converters/MongoDbBasicConvertersLoader.java | 2 +
.../mongodb/converters/MongoDbBasicConverters.java | 18 ++++++++
.../integration/MongoDbTypeConvertersTest.java | 52 ++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git
a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConvertersLoader.java
b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConvertersLoader.java
index c05c7fbd07d..30c1c84b01e 100644
---
a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConvertersLoader.java
+++
b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConvertersLoader.java
@@ -45,6 +45,8 @@ public final class MongoDbBasicConvertersLoader implements
TypeConverterLoader,
(type, exchange, value) ->
org.apache.camel.component.mongodb.converters.MongoDbBasicConverters.fromStringToList((java.lang.String)
value));
addTypeConverter(registry, java.util.Map.class,
org.bson.Document.class, false,
(type, exchange, value) ->
org.apache.camel.component.mongodb.converters.MongoDbBasicConverters.fromDocumentToMap((org.bson.Document)
value));
+ addTypeConverter(registry, org.bson.Document.class, byte[].class,
false,
+ (type, exchange, value) ->
org.apache.camel.component.mongodb.converters.MongoDbBasicConverters.fromByteArrayToDocument((byte[])
value, exchange));
addTypeConverter(registry, org.bson.Document.class,
java.io.File.class, false,
(type, exchange, value) ->
org.apache.camel.component.mongodb.converters.MongoDbBasicConverters.fromFileToDocument((java.io.File)
value, exchange));
addTypeConverter(registry, org.bson.Document.class,
java.io.InputStream.class, false,
diff --git
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
index b093304b353..1c4db56aee7 100644
---
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
+++
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.converter.IOConverter;
+import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.bson.BsonArray;
import org.bson.BsonValue;
@@ -49,6 +50,8 @@ import org.slf4j.LoggerFactory;
public final class MongoDbBasicConverters {
private static final Logger LOG =
LoggerFactory.getLogger(MongoDbBasicConverters.class);
+ private static final DocumentCodec DOCUMENT_CODEC = new DocumentCodec();
+ private static final DecoderContext DECODER_CONTEXT =
DecoderContext.builder().build();
private MongoDbBasicConverters() {
}
@@ -78,6 +81,21 @@ public final class MongoDbBasicConverters {
return fromInputStreamToDocument(new FileInputStream(f), exchange);
}
+ @Converter
+ public static Document fromByteArrayToDocument(byte[] data, Exchange
exchange) throws Exception {
+ final Document answer;
+ final String input = new String(data,
ExchangeHelper.getCharsetName(exchange));
+
+ if (isBson(data)) {
+ JsonReader reader = new JsonReader(input);
+ answer = DOCUMENT_CODEC.decode(reader, DECODER_CONTEXT);
+ } else {
+ answer = Document.parse(input);
+ }
+
+ return answer;
+ }
+
@Converter
public static Document fromInputStreamToDocument(InputStream is, Exchange
exchange) throws Exception {
Document answer = null;
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbTypeConvertersTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbTypeConvertersTest.java
new file mode 100644
index 00000000000..7fa4e6aff6c
--- /dev/null
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbTypeConvertersTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mongodb.integration;
+
+import java.nio.charset.StandardCharsets;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.bson.Document;
+import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class MongoDbTypeConvertersTest {
+ @Test
+ public void convertFromString() throws Exception {
+ try (CamelContext context = new DefaultCamelContext()) {
+ Document doc = context.getTypeConverter().convertTo(
+ Document.class,
+ "{ \"id\": \"foo\", \"value\": \"the value\"}");
+
+ assertEquals("foo", doc.get("id", String.class));
+ assertEquals("the value", doc.get("value", String.class));
+ }
+ }
+
+ @Test
+ public void convertFromBytes() throws Exception {
+ try (CamelContext context = new DefaultCamelContext()) {
+ Document doc = context.getTypeConverter().convertTo(
+ Document.class,
+ "{ \"id\": \"foo\", \"value\": \"the
value\"}".getBytes(StandardCharsets.UTF_8));
+
+ assertEquals("foo", doc.get("id", String.class));
+ assertEquals("the value", doc.get("value", String.class));
+ }
+ }
+}
