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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 0137531837e chore: camel-joor-starter - remove leftover joor language
auto-configuration
0137531837e is described below
commit 0137531837e5fc54970cc18306acef315a805eea
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Sep 15 22:37:56 2026 +0200
chore: camel-joor-starter - remove leftover joor language auto-configuration
The joor language was removed in camel 4.23 (java is its replacement), but
the generated JoorLanguage*Configuration classes, the AutoConfiguration.imports
entry and the spring boot catalog entries are never removed by the generator,
so the starter failed to compile.
Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
---
.../catalog/beans/CassandraKeyValueRepository.json | 2 +-
.../catalog/beans/HazelcastKeyValueRepository.json | 2 +-
.../beans/InfinispanRemoteKeyValueRepository.json | 2 +-
.../camel/springboot/catalog/languages.properties | 1 -
.../camel/springboot/catalog/languages/joor.json | 26 -------
.../camel-joor-starter/src/main/docs/joor.json | 43 ------------
.../springboot/JoorLanguageAutoConfiguration.java | 80 ----------------------
.../joor/springboot/JoorLanguageConfiguration.java | 77 ---------------------
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 -
.../modules/ROOT/pages/starters/joor.adoc | 7 +-
10 files changed, 4 insertions(+), 237 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/CassandraKeyValueRepository.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/CassandraKeyValueRepository.json
index 461bf4e7601..cbbdf6996ca 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/CassandraKeyValueRepository.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/CassandraKeyValueRepository.json
@@ -10,7 +10,7 @@
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-cassandraql-starter",
"version": "4.23.0-SNAPSHOT",
- "properties": { "session": { "index": 0, "kind": "property",
"displayName": "Session", "required": true, "type": "object", "javaType":
"org.apache.camel.utils.cassandra.CassandraSessionHolder", "deprecated": false,
"autowired": false, "secret": false, "description": "Cassandra session" },
"table": { "index": 1, "kind": "property", "displayName": "Table", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "def [...]
+ "properties": { "session": { "index": 0, "kind": "property",
"displayName": "Session", "required": true, "type": "object", "javaType":
"org.apache.camel.utils.cassandra.CassandraSessionHolder", "deprecated": false,
"autowired": false, "secret": false, "description": "Cassandra session" },
"table": { "index": 1, "kind": "property", "displayName": "Table", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "def [...]
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/HazelcastKeyValueRepository.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/HazelcastKeyValueRepository.json
index 4b00da1e658..1d01460e0a3 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/HazelcastKeyValueRepository.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/HazelcastKeyValueRepository.json
@@ -10,7 +10,7 @@
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-hazelcast-starter",
"version": "4.23.0-SNAPSHOT",
- "properties": { "mapName": { "index": 0, "kind": "property",
"displayName": "Map Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "HazelcastKeyValueRepository", "description": "Name of the
Hazelcast map to use" }, "hazelcastInstance": { "index": 1, "kind": "property",
"displayName": "Hazelcast Instance", "required": false, "type": "object",
"javaType": "com.hazelcast.core.HazelcastIns [...]
+ "properties": { "mapName": { "index": 0, "kind": "property",
"displayName": "Map Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "HazelcastKeyValueRepository", "description": "Name of the
Hazelcast map to use" }, "hazelcastInstance": { "index": 1, "kind": "property",
"displayName": "Hazelcast Instance", "required": false, "type": "object",
"javaType": "com.hazelcast.core.HazelcastIns [...]
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanRemoteKeyValueRepository.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanRemoteKeyValueRepository.json
index 12bc5f74ea7..1fd5a049551 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanRemoteKeyValueRepository.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/beans/InfinispanRemoteKeyValueRepository.json
@@ -10,7 +10,7 @@
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-infinispan-starter",
"version": "4.23.0-SNAPSHOT",
- "properties": { "cacheName": { "index": 0, "kind": "property",
"displayName": "Cache Name", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Name of cache" }, "configuration": { "index": 1, "kind":
"property", "displayName": "Configuration", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration",
"deprecated": false, "auto [...]
+ "properties": { "cacheName": { "index": 0, "kind": "property",
"displayName": "Cache Name", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Name of cache" }, "configuration": { "index": 1, "kind":
"property", "displayName": "Configuration", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration",
"deprecated": false, "auto [...]
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages.properties
index 9aee9f1ee7c..15cf09aff99 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages.properties
@@ -8,7 +8,6 @@ header
hl7terser
jactl
java
-joor
jq
js
jsonpath
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/joor.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/joor.json
deleted file mode 100644
index b1cba77c715..00000000000
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/joor.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "language": {
- "kind": "language",
- "name": "joor",
- "title": "jOOR",
- "description": "Evaluates a jOOR (Java compiled once at runtime)
expression",
- "deprecated": true,
- "firstVersion": "3.7.0",
- "label": "language",
- "javaType": "org.apache.camel.language.joor.JoorLanguage",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel.springboot",
- "artifactId": "camel-joor-starter",
- "version": "4.23.0-SNAPSHOT",
- "modelName": "joor",
- "modelJavaType": "org.apache.camel.model.language.JoorExpression"
- },
- "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." },
- "expression": { "index": 1, "kind": "value", "displayName": "Expression",
"group": "common", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The expression value in your chosen language syntax." },
- "preCompile": { "index": 2, "kind": "attribute", "displayName": "Pre
Compile", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether the
expression should be pre compiled once during initialization phase. If this is
turned off, then the expression is reloaded and compiled on each evaluation." },
- "singleQuotes": { "index": 3, "kind": "attribute", "displayName": "Single
Quotes", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether single
quotes can be used as replacement for double quotes. This is convenient when
you need to work with strings inside strings." },
- "resultType": { "index": 4, "kind": "attribute", "displayName": "Result
Type", "group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The class of the result type (type from output)." },
- "trim": { "index": 5, "kind": "attribute", "displayName": "Trim", "group":
"advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether to trim the
source code to remove leading and trailing whitespaces and line breaks." }
- }
-}
diff --git a/components-starter/camel-joor-starter/src/main/docs/joor.json
b/components-starter/camel-joor-starter/src/main/docs/joor.json
index 18f83a63b8c..e87b92a14eb 100644
--- a/components-starter/camel-joor-starter/src/main/docs/joor.json
+++ b/components-starter/camel-joor-starter/src/main/docs/joor.json
@@ -10,17 +10,6 @@
"type":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.language.joor.springboot.JavaLanguageConfiguration",
"sourceMethod": "getCustomizer()"
- },
- {
- "name": "camel.language.joor",
- "type":
"org.apache.camel.language.joor.springboot.JoorLanguageConfiguration",
- "sourceType":
"org.apache.camel.language.joor.springboot.JoorLanguageConfiguration"
- },
- {
- "name": "camel.language.joor.customizer",
- "type":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
- "sourceType":
"org.apache.camel.language.joor.springboot.JoorLanguageConfiguration",
- "sourceMethod": "getCustomizer()"
}
],
"properties": [
@@ -55,38 +44,6 @@
"description": "Whether to trim the source code to remove leading and
trailing whitespaces and line breaks.",
"sourceType":
"org.apache.camel.language.joor.springboot.JavaLanguageConfiguration",
"defaultValue": true
- },
- {
- "name": "camel.language.joor.customizer.enabled",
- "type": "java.lang.Boolean",
- "sourceType":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties"
- },
- {
- "name": "camel.language.joor.enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the joor
language. This is enabled by default.",
- "sourceType":
"org.apache.camel.language.joor.springboot.JoorLanguageConfiguration"
- },
- {
- "name": "camel.language.joor.pre-compile",
- "type": "java.lang.Boolean",
- "description": "Whether the expression should be pre compiled once
during initialization phase. If this is turned off, then the expression is
reloaded and compiled on each evaluation.",
- "sourceType":
"org.apache.camel.language.joor.springboot.JoorLanguageConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.language.joor.single-quotes",
- "type": "java.lang.Boolean",
- "description": "Whether single quotes can be used as replacement for
double quotes. This is convenient when you need to work with strings inside
strings.",
- "sourceType":
"org.apache.camel.language.joor.springboot.JoorLanguageConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.language.joor.trim",
- "type": "java.lang.Boolean",
- "description": "Whether to trim the source code to remove leading and
trailing whitespaces and line breaks.",
- "sourceType":
"org.apache.camel.language.joor.springboot.JoorLanguageConfiguration",
- "defaultValue": true
}
],
"hints": [],
diff --git
a/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageAutoConfiguration.java
b/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageAutoConfiguration.java
deleted file mode 100644
index 62b0d036ce4..00000000000
---
a/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageAutoConfiguration.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.language.joor.springboot;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.language.joor.JoorLanguage;
-import org.apache.camel.spi.Language;
-import org.apache.camel.spi.LanguageCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.LanguageConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@AutoConfiguration(after = CamelAutoConfiguration.class)
-@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
-@EnableConfigurationProperties({LanguageConfigurationProperties.class,JoorLanguageConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.language", "camel.language.joor"})
-public class JoorLanguageAutoConfiguration {
-
- private final ApplicationContext applicationContext;
- private final JoorLanguageConfiguration configuration;
-
- public JoorLanguageAutoConfiguration(
- org.springframework.context.ApplicationContext applicationContext,
-
org.apache.camel.language.joor.springboot.JoorLanguageConfiguration
configuration) {
- this.applicationContext = applicationContext;
- this.configuration = configuration;
- }
-
- @Lazy
- @Bean
- public org.apache.camel.spi.LanguageCustomizer configureJoorLanguage() {
- return new LanguageCustomizer() {
- @Override
- public void configure(String name, Language target) {
- if (target instanceof CamelContextAware cca &&
cca.getCamelContext() != null) {
-
CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(),
applicationContext,
- "camel.language.joor", configuration, target);
- } else {
-
org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not
implement CamelContextAware, skipping auto-configuration properties", name);
- }
- }
- @Override
- public boolean isEnabled(String name, Language target) {
- return HierarchicalPropertiesEvaluator.evaluate(
- applicationContext,
- "camel.language.customizer",
- "camel.language.joor.customizer")
- && target instanceof JoorLanguage;
- }
- };
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageConfiguration.java
b/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageConfiguration.java
deleted file mode 100644
index 880f7326a06..00000000000
---
a/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageConfiguration.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.language.joor.springboot;
-
-import org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Evaluates a jOOR (Java compiled once at runtime) expression
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@ConfigurationProperties(prefix = "camel.language.joor")
-public class JoorLanguageConfiguration
- extends
- LanguageConfigurationPropertiesCommon {
-
- /**
- * Whether to enable auto configuration of the joor language. This is
- * enabled by default.
- */
- private Boolean enabled;
- /**
- * Whether the expression should be pre compiled once during initialization
- * phase. If this is turned off, then the expression is reloaded and
- * compiled on each evaluation.
- */
- private Boolean preCompile = true;
- /**
- * Whether single quotes can be used as replacement for double quotes. This
- * is convenient when you need to work with strings inside strings.
- */
- private Boolean singleQuotes = true;
- /**
- * Whether to trim the source code to remove leading and trailing
- * whitespaces and line breaks.
- */
- private Boolean trim = true;
-
- public Boolean getPreCompile() {
- return preCompile;
- }
-
- public void setPreCompile(Boolean preCompile) {
- this.preCompile = preCompile;
- }
-
- public Boolean getSingleQuotes() {
- return singleQuotes;
- }
-
- public void setSingleQuotes(Boolean singleQuotes) {
- this.singleQuotes = singleQuotes;
- }
-
- public Boolean getTrim() {
- return trim;
- }
-
- public void setTrim(Boolean trim) {
- this.trim = trim;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-joor-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/components-starter/camel-joor-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 47d41fcf2e4..082426bc381 100644
---
a/components-starter/camel-joor-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++
b/components-starter/camel-joor-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -15,5 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.camel.language.joor.springboot.JoorLanguageAutoConfiguration
org.apache.camel.language.joor.springboot.JavaLanguageAutoConfiguration
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/joor.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/joor.adoc
index e61f772b277..f6f55c4f538 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/joor.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/joor.adoc
@@ -8,7 +8,6 @@ Evaluates a Java (Java compiled once at runtime) expression
== What's inside
* xref:{csb-camel-components}:languages:java-language.adoc[Java language]
-* xref:{csb-camel-components}:languages:joor-language.adoc[jOOR language]
Please refer to the above links for usage and configuration details.
@@ -24,7 +23,7 @@ Please refer to the above links for usage and configuration
details.
== Spring Boot Auto-Configuration
-The starter supports 8 options, which are listed below.
+The starter supports 4 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
@@ -33,8 +32,4 @@ The starter supports 8 options, which are listed below.
| camel.language.java.pre-compile | Whether the expression should be pre
compiled once during initialization phase. If this is turned off, then the
expression is reloaded and compiled on each evaluation. | true | Boolean
| camel.language.java.single-quotes | Whether single quotes can be used as
replacement for double quotes. This is convenient when you need to work with
strings inside strings. | true | Boolean
| camel.language.java.trim | Whether to trim the source code to remove leading
and trailing whitespaces and line breaks. | true | Boolean
-| camel.language.joor.enabled | Whether to enable auto configuration of the
joor language. This is enabled by default. | | Boolean
-| camel.language.joor.pre-compile | Whether the expression should be pre
compiled once during initialization phase. If this is turned off, then the
expression is reloaded and compiled on each evaluation. | true | Boolean
-| camel.language.joor.single-quotes | Whether single quotes can be used as
replacement for double quotes. This is convenient when you need to work with
strings inside strings. | true | Boolean
-| camel.language.joor.trim | Whether to trim the source code to remove leading
and trailing whitespaces and line breaks. | true | Boolean
|===
