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 2024/01/17 10:40:01 UTC
(camel) branch main updated: camel-jsonata is not a remote component
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 30554dec035 camel-jsonata is not a remote component
30554dec035 is described below
commit 30554dec03537cc7acc4fa45a31e50759b049316
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 17 11:39:48 2024 +0100
camel-jsonata is not a remote component
---
.../apache/camel/catalog/components/jsonata.json | 2 +-
.../apache/camel/component/jsonata/jsonata.json | 2 +-
.../camel/component/jsonata/JsonataEndpoint.java | 27 ++++++++++++----------
.../component/jsonata/JsonataFirstSampleTest.java | 6 ++---
4 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jsonata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jsonata.json
index ae4b7a31947..19a190944f1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jsonata.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jsonata.json
@@ -20,7 +20,7 @@
"consumerOnly": false,
"producerOnly": true,
"lenientProperties": false,
- "remote": true
+ "remote": false
},
"componentProperties": {
"lazyStartProducer": { "index": 0, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
diff --git a/components/camel-jsonata/src/generated/resources/org/apache/camel/component/jsonata/jsonata.json b/components/camel-jsonata/src/generated/resources/org/apache/camel/component/jsonata/jsonata.json
index ae4b7a31947..19a190944f1 100644
--- a/components/camel-jsonata/src/generated/resources/org/apache/camel/component/jsonata/jsonata.json
+++ b/components/camel-jsonata/src/generated/resources/org/apache/camel/component/jsonata/jsonata.json
@@ -20,7 +20,7 @@
"consumerOnly": false,
"producerOnly": true,
"lenientProperties": false,
- "remote": true
+ "remote": false
},
"componentProperties": {
"lazyStartProducer": { "index": 0, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
diff --git a/components/camel-jsonata/src/main/java/org/apache/camel/component/jsonata/JsonataEndpoint.java b/components/camel-jsonata/src/main/java/org/apache/camel/component/jsonata/JsonataEndpoint.java
index ba32a44e875..50d11c69870 100644
--- a/components/camel-jsonata/src/main/java/org/apache/camel/component/jsonata/JsonataEndpoint.java
+++ b/components/camel-jsonata/src/main/java/org/apache/camel/component/jsonata/JsonataEndpoint.java
@@ -16,6 +16,13 @@
*/
package org.apache.camel.component.jsonata;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import com.dashjoin.jsonata.Jsonata;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,20 +35,14 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.stream.Collectors;
-
import static com.dashjoin.jsonata.Jsonata.jsonata;
/**
* Transforms JSON payload using JSONata transformation.
*/
-@UriEndpoint(firstVersion = "3.5.0", scheme = "jsonata", title = "JSONata", syntax = "jsonata:resourceUri", producerOnly = true,
- category = { Category.TRANSFORMATION })
+@UriEndpoint(firstVersion = "3.5.0", scheme = "jsonata", title = "JSONata", syntax = "jsonata:resourceUri",
+ producerOnly = true, remote = false,
+ category = { Category.TRANSFORMATION })
public class JsonataEndpoint extends ResourceEndpoint {
private final ObjectMapper mapper = new ObjectMapper();
@@ -99,15 +100,17 @@ public class JsonataEndpoint extends ResourceEndpoint {
Map<String, Object> input;
if (getInputType() == JsonataInputOutputType.JsonString) {
InputStream inputStream = exchange.getIn().getBody(InputStream.class);
- input = mapper.readValue(inputStream, new TypeReference<>() {});
+ input = mapper.readValue(inputStream, new TypeReference<>() {
+ });
} else {
- input = mapper.convertValue(exchange.getIn().getBody(), new TypeReference<>() {});
+ input = mapper.convertValue(exchange.getIn().getBody(), new TypeReference<>() {
+ });
}
Object output = null;
Jsonata expression = null;
try (InputStreamReader inputStreamReader
- = new InputStreamReader(getResourceAsInputStream(), StandardCharsets.UTF_8);
+ = new InputStreamReader(getResourceAsInputStream(), StandardCharsets.UTF_8);
BufferedReader bufferedReader = new BufferedReader(inputStreamReader);) {
String spec = bufferedReader
.lines()
diff --git a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFirstSampleTest.java b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFirstSampleTest.java
index e798ade5359..bb8e154cde2 100644
--- a/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFirstSampleTest.java
+++ b/components/camel-jsonata/src/test/java/org/apache/camel/component/jsonata/JsonataFirstSampleTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.jsonata;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -24,9 +27,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.Test;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Unit test based on the first sample test from the JSONata project.
*/