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 b9fffea37fb29f1ab8ab78f785853c965e5c5b94 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Jun 20 11:00:04 2022 +0200 (chores) camel-quickfix: removed unused parameters --- .../org/apache/camel/component/quickfixj/QuickfixjComponent.java | 1 - .../org/apache/camel/component/quickfixj/QuickfixjEndpoint.java | 4 ++-- .../org/apache/camel/component/quickfixj/QuickfixjEngine.java | 8 ++++---- .../org/apache/camel/component/quickfixj/QuickfixjProducer.java | 4 ++-- .../apache/camel/component/quickfixj/QuickfixjProducerTest.java | 2 +- .../java/org/apache/camel/component/quickfixj/TestSupport.java | 8 +++----- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java index 632c395fe03..94f86d14a43 100644 --- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java +++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java @@ -92,7 +92,6 @@ public class QuickfixjComponent extends DefaultComponent implements StartupListe lazyCreateEngineForEndpoint = isLazyCreateEngines(); } engine = new QuickfixjEngine( - getCamelContext(), uri, settings, messageStoreFactory, logFactory, messageFactory, lazyCreateEngineForEndpoint); diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java index d750ed257e0..5d0f9704ca6 100644 --- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java +++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java @@ -157,12 +157,12 @@ public class QuickfixjEndpoint extends DefaultEndpoint implements QuickfixjEvent } } - protected void addProducer(QuickfixjProducer producer) { + protected void addProducer() { engine.incRefCount(); getComponent().ensureEngineStarted(engine); } - protected void removeProducer(QuickfixjProducer producer) { + protected void removeProducer() { int count = engine.decRefCount(); if (count <= 0 && getComponent().isEagerStopEngines()) { LOG.info("Stopping QuickFIX/J Engine: {} no longer active in use", engine.getUri()); diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java index b9ef8de8ab4..7a910dd7161 100644 --- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java +++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java @@ -117,20 +117,20 @@ public class QuickfixjEngine extends ServiceSupport { MessageStoreFactory messageStoreFactoryOverride, LogFactory sessionLogFactoryOverride, MessageFactory messageFactoryOverride) throws Exception { - this(camelContext, uri, loadSettings(camelContext, settingsResourceName), messageStoreFactoryOverride, + this(uri, loadSettings(camelContext, settingsResourceName), messageStoreFactoryOverride, sessionLogFactoryOverride, messageFactoryOverride); } - public QuickfixjEngine(CamelContext camelContext, String uri, SessionSettings settings, + public QuickfixjEngine(String uri, SessionSettings settings, MessageStoreFactory messageStoreFactoryOverride, LogFactory sessionLogFactoryOverride, MessageFactory messageFactoryOverride) throws Exception { - this(camelContext, uri, settings, messageStoreFactoryOverride, sessionLogFactoryOverride, messageFactoryOverride, + this(uri, settings, messageStoreFactoryOverride, sessionLogFactoryOverride, messageFactoryOverride, false); } - public QuickfixjEngine(CamelContext camelContext, String uri, SessionSettings settings, + public QuickfixjEngine(String uri, SessionSettings settings, MessageStoreFactory messageStoreFactoryOverride, LogFactory sessionLogFactoryOverride, MessageFactory messageFactoryOverride, diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java index bd7335c887d..bf2710b92c1 100644 --- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java +++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java @@ -45,13 +45,13 @@ public class QuickfixjProducer extends DefaultProducer { @Override protected void doStart() throws Exception { - getEndpoint().addProducer(this); + getEndpoint().addProducer(); super.doStart(); } @Override protected void doStop() throws Exception { - getEndpoint().removeProducer(this); + getEndpoint().removeProducer(); super.doStop(); } diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java index f1cfa3af598..9cd2f09bda2 100644 --- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java +++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java @@ -59,7 +59,7 @@ public class QuickfixjProducerTest { Mockito.when(mockExchange.getPattern()).thenReturn(ExchangePattern.InOnly); context = Mockito.mock(CamelContext.class); - quickfixjEngine = TestSupport.createEngine(context); + quickfixjEngine = TestSupport.createEngine(); Mockito.when(mockEndpoint.getEngine()).thenReturn(quickfixjEngine); inboundFixMessage = new Message(); diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java index bb4c7d2dd98..fd56a4e1285 100644 --- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java +++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java @@ -21,7 +21,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.Date; -import org.apache.camel.CamelContext; import org.mockito.Mockito; import quickfix.Acceptor; import quickfix.Application; @@ -91,11 +90,11 @@ public final class TestSupport { return factory.create(sessionID, settings); } - public static QuickfixjEngine createEngine(CamelContext camelContext) throws Exception { - return createEngine(camelContext, false); + public static QuickfixjEngine createEngine() throws Exception { + return createEngine(false); } - public static QuickfixjEngine createEngine(CamelContext camelContext, boolean lazy) throws Exception { + public static QuickfixjEngine createEngine(boolean lazy) throws Exception { SessionID sessionID = new SessionID("FIX.4.4:SENDER->TARGET"); MessageStoreFactory mockMessageStoreFactory = Mockito.mock(MessageStoreFactory.class); @@ -113,7 +112,6 @@ public final class TestSupport { settings.setBool(sessionID, Session.SETTING_USE_DATA_DICTIONARY, false); return new QuickfixjEngine( - camelContext, "", settings, mockMessageStoreFactory, Mockito.mock(LogFactory.class),
