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 a99a112879e Rename fury to fory
a99a112879e is described below
commit a99a112879eca22896c2599b9f36791a0b0baa5b
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Jul 4 08:01:53 2025 +0200
Rename fury to fory
---
.../org/apache/camel/catalog/dataformats/fory.json | 2 +-
.../resources/org/apache/camel/catalog/models/fory.json | 2 +-
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../org/apache/camel/catalog/schemas/camel-xml-io.xsd | 2 +-
.../META-INF/org/apache/camel/component/fory/fory.json | 2 +-
.../org/apache/camel/component/fory/ForyDataFormat.java | 14 +-------------
.../META-INF/org/apache/camel/model/dataformat/fory.json | 2 +-
.../org/apache/camel/model/dataformat/ForyDataFormat.java | 7 ++-----
.../camel/reifier/dataformat/ForyDataFormatReifier.java | 5 +++--
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
.../src/generated/resources/schema/camelYamlDsl.json | 2 +-
11 files changed, 14 insertions(+), 28 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fory.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fory.json
index f2997aa3fc5..93fcf9edcd4 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fory.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fory.json
@@ -19,7 +19,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
id of this node" },
"unmarshalType": { "index": 1, "kind": "attribute", "displayName":
"Unmarshal Type", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Class of the java type to use when
unmarshalling" },
"requireClassRegistration": { "index": 2, "kind": "attribute",
"displayName": "Require Class Registration", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Whether to require register classes" },
- "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread
Safe", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether to use
the threadsafe fory" },
+ "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread
Safe", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether to use
the threadsafe Fory" },
"allowAutoWiredFory": { "index": 4, "kind": "attribute", "displayName":
"Allow Auto Wired Fory", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether to auto-discover Fory from the registry" }
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fory.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fory.json
index 38abe61c847..7f2f53d46fd 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fory.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fory.json
@@ -16,7 +16,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
id of this node" },
"unmarshalType": { "index": 1, "kind": "attribute", "displayName":
"Unmarshal Type", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Class of the java type to use when
unmarshalling" },
"requireClassRegistration": { "index": 2, "kind": "attribute",
"displayName": "Require Class Registration", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Whether to require register classes" },
- "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread
Safe", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether to use
the threadsafe fory" },
+ "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread
Safe", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether to use
the threadsafe Fory" },
"allowAutoWiredFory": { "index": 4, "kind": "attribute", "displayName":
"Allow Auto Wired Fory", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether to auto-discover Fory from the registry" }
}
}
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 9df220013a0..e8bedaecfa4 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
@@ -8896,7 +8896,7 @@ Whether to require register classes. Default value: true
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Whether to use the threadsafe fory. Default value: true
+Whether to use the threadsafe Fory. Default value: true
]]>
</xs:documentation>
</xs:annotation>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
index 68c3cdcafdd..270ad8b292c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
@@ -7569,7 +7569,7 @@ Whether to require register classes. Default value: true
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Whether to use the threadsafe fory. Default value: true
+Whether to use the threadsafe Fory. Default value: true
]]>
</xs:documentation>
</xs:annotation>
diff --git
a/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fory.json
b/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fory.json
index f2997aa3fc5..93fcf9edcd4 100644
---
a/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fory.json
+++
b/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fory.json
@@ -19,7 +19,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
id of this node" },
"unmarshalType": { "index": 1, "kind": "attribute", "displayName":
"Unmarshal Type", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Class of the java type to use when
unmarshalling" },
"requireClassRegistration": { "index": 2, "kind": "attribute",
"displayName": "Require Class Registration", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Whether to require register classes" },
- "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread
Safe", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether to use
the threadsafe fory" },
+ "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread
Safe", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether to use
the threadsafe Fory" },
"allowAutoWiredFory": { "index": 4, "kind": "attribute", "displayName":
"Allow Auto Wired Fory", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether to auto-discover Fory from the registry" }
}
}
diff --git
a/components/camel-fory/src/main/java/org/apache/camel/component/fory/ForyDataFormat.java
b/components/camel-fory/src/main/java/org/apache/camel/component/fory/ForyDataFormat.java
index 94ed3e441c1..ded4ad1299d 100644
---
a/components/camel-fory/src/main/java/org/apache/camel/component/fory/ForyDataFormat.java
+++
b/components/camel-fory/src/main/java/org/apache/camel/component/fory/ForyDataFormat.java
@@ -31,8 +31,6 @@ import org.apache.fory.Fory;
import org.apache.fory.config.ForyBuilder;
import org.apache.fory.config.Language;
import org.apache.fory.io.ForyInputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Serialize and deserialize messages using <a
href="https://fory.apache.org";>Apache Fory</a>
@@ -40,7 +38,6 @@ import org.slf4j.LoggerFactory;
@Dataformat("fory")
@Metadata(firstVersion = "4.9.0", title = "Fory")
public class ForyDataFormat extends ServiceSupport implements DataFormat,
DataFormatName, CamelContextAware {
- private static final Logger LOG =
LoggerFactory.getLogger(ForyDataFormat.class);
private CamelContext camelContext;
private Class<?> unmarshalType;
@@ -48,7 +45,6 @@ public class ForyDataFormat extends ServiceSupport implements
DataFormat, DataFo
private boolean requireClassRegistration = true;
private boolean threadSafe = true;
private boolean allowAutoWiredFury = true;
-
private BaseFory fory;
public ForyDataFormat() {
@@ -105,17 +101,9 @@ public class ForyDataFormat extends ServiceSupport
implements DataFormat, DataFo
}
}
- @Override
- protected void doStart() throws Exception {
- }
-
- @Override
- protected void doStop() throws Exception {
- // noop
- }
-
// Properties
//
-------------------------------------------------------------------------
+
public BaseFory getFory() {
return fory;
}
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/fory.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/fory.json
index 38abe61c847..7f2f53d46fd 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/fory.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/fory.json
@@ -16,7 +16,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
id of this node" },
"unmarshalType": { "index": 1, "kind": "attribute", "displayName":
"Unmarshal Type", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Class of the java type to use when
unmarshalling" },
"requireClassRegistration": { "index": 2, "kind": "attribute",
"displayName": "Require Class Registration", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Whether to require register classes" },
- "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread
Safe", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether to use
the threadsafe fory" },
+ "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread
Safe", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether to use
the threadsafe Fory" },
"allowAutoWiredFory": { "index": 4, "kind": "attribute", "displayName":
"Allow Auto Wired Fory", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether to auto-discover Fory from the registry" }
}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ForyDataFormat.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ForyDataFormat.java
index 33e87578d91..b029c4d8e6f 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ForyDataFormat.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ForyDataFormat.java
@@ -33,23 +33,20 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "fory")
@XmlAccessorType(XmlAccessType.FIELD)
public class ForyDataFormat extends DataFormatDefinition {
+
@XmlTransient
private Class<?> unmarshalType;
-
@XmlAttribute(name = "unmarshalType")
@Metadata(description = "Class of the java type to use when unmarshalling")
private String unmarshalTypeName;
-
@XmlAttribute
@Metadata(label = "advanced", description = "Whether to require register
classes", defaultValue = "true",
javaType = "java.lang.Boolean")
private String requireClassRegistration;
-
@XmlAttribute
- @Metadata(label = "advanced", description = "Whether to use the threadsafe
fory", defaultValue = "true",
+ @Metadata(label = "advanced", description = "Whether to use the threadsafe
Fory", defaultValue = "true",
javaType = "java.lang.Boolean")
private String threadSafe;
-
@XmlAttribute
@Metadata(label = "advanced", description = "Whether to auto-discover Fory
from the registry", defaultValue = "true",
javaType = "java.lang.Boolean")
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ForyDataFormatReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ForyDataFormatReifier.java
index daf9989f46e..0474f474600 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ForyDataFormatReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ForyDataFormatReifier.java
@@ -23,15 +23,16 @@ import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.dataformat.ForyDataFormat;
public class ForyDataFormatReifier extends DataFormatReifier<ForyDataFormat> {
+
public ForyDataFormatReifier(CamelContext camelContext,
DataFormatDefinition definition) {
super(camelContext, (ForyDataFormat) definition);
}
@Override
protected void prepareDataFormatConfig(Map<String, Object> properties) {
- properties.put("unmarshalType", definition.getUnmarshalType());
+ properties.put("unmarshalType", or(definition.getUnmarshalType(),
definition.getUnmarshalTypeName()));
properties.put("requireClassRegistration",
definition.getRequireClassRegistration());
properties.put("threadSafe", definition.getThreadSafe());
- properties.put("allowAutoWiredFury",
definition.getAllowAutoWiredFory());
+ properties.put("allowAutoWiredFory",
definition.getAllowAutoWiredFory());
}
}
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 273f64c0aef..65fba7ef9ca 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
@@ -6239,7 +6239,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "allowAutoWiredFory", type =
"boolean", description = "Whether to auto-discover Fory from the registry",
displayName = "Allow Auto Wired Fory"),
@YamlProperty(name = "id", type = "string", description =
"The id of this node", displayName = "Id"),
@YamlProperty(name = "requireClassRegistration", type =
"boolean", description = "Whether to require register classes", displayName =
"Require Class Registration"),
- @YamlProperty(name = "threadSafe", type = "boolean",
description = "Whether to use the threadsafe fory", displayName = "Thread
Safe"),
+ @YamlProperty(name = "threadSafe", type = "boolean",
description = "Whether to use the threadsafe Fory", displayName = "Thread
Safe"),
@YamlProperty(name = "unmarshalType", type = "string",
description = "Class of the java type to use when unmarshalling", displayName =
"Unmarshal Type")
}
)
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 67e3081ab1d..52ea90a61d3 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
@@ -11047,7 +11047,7 @@
"threadSafe" : {
"type" : "boolean",
"title" : "Thread Safe",
- "description" : "Whether to use the threadsafe fory"
+ "description" : "Whether to use the threadsafe Fory"
},
"unmarshalType" : {
"type" : "string",
