This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 34d6c43d4c3 CAMEL-22192 - Camel-Fury: Rename the starter to Fory
(#1456)
34d6c43d4c3 is described below
commit 34d6c43d4c3913adc0fd6b9c3c805a1050041d86
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Jun 23 15:16:40 2025 +0200
CAMEL-22192 - Camel-Fury: Rename the starter to Fory (#1456)
* CAMEL-22192 - Camel-Fury: Rename the starter to Fory
Signed-off-by: Andrea Cosentino <[email protected]>
* CAMEL-22192 - Camel-Fury: Rename the starter to Fory
Signed-off-by: Andrea Cosentino <[email protected]>
---------
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../springboot/catalog/dataformats.properties | 1 +
.../camel/springboot/catalog/dataformats/fory.json | 25 +++++++++
.../pom.xml | 6 +--
.../camel-fory-starter/src/main/docs/fory.json | 59 ++++++++++++++++++++++
.../ForyDataFormatAutoConfiguration.java} | 20 ++++----
.../springboot/ForyDataFormatConfiguration.java} | 24 ++++-----
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +-
.../camel-fury-starter/src/main/docs/fury.json | 59 ----------------------
components-starter/pom.xml | 2 +-
tooling/camel-spring-boot-bom/pom.xml | 6 +--
tooling/camel-spring-boot-dependencies/pom.xml | 12 ++---
13 files changed, 121 insertions(+), 95 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
index 076e7a03e26..10bebcf4d43 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
@@ -15,6 +15,7 @@ fastjson
fhirJson
fhirXml
flatpack
+fory
fury
grok
gson
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fory.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fory.json
new file mode 100644
index 00000000000..da6b5505ae9
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fory.json
@@ -0,0 +1,25 @@
+{
+ "dataformat": {
+ "kind": "dataformat",
+ "name": "fory",
+ "title": "Fory",
+ "description": "Serialize and deserialize messages using Apache Fory",
+ "deprecated": false,
+ "firstVersion": "4.9.0",
+ "label": "dataformat,transformation",
+ "javaType": "org.apache.camel.component.fory.ForyDataFormat",
+ "supportLevel": "Preview",
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-fory-starter",
+ "version": "4.13.0-SNAPSHOT",
+ "modelName": "fory",
+ "modelJavaType": "org.apache.camel.model.dataformat.ForyDataFormat"
+ },
+ "properties": {
+ "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" },
+ "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-starter/camel-fury-starter/pom.xml
b/components-starter/camel-fory-starter/pom.xml
similarity index 93%
rename from components-starter/camel-fury-starter/pom.xml
rename to components-starter/camel-fory-starter/pom.xml
index bca170fac1f..3f64bba6964 100644
--- a/components-starter/camel-fury-starter/pom.xml
+++ b/components-starter/camel-fory-starter/pom.xml
@@ -24,9 +24,9 @@
<artifactId>components-starter</artifactId>
<version>4.13.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-fury-starter</artifactId>
+ <artifactId>camel-fory-starter</artifactId>
<packaging>jar</packaging>
- <name>Camel SB Starters :: fury</name>
+ <name>Camel SB Starters :: fory</name>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-fury</artifactId>
+ <artifactId>camel-fory</artifactId>
<version>${camel-version}</version>
</dependency>
<!--START OF GENERATED CODE-->
diff --git a/components-starter/camel-fory-starter/src/main/docs/fory.json
b/components-starter/camel-fory-starter/src/main/docs/fory.json
new file mode 100644
index 00000000000..b7e998da314
--- /dev/null
+++ b/components-starter/camel-fory-starter/src/main/docs/fory.json
@@ -0,0 +1,59 @@
+{
+ "groups": [
+ {
+ "name": "camel.dataformat.fory",
+ "type":
"org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration",
+ "sourceType":
"org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.fory.customizer",
+ "type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
+ "sourceType":
"org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration",
+ "sourceMethod": "getCustomizer()"
+ }
+ ],
+ "properties": [
+ {
+ "name": "camel.dataformat.fory.allow-auto-wired-fory",
+ "type": "java.lang.Boolean",
+ "description": "Whether to auto-discover Fory from the registry",
+ "sourceType":
"org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration",
+ "defaultValue": true
+ },
+ {
+ "name": "camel.dataformat.fory.customizer.enabled",
+ "type": "java.lang.Boolean",
+ "sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
+ },
+ {
+ "name": "camel.dataformat.fory.enabled",
+ "type": "java.lang.Boolean",
+ "description": "Whether to enable auto configuration of the fory data
format. This is enabled by default.",
+ "sourceType":
"org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.fory.require-class-registration",
+ "type": "java.lang.Boolean",
+ "description": "Whether to require register classes",
+ "sourceType":
"org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration",
+ "defaultValue": true
+ },
+ {
+ "name": "camel.dataformat.fory.thread-safe",
+ "type": "java.lang.Boolean",
+ "description": "Whether to use the threadsafe fory",
+ "sourceType":
"org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration",
+ "defaultValue": true
+ },
+ {
+ "name": "camel.dataformat.fory.unmarshal-type",
+ "type": "java.lang.String",
+ "description": "Class of the java type to use when unmarshalling",
+ "sourceType":
"org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration"
+ }
+ ],
+ "hints": [],
+ "ignored": {
+ "properties": []
+ }
+}
\ No newline at end of file
diff --git
a/components-starter/camel-fury-starter/src/main/java/org/apache/camel/component/fury/springboot/FuryDataFormatAutoConfiguration.java
b/components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatAutoConfiguration.java
similarity index 86%
rename from
components-starter/camel-fury-starter/src/main/java/org/apache/camel/component/fury/springboot/FuryDataFormatAutoConfiguration.java
rename to
components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatAutoConfiguration.java
index 4549853cf26..a30115076d6 100644
---
a/components-starter/camel-fury-starter/src/main/java/org/apache/camel/component/fury/springboot/FuryDataFormatAutoConfiguration.java
+++
b/components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatAutoConfiguration.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.fury.springboot;
+package org.apache.camel.component.fory.springboot;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.fury.FuryDataFormat;
+import org.apache.camel.component.fory.ForyDataFormat;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatCustomizer;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
@@ -42,24 +42,24 @@ import org.springframework.context.annotation.Lazy;
@Configuration(proxyBeanMethods = false)
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
-@EnableConfigurationProperties({DataFormatConfigurationProperties.class,FuryDataFormatConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.fury"})
-public class FuryDataFormatAutoConfiguration {
+@EnableConfigurationProperties({DataFormatConfigurationProperties.class,ForyDataFormatConfiguration.class})
+@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.fory"})
+public class ForyDataFormatAutoConfiguration {
@Autowired
private ApplicationContext applicationContext;
private final CamelContext camelContext;
@Autowired
- private FuryDataFormatConfiguration configuration;
+ private ForyDataFormatConfiguration configuration;
- public FuryDataFormatAutoConfiguration(
+ public ForyDataFormatAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
}
@Lazy
@Bean
- public DataFormatCustomizer configureFuryDataFormatFactory() {
+ public DataFormatCustomizer configureForyDataFormatFactory() {
return new DataFormatCustomizer() {
@Override
public void configure(String name, DataFormat target) {
@@ -70,8 +70,8 @@ public class FuryDataFormatAutoConfiguration {
return HierarchicalPropertiesEvaluator.evaluate(
applicationContext,
"camel.dataformat.customizer",
- "camel.dataformat.fury.customizer")
- && target instanceof FuryDataFormat;
+ "camel.dataformat.fory.customizer")
+ && target instanceof ForyDataFormat;
}
};
}
diff --git
a/components-starter/camel-fury-starter/src/main/java/org/apache/camel/component/fury/springboot/FuryDataFormatConfiguration.java
b/components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatConfiguration.java
similarity index 77%
rename from
components-starter/camel-fury-starter/src/main/java/org/apache/camel/component/fury/springboot/FuryDataFormatConfiguration.java
rename to
components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatConfiguration.java
index f3efd4a1d35..9dac18b7c2e 100644
---
a/components-starter/camel-fury-starter/src/main/java/org/apache/camel/component/fury/springboot/FuryDataFormatConfiguration.java
+++
b/components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatConfiguration.java
@@ -14,23 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.fury.springboot;
+package org.apache.camel.component.fory.springboot;
import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * Serialize and deserialize messages using Apache Fury
+ * Serialize and deserialize messages using Apache Fory
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.fury")
-public class FuryDataFormatConfiguration
+@ConfigurationProperties(prefix = "camel.dataformat.fory")
+public class ForyDataFormatConfiguration
extends
DataFormatConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the fury data format. This is
+ * Whether to enable auto configuration of the fory data format. This is
* enabled by default.
*/
private Boolean enabled;
@@ -43,13 +43,13 @@ public class FuryDataFormatConfiguration
*/
private Boolean requireClassRegistration = true;
/**
- * Whether to use the threadsafe fury
+ * Whether to use the threadsafe fory
*/
private Boolean threadSafe = true;
/**
- * Whether to auto-discover Fury from the registry
+ * Whether to auto-discover Fory from the registry
*/
- private Boolean allowAutoWiredFury = true;
+ private Boolean allowAutoWiredFory = true;
public String getUnmarshalType() {
return unmarshalType;
@@ -75,11 +75,11 @@ public class FuryDataFormatConfiguration
this.threadSafe = threadSafe;
}
- public Boolean getAllowAutoWiredFury() {
- return allowAutoWiredFury;
+ public Boolean getAllowAutoWiredFory() {
+ return allowAutoWiredFory;
}
- public void setAllowAutoWiredFury(Boolean allowAutoWiredFury) {
- this.allowAutoWiredFury = allowAutoWiredFury;
+ public void setAllowAutoWiredFory(Boolean allowAutoWiredFory) {
+ this.allowAutoWiredFory = allowAutoWiredFory;
}
}
\ No newline at end of file
diff --git
a/components-starter/camel-fury-starter/src/main/resources/META-INF/LICENSE.txt
b/components-starter/camel-fory-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from
components-starter/camel-fury-starter/src/main/resources/META-INF/LICENSE.txt
rename to
components-starter/camel-fory-starter/src/main/resources/META-INF/LICENSE.txt
diff --git
a/components-starter/camel-fury-starter/src/main/resources/META-INF/NOTICE.txt
b/components-starter/camel-fory-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from
components-starter/camel-fury-starter/src/main/resources/META-INF/NOTICE.txt
rename to
components-starter/camel-fory-starter/src/main/resources/META-INF/NOTICE.txt
diff --git
a/components-starter/camel-fury-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/components-starter/camel-fory-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 92%
rename from
components-starter/camel-fury-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to
components-starter/camel-fory-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 76e231ea24e..68ef028b848 100644
---
a/components-starter/camel-fury-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++
b/components-starter/camel-fory-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -15,4 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.camel.component.fury.springboot.FuryDataFormatAutoConfiguration
\ No newline at end of file
+org.apache.camel.component.fory.springboot.ForyDataFormatAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-fury-starter/src/main/docs/fury.json
b/components-starter/camel-fury-starter/src/main/docs/fury.json
deleted file mode 100644
index ffad92d8adf..00000000000
--- a/components-starter/camel-fury-starter/src/main/docs/fury.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.dataformat.fury",
- "type":
"org.apache.camel.component.fury.springboot.FuryDataFormatConfiguration",
- "sourceType":
"org.apache.camel.component.fury.springboot.FuryDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.fury.customizer",
- "type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
- "sourceType":
"org.apache.camel.component.fury.springboot.FuryDataFormatConfiguration",
- "sourceMethod": "getCustomizer()"
- }
- ],
- "properties": [
- {
- "name": "camel.dataformat.fury.allow-auto-wired-fury",
- "type": "java.lang.Boolean",
- "description": "Whether to auto-discover Fury from the registry",
- "sourceType":
"org.apache.camel.component.fury.springboot.FuryDataFormatConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.dataformat.fury.customizer.enabled",
- "type": "java.lang.Boolean",
- "sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
- },
- {
- "name": "camel.dataformat.fury.enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the fury data
format. This is enabled by default.",
- "sourceType":
"org.apache.camel.component.fury.springboot.FuryDataFormatConfiguration"
- },
- {
- "name": "camel.dataformat.fury.require-class-registration",
- "type": "java.lang.Boolean",
- "description": "Whether to require register classes",
- "sourceType":
"org.apache.camel.component.fury.springboot.FuryDataFormatConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.dataformat.fury.thread-safe",
- "type": "java.lang.Boolean",
- "description": "Whether to use the threadsafe fury",
- "sourceType":
"org.apache.camel.component.fury.springboot.FuryDataFormatConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.dataformat.fury.unmarshal-type",
- "type": "java.lang.String",
- "description": "Class of the java type to use when unmarshalling",
- "sourceType":
"org.apache.camel.component.fury.springboot.FuryDataFormatConfiguration"
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 5e774c6f240..04135b5c2aa 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -220,9 +220,9 @@
<module>camel-flink-starter</module>
<module>camel-flowable-starter</module>
<module>camel-fop-starter</module>
+ <module>camel-fory-starter</module>
<module>camel-freemarker-starter</module>
<module>camel-ftp-starter</module>
- <module>camel-fury-starter</module>
<module>camel-geocoder-starter</module>
<module>camel-git-starter</module>
<module>camel-github-starter</module>
diff --git a/tooling/camel-spring-boot-bom/pom.xml
b/tooling/camel-spring-boot-bom/pom.xml
index 783d1ce0ae2..ee408e6b804 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -635,17 +635,17 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-freemarker-starter</artifactId>
+ <artifactId>camel-fory-starter</artifactId>
<version>4.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-ftp-starter</artifactId>
+ <artifactId>camel-freemarker-starter</artifactId>
<version>4.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-fury-starter</artifactId>
+ <artifactId>camel-ftp-starter</artifactId>
<version>4.13.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 7489a38bb1a..63a4952f725 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -889,17 +889,17 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-freemarker-starter</artifactId>
+ <artifactId>camel-fory-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-ftp-starter</artifactId>
+ <artifactId>camel-freemarker-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-fury-starter</artifactId>
+ <artifactId>camel-ftp-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2961,17 +2961,17 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-freemarker</artifactId>
+ <artifactId>camel-fory</artifactId>
<version>4.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-ftp</artifactId>
+ <artifactId>camel-freemarker</artifactId>
<version>4.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-fury</artifactId>
+ <artifactId>camel-ftp</artifactId>
<version>4.13.0-SNAPSHOT</version>
</dependency>
<dependency>
