This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.10.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.10.x by this push:
new fc250135dc1 Remove johnzon as a json library as it was removed as part
of Camel v4 as it was not compatible.
fc250135dc1 is described below
commit fc250135dc1b5c357fe8d691a5fb15c9a2253bca
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Apr 26 10:55:49 2025 +0200
Remove johnzon as a json library as it was removed as part of Camel v4 as
it was not compatible.
---
.../src/generated/resources/org/apache/camel/catalog/models/json.json | 2 +-
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 1 -
.../resources/META-INF/org/apache/camel/model/dataformat/json.json | 2 +-
.../src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java | 1 -
.../org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
.../camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json | 2 +-
6 files changed, 4 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
index 481742c34e5..22e3b7ff969 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
@@ -17,7 +17,7 @@
"useDefaultObjectMapper": { "index": 2, "kind": "attribute",
"displayName": "Use Default Object Mapper", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether to lookup and use default Jackson ObjectMapper from the registry." },
"autoDiscoverObjectMapper": { "index": 3, "kind": "attribute",
"displayName": "Auto Discover Object Mapper", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
set to true then Jackson will look for an objectMapper to use from the
registry" },
"prettyPrint": { "index": 4, "kind": "attribute", "displayName": "Pretty
Print", "group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "To enable pretty printing output nicely
formatted. Is by default false." },
- "library": { "index": 5, "kind": "attribute", "displayName": "Library",
"group": "common", "required": false, "type": "enum", "javaType":
"org.apache.camel.model.dataformat.JsonLibrary", "enum": [ "Fastjson", "Gson",
"Jackson", "Johnzon", "Jsonb" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "Jackson", "description": "Which json library
to use." },
+ "library": { "index": 5, "kind": "attribute", "displayName": "Library",
"group": "common", "required": false, "type": "enum", "javaType":
"org.apache.camel.model.dataformat.JsonLibrary", "enum": [ "Fastjson", "Gson",
"Jackson", "Jsonb" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "Jackson", "description": "Which json library to use." },
"combineUnicodeSurrogates": { "index": 6, "kind": "attribute",
"displayName": "Combine Unicode Surrogates", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Force generator that outputs JSON content to combine surrogate pairs (if any)
into 4-byte characters. This should be preferred when using 4-byte characters
such as Japanese." },
"unmarshalType": { "index": 7, "kind": "attribute", "displayName":
"Unmarshal Type", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Class name of the java type to use when
unmarshalling" },
"jsonView": { "index": 8, "kind": "attribute", "displayName": "Json View",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "When marshalling a POJO to JSON you might want
to exclude certain fields from the JSON output. With Jackson you can use JSON
views to accomplish this. This option is to refer to the class which has
JsonView annotations" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 438dd6ef9d1..8346f8a4efa 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -18554,7 +18554,6 @@ An optional certificate alias to use. This is useful
when the keystore has multi
<xs:enumeration value="Fastjson"/>
<xs:enumeration value="Gson"/>
<xs:enumeration value="Jackson"/>
- <xs:enumeration value="Johnzon"/>
<xs:enumeration value="Jsonb"/>
</xs:restriction>
</xs:simpleType>
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/json.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/json.json
index 481742c34e5..22e3b7ff969 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/json.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/json.json
@@ -17,7 +17,7 @@
"useDefaultObjectMapper": { "index": 2, "kind": "attribute",
"displayName": "Use Default Object Mapper", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether to lookup and use default Jackson ObjectMapper from the registry." },
"autoDiscoverObjectMapper": { "index": 3, "kind": "attribute",
"displayName": "Auto Discover Object Mapper", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
set to true then Jackson will look for an objectMapper to use from the
registry" },
"prettyPrint": { "index": 4, "kind": "attribute", "displayName": "Pretty
Print", "group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "To enable pretty printing output nicely
formatted. Is by default false." },
- "library": { "index": 5, "kind": "attribute", "displayName": "Library",
"group": "common", "required": false, "type": "enum", "javaType":
"org.apache.camel.model.dataformat.JsonLibrary", "enum": [ "Fastjson", "Gson",
"Jackson", "Johnzon", "Jsonb" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "Jackson", "description": "Which json library
to use." },
+ "library": { "index": 5, "kind": "attribute", "displayName": "Library",
"group": "common", "required": false, "type": "enum", "javaType":
"org.apache.camel.model.dataformat.JsonLibrary", "enum": [ "Fastjson", "Gson",
"Jackson", "Jsonb" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "Jackson", "description": "Which json library to use." },
"combineUnicodeSurrogates": { "index": 6, "kind": "attribute",
"displayName": "Combine Unicode Surrogates", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Force generator that outputs JSON content to combine surrogate pairs (if any)
into 4-byte characters. This should be preferred when using 4-byte characters
such as Japanese." },
"unmarshalType": { "index": 7, "kind": "attribute", "displayName":
"Unmarshal Type", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Class name of the java type to use when
unmarshalling" },
"jsonView": { "index": 8, "kind": "attribute", "displayName": "Json View",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "When marshalling a POJO to JSON you might want
to exclude certain fields from the JSON output. With Jackson you can use JSON
views to accomplish this. This option is to refer to the class which has
JsonView annotations" },
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
index 3e39209ec76..e169ae1d337 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
@@ -29,7 +29,6 @@ public enum JsonLibrary {
Fastjson("fastjson"),
Gson("gson"),
Jackson("jackson"),
- Johnzon("johnzon"),
Jsonb("jsonb");
private final String dataFormatName;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index ea018fb0655..de2ff3fe62a 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -8245,7 +8245,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "id", type = "string", description =
"The id of this node", displayName = "Id"),
@YamlProperty(name = "include", type = "string",
description = "If you want to marshal a pojo to JSON, and the pojo has some
fields with null values. And you want to skip these null values, you can set
this option to NON_NULL", displayName = "Include"),
@YamlProperty(name = "jsonView", type = "string",
description = "When marshalling a POJO to JSON you might want to exclude
certain fields from the JSON output. With Jackson you can use JSON views to
accomplish this. This option is to refer to the class which has JsonView
annotations", displayName = "Json View"),
- @YamlProperty(name = "library", type =
"enum:Fastjson,Gson,Jackson,Johnzon,Jsonb", defaultValue = "Jackson",
description = "Which json library to use.", displayName = "Library"),
+ @YamlProperty(name = "library", type =
"enum:Fastjson,Gson,Jackson,Jsonb", defaultValue = "Jackson", description =
"Which json library to use.", displayName = "Library"),
@YamlProperty(name = "moduleClassNames", type = "string",
description = "To use custom Jackson modules
com.fasterxml.jackson.databind.Module specified as a String with FQN class
names. Multiple classes can be separated by comma.", displayName = "Module
Class Names"),
@YamlProperty(name = "moduleRefs", type = "string",
description = "To use custom Jackson modules referred from the Camel registry.
Multiple modules can be separated by comma.", displayName = "Module Refs"),
@YamlProperty(name = "namingStrategy", type = "string",
description = "If set then Jackson will use the the defined Property Naming
Strategy.Possible values are: LOWER_CAMEL_CASE, LOWER_DOT_CASE, LOWER_CASE,
KEBAB_CASE, SNAKE_CASE and UPPER_CAMEL_CASE", displayName = "Naming Strategy"),
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 28d783304bc..aba98d0ea64 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -11387,7 +11387,7 @@
"title" : "Library",
"description" : "Which json library to use.",
"default" : "Jackson",
- "enum" : [ "Fastjson", "Gson", "Jackson", "Johnzon", "Jsonb" ]
+ "enum" : [ "Fastjson", "Gson", "Jackson", "Jsonb" ]
},
"moduleClassNames" : {
"type" : "string",
