Skip to content

Commit 87dfc87

Browse files
authored
CAMEL-23405: camel-core - Remove ReifierStrategy (#22919)
1 parent 5b5cbd8 commit 87dfc87

8 files changed

Lines changed: 2 additions & 68 deletions

File tree

core/camel-api/src/main/java/org/apache/camel/spi/ReifierStrategy.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
import org.apache.camel.spi.InterceptStrategy;
124124
import org.apache.camel.spi.NodeIdFactory;
125125
import org.apache.camel.spi.ProcessorFactory;
126-
import org.apache.camel.spi.ReifierStrategy;
127126
import org.apache.camel.spi.RouteIdAware;
128127
import org.apache.camel.support.CamelContextHelper;
129128
import org.apache.camel.support.PluginHelper;
@@ -171,9 +170,6 @@ protected ProcessorReifier(CamelContext camelContext, T definition) {
171170
public static void registerReifier(
172171
Class<?> processorClass,
173172
BiFunction<Route, ProcessorDefinition<?>, ProcessorReifier<? extends ProcessorDefinition<?>>> creator) {
174-
if (PROCESSORS.isEmpty()) {
175-
ReifierStrategy.addReifierClearer(ProcessorReifier::clearReifiers);
176-
}
177173
PROCESSORS.put(processorClass, creator);
178174
}
179175

core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
3232
import org.apache.camel.spi.PropertyConfigurer;
3333
import org.apache.camel.spi.PropertyConfigurerAware;
34-
import org.apache.camel.spi.ReifierStrategy;
3534
import org.apache.camel.support.CamelContextHelper;
3635
import org.apache.camel.support.PluginHelper;
3736
import org.apache.camel.support.PropertyBindingSupport;
@@ -59,9 +58,6 @@ protected DataFormatReifier(CamelContext camelContext, T definition) {
5958
public static void registerReifier(
6059
Class<? extends DataFormatDefinition> dataFormatClass,
6160
BiFunction<CamelContext, DataFormatDefinition, DataFormatReifier<? extends DataFormatDefinition>> creator) {
62-
if (DATAFORMATS.isEmpty()) {
63-
ReifierStrategy.addReifierClearer(DataFormatReifier::clearReifiers);
64-
}
6561
DATAFORMATS.put(dataFormatClass, creator);
6662
}
6763

core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.apache.camel.reifier.AbstractReifier;
4848
import org.apache.camel.spi.Language;
4949
import org.apache.camel.spi.PropertiesComponent;
50-
import org.apache.camel.spi.ReifierStrategy;
5150
import org.apache.camel.support.ExpressionToPredicateAdapter;
5251
import org.apache.camel.support.ScriptHelper;
5352
import org.apache.camel.util.ObjectHelper;
@@ -70,9 +69,6 @@ public ExpressionReifier(CamelContext camelContext, T definition) {
7069
public static void registerReifier(
7170
Class<?> processorClass,
7271
BiFunction<CamelContext, ExpressionDefinition, ExpressionReifier<? extends ExpressionDefinition>> creator) {
73-
if (EXPRESSIONS.isEmpty()) {
74-
ReifierStrategy.addReifierClearer(ExpressionReifier::clearReifiers);
75-
}
7672
EXPRESSIONS.put(processorClass, creator);
7773
}
7874

core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition;
3232
import org.apache.camel.processor.loadbalancer.LoadBalancer;
3333
import org.apache.camel.reifier.AbstractReifier;
34-
import org.apache.camel.spi.ReifierStrategy;
3534
import org.apache.camel.util.StringHelper;
3635

3736
public class LoadBalancerReifier<T extends LoadBalancerDefinition> extends AbstractReifier {
@@ -50,9 +49,6 @@ public LoadBalancerReifier(Route route, T definition) {
5049
public static void registerReifier(
5150
Class<?> processorClass,
5251
BiFunction<Route, LoadBalancerDefinition, LoadBalancerReifier<? extends LoadBalancerDefinition>> creator) {
53-
if (LOAD_BALANCERS.isEmpty()) {
54-
ReifierStrategy.addReifierClearer(LoadBalancerReifier::clearReifiers);
55-
}
5652
LOAD_BALANCERS.put(processorClass, creator);
5753
}
5854

core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.camel.model.transformer.LoadTransformerDefinition;
2828
import org.apache.camel.model.transformer.TransformerDefinition;
2929
import org.apache.camel.reifier.AbstractReifier;
30-
import org.apache.camel.spi.ReifierStrategy;
3130
import org.apache.camel.spi.Transformer;
3231

3332
public abstract class TransformerReifier<T> extends AbstractReifier {
@@ -46,9 +45,6 @@ protected TransformerReifier(CamelContext camelContext, T definition) {
4645
public static void registerReifier(
4746
Class<?> processorClass,
4847
BiFunction<CamelContext, TransformerDefinition, TransformerReifier<? extends TransformerDefinition>> creator) {
49-
if (TRANSFORMERS.isEmpty()) {
50-
ReifierStrategy.addReifierClearer(TransformerReifier::clearReifiers);
51-
}
5248
TRANSFORMERS.put(processorClass, creator);
5349
}
5450

core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.camel.model.validator.PredicateValidatorDefinition;
2727
import org.apache.camel.model.validator.ValidatorDefinition;
2828
import org.apache.camel.reifier.AbstractReifier;
29-
import org.apache.camel.spi.ReifierStrategy;
3029
import org.apache.camel.spi.Validator;
3130

3231
public abstract class ValidatorReifier<T> extends AbstractReifier {
@@ -45,9 +44,6 @@ protected ValidatorReifier(CamelContext camelContext, T definition) {
4544
public static void registerReifier(
4645
Class<?> processorClass,
4746
BiFunction<CamelContext, ValidatorDefinition, ValidatorReifier<? extends ValidatorDefinition>> creator) {
48-
if (VALIDATORS.isEmpty()) {
49-
ReifierStrategy.addReifierClearer(ValidatorReifier::clearReifiers);
50-
}
5147
VALIDATORS.put(processorClass, creator);
5248
}
5349

docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Java object serialization is a recurring source of security issues and therefore
2222
These converters are not used at all by Camel itself. To restore compatibility then end users can add these type converters back as custom converters in their own Camel applications.
2323
However, using Java serialization is discouraged and highly recommend to use other means.
2424

25+
Removed `org.apache.camel.spi.ReifierStrategy` which is no longer in use by Camel and can safely be removed.
26+
2527
=== camel-yaml-dsl
2628

2729
A new canonical JSON Schema variant (`camelYamlDsl-canonical.json`) has been added alongside the existing classic

0 commit comments

Comments
 (0)