This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7e3059c367960d02d81f4bed35165ca2d4ce55b2
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Nov 7 09:34:12 2020 +0100
Polished
---
.../src/main/java/org/apache/camel/reifier/ProcessorReifier.java | 4 +---
.../org/apache/camel/reifier/dataformat/DataFormatReifier.java | 4 +---
.../apache/camel/reifier/errorhandler/ErrorHandlerReifier.java | 9 +--------
.../org/apache/camel/reifier/language/ExpressionReifier.java | 6 ++----
.../apache/camel/reifier/loadbalancer/LoadBalancerReifier.java | 4 +---
.../org/apache/camel/reifier/transformer/TransformerReifier.java | 4 +---
.../org/apache/camel/reifier/validator/ValidatorReifier.java | 4 +---
7 files changed, 8 insertions(+), 27 deletions(-)
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index e8d5c9a..4eccd71 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -119,9 +119,7 @@ public abstract class ProcessorReifier<T extends
ProcessorDefinition<?>> extends
private static final Map<Class<?>, BiFunction<Route,
ProcessorDefinition<?>, ProcessorReifier<? extends ProcessorDefinition<?>>>>
PROCESSORS;
static {
// for custom reifiers
- Map<Class<?>, BiFunction<Route, ProcessorDefinition<?>,
ProcessorReifier<? extends ProcessorDefinition<?>>>> map
- = new HashMap<>(0);
- PROCESSORS = map;
+ PROCESSORS = new HashMap<>(0);
ReifierStrategy.addReifierClearer(ProcessorReifier::clearReifiers);
}
protected final Logger log = LoggerFactory.getLogger(getClass());
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
index 15a2859..34a4874 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
@@ -86,9 +86,7 @@ public abstract class DataFormatReifier<T extends
DataFormatDefinition> extends
private static final Map<Class<? extends DataFormatDefinition>,
BiFunction<CamelContext, DataFormatDefinition, DataFormatReifier<? extends
DataFormatDefinition>>> DATAFORMATS;
static {
// for custom reifiers
- Map<Class<? extends DataFormatDefinition>, BiFunction<CamelContext,
DataFormatDefinition, DataFormatReifier<? extends DataFormatDefinition>>> map
- = new HashMap<>(0);
- DATAFORMATS = map;
+ DATAFORMATS = new HashMap<>(0);
ReifierStrategy.addReifierClearer(DataFormatReifier::clearReifiers);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
index 2c0e0e9..3effc41 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
@@ -51,14 +51,7 @@ import org.apache.camel.util.ObjectHelper;
public abstract class ErrorHandlerReifier<T extends ErrorHandlerFactory>
extends AbstractReifier {
- private static final Map<Class<?>, BiFunction<Route, ErrorHandlerFactory,
ErrorHandlerReifier<? extends ErrorHandlerFactory>>> ERROR_HANDLERS;
-
- static {
- // for custom reifiers
- Map<Class<?>, BiFunction<Route, ErrorHandlerFactory,
ErrorHandlerReifier<? extends ErrorHandlerFactory>>> map
- = new HashMap<>(0);
- ERROR_HANDLERS = map;
- }
+ private static final Map<Class<?>, BiFunction<Route, ErrorHandlerFactory,
ErrorHandlerReifier<? extends ErrorHandlerFactory>>> ERROR_HANDLERS = new
HashMap<>(0);
protected T definition;
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
index a60d840..3cec62c 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.reifier.language;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
import java.util.Map;
import java.util.function.BiFunction;
@@ -62,9 +62,7 @@ public class ExpressionReifier<T extends
ExpressionDefinition> extends AbstractR
static {
// for custom reifiers
- Map<Class<?>, BiFunction<CamelContext, ExpressionDefinition,
ExpressionReifier<? extends ExpressionDefinition>>> map
- = new LinkedHashMap<>(0);
- EXPRESSIONS = map;
+ EXPRESSIONS = new HashMap<>(0);
ReifierStrategy.addReifierClearer(ExpressionReifier::clearReifiers);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
index 2cd27a1..a6df7bf 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java
@@ -39,9 +39,7 @@ public class LoadBalancerReifier<T extends
LoadBalancerDefinition> extends Abstr
private static final Map<Class<?>, BiFunction<Route,
LoadBalancerDefinition, LoadBalancerReifier<? extends LoadBalancerDefinition>>>
LOAD_BALANCERS;
static {
// for custom reifiers
- Map<Class<?>, BiFunction<Route, LoadBalancerDefinition,
LoadBalancerReifier<? extends LoadBalancerDefinition>>> map
- = new HashMap<>(0);
- LOAD_BALANCERS = map;
+ LOAD_BALANCERS = new HashMap<>(0);
ReifierStrategy.addReifierClearer(LoadBalancerReifier::clearReifiers);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
index 6776783..af4908b 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java
@@ -34,9 +34,7 @@ public abstract class TransformerReifier<T> extends
AbstractReifier {
private static final Map<Class<?>, BiFunction<CamelContext,
TransformerDefinition, TransformerReifier<? extends TransformerDefinition>>>
TRANSFORMERS;
static {
// for custom reifiers
- Map<Class<?>, BiFunction<CamelContext, TransformerDefinition,
TransformerReifier<? extends TransformerDefinition>>> map
- = new HashMap<>(0);
- TRANSFORMERS = map;
+ TRANSFORMERS = new HashMap<>(0);
ReifierStrategy.addReifierClearer(TransformerReifier::clearReifiers);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
index 04a469e..4408da8 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java
@@ -34,9 +34,7 @@ public abstract class ValidatorReifier<T> extends
AbstractReifier {
private static final Map<Class<?>, BiFunction<CamelContext,
ValidatorDefinition, ValidatorReifier<? extends ValidatorDefinition>>>
VALIDATORS;
static {
// for custom reifiers
- Map<Class<?>, BiFunction<CamelContext, ValidatorDefinition,
ValidatorReifier<? extends ValidatorDefinition>>> map
- = new HashMap<>(0);
- VALIDATORS = map;
+ VALIDATORS = new HashMap<>(0);
ReifierStrategy.addReifierClearer(ValidatorReifier::clearReifiers);
}
