This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 0486ca2 Replaced JSon to JSON and replaced JSonPath to JsonPath. This
fixes #2143
0486ca2 is described below
commit 0486ca2d98f042efc45c6498d50d92d434020783
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Dec 13 15:16:18 2017 +0100
Replaced JSon to JSON and replaced JSonPath to JsonPath. This fixes #2143
---
.../java/org/apache/camel/model/language/JsonPathExpression.java | 8 ++++----
components/camel-jsonpath/src/main/docs/jsonpath-language.adoc | 8 ++++----
.../src/main/java/org/apache/camel/jsonpath/JsonPath.java | 6 +++---
components/readme.adoc | 2 +-
docs/user-manual/en/SUMMARY.md | 2 +-
.../camel/jsonpath/springboot/JsonPathLanguageConfiguration.java | 6 +++---
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
index 596d18b..d289437 100644
---
a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
+++
b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
@@ -29,11 +29,11 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.util.ObjectHelper;
/**
- * To use JSonPath in Camel expressions or predicates.
+ * To use JsonPath in Camel expressions or predicates.
*
* @version
*/
-@Metadata(firstVersion = "2.13.0", label = "language,json", title = "JSonPath")
+@Metadata(firstVersion = "2.13.0", label = "language,json", title = "JsonPath")
@XmlRootElement(name = "jsonpath")
@XmlAccessorType(XmlAccessType.FIELD)
public class JsonPathExpression extends ExpressionDefinition {
@@ -91,7 +91,7 @@ public class JsonPathExpression extends ExpressionDefinition {
}
/**
- * Whether to allow in inlined simple exceptions in the json path
expression
+ * Whether to allow in inlined simple exceptions in the JsonPath expression
*/
public void setAllowSimple(Boolean allowSimple) {
this.allowSimple = allowSimple;
@@ -120,7 +120,7 @@ public class JsonPathExpression extends
ExpressionDefinition {
}
/**
- * Whether to write the output of each row/element as a JSon String value
instead of a Map/POJO value.
+ * Whether to write the output of each row/element as a JSON String value
instead of a Map/POJO value.
*/
public void setWriteAsString(Boolean writeAsString) {
this.writeAsString = writeAsString;
diff --git a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
index 9d56b18..e6955a6 100644
--- a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
+++ b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
@@ -1,4 +1,4 @@
-== JSonPath Language
+== JsonPath Language
*Available as of Camel version 2.13*
@@ -22,7 +22,7 @@ from("queue:books.new")
// language options: START
-The JSonPath language supports 7 options which are listed below.
+The JsonPath language supports 7 options which are listed below.
@@ -31,9 +31,9 @@ The JSonPath language supports 7 options which are listed
below.
| Name | Default | Java Type | Description
| resultType | | String | Sets the class name of the result type (type from
output)
| suppressExceptions | false | Boolean | Whether to suppress exceptions such
as PathNotFoundException.
-| allowSimple | true | Boolean | Whether to allow in inlined simple exceptions
in the json path expression
+| allowSimple | true | Boolean | Whether to allow in inlined simple exceptions
in the JsonPath expression
| allowEasyPredicate | true | Boolean | Whether to allow using the easy
predicate parser to pre-parse predicates.
-| writeAsString | false | Boolean | Whether to write the output of each
row/element as a JSon String value instead of a Map/POJO value.
+| writeAsString | false | Boolean | Whether to write the output of each
row/element as a JSON String value instead of a Map/POJO value.
| headerName | | String | Name of header to use as input instead of the
message body
| trim | true | Boolean | Whether to trim the value to remove leading and
trailing whitespaces and line breaks
|===
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPath.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPath.java
index bbb399f..0cf390e 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPath.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPath.java
@@ -26,7 +26,7 @@ import com.jayway.jsonpath.Option;
import org.apache.camel.language.LanguageAnnotation;
/**
- * An annotation used to inject a <a
href="http://commons.apache.org/jsonpath/">JSon Path</a>
+ * An annotation used to inject a <a
href="http://commons.apache.org/jsonpath/">JsonPath</a>
* expression into a method parameter when using
* <a href="http://camel.apache.org/bean-integration.html">Bean Integration</a>
*
@@ -46,12 +46,12 @@ public @interface JsonPath {
boolean suppressExceptions() default false;
/**
- * Whether to allow in inlined simple exceptions in the json path
expression
+ * Whether to allow in inlined simple exceptions in the JsonPath expression
*/
boolean allowSimple() default true;
/**
- * To configure the json path options to use
+ * To configure the JsonPath options to use
*/
Option[] options() default {};
}
\ No newline at end of file
diff --git a/components/readme.adoc b/components/readme.adoc
index bde02f9..84d0c56 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1007,7 +1007,7 @@ Number of Languages: 24 in 12 JAR artifacts (6 deprecated)
| link:camel-script/src/main/docs/javaScript-language.adoc[JavaScript]
(camel-script) | 1.0 | To use JavaScript in Camel expressions or predicates.
-| link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JSonPath]
(camel-jsonpath) | 2.13 | To use JSonPath in Camel expressions or predicates.
+| link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JsonPath]
(camel-jsonpath) | 2.13 | To use JsonPath in Camel expressions or predicates.
| link:camel-jxpath/src/main/docs/jxpath-language.adoc[JXPath] (camel-jxpath)
| 1.3 | *deprecated* To use JXPath in Camel expressions or predicates.
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index c272613..9e38e87 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -504,7 +504,7 @@
* [Header](header-language.adoc)
* [HL7 Terser](terser-language.adoc)
* [JavaScript](javaScript-language.adoc)
- * [JSonPath](jsonpath-language.adoc)
+ * [JsonPath](jsonpath-language.adoc)
* [JXPath](jxpath-language.adoc)
* [MVEL](mvel-language.adoc)
* [OGNL](ognl-language.adoc)
diff --git
a/platforms/spring-boot/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java
b/platforms/spring-boot/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java
index f9a7c6e..d40ca8f 100644
---
a/platforms/spring-boot/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java
@@ -21,7 +21,7 @@ import
org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * To use JSonPath in Camel expressions or predicates.
+ * To use JsonPath in Camel expressions or predicates.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -36,7 +36,7 @@ public class JsonPathLanguageConfiguration
*/
private Boolean suppressExceptions = false;
/**
- * Whether to allow in inlined simple exceptions in the json path
expression
+ * Whether to allow in inlined simple exceptions in the JsonPath expression
*/
private Boolean allowSimple = true;
/**
@@ -44,7 +44,7 @@ public class JsonPathLanguageConfiguration
*/
private Boolean allowEasyPredicate = true;
/**
- * Whether to write the output of each row/element as a JSon String value
+ * Whether to write the output of each row/element as a JSON String value
* instead of a Map/POJO value.
*/
private Boolean writeAsString = false;
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].