You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/06/20 12:19:13 UTC
[camel] branch main updated (fdc66987bea -> 857e0abe6e0)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from fdc66987bea chore(deps): Included dependency review
new 4e8707268be (chores) camel-bean: removed unused parameters
new fc2709f06ae (chores) camel-directvm: removed unused parameters
new cf0d203447e (chores) camel-file: removed unused parameters
new 93d12a8037e (chores) camel-mail: removed unused parameters
new b9fffea37fb (chores) camel-quickfix: removed unused parameters
new aade2d86506 (chores) camel-thrift: removed unused parameters
new 02f74172b19 (chores) camel-vertx-kafka-component: removed unused parameters
new 6f088a755e9 (chores) camel-websocket: removed/documented unused parameters
new 857e0abe6e0 (chores) openapi-rest-dsl-generator: removed unused parameters
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/bean/AbstractCamelInvocationHandler.java | 4 ++--
.../org/apache/camel/component/directvm/DirectVmComponent.java | 2 +-
.../org/apache/camel/component/directvm/DirectVmConsumer.java | 4 ++--
.../file/strategy/FileLockExclusiveReadLockStrategy.java | 4 ++--
.../file/strategy/MarkerFileExclusiveReadLockStrategy.java | 9 ++++-----
.../main/java/org/apache/camel/component/mail/MailBinding.java | 4 ++--
.../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 +++-----
.../java/org/apache/camel/component/thrift/ThriftComponent.java | 6 +++---
.../org/apache/camel/component/thrift/ThriftConfiguration.java | 3 +--
.../vertx/kafka/VertxKafkaConfigurationOptionsProxy.java | 4 ++--
.../vertx/kafka/operations/VertxKafkaProducerOperations.java | 4 ++--
.../org/apache/camel/component/websocket/WebsocketComponent.java | 6 +++---
.../org/apache/camel/component/websocket/WebsocketEndpoint.java | 3 +--
.../org/apache/camel/component/websocket/WebsocketProducer.java | 6 +++++-
.../apache/camel/component/websocket/WebsocketEndpointTest.java | 2 +-
.../apache/camel/generator/openapi/RestDefinitionEmitter.java | 3 +--
.../camel/generator/openapi/RestDslDefinitionGenerator.java | 5 ++---
.../org/apache/camel/generator/openapi/RestDslXmlGenerator.java | 2 +-
.../org/apache/camel/generator/openapi/RestDslYamlGenerator.java | 2 +-
.../camel/generator/openapi/RestDefinitionEmitterTest.java | 2 +-
.../org/apache/camel/generator/openapi/RestDslGeneratorTest.java | 2 +-
.../apache/camel/generator/openapi/RestDslGeneratorV3Test.java | 2 +-
27 files changed, 51 insertions(+), 55 deletions(-)
[camel] 02/09: (chores) camel-directvm: removed unused parameters
Posted by 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 fc2709f06ae10c7a509402aa4ea61965ef71f4f2
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jun 20 10:44:58 2022 +0200
(chores) camel-directvm: removed unused parameters
---
.../java/org/apache/camel/component/directvm/DirectVmComponent.java | 2 +-
.../java/org/apache/camel/component/directvm/DirectVmConsumer.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
index bc1c4dd70fd..a5a4e33d0d4 100644
--- a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
+++ b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
@@ -93,7 +93,7 @@ public class DirectVmComponent extends DefaultComponent {
}
}
- public void removeConsumer(DirectVmEndpoint endpoint, DirectVmConsumer consumer) {
+ public void removeConsumer(DirectVmEndpoint endpoint) {
String key = getConsumerKey(endpoint.getEndpointUri());
CONSUMERS.remove(key);
}
diff --git a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
index 01d11d483ef..897e8ae308f 100644
--- a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
+++ b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
@@ -42,13 +42,13 @@ public class DirectVmConsumer extends DefaultConsumer implements Suspendable {
@Override
protected void doStop() throws Exception {
- getEndpoint().getComponent().removeConsumer(getEndpoint(), this);
+ getEndpoint().getComponent().removeConsumer(getEndpoint());
super.doStop();
}
@Override
protected void doSuspend() throws Exception {
- getEndpoint().getComponent().removeConsumer(getEndpoint(), this);
+ getEndpoint().getComponent().removeConsumer(getEndpoint());
}
@Override
[camel] 04/09: (chores) camel-mail: removed unused parameters
Posted by 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 93d12a8037efa76d6c8c5d387f641a9fc81b0c02
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jun 20 10:58:32 2022 +0200
(chores) camel-mail: removed unused parameters
---
.../src/main/java/org/apache/camel/component/mail/MailBinding.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
index 94290d72a1b..d63989a8838 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
@@ -518,7 +518,7 @@ public class MailBinding {
LOG.trace("Attachment #{}: FileName: {}", i, attachmentFilename);
}
if (attachment != null) {
- if (shouldAddAttachment(exchange, attachmentFilename, attachment.getDataHandler())) {
+ if (shouldAddAttachment()) {
// Create another body part
BodyPart messageBodyPart = new MimeBodyPart();
// Set the data handler to the attachment
@@ -639,7 +639,7 @@ public class MailBinding {
/**
* Strategy to allow filtering of attachments which are added on the Mail message
*/
- protected boolean shouldAddAttachment(Exchange exchange, String attachmentFilename, DataHandler handler) {
+ protected boolean shouldAddAttachment() {
return true;
}
[camel] 08/09: (chores) camel-websocket: removed/documented unused parameters
Posted by 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 6f088a755e9d173ff7e63a14f1029b88e4eef6d8
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jun 20 11:10:12 2022 +0200
(chores) camel-websocket: removed/documented unused parameters
---
.../org/apache/camel/component/websocket/WebsocketComponent.java | 6 +++---
.../org/apache/camel/component/websocket/WebsocketEndpoint.java | 3 +--
.../org/apache/camel/component/websocket/WebsocketProducer.java | 6 +++++-
.../org/apache/camel/component/websocket/WebsocketEndpointTest.java | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 696ca674bb8..98fc9f9052f 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -292,7 +292,7 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
int port = extractPortNumber(remaining);
String host = extractHostName(remaining);
- WebsocketEndpoint endpoint = newEndpoint(uri, remaining, parameters);
+ WebsocketEndpoint endpoint = newEndpoint(uri, remaining);
if (enableJmx != null) {
endpoint.setEnableJmx(enableJmx);
@@ -328,8 +328,8 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
return endpoint;
}
- protected WebsocketEndpoint newEndpoint(String uri, String remaining, Map<String, Object> parameters) {
- return new WebsocketEndpoint(this, uri, remaining, parameters);
+ protected WebsocketEndpoint newEndpoint(String uri, String remaining) {
+ return new WebsocketEndpoint(this, uri, remaining);
}
protected void setWebSocketComponentServletInitialParameter(ServletContextHandler context, WebsocketEndpoint endpoint) {
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java
index 16c2e13ebd9..4cdf5b3399f 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.websocket;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;
-import java.util.Map;
import org.apache.camel.Category;
import org.apache.camel.Consumer;
@@ -85,7 +84,7 @@ public class WebsocketEndpoint extends DefaultEndpoint {
@UriParam(label = "consumer", defaultValue = "any")
private String subprotocol;
- public WebsocketEndpoint(WebsocketComponent component, String uri, String resourceUri, Map<String, Object> parameters) {
+ public WebsocketEndpoint(WebsocketComponent component, String uri, String resourceUri) {
super(uri, component);
this.resourceUri = resourceUri;
this.component = component;
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
index 63bc0b5f079..06eb2d297e9 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
@@ -181,8 +181,12 @@ public class WebsocketProducer extends DefaultProducer implements WebsocketProdu
/**
* Called when a sleep is interrupted; allows derived classes to handle this case differently
+ *
+ * @param e the interrupted exception instance
+ * @param exchange the exchange being processed
*/
- protected void handleSleepInterruptedException(InterruptedException e, Exchange exchange) throws InterruptedException {
+ protected void handleSleepInterruptedException(InterruptedException e, @SuppressWarnings("unused") Exchange exchange)
+ throws InterruptedException {
if (LOG.isDebugEnabled()) {
LOG.debug("Sleep interrupted, are we stopping? {}", isStopping() || isStopped());
}
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
index c2b6c5ddb97..0eb8f7a5a15 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
@@ -50,7 +50,7 @@ public class WebsocketEndpointTest {
@BeforeEach
public void setUp() throws Exception {
- websocketEndpoint = new WebsocketEndpoint(component, URI, REMAINING, null);
+ websocketEndpoint = new WebsocketEndpoint(component, URI, REMAINING);
component = new WebsocketComponent();
component.setPort(1988);
component.setHost("localhost");
[camel] 05/09: (chores) camel-quickfix: removed unused parameters
Posted by 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 b9fffea37fb29f1ab8ab78f785853c965e5c5b94
Author: Otavio Rodolfo Piske <an...@gmail.com>
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),
[camel] 03/09: (chores) camel-file: removed unused parameters
Posted by 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 cf0d203447e27432f3187d58ce5b50d00c8ca7da
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jun 20 10:52:23 2022 +0200
(chores) camel-file: removed unused parameters
---
.../file/strategy/FileLockExclusiveReadLockStrategy.java | 4 ++--
.../file/strategy/MarkerFileExclusiveReadLockStrategy.java | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
index 91560993aa8..f0bf652dd0f 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
@@ -153,10 +153,10 @@ public class FileLockExclusiveReadLockStrategy extends MarkerFileExclusiveReadLo
}
@Override
- protected void doReleaseExclusiveReadLock(GenericFileOperations<File> operations, GenericFile<File> file, Exchange exchange)
+ protected void doReleaseExclusiveReadLock(GenericFile<File> file, Exchange exchange)
throws Exception {
// must call super
- super.doReleaseExclusiveReadLock(operations, file, exchange);
+ super.doReleaseExclusiveReadLock(file, exchange);
FileLock lock = exchange.getProperty(asExclusiveReadLockKey(file, Exchange.FILE_LOCK_EXCLUSIVE_LOCK), FileLock.class);
RandomAccessFile rac
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
index 39e0dd390c0..4e3e638ffab 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
@@ -94,25 +94,24 @@ public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusive
public void releaseExclusiveReadLockOnAbort(
GenericFileOperations<File> operations, GenericFile<File> file, Exchange exchange)
throws Exception {
- doReleaseExclusiveReadLock(operations, file, exchange);
+ doReleaseExclusiveReadLock(file, exchange);
}
@Override
public void releaseExclusiveReadLockOnRollback(
GenericFileOperations<File> operations, GenericFile<File> file, Exchange exchange)
throws Exception {
- doReleaseExclusiveReadLock(operations, file, exchange);
+ doReleaseExclusiveReadLock(file, exchange);
}
@Override
public void releaseExclusiveReadLockOnCommit(
GenericFileOperations<File> operations, GenericFile<File> file, Exchange exchange)
throws Exception {
- doReleaseExclusiveReadLock(operations, file, exchange);
+ doReleaseExclusiveReadLock(file, exchange);
}
- protected void doReleaseExclusiveReadLock(
- GenericFileOperations<File> operations, GenericFile<File> file, Exchange exchange)
+ protected void doReleaseExclusiveReadLock(GenericFile<File> file, Exchange exchange)
throws Exception {
if (!markerFile) {
// if not using marker file then nothing to release
[camel] 09/09: (chores) openapi-rest-dsl-generator: removed unused parameters
Posted by 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 857e0abe6e0100a67e615afd5ea679a519677a50
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jun 20 11:13:41 2022 +0200
(chores) openapi-rest-dsl-generator: removed unused parameters
---
.../org/apache/camel/generator/openapi/RestDefinitionEmitter.java | 3 +--
.../apache/camel/generator/openapi/RestDslDefinitionGenerator.java | 5 ++---
.../java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java | 2 +-
.../org/apache/camel/generator/openapi/RestDslYamlGenerator.java | 2 +-
.../apache/camel/generator/openapi/RestDefinitionEmitterTest.java | 2 +-
.../org/apache/camel/generator/openapi/RestDslGeneratorTest.java | 2 +-
.../org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java | 2 +-
7 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDefinitionEmitter.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDefinitionEmitter.java
index 9e713e45aa7..d0b3364896f 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDefinitionEmitter.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDefinitionEmitter.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.camel.CamelContext;
import org.apache.camel.model.rest.RestsDefinition;
class RestDefinitionEmitter implements CodeEmitter<RestsDefinition> {
@@ -31,7 +30,7 @@ class RestDefinitionEmitter implements CodeEmitter<RestsDefinition> {
private Object variable;
- RestDefinitionEmitter(final CamelContext context) {
+ RestDefinitionEmitter() {
definition = new RestsDefinition();
variable = definition;
}
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslDefinitionGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslDefinitionGenerator.java
index 27d714d9886..bb861fdcb5d 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslDefinitionGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslDefinitionGenerator.java
@@ -17,7 +17,6 @@
package org.apache.camel.generator.openapi;
import io.apicurio.datamodels.openapi.models.OasDocument;
-import org.apache.camel.CamelContext;
import org.apache.camel.model.rest.RestsDefinition;
public final class RestDslDefinitionGenerator extends RestDslGenerator<RestDslDefinitionGenerator> {
@@ -26,8 +25,8 @@ public final class RestDslDefinitionGenerator extends RestDslGenerator<RestDslDe
super(document);
}
- public RestsDefinition generate(final CamelContext context) {
- final RestDefinitionEmitter emitter = new RestDefinitionEmitter(context);
+ public RestsDefinition generate() {
+ final RestDefinitionEmitter emitter = new RestDefinitionEmitter();
final String basePath = RestDslGenerator.determineBasePathFrom(this.basePath, document);
final PathVisitor<RestsDefinition> restDslStatement
= new PathVisitor<>(basePath, emitter, filter, destinationGenerator());
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
index 02e8403170a..3a94f83b6f6 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
@@ -48,7 +48,7 @@ public class RestDslXmlGenerator extends RestDslGenerator<RestDslXmlGenerator> {
}
public String generate(final CamelContext context) throws Exception {
- final RestDefinitionEmitter emitter = new RestDefinitionEmitter(context);
+ final RestDefinitionEmitter emitter = new RestDefinitionEmitter();
final String basePath = RestDslGenerator.determineBasePathFrom(this.basePath, document);
final PathVisitor<RestsDefinition> restDslStatement = new PathVisitor<>(
basePath, emitter, filter,
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
index cb7f7771d8b..7ad447ad6a7 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
@@ -67,7 +67,7 @@ public class RestDslYamlGenerator extends RestDslGenerator<RestDslYamlGenerator>
}
public String generate(final CamelContext context, boolean generateRoutes) throws Exception {
- final RestDefinitionEmitter emitter = new RestDefinitionEmitter(context);
+ final RestDefinitionEmitter emitter = new RestDefinitionEmitter();
final String basePath = RestDslGenerator.determineBasePathFrom(this.basePath, document);
final PathVisitor<RestsDefinition> restDslStatement = new PathVisitor<>(
basePath, emitter, filter,
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
index 3b96078d7a9..740b32abac7 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
@@ -34,7 +34,7 @@ public class RestDefinitionEmitterTest {
public void shouldGenerateObjects() throws IOException {
try (DefaultCamelContext context = new DefaultCamelContext()) {
- final RestDefinitionEmitter emitter = new RestDefinitionEmitter(context);
+ final RestDefinitionEmitter emitter = new RestDefinitionEmitter();
emitter.emit("rest");
emitter.emit("put", "/pet");
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
index 56581bcd5e7..9c257d61bc6 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
@@ -49,7 +49,7 @@ public class RestDslGeneratorTest {
@Test
public void shouldCreateDefinitions() throws Exception {
try (CamelContext context = new DefaultCamelContext()) {
- final RestsDefinition definition = RestDslGenerator.toDefinition(document).generate(context);
+ final RestsDefinition definition = RestDslGenerator.toDefinition(document).generate();
assertThat(definition).isNotNull();
assertThat(definition.getRests()).hasSize(1);
assertThat(definition.getRests().get(0).getPath()).isEqualTo("/v2");
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
index 301e1f34f98..d0e376e6229 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
@@ -44,7 +44,7 @@ public class RestDslGeneratorV3Test {
@Test
public void shouldCreateDefinitions() throws Exception {
try (CamelContext context = new DefaultCamelContext()) {
- final RestsDefinition definition = RestDslGenerator.toDefinition(document).generate(context);
+ final RestsDefinition definition = RestDslGenerator.toDefinition(document).generate();
assertThat(definition).isNotNull();
assertThat(definition.getRests()).hasSize(1);
assertThat(definition.getRests().get(0).getPath()).isEqualTo("/api/v3");
[camel] 01/09: (chores) camel-bean: removed unused parameters
Posted by 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 4e8707268be5d3f21fabad6aefbde8bcd1008302
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jun 20 10:42:00 2022 +0200
(chores) camel-bean: removed unused parameters
---
.../apache/camel/component/bean/AbstractCamelInvocationHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
index 8a5ef875ea3..f5a15bef6eb 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
@@ -188,7 +188,7 @@ public abstract class AbstractCamelInvocationHandler implements InvocationHandle
LOG.trace("Proxied method call {} invoking producer: {}", method.getName(), producer);
producer.process(exchange);
- Object answer = afterInvoke(method, exchange, exchange.getPattern(), isFuture);
+ Object answer = afterInvoke(method, exchange, isFuture);
LOG.trace("Proxied method call {} returning: {}", method.getName(), answer);
return answer;
}
@@ -213,7 +213,7 @@ public abstract class AbstractCamelInvocationHandler implements InvocationHandle
}
}
- protected Object afterInvoke(Method method, Exchange exchange, ExchangePattern pattern, boolean isFuture) throws Exception {
+ protected Object afterInvoke(Method method, Exchange exchange, boolean isFuture) throws Exception {
// check if we had an exception
Exception cause = exchange.getException();
if (cause != null) {
[camel] 06/09: (chores) camel-thrift: removed unused parameters
Posted by 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 aade2d865062c0d4e2189b0bf11e2cf39a40b94e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jun 20 11:04:45 2022 +0200
(chores) camel-thrift: removed unused parameters
---
.../java/org/apache/camel/component/thrift/ThriftComponent.java | 6 +++---
.../java/org/apache/camel/component/thrift/ThriftConfiguration.java | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftComponent.java b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftComponent.java
index 78624f7bfbd..da45b5d38dd 100644
--- a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftComponent.java
+++ b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftComponent.java
@@ -39,7 +39,7 @@ public class ThriftComponent extends DefaultComponent implements SSLContextParam
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
ThriftConfiguration config = new ThriftConfiguration();
- config = parseConfiguration(config, uri, parameters);
+ config = parseConfiguration(config, uri);
SSLContextParameters sslParameters = config.getSslParameters();
if (config.getNegotiationType() == ThriftNegotiationType.SSL && sslParameters == null) {
sslParameters = retrieveGlobalSslContextParameters();
@@ -57,9 +57,9 @@ public class ThriftComponent extends DefaultComponent implements SSLContextParam
* @return the parsed and valid configuration to use
*/
protected ThriftConfiguration parseConfiguration(
- ThriftConfiguration configuration, String remaining, Map<String, Object> parameters)
+ ThriftConfiguration configuration, String remaining)
throws Exception {
- configuration.parseURI(new URI(remaining), parameters, this);
+ configuration.parseURI(new URI(remaining));
return configuration;
}
diff --git a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftConfiguration.java b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftConfiguration.java
index 647a4ecc5bf..a549b2505e2 100644
--- a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftConfiguration.java
+++ b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.thrift;
import java.net.URI;
-import java.util.Map;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
@@ -185,7 +184,7 @@ public class ThriftConfiguration {
this.maxPoolSize = maxPoolSize;
}
- public void parseURI(URI uri, Map<String, Object> parameters, ThriftComponent component) {
+ public void parseURI(URI uri) {
setHost(uri.getHost());
if (uri.getPort() != -1) {
[camel] 07/09: (chores) camel-vertx-kafka-component: removed unused parameters
Posted by 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 02f74172b198ae19e7ac1434348ab3c8cec8abaa
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jun 20 11:07:03 2022 +0200
(chores) camel-vertx-kafka-component: removed unused parameters
---
.../component/vertx/kafka/VertxKafkaConfigurationOptionsProxy.java | 4 ++--
.../vertx/kafka/operations/VertxKafkaProducerOperations.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaConfigurationOptionsProxy.java b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaConfigurationOptionsProxy.java
index 6ab88e9ac27..abccae5105c 100644
--- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaConfigurationOptionsProxy.java
+++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaConfigurationOptionsProxy.java
@@ -38,11 +38,11 @@ public class VertxKafkaConfigurationOptionsProxy {
return getOption(message, VertxKafkaConstants.MESSAGE_KEY, () -> null, Object.class);
}
- public String getKeySerializer(final Message message) {
+ public String getKeySerializer() {
return configuration.getKeySerializer();
}
- public String getValueSerializer(final Message message) {
+ public String getValueSerializer() {
return configuration.getValueSerializer();
}
diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/operations/VertxKafkaProducerOperations.java b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/operations/VertxKafkaProducerOperations.java
index b27dc9e32f0..f2adffcae46 100644
--- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/operations/VertxKafkaProducerOperations.java
+++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/operations/VertxKafkaProducerOperations.java
@@ -179,7 +179,7 @@ public class VertxKafkaProducerOperations {
private Object getMessageKey(final Message message) {
return VertxKafkaTypeSerializer.tryConvertToSerializedType(message,
configurationOptionsProxy.getMessageKey(message),
- configurationOptionsProxy.getKeySerializer(message));
+ configurationOptionsProxy.getKeySerializer());
}
private Integer getPartitionId(final Message message) {
@@ -188,7 +188,7 @@ public class VertxKafkaProducerOperations {
private Object getMessageValue(final Message message, final Object inputData) {
return VertxKafkaTypeSerializer.tryConvertToSerializedType(message, inputData,
- configurationOptionsProxy.getValueSerializer(message));
+ configurationOptionsProxy.getValueSerializer());
}
private Long getOverrideTimestamp(final Message message) {