[camel] 01/03: camel-core - Polished

[davsclaus]

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 1472e5745ed1bdf729bad1379164dea70657127d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Oct 22 18:27:36 2020 +0200

    camel-core - Polished
---
 .../org/apache/camel/impl/DefaultCamelContext.java |  2 +-
 .../java/org/apache/camel/impl/DefaultModel.java   | 26 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index a15e0cf..dcff5ab 100644
--- 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -78,7 +78,7 @@ public class DefaultCamelContext extends SimpleCamelContext 
implements ModelCame
 
     private static final Logger LOG = 
LoggerFactory.getLogger(DefaultCamelContext.class);
 
-    private Model model = new DefaultModel(this);
+    private final Model model = new DefaultModel(this);
 
     /**
      * Creates the {@link ModelCamelContext} using {@link 
org.apache.camel.support.DefaultRegistry} as registry.
diff --git 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java
index b1d2d02..70b0b34 100644
--- 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java
+++ 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java
@@ -60,25 +60,16 @@ public class DefaultModel implements Model {
     private Map<String, DataFormatDefinition> dataFormats = new HashMap<>();
     private List<TransformerDefinition> transformers = new ArrayList<>();
     private List<ValidatorDefinition> validators = new ArrayList<>();
-    private Map<String, ServiceCallConfigurationDefinition> 
serviceCallConfigurations = new ConcurrentHashMap<>();
-    private Map<String, HystrixConfigurationDefinition> hystrixConfigurations 
= new ConcurrentHashMap<>();
-    private Map<String, Resilience4jConfigurationDefinition> 
resilience4jConfigurations = new ConcurrentHashMap<>();
-    private Map<String, FaultToleranceConfigurationDefinition> 
faultToleranceConfigurations = new ConcurrentHashMap<>();
+    private final Map<String, ServiceCallConfigurationDefinition> 
serviceCallConfigurations = new ConcurrentHashMap<>();
+    private final Map<String, HystrixConfigurationDefinition> 
hystrixConfigurations = new ConcurrentHashMap<>();
+    private final Map<String, Resilience4jConfigurationDefinition> 
resilience4jConfigurations = new ConcurrentHashMap<>();
+    private final Map<String, FaultToleranceConfigurationDefinition> 
faultToleranceConfigurations = new ConcurrentHashMap<>();
     private Function<RouteDefinition, Boolean> routeFilter;
 
     public DefaultModel(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
 
-    protected static <T> T lookup(CamelContext context, String ref, Class<T> 
type) {
-        try {
-            return context.getRegistry().lookupByNameAndType(ref, type);
-        } catch (Exception e) {
-            // need to ignore not same type and return it as null
-            return null;
-        }
-    }
-
     public CamelContext getCamelContext() {
         return camelContext;
     }
@@ -498,4 +489,13 @@ public class DefaultModel implements Model {
         return camelContext.isStarted() && !camelContext.isStarting();
     }
 
+    private static <T> T lookup(CamelContext context, String ref, Class<T> 
type) {
+        try {
+            return context.getRegistry().lookupByNameAndType(ref, type);
+        } catch (Exception e) {
+            // need to ignore not same type and return it as null
+            return null;
+        }
+    }
+
 }