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
The following commit(s) were added to refs/heads/main by this push:
new 3192a1f (chores): replace usages of RuntimeException with
RuntimeCamelException
3192a1f is described below
commit 3192a1f94c2d096d15299471728a15941ce5f88e
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Sep 22 18:14:13 2021 +0200
(chores): replace usages of RuntimeException with RuntimeCamelException
components:
components/camel-activemq, components/camel-kafka, components/camel-ldap
components/camel-ldif, components/camel-milo, components/camel-minio,
components/camel-mllp, components/camel-olingo2, components/camel-pubnub,
components/camel-quickfix, components/camel-reactive-streams,
components/camel-reactor,
components/camel-solr, components/camel-telegram, components/camel-tika,
components/camel-twilio, components/camel-xmpp, components/camel-xstream,
components/camel-zendesk
---
.../component/activemq/TransactedConsumeTest.java | 3 ++-
.../kafka/KafkaIdempotentRepository.java | 3 ++-
.../core/integ5/ServerAnnotationProcessor.java | 7 ++---
.../core/integ5/ServerAnnotationProcessor.java | 7 ++---
.../camel/component/milo/KeyStoreLoader.java | 4 ++-
.../milo/client/MiloClientConfiguration.java | 3 ++-
.../milo/client/MiloClientConnection.java | 3 ++-
.../milo/client/internal/SubscriptionManager.java | 3 ++-
.../component/milo/server/MiloServerComponent.java | 3 ++-
.../milo/server/internal/CamelServerItem.java | 3 ++-
.../component/milo/AbstractMiloServerTest.java | 3 ++-
.../apache/camel/component/minio/MinioChecks.java | 4 ++-
.../component/mllp/MllpTcpServerConsumer.java | 3 ++-
.../mllp/MllpTcpServerConsumerBindTimeoutTest.java | 3 ++-
.../org/apache/camel/test/util/PayloadBuilder.java | 30 ++++++++++++----------
.../olingo2/Olingo2AppAPIETagEnabledTest.java | 3 ++-
.../camel/component/pubnub/PubNubProducer.java | 7 ++---
.../component/quickfixj/QuickfixjProducerTest.java | 5 ++--
.../quickfixj/examples/trading/TradeExecutor.java | 5 ++--
.../reactive/streams/DelayedMonoPublisherTest.java | 11 ++++----
.../component/reactive/streams/EventTypeTest.java | 5 ++--
.../CamelPublisherConversionVerificationTest.java | 3 ++-
.../tck/CamelPublisherVerificationTest.java | 5 ++--
.../CamelSubscriberConversionVerificationTest.java | 5 ++--
.../tck/CamelSubscriberVerificationTest.java | 5 ++--
.../engine/ReactorStreamsServiceEventTypeTest.java | 5 ++--
.../apache/camel/component/solr/SolrEndpoint.java | 3 ++-
.../component/telegram/model/ReplyMarkup.java | 3 ++-
.../component/telegram/util/TelegramTestUtil.java | 5 ++--
.../camel/component/tika/TikaConfiguration.java | 3 ++-
.../twilio/AbstractTwilioTestSupport.java | 3 ++-
.../apache/camel/component/xmpp/XmppConsumer.java | 3 ++-
.../component/xmpp/XmppGroupChatProducer.java | 4 ++-
.../component/xmpp/XmppPrivateChatProducer.java | 5 ++--
.../dataformat/xstream/AbstractXStreamWrapper.java | 3 ++-
.../xstream/XStreamConfigurationTest.java | 5 ++--
.../zendesk/AbstractZendeskTestSupport.java | 3 ++-
37 files changed, 111 insertions(+), 70 deletions(-)
diff --git
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
index 71cb153..a3df1eb 100644
---
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
+++
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
@@ -36,6 +36,7 @@ import org.apache.activemq.store.kahadb.disk.journal.Journal;
import org.apache.activemq.util.Wait;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.activemq.support.ActiveMQSpringTestSupport;
import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.test.infra.activemq.services.ActiveMQEmbeddedService;
@@ -125,7 +126,7 @@ public class TransactedConsumeTest extends
ActiveMQSpringTestSupport {
try {
sendJMSMessageToKickOffRoute();
} catch (Exception e) {
- throw new RuntimeException("Failed to fill q", e);
+ throw new RuntimeCamelException("Failed to fill q", e);
}
return super.createApplicationContext();
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepository.java
b/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepository.java
index 908f4fe..e7f0d9d 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepository.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepository.java
@@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.api.management.ManagedOperation;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.spi.IdempotentRepository;
@@ -365,7 +366,7 @@ public class KafkaIdempotentRepository extends
ServiceSupport implements Idempot
producer.send(new ProducerRecord<>(topic, key,
action.toString())).get(); // sync
// send
} catch (ExecutionException | InterruptedException e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
diff --git
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index ae9fbca..292b05b 100644
---
a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++
b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.camel.RuntimeCamelException;
import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms;
import org.apache.directory.api.util.Network;
import org.apache.directory.api.util.Strings;
@@ -134,7 +135,7 @@ public final class ServerAnnotationProcessor {
.getDeclaredConstructor().newInstance();
ldapServer.addExtendedOperationHandler(extOpHandler);
} catch (Exception e) {
- throw new RuntimeException(I18n.err(I18n.ERR_690,
extOpClass.getName()), e);
+ throw new RuntimeCamelException(I18n.err(I18n.ERR_690,
extOpClass.getName()), e);
}
}
@@ -144,7 +145,7 @@ public final class ServerAnnotationProcessor {
.getDeclaredConstructor().newInstance();
ldapServer.addSaslMechanismHandler(saslMech.name(),
handler);
} catch (Exception e) {
- throw new RuntimeException(
+ throw new RuntimeCamelException(
I18n.err(I18n.ERR_691, saslMech.name(),
saslMech.implClass().getName()), e);
}
}
@@ -160,7 +161,7 @@ public final class ServerAnnotationProcessor {
ntlmHandler.setNtlmProvider((NtlmProvider)
ntlmProviderClass
.getDeclaredConstructor().newInstance());
} catch (Exception e) {
- throw new RuntimeException(I18n.err(I18n.ERR_692), e);
+ throw new
RuntimeCamelException(I18n.err(I18n.ERR_692), e);
}
}
}
diff --git
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index ae9fbca..292b05b 100644
---
a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++
b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.camel.RuntimeCamelException;
import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms;
import org.apache.directory.api.util.Network;
import org.apache.directory.api.util.Strings;
@@ -134,7 +135,7 @@ public final class ServerAnnotationProcessor {
.getDeclaredConstructor().newInstance();
ldapServer.addExtendedOperationHandler(extOpHandler);
} catch (Exception e) {
- throw new RuntimeException(I18n.err(I18n.ERR_690,
extOpClass.getName()), e);
+ throw new RuntimeCamelException(I18n.err(I18n.ERR_690,
extOpClass.getName()), e);
}
}
@@ -144,7 +145,7 @@ public final class ServerAnnotationProcessor {
.getDeclaredConstructor().newInstance();
ldapServer.addSaslMechanismHandler(saslMech.name(),
handler);
} catch (Exception e) {
- throw new RuntimeException(
+ throw new RuntimeCamelException(
I18n.err(I18n.ERR_691, saslMech.name(),
saslMech.implClass().getName()), e);
}
}
@@ -160,7 +161,7 @@ public final class ServerAnnotationProcessor {
ntlmHandler.setNtlmProvider((NtlmProvider)
ntlmProviderClass
.getDeclaredConstructor().newInstance());
} catch (Exception e) {
- throw new RuntimeException(I18n.err(I18n.ERR_692), e);
+ throw new
RuntimeCamelException(I18n.err(I18n.ERR_692), e);
}
}
}
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java
index e6c4cad..e91947a 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java
@@ -29,6 +29,8 @@ import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.NoSuchElementException;
+import org.apache.camel.RuntimeCamelException;
+
public class KeyStoreLoader {
public static final String DEFAULT_KEY_STORE_TYPE = "PKCS12";
@@ -122,7 +124,7 @@ public class KeyStoreLoader {
try {
effectiveKeyAlias = keyStore.aliases().nextElement();
} catch (final NoSuchElementException e) {
- throw new RuntimeException("Failed to enumerate key alias", e);
+ throw new RuntimeCamelException("Failed to enumerate key
alias", e);
}
}
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
index 485b72c..7fe6227 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
@@ -25,6 +25,7 @@ import java.util.function.Consumer;
import javax.xml.bind.annotation.XmlTransient;
import com.google.common.base.Supplier;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.milo.KeyStoreLoader;
import org.apache.camel.component.milo.KeyStoreLoader.Result;
import org.apache.camel.spi.UriParam;
@@ -369,7 +370,7 @@ public class MiloClientConfiguration implements Cloneable {
}
if (adding == null) {
- throw new RuntimeException("Unknown security policy: " +
policy);
+ throw new RuntimeCamelException("Unknown security policy: " +
policy);
}
this.allowedSecurityPolicies.add(adding);
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConnection.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConnection.java
index 5cbf405..9837a78 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConnection.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConnection.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.milo.client.internal.SubscriptionManager;
import org.eclipse.milo.opcua.stack.core.Stack;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
@@ -71,7 +72,7 @@ public class MiloClientConnection implements AutoCloseable {
try {
init();
} catch (final Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
this.initialized = true;
}
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
index f5c5d0f..dceca11 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
@@ -38,6 +38,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.google.common.base.Strings;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.milo.client.MiloClientConfiguration;
import org.apache.camel.component.milo.client.MonitorFilterConfiguration;
import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
@@ -92,7 +93,7 @@ public class SubscriptionManager {
LOG.info("Transfer failed {} : {}",
subscription.getSubscriptionId(), statusCode);
// we simply tear it down and build it up again
- handleConnectionFailue(new RuntimeException("Subscription failed
to reconnect"));
+ handleConnectionFailue(new RuntimeCamelException("Subscription
failed to reconnect"));
}
@Override
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
index 2d12d18..d8c3b07 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
@@ -36,6 +36,7 @@ import java.util.Objects;
import java.util.Set;
import org.apache.camel.Endpoint;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.milo.KeyStoreLoader;
import org.apache.camel.component.milo.server.internal.CamelNamespace;
import org.apache.camel.spi.Metadata;
@@ -593,7 +594,7 @@ public class MiloServerComponent extends DefaultComponent {
DefaultTrustListManager trustListManager = new
DefaultTrustListManager(new File(defaultCertificateValidator));
this.certificateValidator = new
DefaultCertificateValidator(trustListManager);
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
index 044506c..a19a0bc 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
@@ -22,6 +22,7 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.function.Consumer;
+import org.apache.camel.RuntimeCamelException;
import org.eclipse.milo.opcua.sdk.core.AccessLevel;
import org.eclipse.milo.opcua.sdk.server.nodes.UaNodeContext;
import org.eclipse.milo.opcua.sdk.server.nodes.UaObjectNode;
@@ -129,7 +130,7 @@ public class CamelServerItem {
return;
}
- final RuntimeException ex = new RuntimeException(errors.pollFirst());
+ final RuntimeException ex = new
RuntimeCamelException(errors.pollFirst());
errors.forEach(ex::addSuppressed);
throw ex;
}
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
index f56050c..7e54cfa 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
@@ -21,6 +21,7 @@ import java.security.GeneralSecurityException;
import java.util.function.Consumer;
import org.apache.camel.CamelContext;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.test.AvailablePortFinder;
@@ -127,7 +128,7 @@ public abstract class AbstractMiloServerTest extends
CamelTestSupport {
loader.setKeyPassword("test");
return loader.load();
} catch (final GeneralSecurityException | IOException e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
diff --git
a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioChecks.java
b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioChecks.java
index da3f5fc..3d078db 100644
---
a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioChecks.java
+++
b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioChecks.java
@@ -19,12 +19,14 @@ package org.apache.camel.component.minio;
import java.util.function.Consumer;
import java.util.function.Supplier;
+import org.apache.camel.RuntimeCamelException;
+
import static org.apache.camel.util.ObjectHelper.isNotEmpty;
public final class MinioChecks {
private MinioChecks() {
// Prevent instantiation of this factory class.
- throw new RuntimeException(
+ throw new RuntimeCamelException(
"Do not instantiate a Factory class! Refer to the class to
learn how to properly use this factory implementation.");
}
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 21a7bdf..ac27b49 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -40,6 +40,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
import org.apache.camel.api.management.ManagedResource;
@@ -505,7 +506,7 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
acknowledgementMessageType
= new String(acknowledgmentTypeBytes,
ExchangeHelper.getCharsetName(exchange));
} catch (IOException ioEx) {
- throw new RuntimeException("Failed to convert
acknowledgement message to string", ioEx);
+ throw new RuntimeCamelException("Failed to convert
acknowledgement message to string", ioEx);
}
// Verify it's a valid acknowledgement code
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
index 116e602..51f0615 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.LoggingLevel;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
@@ -94,7 +95,7 @@ public class MllpTcpServerConsumerBindTimeoutTest extends
CamelTestSupport {
Thread.sleep(15000);
tmpSocket.close();
} catch (Exception ex) {
- throw new RuntimeException("Exception caught in dummy
listener", ex);
+ throw new RuntimeCamelException("Exception caught in dummy
listener", ex);
}
}
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/test/util/PayloadBuilder.java
b/components/camel-mllp/src/test/java/org/apache/camel/test/util/PayloadBuilder.java
index ba1521a..a1c6841 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/test/util/PayloadBuilder.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/test/util/PayloadBuilder.java
@@ -19,6 +19,8 @@ package org.apache.camel.test.util;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import org.apache.camel.RuntimeCamelException;
+
public class PayloadBuilder {
ByteArrayOutputStream builderStream = new ByteArrayOutputStream();
@@ -45,7 +47,7 @@ public class PayloadBuilder {
try {
return new PayloadBuilder(b).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(byte) failure",
e);
+ throw new RuntimeCamelException("PayloadBuilder.build(byte)
failure", e);
}
}
@@ -53,7 +55,7 @@ public class PayloadBuilder {
try {
return new PayloadBuilder(b).append(bytes).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(byte) failure",
e);
+ throw new RuntimeCamelException("PayloadBuilder.build(byte)
failure", e);
}
}
@@ -61,7 +63,7 @@ public class PayloadBuilder {
try {
return new PayloadBuilder(bytes).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(byte[]) failure",
e);
+ throw new RuntimeCamelException("PayloadBuilder.build(byte[])
failure", e);
}
}
@@ -69,7 +71,7 @@ public class PayloadBuilder {
try {
return new PayloadBuilder(c).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(char...)
failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(char...)
failure", e);
}
}
@@ -77,7 +79,7 @@ public class PayloadBuilder {
try {
return new PayloadBuilder(c).append(chars).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(char...)
failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(char...)
failure", e);
}
}
@@ -85,7 +87,7 @@ public class PayloadBuilder {
try {
return new PayloadBuilder(chars).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(char...)
failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(char...)
failure", e);
}
}
@@ -93,7 +95,7 @@ public class PayloadBuilder {
try {
return new PayloadBuilder(s).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(String) failure",
e);
+ throw new RuntimeCamelException("PayloadBuilder.build(String)
failure", e);
}
}
@@ -101,7 +103,7 @@ public class PayloadBuilder {
try {
return new PayloadBuilder(strings).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(String[])
failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(String[])
failure", e);
}
}
@@ -111,7 +113,7 @@ public class PayloadBuilder {
.append(s)
.build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(String) failure",
e);
+ throw new RuntimeCamelException("PayloadBuilder.build(String)
failure", e);
}
}
@@ -122,7 +124,7 @@ public class PayloadBuilder {
.append(end)
.build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(char, String,
char...) failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(char,
String, char...) failure", e);
}
}
@@ -132,7 +134,7 @@ public class PayloadBuilder {
.append(bytes)
.append(end).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(char, byte[],
char...) failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(char,
byte[], char...) failure", e);
}
}
@@ -141,7 +143,7 @@ public class PayloadBuilder {
return new PayloadBuilder(s)
.append(end).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(String, char...)
failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(String,
char...) failure", e);
}
}
@@ -150,7 +152,7 @@ public class PayloadBuilder {
return new PayloadBuilder(bytes)
.append(end).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(byte[], char...)
failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(byte[],
char...) failure", e);
}
}
@@ -159,7 +161,7 @@ public class PayloadBuilder {
return new PayloadBuilder(bytes)
.append(s).build();
} catch (IOException e) {
- throw new RuntimeException("PayloadBuilder.build(byte[], String)
failure", e);
+ throw new RuntimeCamelException("PayloadBuilder.build(byte[],
String) failure", e);
}
}
diff --git
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPIETagEnabledTest.java
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPIETagEnabledTest.java
index fa9a0d3..8fe9919 100644
---
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPIETagEnabledTest.java
+++
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2AppAPIETagEnabledTest.java
@@ -27,6 +27,7 @@ import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import okio.Buffer;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.olingo2.api.Olingo2App;
import org.apache.camel.component.olingo2.api.impl.Olingo2AppImpl;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
@@ -133,7 +134,7 @@ public class Olingo2AppAPIETagEnabledTest extends
AbstractOlingo2AppAPITestSuppo
}
} catch (Exception ex) {
- throw new RuntimeException(ex);
+ throw new RuntimeCamelException(ex);
}
break;
case HttpMethod.PATCH:
diff --git
a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubProducer.java
b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubProducer.java
index 02bd3cd..9bba652 100644
---
a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubProducer.java
+++
b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubProducer.java
@@ -31,6 +31,7 @@ import
com.pubnub.api.models.consumer.presence.PNWhereNowResult;
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelException;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -102,7 +103,7 @@ public class PubNubProducer extends DefaultAsyncProducer {
private void doPublish(Exchange exchange, AsyncCallback callback) {
Object body = exchange.getIn().getBody();
if (ObjectHelper.isEmpty(body)) {
- throw new RuntimeException("Can not publish empty message");
+ throw new RuntimeCamelException("Can not publish empty message");
}
LOG.debug("Sending message [{}] to channel [{}]", body,
getChannel(exchange));
endpoint.getPubnub()
@@ -224,9 +225,9 @@ public class PubNubProducer extends DefaultAsyncProducer {
exchange.setException(errorData.getThrowable());
if (errorData != null && errorData.getThrowable() instanceof
PubNubException) {
PubNubException pubNubException = (PubNubException)
errorData.getThrowable();
- throw new
RuntimeException(pubNubException.getPubnubError().getMessage(),
errorData.getThrowable());
+ throw new
RuntimeCamelException(pubNubException.getPubnubError().getMessage(),
errorData.getThrowable());
}
- throw new RuntimeException(status.getErrorData().getThrowable());
+ throw new
RuntimeCamelException(status.getErrorData().getThrowable());
}
if (exchange.getPattern().isOutCapable()) {
exchange.getOut().copyFrom(exchange.getIn());
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 40cd207..f783ca6 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
@@ -22,6 +22,7 @@ import java.util.TimerTask;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.RuntimeCamelException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -140,7 +141,7 @@ public class QuickfixjProducerTest {
quickfixjEngine.getMessageCorrelator().onEvent(QuickfixjEventCategory.AppMessageReceived,
sessionID,
outboundFixMessage);
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
}, 10);
@@ -181,7 +182,7 @@ public class QuickfixjProducerTest {
quickfixjEngine.getMessageCorrelator().onEvent(QuickfixjEventCategory.AppMessageReceived,
sessionID,
outboundFixMessage);
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
}, 10);
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
index e2c823e..ae24095 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.camel.RuntimeCamelException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import quickfix.ConfigError;
@@ -181,7 +182,7 @@ public class TradeExecutor {
price = new Price(message.getDouble(Price.FIELD));
} else {
if (marketQuoteProvider == null) {
- throw new RuntimeException("No market data provider specified
for market order");
+ throw new RuntimeCamelException("No market data provider
specified for market order");
}
char side = message.getChar(Side.FIELD);
if (side == Side.BUY) {
@@ -189,7 +190,7 @@ public class TradeExecutor {
} else if (side == Side.SELL || side == Side.SELL_SHORT) {
price = new
Price(marketQuoteProvider.getBid(message.getString(Symbol.FIELD)));
} else {
- throw new RuntimeException("Invalid order side: " + side);
+ throw new RuntimeCamelException("Invalid order side: " + side);
}
}
return price;
diff --git
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java
index 2fb6d78..050c11e 100644
---
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java
+++
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import io.reactivex.Flowable;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.reactive.streams.engine.DelayedMonoPublisher;
import org.apache.camel.component.reactive.streams.support.TestSubscriber;
import org.junit.jupiter.api.AfterEach;
@@ -74,7 +75,7 @@ public class DelayedMonoPublisherTest {
@Test
public void testExceptionAlreadyAvailable() throws Exception {
- Exception ex = new RuntimeException("An exception");
+ Exception ex = new RuntimeCamelException("An exception");
DelayedMonoPublisher<Integer> pub = new
DelayedMonoPublisher<>(service);
pub.setException(ex);
@@ -202,7 +203,7 @@ public class DelayedMonoPublisherTest {
DelayedMonoPublisher<Integer> pub = new
DelayedMonoPublisher<>(service);
- Exception ex = new RuntimeException("An exception");
+ Exception ex = new RuntimeCamelException("An exception");
ConcurrentLinkedDeque<Throwable> exceptions = new
ConcurrentLinkedDeque<>();
CountDownLatch latch = new CountDownLatch(2);
@@ -260,7 +261,7 @@ public class DelayedMonoPublisherTest {
@Test
public void testDataOrExceptionAllowed() throws Exception {
DelayedMonoPublisher<Integer> pub = new
DelayedMonoPublisher<>(service);
- Exception ex = new RuntimeException("An exception");
+ Exception ex = new RuntimeCamelException("An exception");
pub.setException(ex);
assertThrows(IllegalStateException.class,
() -> pub.setData(1));
@@ -270,7 +271,7 @@ public class DelayedMonoPublisherTest {
public void testDataOrExceptionAllowed2() throws Exception {
DelayedMonoPublisher<Integer> pub = new
DelayedMonoPublisher<>(service);
pub.setData(1);
- Exception ex = new RuntimeException("An exception");
+ Exception ex = new RuntimeCamelException("An exception");
assertThrows(IllegalStateException.class,
() -> pub.setException(ex));
}
@@ -286,7 +287,7 @@ public class DelayedMonoPublisherTest {
@Test
public void testOnlyOneExceptionAllowed() throws Exception {
DelayedMonoPublisher<Integer> pub = new
DelayedMonoPublisher<>(service);
- final RuntimeException runtimeException = new RuntimeException("An
exception");
+ final RuntimeCamelException runtimeException = new
RuntimeCamelException("An exception");
pub.setException(runtimeException);
assertThrows(IllegalStateException.class,
() -> pub.setException(runtimeException));
diff --git
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/EventTypeTest.java
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/EventTypeTest.java
index 82d5d94..b92a0f6 100644
---
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/EventTypeTest.java
+++
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/EventTypeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.reactive.streams;
import io.reactivex.Flowable;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams;
@@ -118,7 +119,7 @@ public class EventTypeTest extends BaseReactiveTest {
context.start();
- RuntimeException ex = new RuntimeException("1");
+ RuntimeException ex = new RuntimeCamelException("1");
Flowable.just(1)
.map(n -> {
@@ -153,7 +154,7 @@ public class EventTypeTest extends BaseReactiveTest {
context.start();
- RuntimeException ex = new RuntimeException("1");
+ RuntimeException ex = new RuntimeCamelException("1");
Flowable.just(1)
.map(n -> {
diff --git
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelPublisherConversionVerificationTest.java
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelPublisherConversionVerificationTest.java
index b04193d..04b9bf6 100644
---
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelPublisherConversionVerificationTest.java
+++
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelPublisherConversionVerificationTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.reactive.streams.tck;
import org.apache.camel.CamelContext;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams;
import org.apache.camel.impl.DefaultCamelContext;
@@ -51,7 +52,7 @@ public class CamelPublisherConversionVerificationTest extends
PublisherVerificat
builder.addRoutesToCamelContext(context);
context.start();
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
Publisher<Long> pub =
CamelReactiveStreams.get(context).fromStream("prod", Long.class);
diff --git
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelPublisherVerificationTest.java
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelPublisherVerificationTest.java
index 898790a..9d45d75 100644
---
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelPublisherVerificationTest.java
+++
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelPublisherVerificationTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.reactive.streams.tck;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams;
import org.apache.camel.impl.DefaultCamelContext;
@@ -53,7 +54,7 @@ public class CamelPublisherVerificationTest extends
PublisherVerification<Exchan
builder.addRoutesToCamelContext(context);
context.start();
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
return pub;
@@ -86,7 +87,7 @@ public class CamelPublisherVerificationTest extends
PublisherVerification<Exchan
this.context.stop();
}
} catch (Exception ex) {
- throw new RuntimeException(ex);
+ throw new RuntimeCamelException(ex);
}
}
}
diff --git
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelSubscriberConversionVerificationTest.java
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelSubscriberConversionVerificationTest.java
index f3f31d2..32c9045 100644
---
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelSubscriberConversionVerificationTest.java
+++
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelSubscriberConversionVerificationTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.reactive.streams.tck;
import org.apache.camel.CamelContext;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams;
import org.apache.camel.impl.DefaultCamelContext;
@@ -52,7 +53,7 @@ public class CamelSubscriberConversionVerificationTest
extends SubscriberBlackbo
builder.addRoutesToCamelContext(context);
context.start();
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
return sub;
@@ -79,7 +80,7 @@ public class CamelSubscriberConversionVerificationTest
extends SubscriberBlackbo
this.context.stop();
}
} catch (Exception ex) {
- throw new RuntimeException(ex);
+ throw new RuntimeCamelException(ex);
}
}
diff --git
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelSubscriberVerificationTest.java
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelSubscriberVerificationTest.java
index dacce97..eb1b736 100644
---
a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelSubscriberVerificationTest.java
+++
b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/tck/CamelSubscriberVerificationTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.reactive.streams.tck;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams;
import org.apache.camel.impl.DefaultCamelContext;
@@ -54,7 +55,7 @@ public class CamelSubscriberVerificationTest extends
SubscriberBlackboxVerificat
builder.addRoutesToCamelContext(context);
context.start();
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
return sub;
@@ -83,7 +84,7 @@ public class CamelSubscriberVerificationTest extends
SubscriberBlackboxVerificat
this.context.stop();
}
} catch (Exception ex) {
- throw new RuntimeException(ex);
+ throw new RuntimeCamelException(ex);
}
}
}
diff --git
a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceEventTypeTest.java
b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceEventTypeTest.java
index 2e95324..76273a3 100644
---
a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceEventTypeTest.java
+++
b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceEventTypeTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.reactor.engine;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.reactive.streams.ReactiveStreamsConstants;
@@ -111,7 +112,7 @@ public class ReactorStreamsServiceEventTypeTest extends
ReactorStreamsServiceTes
context.start();
- RuntimeException ex = new RuntimeException("1");
+ RuntimeException ex = new RuntimeCamelException("1");
Flux.just(1)
.map(n -> {
@@ -145,7 +146,7 @@ public class ReactorStreamsServiceEventTypeTest extends
ReactorStreamsServiceTes
context.start();
- RuntimeException ex = new RuntimeException("1");
+ RuntimeException ex = new RuntimeCamelException("1");
Flux.just(1)
.map(n -> {
diff --git
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
index 2c2c746..e9ddd65 100644
---
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
+++
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
@@ -25,6 +25,7 @@ import org.apache.camel.Category;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
@@ -53,7 +54,7 @@ public class SolrEndpoint extends DefaultEndpoint {
String decoded = URLDecoder.decode(zkHost, "UTF-8");
this.solrConfiguration.setZkHost(decoded);
} catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyMarkup.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyMarkup.java
index 0403ce9..30460c4 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyMarkup.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyMarkup.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.telegram.model;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.camel.RuntimeCamelException;
public interface ReplyMarkup {
@@ -25,7 +26,7 @@ public interface ReplyMarkup {
try {
return new ObjectMapper().writeValueAsString(this);
} catch (final JsonProcessingException e) {
- throw new RuntimeException("Object conversion failed.");
+ throw new RuntimeCamelException("Object conversion failed.");
}
}
}
diff --git
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestUtil.java
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestUtil.java
index 7765a14..7eef7a6 100644
---
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestUtil.java
+++
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestUtil.java
@@ -25,6 +25,7 @@ import java.nio.charset.StandardCharsets;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.util.IOHelper;
/**
@@ -82,7 +83,7 @@ public final class TelegramTestUtil {
TelegramTestUtil.class.getClassLoader().getResourceAsStream(path),
StandardCharsets.UTF_8)) {
return IOHelper.toString(r);
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
@@ -90,7 +91,7 @@ public final class TelegramTestUtil {
try {
return new ObjectMapper().writeValueAsString(result);
} catch (JsonProcessingException e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
}
diff --git
a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaConfiguration.java
b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaConfiguration.java
index de333f4..d3ee61d 100644
---
a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaConfiguration.java
+++
b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaConfiguration.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.tika;
import java.nio.charset.Charset;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@@ -107,7 +108,7 @@ public class TikaConfiguration {
try {
this.tikaConfig = new TikaConfig(tikaConfigUri);
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeCamelException(e);
}
}
}
diff --git
a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java
b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java
index 4575c1e..08e8f0e 100644
---
a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java
+++
b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java
@@ -22,6 +22,7 @@ import java.util.Properties;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
@@ -44,7 +45,7 @@ public class AbstractTwilioTestSupport extends
CamelTestSupport {
try {
properties.load(AbstractTwilioTestSupport.class.getResourceAsStream(TEST_OPTIONS_PROPERTIES));
} catch (Exception e) {
- throw new RuntimeException(
+ throw new RuntimeCamelException(
String.format("%s could not be loaded: %s",
TEST_OPTIONS_PROPERTIES, e.getMessage()),
e);
}
diff --git
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
index f9468a6..eafbd9c 100644
---
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
+++
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.util.URISupport;
import org.jivesoftware.smack.MessageListener;
@@ -72,7 +73,7 @@ public class XmppConsumer extends DefaultConsumer implements
IncomingChatMessage
connection = endpoint.createConnection();
} catch (SmackException e) {
if (endpoint.isTestConnectionOnStartup()) {
- throw new RuntimeException("Could not connect to XMPP
server.", e);
+ throw new RuntimeCamelException("Could not connect to XMPP
server.", e);
} else {
LOG.warn(e.getMessage());
if (getExceptionHandler() != null) {
diff --git
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
index 3e85603..4b22dc0 100644
---
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
+++
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.xmpp;
import java.io.IOException;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.support.DefaultProducer;
import org.jivesoftware.smack.SmackException;
@@ -104,7 +105,8 @@ public class XmppGroupChatProducer extends DefaultProducer {
connection = endpoint.createConnection();
} catch (SmackException e) {
if (endpoint.isTestConnectionOnStartup()) {
- throw new RuntimeException("Could not connect to XMPP
server: " + endpoint.getConnectionDescription(), e);
+ throw new RuntimeCamelException(
+ "Could not connect to XMPP server: " +
endpoint.getConnectionDescription(), e);
} else {
LOG.warn("Could not connect to XMPP server. {} Producer
will attempt lazy connection when needed.",
e.getMessage());
diff --git
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
index 8a93898..8da40f6 100644
---
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
+++
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.xmpp;
import java.io.IOException;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.StringHelper;
@@ -61,7 +62,7 @@ public class XmppPrivateChatProducer extends DefaultProducer {
this.reconnect();
}
} catch (Exception e) {
- throw new RuntimeException("Could not connect to XMPP server.", e);
+ throw new RuntimeCamelException("Could not connect to XMPP
server.", e);
}
String participant = endpoint.getParticipant();
@@ -116,7 +117,7 @@ public class XmppPrivateChatProducer extends
DefaultProducer {
connection = endpoint.createConnection();
} catch (SmackException e) {
if (endpoint.isTestConnectionOnStartup()) {
- throw new RuntimeException(
+ throw new RuntimeCamelException(
"Could not establish connection to XMPP server: "
+ endpoint.getConnectionDescription(), e);
} else {
LOG.warn("Could not connect to XMPP server: {} Producer
will attempt lazy connection when needed.",
diff --git
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index 12aa063..afeafc1 100644
---
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -38,6 +38,7 @@ import
com.thoughtworks.xstream.security.WildcardTypePermission;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatContentTypeHeader;
@@ -195,7 +196,7 @@ public abstract class AbstractXStreamWrapper extends
ServiceSupport
addPermissions(xstream, permissions);
}
} catch (Exception e) {
- throw new RuntimeException("Unable to build XStream instance", e);
+ throw new RuntimeCamelException("Unable to build XStream
instance", e);
}
return xstream;
diff --git
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
index 3de35b5..9f45c70 100644
---
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
+++
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
@@ -28,6 +28,7 @@ import
com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.dataformat.XStreamDataFormat;
@@ -211,7 +212,7 @@ public class XStreamConfigurationTest extends
CamelTestSupport {
if (xstream != null) {
constructorInjected = true;
} else {
- throw new RuntimeException("XStream should not be null");
+ throw new RuntimeCamelException("XStream should not be null");
}
}
@@ -240,7 +241,7 @@ public class XStreamConfigurationTest extends
CamelTestSupport {
if (xstream != null) {
methodInjected = true;
} else {
- throw new RuntimeException("XStream should not be null");
+ throw new RuntimeCamelException("XStream should not be null");
}
}
diff --git
a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
index 73ffb11..612e236 100644
---
a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
+++
b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.camel.CamelContext;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
@@ -52,7 +53,7 @@ public class AbstractZendeskTestSupport extends
CamelTestSupport {
try {
properties.load(AbstractZendeskTestSupport.class.getResourceAsStream(TEST_OPTIONS_PROPERTIES));
} catch (Exception e) {
- throw new RuntimeException("Unable to load test properties", e);
+ throw new RuntimeCamelException("Unable to load test properties",
e);
}
return properties;
}
