This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 440a0f87b3 Avoid shadowing variables
440a0f87b3 is described below
commit 440a0f87b335c7aa05d0ce3fc97d015085883800
Author: James Netherton <[email protected]>
AuthorDate: Thu Nov 27 12:12:31 2025 +0000
Avoid shadowing variables
---
.../apache/camel/quarkus/core/FastTypeConverterInjector.java | 11 ++---------
.../component/reactive/streams/ReactiveStreamsRecorder.java | 7 ++++---
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverterInjector.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverterInjector.java
index b3412309f4..c1e674c00c 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverterInjector.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverterInjector.java
@@ -20,34 +20,27 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.engine.DefaultInjector;
-import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.ObjectHelper;
-import org.apache.camel.support.PluginHelper;
/**
* An {@link org.apache.camel.spi.Injector} that can delegate TypeConverter
instance resolution to Arc.
*/
public class FastTypeConverterInjector extends DefaultInjector {
- private final CamelContext context;
- private final CamelBeanPostProcessor postProcessor;
-
public FastTypeConverterInjector(CamelContext context) {
super(context);
- this.context = context;
- this.postProcessor = PluginHelper.getBeanPostProcessor(context);
}
@Override
public <T> T newInstance(Class<T> type, boolean postProcessBean) {
// Try TypeConverter discovery from the Camel registry / Arc container
- T typeConverter = CamelContextHelper.findSingleByType(context, type);
+ T typeConverter = CamelContextHelper.findSingleByType(camelContext,
type);
if (typeConverter == null) {
// Fallback to the default injector behavior
typeConverter = ObjectHelper.newInstance(type);
}
- CamelContextAware.trySetCamelContext(typeConverter, context);
+ CamelContextAware.trySetCamelContext(typeConverter, camelContext);
if (postProcessBean) {
try {
postProcessor.postProcessBeforeInitialization(typeConverter,
typeConverter.getClass().getName());
diff --git
a/extensions/reactive-streams/runtime/src/main/java/org/apache/camel/quarkus/component/reactive/streams/ReactiveStreamsRecorder.java
b/extensions/reactive-streams/runtime/src/main/java/org/apache/camel/quarkus/component/reactive/streams/ReactiveStreamsRecorder.java
index a43c723f20..bf3aead922 100644
---
a/extensions/reactive-streams/runtime/src/main/java/org/apache/camel/quarkus/component/reactive/streams/ReactiveStreamsRecorder.java
+++
b/extensions/reactive-streams/runtime/src/main/java/org/apache/camel/quarkus/component/reactive/streams/ReactiveStreamsRecorder.java
@@ -39,17 +39,16 @@ public class ReactiveStreamsRecorder {
private static class QuarkusReactiveStreamsComponent extends
ReactiveStreamsComponent {
private final CamelReactiveStreamsServiceFactory
reactiveStreamServiceFactory;
- private final Object lock;
private CamelReactiveStreamsService reactiveStreamService;
public
QuarkusReactiveStreamsComponent(CamelReactiveStreamsServiceFactory
reactiveStreamServiceFactory) {
this.reactiveStreamServiceFactory = reactiveStreamServiceFactory;
- this.lock = new Object();
}
@Override
public CamelReactiveStreamsService getReactiveStreamsService() {
- synchronized (this.lock) {
+ lock.lock();
+ try {
if (getReactiveStreamsEngineConfiguration() == null) {
ReactiveStreamsEngineConfiguration
reactiveStreamsEngineConfiguration = new ReactiveStreamsEngineConfiguration();
reactiveStreamsEngineConfiguration.setThreadPoolMaxSize(getThreadPoolMaxSize());
@@ -69,6 +68,8 @@ public class ReactiveStreamsRecorder {
throw new RuntimeCamelException(e);
}
}
+ } finally {
+ lock.unlock();
}
return this.reactiveStreamService;