This is an automated email from the ASF dual-hosted git repository. JiriOndrusek pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-upgrade-recipes.git
commit 12920d22d8b3ade0947d8d803383e7cd8c59389d Author: Jiri Ondrusek <[email protected]> AuthorDate: Wed Jun 24 11:38:31 2026 +0200 Move shared recipe implementations to patch packages and fix YAML references --- RECIPE-CONVENTIONS.md | 85 ++++++++++++++++++++++ .../XmlDsl418_1SagaRecipe.java} | 4 +- .../YamlDsl418_1SagaRecipe.java} | 4 +- .../RenameHeaderInJavaMethod.java | 2 +- .../RenameHeaderInSimpleExpression.java | 2 +- .../RenameHeaderInXmlDsl.java | 2 +- .../RenameHeaderInYamlDsl.java | 2 +- .../RenameHeaderPrefixInJavaMethod.java | 2 +- .../RenameHeaderPrefixInSimpleExpression.java | 2 +- .../RenameHeaderPrefixInXmlDsl.java | 2 +- .../RenameHeaderPrefixInYamlDsl.java | 2 +- .../RenameHeaderPrefixes.java | 4 +- .../{camel421 => camel418_3}/RenameHeaders.java | 6 +- .../camel421/RemoveReifierStrategyImport.java | 79 -------------------- .../RemoveZooWordEmbeddingPredictorImport.java | 80 -------------------- .../main/resources/META-INF/rewrite/4.18.1.yaml | 4 +- .../main/resources/META-INF/rewrite/4.18.3.yaml | 24 +++--- .../src/main/resources/META-INF/rewrite/4.18.yaml | 8 +- .../src/main/resources/META-INF/rewrite/4.21.yaml | 32 ++++---- .../main/resources/META-INF/rewrite/examples.yml | 18 ++--- .../apache/camel/upgrade/CamelUpdate421Test.java | 58 --------------- .../RenameHeaderInJavaMethodTest.java | 2 +- .../RenameHeaderInSimpleExpressionTest.java | 2 +- .../RenameHeaderInXmlDslTest.java | 2 +- .../RenameHeaderInYamlDslTest.java | 2 +- .../RenameHeaderPrefixInJavaMethodTest.java | 2 +- .../RenameHeaderPrefixInSimpleExpressionTest.java | 2 +- .../RenameHeaderPrefixInXmlDslTest.java | 2 +- .../RenameHeaderPrefixInYamlDslTest.java | 2 +- .../RenameHeadersTest.java | 2 +- release_notes.adoc | 4 +- 31 files changed, 155 insertions(+), 289 deletions(-) diff --git a/RECIPE-CONVENTIONS.md b/RECIPE-CONVENTIONS.md new file mode 100644 index 0000000..6ece041 --- /dev/null +++ b/RECIPE-CONVENTIONS.md @@ -0,0 +1,85 @@ +# Recipe Organization Convention: Patch vs. Main Migration Recipes + +When a breaking change is backported to an LTS patch release (e.g., 4.18.3) and also ships in the next main version (e.g., 4.21), the same migration recipe is needed in both upgrade paths. This document describes the convention the project follows to avoid duplicating Java code and YAML definitions. + +## The Convention + +**Rule: Implementation lives in the patch package; newer versions reference it.** + +When a patch release (e.g., 4.18.3) and a main release (e.g., 4.21) both require the same migration: + +1. **Java implementation** goes into the patch-version package (e.g., `org.apache.camel.upgrade.camel418_3`) +2. **YAML recipe definitions** using those Java classes are defined in the patch YAML file (e.g., `4.18.3.yaml`) with recipe names in the patch namespace (e.g., `camel418_3.upgradeJGroupsHeaders`) +3. **Newer main-version YAMLs** (e.g., `4.21.yaml`) reference the patch recipes -- they do NOT duplicate the Java classes or redefine the YAML recipes under their own namespace + +### Example: Header Renames (4.18.3 / 4.21) + +**Java classes** -- all in `src/main/java/org/apache/camel/upgrade/camel418_3/`: +- `RenameHeaders.java`, `RenameHeaderPrefixes.java`, and their visitor classes + +**No `camel421/` Java package exists** -- 4.21 has no header rename Java code of its own. + +**4.18.3.yaml** defines the recipes with their implementations: +```yaml +name: org.apache.camel.upgrade.camel418_3.upgradeJGroupsHeaders +recipeList: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: # points to patch Java class + headerMappings: + JGROUPS_CHANNEL_ADDRESS: CamelJGroupsChannelAddress +``` + +**4.21.yaml** reuses those patch recipes in two ways: + +1. Referencing whole patch-defined recipes directly: +```yaml +name: org.apache.camel.upgrade.camel421.CamelMigrationRecipe +recipeList: + ## inherited from patch recipe + - org.apache.camel.upgrade.camel418_3.upgradeJGroupsHeaders # reuses 4.18.3 recipe + - org.apache.camel.upgrade.camel418_3.upgradeJiraHeaders + - org.apache.camel.upgrade.camel418_3.upgradeShiroHeaders + ... +``` + +2. Defining new 4.21-specific YAML recipes that reuse the patch Java class: +```yaml +name: org.apache.camel.upgrade.camel421.upgradeKafkaRecipes +recipeList: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: # reuses patch Java class + headerMappings: + kafka.PARTITION_KEY: CamelKafkaPartitionKey +``` + +### Example: Saga EIP (4.18.1 / 4.19) + +**Java classes** in `camel418_1/`: `XmlDsl419SagaRecipe.java`, `YamlDsl419SagaRecipe.java` + +**4.18.1.yaml** defines the saga recipe: +```yaml +name: org.apache.camel.upgrade.camel418_1.saga +recipeList: + - org.apache.camel.upgrade.camel418_1.XmlDsl419SagaRecipe + - org.apache.camel.upgrade.camel418_1.YamlDsl419SagaRecipe +``` + +**4.19.yaml** references it: +```yaml +name: org.apache.camel.upgrade.camel419.CamelMigrationRecipe +recipeList: + - org.apache.camel.upgrade.camel418_1.saga # reuses 4.18.1 recipe + - org.apache.camel.upgrade.camel419.removedComponents +``` + +## LTS Aggregation + +LTS recipes (e.g., `4.18LTS.yaml`) chain patch recipes in reverse chronological order: +``` +camel418_3.CamelMigrationRecipe (4.18.1 -> 4.18.3) +camel418_1.CamelMigrationRecipe (4.18.0 -> 4.18.1) +camel418.CamelMigrationRecipe (4.17 -> 4.18) +... older versions +``` + +## Exception: 4.10.x + +The 4.10.4 patch predates this convention and does not follow it -- its implementation lives in the main-version package (`camel412`) rather than in a dedicated patch package. diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel419/XmlDsl419SagaRecipe.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_1/XmlDsl418_1SagaRecipe.java similarity index 97% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel419/XmlDsl419SagaRecipe.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_1/XmlDsl418_1SagaRecipe.java index a37bb74..34ed9d8 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel419/XmlDsl419SagaRecipe.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_1/XmlDsl418_1SagaRecipe.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel419; +package org.apache.camel.upgrade.camel418_1; import org.apache.camel.upgrade.AbstractCamelXmlVisitor; import org.openrewrite.ExecutionContext; @@ -33,7 +33,7 @@ import java.util.Optional; * Changed model for configuring completion and compensation URIs in XML DSL. * Converts child elements to attributes. */ -public class XmlDsl419SagaRecipe extends Recipe { +public class XmlDsl418_1SagaRecipe extends Recipe { private static final XPathMatcher SAGA_MATCHER = new XPathMatcher("//saga"); diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel419/YamlDsl419SagaRecipe.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_1/YamlDsl418_1SagaRecipe.java similarity index 97% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel419/YamlDsl419SagaRecipe.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_1/YamlDsl418_1SagaRecipe.java index 64c8ef7..026fbfd 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel419/YamlDsl419SagaRecipe.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_1/YamlDsl418_1SagaRecipe.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel419; +package org.apache.camel.upgrade.camel418_1; import org.apache.camel.upgrade.AbstractCamelYamlVisitor; import org.apache.camel.upgrade.RecipesUtil; @@ -32,7 +32,7 @@ import org.openrewrite.yaml.tree.Yaml; * Changed model for configuring completion and compensation URIs in YAML DSL. * Flattens nested uri fields to direct attribute values. */ -public class YamlDsl419SagaRecipe extends Recipe { +public class YamlDsl418_1SagaRecipe extends Recipe { private static final JsonPathMatcher COMPENSATION_MATCHER = new JsonPathMatcher("$..saga.compensation"); private static final JsonPathMatcher COMPLETION_MATCHER = new JsonPathMatcher("$..saga.completion"); diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInJavaMethod.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInJavaMethod.java similarity index 99% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInJavaMethod.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInJavaMethod.java index 0a847a5..2dbddf1 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInJavaMethod.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInJavaMethod.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.AbstractCamelJavaVisitor; import org.apache.camel.upgrade.RecipesUtil; diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInSimpleExpression.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInSimpleExpression.java similarity index 99% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInSimpleExpression.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInSimpleExpression.java index 1089d4e..f62c3e4 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInSimpleExpression.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInSimpleExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.AbstractCamelJavaVisitor; import org.apache.camel.upgrade.RecipesUtil; diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInXmlDsl.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInXmlDsl.java similarity index 98% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInXmlDsl.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInXmlDsl.java index 9ca4d6f..0f889cd 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInXmlDsl.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInXmlDsl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.AbstractCamelXmlVisitor; import org.openrewrite.ExecutionContext; diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInYamlDsl.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInYamlDsl.java similarity index 99% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInYamlDsl.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInYamlDsl.java index ea9dbe3..ff6ea84 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderInYamlDsl.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInYamlDsl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.AbstractCamelYamlVisitor; import org.apache.camel.upgrade.RecipesUtil; diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInJavaMethod.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInJavaMethod.java similarity index 99% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInJavaMethod.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInJavaMethod.java index 04b87de..ad9d876 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInJavaMethod.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInJavaMethod.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.AbstractCamelJavaVisitor; import org.apache.camel.upgrade.RecipesUtil; diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInSimpleExpression.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInSimpleExpression.java similarity index 99% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInSimpleExpression.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInSimpleExpression.java index b201597..298910a 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInSimpleExpression.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInSimpleExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.AbstractCamelJavaVisitor; import org.apache.camel.upgrade.RecipesUtil; diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInXmlDsl.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInXmlDsl.java similarity index 98% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInXmlDsl.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInXmlDsl.java index 29d0a6b..ee54903 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInXmlDsl.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInXmlDsl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.AbstractCamelXmlVisitor; import org.openrewrite.ExecutionContext; diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInYamlDsl.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInYamlDsl.java similarity index 99% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInYamlDsl.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInYamlDsl.java index 77be3cd..9d944ff 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInYamlDsl.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInYamlDsl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.AbstractCamelYamlVisitor; import org.apache.camel.upgrade.RecipesUtil; diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixes.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixes.java similarity index 97% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixes.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixes.java index 8d344e8..7e0b9bf 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixes.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.openrewrite.Option; import org.openrewrite.Recipe; @@ -35,7 +35,7 @@ import java.util.Map; * * Example YAML configuration: * <pre> - * - org.apache.camel.upgrade.camel421.RenameHeaderPrefixes: + * - org.apache.camel.upgrade.camel418_3.RenameHeaderPrefixes: * prefixMappings: * SolrField.: CamelSolrField. * SolrParam.: CamelSolrParam. diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaders.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaders.java similarity index 96% rename from camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaders.java rename to camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaders.java index 51cbcef..2dcd08f 100644 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RenameHeaders.java +++ b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel418_3/RenameHeaders.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.openrewrite.Option; import org.openrewrite.Recipe; @@ -30,7 +30,7 @@ import java.util.Map; * * Example YAML configuration (bulk rename): * <pre> - * - org.apache.camel.upgrade.camel421.RenameHeaders: + * - org.apache.camel.upgrade.camel418_3.RenameHeaders: * headerMappings: * kafka.TOPIC: CamelKafkaTopic * kafka.PARTITION: CamelKafkaPartition @@ -39,7 +39,7 @@ import java.util.Map; * * Example YAML configuration (single rename): * <pre> - * - org.apache.camel.upgrade.camel421.RenameHeaders: + * - org.apache.camel.upgrade.camel418_3.RenameHeaders: * oldHeaderName: kafka.TOPIC * newHeaderName: CamelKafkaTopic * </pre> diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RemoveReifierStrategyImport.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RemoveReifierStrategyImport.java deleted file mode 100644 index 01bfe60..0000000 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RemoveReifierStrategyImport.java +++ /dev/null @@ -1,79 +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.upgrade.camel421; - -import org.openrewrite.ExecutionContext; -import org.openrewrite.Recipe; -import org.openrewrite.TreeVisitor; -import org.openrewrite.java.JavaIsoVisitor; -import org.openrewrite.java.tree.J; - -import java.util.ArrayList; -import java.util.List; - -public class RemoveReifierStrategyImport extends Recipe { - - @Override - public String getDisplayName() { - return "Remove ReifierStrategy import"; - } - - @Override - public String getDescription() { - return "Removes import for org.apache.camel.spi.ReifierStrategy which is no longer in use."; - } - - @Override - public TreeVisitor<?, ExecutionContext> getVisitor() { - return new JavaIsoVisitor<ExecutionContext>() { - @Override - public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) { - J.CompilationUnit c = super.visitCompilationUnit(cu, ctx); - - // Find and remove the ReifierStrategy import - List<J.Import> imports = new ArrayList<>(c.getImports()); - int removedIndex = -1; - for (int i = 0; i < imports.size(); i++) { - String importType = imports.get(i).getQualid().printTrimmed(getCursor()); - if ("org.apache.camel.spi.ReifierStrategy".equals(importType)) { - removedIndex = i; - imports.remove(i); - break; - } - } - - if (removedIndex >= 0 && !imports.isEmpty()) { - // If we removed the first import and there are more imports, - // clean up the prefix of the new first import - if (removedIndex == 0) { - J.Import firstImport = imports.get(0); - String prefix = firstImport.getPrefix().getWhitespace(); - // Remove leading newlines - String cleanedPrefix = prefix.replaceFirst("^\\n+", ""); - imports.set(0, firstImport.withPrefix(firstImport.getPrefix().withWhitespace(cleanedPrefix))); - } - c = c.withImports(imports); - } else if (removedIndex >= 0) { - // All imports removed - c = c.withImports(imports); - } - - return c; - } - }; - } -} diff --git a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RemoveZooWordEmbeddingPredictorImport.java b/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RemoveZooWordEmbeddingPredictorImport.java deleted file mode 100644 index 3f23c54..0000000 --- a/camel-upgrade-recipes/src/main/java/org/apache/camel/upgrade/camel421/RemoveZooWordEmbeddingPredictorImport.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.upgrade.camel421; - -import org.openrewrite.ExecutionContext; -import org.openrewrite.Recipe; -import org.openrewrite.TreeVisitor; -import org.openrewrite.java.JavaIsoVisitor; -import org.openrewrite.java.tree.J; - -import java.util.ArrayList; -import java.util.List; - -public class RemoveZooWordEmbeddingPredictorImport extends Recipe { - - @Override - public String getDisplayName() { - return "Remove ZooWordEmbeddingPredictor import"; - } - - @Override - public String getDescription() { - return "Removes import for ZooWordEmbeddingPredictor which has been removed from camel-djl. The underlying MXNet engine is discontinued and the zoo model never loaded successfully."; - } - - @Override - public TreeVisitor<?, ExecutionContext> getVisitor() { - return new JavaIsoVisitor<ExecutionContext>() { - @Override - public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) { - J.CompilationUnit c = super.visitCompilationUnit(cu, ctx); - - // Find and remove the ZooWordEmbeddingPredictor import - List<J.Import> imports = new ArrayList<>(c.getImports()); - int removedIndex = -1; - for (int i = 0; i < imports.size(); i++) { - String importType = imports.get(i).getQualid().printTrimmed(getCursor()); - // The class could be in different packages, so we check the simple name - if (importType.endsWith(".ZooWordEmbeddingPredictor")) { - removedIndex = i; - imports.remove(i); - break; - } - } - - if (removedIndex >= 0 && !imports.isEmpty()) { - // If we removed the first import and there are more imports, - // clean up the prefix of the new first import - if (removedIndex == 0) { - J.Import firstImport = imports.get(0); - String prefix = firstImport.getPrefix().getWhitespace(); - // Remove leading newlines - String cleanedPrefix = prefix.replaceFirst("^\\n+", ""); - imports.set(0, firstImport.withPrefix(firstImport.getPrefix().withWhitespace(cleanedPrefix))); - } - c = c.withImports(imports); - } else if (removedIndex >= 0) { - // All imports removed - c = c.withImports(imports); - } - - return c; - } - }; - } -} diff --git a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.1.yaml b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.1.yaml index 7f93e59..287dde4 100644 --- a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.1.yaml +++ b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.1.yaml @@ -37,8 +37,8 @@ name: org.apache.camel.upgrade.camel418_1.saga displayName: Migrate camel-sage model configuration description: The Saga EIP has fixed the model for how to configure completion and compensation URIs. recipeList: - - org.apache.camel.upgrade.camel419.XmlDsl419SagaRecipe - - org.apache.camel.upgrade.camel419.YamlDsl419SagaRecipe + - org.apache.camel.upgrade.camel418_1.XmlDsl418_1SagaRecipe + - org.apache.camel.upgrade.camel418_1.YamlDsl418_1SagaRecipe - org.apache.camel.upgrade.camel418_1.routePolicy --- ### https://camel.apache.org/manual/camel-4x-upgrade-guide-4_19.html#_camel_yaml_io_camel_xml_io diff --git a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.3.yaml b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.3.yaml index c06218d..ec74778 100644 --- a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.3.yaml +++ b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.3.yaml @@ -54,7 +54,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-jgroups recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: JGROUPS_CHANNEL_ADDRESS: CamelJGroupsChannelAddress JGROUPS_DEST: CamelJGroupsDest @@ -71,7 +71,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-jira recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: IssueAssigneeId: CamelJiraIssueAssigneeId IssueAssignee: CamelJiraIssueAssignee @@ -104,7 +104,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-jgroups-raft recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: JGROUPSRAFT_LOG_SIZE: CamelJGroupsRaftLogSize JGROUPSRAFT_COMMIT_INDEX: CamelJGroupsRaftCommitIndex @@ -129,7 +129,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-shiro recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: SHIRO_SECURITY_TOKEN: CamelShiroSecurityToken SHIRO_SECURITY_USERNAME: CamelShiroSecurityUsername @@ -145,7 +145,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-solr recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaderPrefixes: + - org.apache.camel.upgrade.camel418_3.RenameHeaderPrefixes: prefixMappings: SolrField.: CamelSolrField. SolrParam.: CamelSolrParam. @@ -160,7 +160,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-github2 recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: GitHubPullRequest: CamelGitHubPullRequest GitHubInResponseTo: CamelGitHubInResponseTo @@ -177,7 +177,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-google-functions recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: GoogleCloudFunctionsOperation: CamelGoogleCloudFunctionsOperation GoogleCloudFunctionsEntryPoint: CamelGoogleCloudFunctionsEntryPoint @@ -195,7 +195,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-google-secret-manager recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: GoogleSecretManagerOperation: CamelGoogleSecretManagerOperation --- @@ -209,7 +209,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-mongodb-gridfs recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: gridfs.operation: CamelGridFsOperation gridfs.metadata: CamelGridFsMetadata @@ -227,7 +227,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-lucene recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: RETURN_LUCENE_DOCS: CamelLuceneReturnLuceneDocs --- @@ -241,7 +241,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-openstack recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: FlavorId: CamelOpenstackNovaFlavorId RAM: CamelOpenstackNovaRam @@ -278,7 +278,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-web3j recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: AT_BLOCK: CamelWeb3jAtBlock FROM_ADDRESS: CamelWeb3jFromAddress diff --git a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.yaml b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.yaml index 2020733..45b88dd 100644 --- a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.yaml +++ b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.18.yaml @@ -52,7 +52,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-kafka recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: kafka.PARTITION_KEY: CamelKafkaPartitionKey kafka.PARTITION: CamelKafkaPartition @@ -77,7 +77,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-dns recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: dns.class: CamelDnsClass dns.name: CamelDnsName @@ -96,7 +96,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-salesforce recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: sObjectName: CamelSalesforceSObjectName sObjectId: CamelSalesforceSObjectId @@ -114,6 +114,6 @@ recipeList: pkChunkingChunkSize: CamelSalesforcePkChunkingChunkSize pkChunkingParent: CamelSalesforcePkChunkingParent pkChunkingStartRow: CamelSalesforcePkChunkingStartRow - - org.apache.camel.upgrade.camel421.RenameHeaderPrefixes: + - org.apache.camel.upgrade.camel418_3.RenameHeaderPrefixes: prefixMappings: apexQueryParam.: CamelSalesforceApexQueryParam. diff --git a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.21.yaml b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.21.yaml index 2606659..959421f 100644 --- a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.21.yaml +++ b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/4.21.yaml @@ -57,8 +57,6 @@ recipeList: - org.apache.camel.upgrade.camel421.upgradeMiloHeaders - org.apache.camel.upgrade.camel421.upgradeOpensearchHeaders - org.apache.camel.upgrade.camel421.upgradeIrcHeaders - - org.apache.camel.upgrade.camel421.RemoveReifierStrategyImport - - org.apache.camel.upgrade.camel421.RemoveZooWordEmbeddingPredictorImport - org.apache.camel.upgrade.camel421.removeCamelStompDependency - org.apache.camel.upgrade.camel421.removeCamelAwsXrayDependency - org.apache.camel.upgrade.camel421.removeCamelGuavaEventbusDependency @@ -78,7 +76,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-kafka recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: kafka.PARTITION_KEY: CamelKafkaPartitionKey kafka.PARTITION: CamelKafkaPartition @@ -103,7 +101,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-dns recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: dns.class: CamelDnsClass dns.name: CamelDnsName @@ -122,7 +120,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-couchdb recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: CouchDbDatabase: CamelCouchDbDatabase CouchDbSeq: CamelCouchDbSeq @@ -140,7 +138,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-couchbase recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: CCB_KEY: CamelCouchbaseKey CCB_ID: CamelCouchbaseId @@ -158,7 +156,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-github recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: GitHubPullRequest: CamelGitHubPullRequest GitHubInResponseTo: CamelGitHubInResponseTo @@ -175,7 +173,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-google-vision recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: GoogleCloudVisionOperation: CamelGoogleCloudVisionOperation GoogleCloudVisionResponseObject: CamelGoogleCloudVisionResponseObject @@ -190,7 +188,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-google-text-to-speech recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: GoogleCloudTextToSpeechOperation: CamelGoogleCloudTextToSpeechOperation GoogleCloudTextToSpeechResponseObject: CamelGoogleCloudTextToSpeechResponseObject @@ -205,7 +203,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-google-speech-to-text recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: GoogleCloudSpeechToTextOperation: CamelGoogleCloudSpeechToTextOperation GoogleCloudSpeechToTextResponseObject: CamelGoogleCloudSpeechToTextResponseObject @@ -220,7 +218,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-irc recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: irc.messageType: CamelIrcMessageType irc.target: CamelIrcTarget @@ -243,7 +241,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-pdf recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: protection-policy: CamelPdfProtectionPolicy pdf-document: CamelPdfDocument @@ -260,7 +258,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-arangodb recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: key: CamelArangoDbKey ResultClassType: CamelArangoDbResultClassType @@ -275,7 +273,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-jt400 recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: KEY: CamelJt400Key SENDER_INFORMATION: CamelJt400SenderInformation @@ -290,7 +288,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-mail recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: copyTo: CamelMailCopyTo moveTo: CamelMailMoveTo @@ -306,7 +304,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-milo recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: await: CamelMiloAwait --- @@ -320,7 +318,7 @@ preconditions: groupIdPattern: org.apache.camel artifactIdPattern: camel-opensearch recipeList: - - org.apache.camel.upgrade.camel421.RenameHeaders: + - org.apache.camel.upgrade.camel418_3.RenameHeaders: headerMappings: operation: CamelOpensearchOperation indexId: CamelOpensearchIndexId diff --git a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/examples.yml b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/examples.yml index d2aeab9..9d27753 100644 --- a/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/examples.yml +++ b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/examples.yml @@ -1,6 +1,6 @@ --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaderInJavaMethod +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaderInJavaMethod examples: - description: '' parameters: @@ -26,7 +26,7 @@ examples: language: java --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaderInSimpleExpression +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaderInSimpleExpression examples: - description: '' parameters: @@ -54,7 +54,7 @@ examples: language: java --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaderInXmlDsl +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaderInXmlDsl examples: - description: '' parameters: @@ -78,7 +78,7 @@ examples: language: xml --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaderInYamlDsl +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaderInYamlDsl examples: - description: '' parameters: @@ -104,7 +104,7 @@ examples: language: yaml --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaderPrefixInJavaMethod +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaderPrefixInJavaMethod examples: - description: '' parameters: @@ -132,7 +132,7 @@ examples: language: java --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaderPrefixInSimpleExpression +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaderPrefixInSimpleExpression examples: - description: '' parameters: @@ -160,7 +160,7 @@ examples: language: java --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaderPrefixInXmlDsl +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaderPrefixInXmlDsl examples: - description: '' parameters: @@ -184,7 +184,7 @@ examples: language: xml --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaderPrefixInYamlDsl +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaderPrefixInYamlDsl examples: - description: '' parameters: @@ -210,7 +210,7 @@ examples: language: yaml --- type: specs.openrewrite.org/v1beta/example -recipeName: org.apache.camel.upgrade.camel421.RenameHeaders +recipeName: org.apache.camel.upgrade.camel418_3.RenameHeaders examples: - description: '' parameters: diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate421Test.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate421Test.java index 34a9ae1..ccaa588 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate421Test.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate421Test.java @@ -17,7 +17,6 @@ package org.apache.camel.upgrade; import org.junit.jupiter.api.Test; -import org.openrewrite.DocumentExample; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; import org.openrewrite.test.TypeValidation; @@ -43,35 +42,6 @@ public class CamelUpdate421Test implements RewriteTest { .expectedCyclesThatMakeChanges(1); } - @DocumentExample - @Test - void removeReifierStrategyImport() { - //language=java - rewriteRun( - java( - """ - import org.apache.camel.builder.RouteBuilder; - import org.apache.camel.spi.ReifierStrategy; - - class Test extends RouteBuilder { - public void configure() { - from("direct:start").to("log:test"); - } - } - """, - """ - import org.apache.camel.builder.RouteBuilder; - - class Test extends RouteBuilder { - public void configure() { - from("direct:start").to("log:test"); - } - } - """ - ) - ); - } - @Test void jGroupsHeadersMigration() { new CamelUpdate418_3Test().jGroupsHeadersMigration(); @@ -281,34 +251,6 @@ public class CamelUpdate421Test implements RewriteTest { )); } - @Test - void removeZooWordEmbeddingPredictorImport() { - //language=java - rewriteRun( - java( - """ - import org.apache.camel.builder.RouteBuilder; - import org.apache.camel.component.djl.model.nlp.ZooWordEmbeddingPredictor; - - class Test extends RouteBuilder { - public void configure() { - from("direct:start").to("log:test"); - } - } - """, - """ - import org.apache.camel.builder.RouteBuilder; - - class Test extends RouteBuilder { - public void configure() { - from("direct:start").to("log:test"); - } - } - """ - ) - ); - } - @Test void luceneHeadersMigrationJava() { new CamelUpdate418_3Test().luceneHeadersMigrationJava(); diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInJavaMethodTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInJavaMethodTest.java similarity index 99% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInJavaMethodTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInJavaMethodTest.java index b92a04c..ea0e286 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInJavaMethodTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInJavaMethodTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.CamelTestUtil; import org.junit.jupiter.api.Test; diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInSimpleExpressionTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInSimpleExpressionTest.java similarity index 99% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInSimpleExpressionTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInSimpleExpressionTest.java index 4635472..b41ecdf 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInSimpleExpressionTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInSimpleExpressionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.CamelTestUtil; import org.junit.jupiter.api.Test; diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInXmlDslTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInXmlDslTest.java similarity index 99% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInXmlDslTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInXmlDslTest.java index 322592e..a57d7fd 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInXmlDslTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInXmlDslTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInYamlDslTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInYamlDslTest.java similarity index 99% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInYamlDslTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInYamlDslTest.java index a9fd6db..242daa9 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderInYamlDslTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderInYamlDslTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInJavaMethodTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInJavaMethodTest.java similarity index 99% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInJavaMethodTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInJavaMethodTest.java index 14befa2..5d7ceed 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInJavaMethodTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInJavaMethodTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.CamelTestUtil; import org.junit.jupiter.api.Test; diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInSimpleExpressionTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInSimpleExpressionTest.java similarity index 99% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInSimpleExpressionTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInSimpleExpressionTest.java index a4cb3f6..4c240dc 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInSimpleExpressionTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInSimpleExpressionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.CamelTestUtil; import org.junit.jupiter.api.Test; diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInXmlDslTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInXmlDslTest.java similarity index 99% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInXmlDslTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInXmlDslTest.java index 95910e7..d2c1310 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInXmlDslTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInXmlDslTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInYamlDslTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInYamlDslTest.java similarity index 99% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInYamlDslTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInYamlDslTest.java index 454ef01..77b64d1 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeaderPrefixInYamlDslTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeaderPrefixInYamlDslTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; diff --git a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeadersTest.java b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeadersTest.java similarity index 98% rename from camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeadersTest.java rename to camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeadersTest.java index 65e7851..b530588 100644 --- a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel421/RenameHeadersTest.java +++ b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/camel418_3/RenameHeadersTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.upgrade.camel421; +package org.apache.camel.upgrade.camel418_3; import org.apache.camel.upgrade.CamelTestUtil; import org.junit.jupiter.api.Test; diff --git a/release_notes.adoc b/release_notes.adoc index c76dcaa..00a3363 100644 --- a/release_notes.adoc +++ b/release_notes.adoc @@ -34,7 +34,7 @@ The following table lists migration topics and indicates the level of coverage ( | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#virtual-threads[Virtual Threads maxQueueSize Honored] | ❌ None | Runtime behavior change | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#new-block-rejected-policy[New Block Rejected Policy] | ❌ None | New feature | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#java-serialization[Java Serialization Type Converters Removed] | ❌ None | Removal without replacement -| https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#reifierstrategy[ReifierStrategy SPI Removed] | ✅ Full | Import removal automated for `org.apache.camel.spi.ReifierStrategy` +| https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#reifierstrategy[ReifierStrategy SPI Removed] | ❌ None | Class `org.apache.camel.spi.ReifierStrategy` was removed with no replacement | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#namednode-getchildren-method[NamedNode.getChildren() Method] | ❌ None | New method (additive) | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#namednode-level[NamedNode Level Calculation Changed] | ❌ None | Runtime behavior change | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-jbang[camel-jbang] | ❌ None | CLI runtime behavior @@ -52,7 +52,7 @@ The following table lists migration topics and indicates the level of coverage ( | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-github-removal[camel-github Removed] | ✅ Full | Automated removal of `org.apache.camel:camel-github` dependency. Migration to `camel-github2` was automated in 4.18.3 (see 4.18.3 section below). | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-telemetry[camel-telemetry Processor Span Changes] | ❌ None | Interface signature changed | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-opentelemetry2[camel-opentelemetry2 Scope Management] | ❌ None | Internal implementation change -| https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-djl[camel-djl Word Embedding Removed] | ✅ Full | Import removal automated for `ZooWordEmbeddingPredictor` +| https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-djl[camel-djl Word Embedding Removed] | ❌ None | Class `ZooWordEmbeddingPredictor` was removed with no replacement | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-aws-bedrock[camel-aws-bedrock Guardrail Header] | ❌ None | New optional feature | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-jgroups-potential-breaking-change[camel-jgroups Headers] | ⚠️ Partial | Only basic header usage is migrated. Automated for `.setHeader()` and Simple expressions. Dynamic headers and Map operations require manual review. | https://camel.apache.org/manual/camel-4x-upgrade-guide-4_21.html#camel-elasticsearch-rest-client[camel-elasticsearch-rest-client Headers] | ❌ None | Header values are too common, automatic upgrade is complicated.
