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 5eb89c8c05ba97d6fd66b7052af21559629e4410 Author: Guillaume Nodet <[email protected]> AuthorDate: Tue May 21 10:32:54 2024 +0200 Fix visibility problems --- .../main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java | 2 +- .../main/java/org/apache/camel/impl/converter/CachingInjector.java | 2 +- .../main/java/org/apache/camel/model/dataformat/FhirDataformat.java | 2 +- .../apache/camel/model/dataformat/UniVocityAbstractDataFormat.java | 2 +- .../java/org/apache/camel/model/language/ExpressionDefinition.java | 2 +- .../org/apache/camel/model/language/NamespaceAwareExpression.java | 2 +- .../org/apache/camel/processor/ConcurrentRequestsThrottler.java | 2 +- .../java/org/apache/camel/processor/TotalRequestsThrottler.java | 2 +- .../src/main/java/org/apache/camel/main/PropertyOptionKey.java | 4 ++-- .../src/main/java/org/apache/camel/xml/in/BaseParser.java | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java index 0cfce32eaee..fe627dc23f8 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java @@ -46,7 +46,7 @@ public class DurationRoutePolicy extends org.apache.camel.support.RoutePolicySup private static final Logger LOG = LoggerFactory.getLogger(DurationRoutePolicy.class); - enum Action { + public enum Action { STOP_CAMEL_CONTEXT, STOP_ROUTE, SUSPEND_ROUTE, diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java index 03058bf3c8a..fa2de813848 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java @@ -21,7 +21,7 @@ import org.apache.camel.spi.TypeConverterRegistry; /** * A caching proxy */ -class CachingInjector<T> { +public class CachingInjector<T> { private final TypeConverterRegistry repository; private final Class<T> type; private T instance; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java index d3c371b0c8c..9e301d104fd 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java @@ -477,7 +477,7 @@ public abstract class FhirDataformat extends DataFormatDefinition implements Con */ @XmlTransient @SuppressWarnings("unchecked") - abstract static class AbstractBuilder<T extends AbstractBuilder<T, F>, F extends FhirDataformat> + protected abstract static class AbstractBuilder<T extends AbstractBuilder<T, F>, F extends FhirDataformat> implements DataFormatBuilder<F> { private String fhirContext; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java index 217f927336b..6fc5657164c 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java @@ -287,7 +287,7 @@ public abstract class UniVocityAbstractDataFormat extends DataFormatDefinition { */ @XmlTransient @SuppressWarnings("unchecked") - abstract static class AbstractBuilder<T extends AbstractBuilder<T, F>, F extends UniVocityAbstractDataFormat> + protected abstract static class AbstractBuilder<T extends AbstractBuilder<T, F>, F extends UniVocityAbstractDataFormat> implements DataFormatBuilder<F> { private String nullValue; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java index bc9d5da4af5..9ac98e65c51 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java @@ -274,7 +274,7 @@ public class ExpressionDefinition */ @XmlTransient @SuppressWarnings("unchecked") - abstract static class AbstractBuilder<T extends AbstractBuilder<T, E>, E extends ExpressionDefinition> + protected abstract static class AbstractBuilder<T extends AbstractBuilder<T, E>, E extends ExpressionDefinition> implements LanguageBuilder<E> { private String id; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java index 5047872cd84..883459900ff 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java @@ -99,7 +99,7 @@ public abstract class NamespaceAwareExpression extends SingleInputTypedExpressio */ @XmlTransient @SuppressWarnings("unchecked") - abstract static class AbstractNamespaceAwareBuilder< + protected abstract static class AbstractNamespaceAwareBuilder< T extends AbstractNamespaceAwareBuilder<T, E>, E extends NamespaceAwareExpression> extends AbstractBuilder<T, E> { diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/ConcurrentRequestsThrottler.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/ConcurrentRequestsThrottler.java index 10d9c25c4c9..a67b2182d7c 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/ConcurrentRequestsThrottler.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/ConcurrentRequestsThrottler.java @@ -214,7 +214,7 @@ public class ConcurrentRequestsThrottler extends AbstractThrottler { super.doShutdown(); } - private class ThrottlingState { + protected class ThrottlingState { private final String key; private final AtomicReference<ScheduledFuture<?>> cleanFuture = new AtomicReference<>(); private volatile int throttleRate; diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/TotalRequestsThrottler.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/TotalRequestsThrottler.java index 7ce539b0356..a09628d67e7 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/TotalRequestsThrottler.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/TotalRequestsThrottler.java @@ -214,7 +214,7 @@ public class TotalRequestsThrottler extends AbstractThrottler { super.doShutdown(); } - private class ThrottlingState { + protected class ThrottlingState { private final String key; private final DelayQueue<ThrottlePermit> delayQueue = new DelayQueue<>(); private final AtomicReference<ScheduledFuture<?>> cleanFuture = new AtomicReference<>(); diff --git a/core/camel-main/src/main/java/org/apache/camel/main/PropertyOptionKey.java b/core/camel-main/src/main/java/org/apache/camel/main/PropertyOptionKey.java index c732c00595a..0091147dc4d 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/PropertyOptionKey.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/PropertyOptionKey.java @@ -20,11 +20,11 @@ import java.util.Objects; import org.apache.camel.util.ObjectHelper; -final class PropertyOptionKey { +public final class PropertyOptionKey { private final Object instance; private final String optionPrefix; - PropertyOptionKey(Object instance, String optionPrefix) { + public PropertyOptionKey(Object instance, String optionPrefix) { this.instance = ObjectHelper.notNull(instance, "instance"); this.optionPrefix = ObjectHelper.notNull(optionPrefix, "optionPrefix"); } diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java index 265525d9841..8058de66f74 100644 --- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java +++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java @@ -501,15 +501,15 @@ public class BaseParser { return factory; } - interface AttributeHandler<T> { + protected interface AttributeHandler<T> { boolean accept(T definition, String name, String value) throws IOException, XmlPullParserException; } - interface ElementHandler<T> { + protected interface ElementHandler<T> { boolean accept(T definition, String name) throws IOException, XmlPullParserException; } - interface ValueHandler<T> { + protected interface ValueHandler<T> { void accept(T definition, String value) throws IOException, XmlPullParserException; }
