(camel) 01/02: CAMEL-20234: consolidate exchange visibility

[or...@apache.org]

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

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

commit 7c66c11d975031753ef2707220b130ef92aaa255
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Dec 13 15:42:46 2023 -0300

    CAMEL-20234: consolidate exchange visibility
---
 .../org/apache/camel/support/AbstractExchange.java  | 21 ++++++++-------------
 .../apache/camel/support/DefaultPooledExchange.java |  9 ---------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index df3ed17dcc3..1a5b5e81009 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -65,7 +65,7 @@ abstract class AbstractExchange implements Exchange {
     private final ExtendedExchangeExtension privateExtension;
     private RedeliveryTraitPayload externalRedelivered = RedeliveryTraitPayload.UNDEFINED_REDELIVERY;
 
-    AbstractExchange(CamelContext context, EnumMap<ExchangePropertyKey, Object> internalProperties,
+    protected AbstractExchange(CamelContext context, EnumMap<ExchangePropertyKey, Object> internalProperties,
                      Map<String, Object> properties) {
         this.context = context;
         this.internalProperties = new EnumMap<>(internalProperties);
@@ -73,11 +73,11 @@ abstract class AbstractExchange implements Exchange {
         this.properties = safeCopyProperties(properties);
     }
 
-    public AbstractExchange(CamelContext context) {
+    protected AbstractExchange(CamelContext context) {
         this(context, ExchangePattern.InOnly);
     }
 
-    public AbstractExchange(CamelContext context, ExchangePattern pattern) {
+    protected AbstractExchange(CamelContext context, ExchangePattern pattern) {
         this.context = context;
         this.pattern = pattern;
 
@@ -85,7 +85,7 @@ abstract class AbstractExchange implements Exchange {
         privateExtension = new ExtendedExchangeExtension(this);
     }
 
-    public AbstractExchange(Exchange parent) {
+    protected AbstractExchange(Exchange parent) {
         this.context = parent.getContext();
         this.pattern = parent.getPattern();
 
@@ -97,7 +97,7 @@ abstract class AbstractExchange implements Exchange {
         privateExtension.setUnitOfWork(parent.getUnitOfWork());
     }
 
-    AbstractExchange(AbstractExchange parent) {
+    protected AbstractExchange(AbstractExchange parent) {
         this.context = parent.getContext();
         this.pattern = parent.getPattern();
 
@@ -133,16 +133,11 @@ abstract class AbstractExchange implements Exchange {
         }
     }
 
-    public AbstractExchange(Endpoint fromEndpoint) {
-        this.context = fromEndpoint.getCamelContext();
-        this.pattern = fromEndpoint.getExchangePattern();
-
-        internalProperties = new EnumMap<>(ExchangePropertyKey.class);
-        privateExtension = new ExtendedExchangeExtension(this);
-        privateExtension.setFromEndpoint(fromEndpoint);
+    protected AbstractExchange(Endpoint fromEndpoint) {
+        this(fromEndpoint, fromEndpoint.getExchangePattern());
     }
 
-    public AbstractExchange(Endpoint fromEndpoint, ExchangePattern pattern) {
+    protected AbstractExchange(Endpoint fromEndpoint, ExchangePattern pattern) {
         this.context = fromEndpoint.getCamelContext();
         this.pattern = pattern;
 
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 286875aed55..cc09cbae7d4 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -45,14 +45,6 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
         this.clock = new ResetableClock();
     }
 
-    public DefaultPooledExchange(CamelContext context, ExchangePattern pattern) {
-        super(context, pattern);
-        this.originalPattern = pattern;
-        this.properties = new ConcurrentHashMap<>(8);
-
-        this.clock = new ResetableClock();
-    }
-
     public DefaultPooledExchange(Exchange parent) {
         super(parent);
         this.originalPattern = parent.getPattern();
@@ -136,7 +128,6 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
             if (onDone != null) {
                 onDone.onDone(this);
             }
-
         }
     }