(camel) 01/04: Make model field final in DefaultCamelContext, deprecate the disposeModel method which was used with the lightweight mode

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 84838b5e1a54f4333a6080b7086d80af297c094d
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed May 15 17:33:00 2024 +0200

    Make model field final in DefaultCamelContext, deprecate the disposeModel 
method which was used with the lightweight mode
---
 .../src/main/java/org/apache/camel/ExtendedCamelContext.java      | 3 +++
 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java   | 1 +
 .../apache/camel/impl/engine/DefaultCamelContextExtension.java    | 1 -
 .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java  | 8 +-------
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java 
b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 75f351bd165..318d50a5743 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -441,7 +441,10 @@ public interface ExtendedCamelContext {
      * Danger!!! This will dispose the route model from the {@link 
CamelContext} which is used for lightweight mode.
      * This means afterwards no new routes can be dynamically added. Any 
operations on the
      * org.apache.camel.model.ModelCamelContext will return null or be a noop 
operation.
+     *
+     * @deprecated noop, do not use
      */
+    @Deprecated
     void disposeModel();
 
     /**
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 55445d737fd..763c09d8738 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -4085,6 +4085,7 @@ public abstract class AbstractCamelContext extends 
BaseService
 
     public abstract Processor createErrorHandler(Route route, Processor 
processor) throws Exception;
 
+    @Deprecated
     public abstract void disposeModel();
 
     public abstract String getTestExcludeRoutes();
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index cd84505f92e..d0f5036c2a8 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -950,7 +950,6 @@ class DefaultCamelContextExtension implements 
ExtendedCamelContext {
 
     @Override
     public void disposeModel() {
-        camelContext.disposeModel();
     }
 
     @Override
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 01ae79b13c0..b0493d5d4c9 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
@@ -105,7 +105,7 @@ public class DefaultCamelContext extends SimpleCamelContext 
implements ModelCame
     private static final Logger LOG = 
LoggerFactory.getLogger(DefaultCamelContext.class);
     private static final UuidGenerator UUID = new SimpleUuidGenerator();
 
-    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.
@@ -231,12 +231,6 @@ public class DefaultCamelContext extends 
SimpleCamelContext implements ModelCame
         return resolver;
     }
 
-    @Override
-    public void disposeModel() {
-        LOG.debug("Disposing Model on CamelContext");
-        model = null;
-    }
-
     @Override
     public void addModelLifecycleStrategy(ModelLifecycleStrategy 
modelLifecycleStrategy) {
         model.addModelLifecycleStrategy(modelLifecycleStrategy);