You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2023/02/12 21:48:42 UTC
[camel] branch avoid-java-assert-keyword created (now 686e06535ab)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch avoid-java-assert-keyword
in repository https://gitbox.apache.org/repos/asf/camel.git
at 686e06535ab avoid java assert keyword as disabled per default
This branch includes the following new commits:
new 686e06535ab avoid java assert keyword as disabled per default
The 1 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.
[camel] 01/01: avoid java assert keyword as disabled per default
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch avoid-java-assert-keyword
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 686e06535abbe4118088d5cbb060bb47aeba2f39
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sun Feb 12 22:46:52 2023 +0100
avoid java assert keyword as disabled per default
---
.../kinesis/consumer/KinesisDefaultResumeAdapter.java | 5 +++--
.../aws2/kinesis/integration/KinesisConsumerIT.java | 3 ++-
.../aws2/kinesis/integration/KinesisConsumerResumeIT.java | 8 ++++----
.../camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java | 15 ++++++++-------
.../camel/component/caffeine/resume/CaffeineCache.java | 3 ++-
.../org/apache/camel/utils/cassandra/CassandraUtils.java | 3 ---
.../dataformat/csv/converter/MyCvsRecordConverter.java | 6 +++---
.../component/cxf/transport/message/CxfMessageHelper.java | 3 ++-
.../consumer/adapters/DefaultFileOffsetResumeAdapter.java | 4 ++--
.../kafka/consumer/errorhandler/KafkaErrorStrategies.java | 3 ++-
.../kafka/producer/support/KafkaProducerCallBack.java | 4 ++--
.../idempotent/kafka/KafkaIdempotentRepository.java | 5 ++---
.../resume/kafka/KafkaResumeStrategyConfiguration.java | 13 ++++---------
.../java/org/apache/camel/component/wal/LogWriter.java | 3 ++-
.../apache/camel/component/xj/JsonXmlStreamReader.java | 5 +++--
.../org/apache/camel/builder/xml/XsltUriResolverTest.java | 3 ++-
.../PropertiesComponentPropertiesSourceTest.java | 3 ++-
.../apache/camel/support/component/ApiMethodHelper.java | 3 ++-
.../java/org/apache/camel/support/jndi/JndiContext.java | 7 +++----
.../org/apache/camel/support/resume/AdapterHelper.java | 7 ++++---
.../camel/test/infra/core/DefaultAnnotationProcessor.java | 6 +++---
.../camel/test/infra/core/api/CamelTestSupportHelper.java | 3 ++-
22 files changed, 59 insertions(+), 56 deletions(-)
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
index 0c472acc8cd..a6e34a9d078 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
@@ -26,6 +26,7 @@ import org.apache.camel.resume.OffsetKey;
import org.apache.camel.resume.ResumeAdapter;
import org.apache.camel.resume.cache.ResumeCache;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.services.kinesis.model.GetShardIteratorRequest;
@@ -46,8 +47,8 @@ public class KinesisDefaultResumeAdapter implements KinesisResumeAdapter, Cachea
@Override
public void resume() {
- assert streamName != null;
- assert resumable != null;
+ ObjectHelper.notNull(streamName, "streamName");
+ ObjectHelper.notNull(resumable, "resumable");
KinesisOffset offset = cache.get(streamName, KinesisOffset.class);
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
index 4d5acc64957..beebc63905e 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
@@ -34,6 +34,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.TestUtils;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
@@ -127,7 +128,7 @@ public class KinesisConsumerIT extends CamelTestSupport {
assertEquals(messageCount, receivedMessages.size());
for (KinesisData data : receivedMessages) {
- assert data != null; // should never happen
+ ObjectHelper.notNull(data, "data");
assertNotNull(data.body, "The body should not be null");
assertNotNull(data.partition, "The partition should not be null");
/*
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
index dbeb01b86bf..2e6a9a8fe4a 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
@@ -34,6 +34,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.TestUtils;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -86,13 +87,12 @@ public class KinesisConsumerResumeIT extends CamelTestSupport {
@Override
public void setRequestBuilder(GetShardIteratorRequest.Builder builder) {
- assert builder != null; // should never happen
- this.builder = builder;
+ this.builder = ObjectHelper.notNull(builder, "builder");
}
@Override
public void setStreamName(String streamName) {
- assert streamName != null; // should never happen
+ ObjectHelper.notNull(streamName, "streamName");
}
@Override
@@ -193,7 +193,7 @@ public class KinesisConsumerResumeIT extends CamelTestSupport {
assertEquals(expectedCount, receivedMessages.size());
for (KinesisData data : receivedMessages) {
- assert data != null; // should never happen
+ ObjectHelper.notNull(data, "data");
LOG.info("Received: {}", data.body);
assertNotNull(data.body, "The body should not be null");
assertNotNull(data.partition, "The partition should not be null");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
index 5c73ff8de33..ccf099b92d9 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
@@ -64,13 +65,13 @@ public class BindyCsvSkipFieldTest {
@Override
public void process(Exchange exchange) {
CsvSkipField csvSkipField = (CsvSkipField) exchange.getIn().getBody();
- assert csvSkipField.getAttention().equals("VOA");
- assert csvSkipField.getAddressLine1().equals("12 abc street");
- assert csvSkipField.getCity().equals("Melbourne");
- assert csvSkipField.getState().equals("VIC");
- assert csvSkipField.getZip().equals("3000");
- assert csvSkipField.getCountry().equals("Australia");
- assert csvSkipField.getDummy2().equals("end of record");
+ ObjectHelper.equal("VOA", csvSkipField.getAttention());
+ ObjectHelper.equal("12 abc street", csvSkipField.getAddressLine1());
+ ObjectHelper.equal("Melbourne", csvSkipField.getCity());
+ ObjectHelper.equal("VIC", csvSkipField.getState());
+ ObjectHelper.equal("3000", csvSkipField.getZip());
+ ObjectHelper.equal("Australia", csvSkipField.getCountry());
+ ObjectHelper.equal("end of record", csvSkipField.getDummy2());
}
})
diff --git a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/resume/CaffeineCache.java b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/resume/CaffeineCache.java
index 761a7af90f9..a15e5b8cacb 100644
--- a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/resume/CaffeineCache.java
+++ b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/resume/CaffeineCache.java
@@ -25,6 +25,7 @@ import java.util.function.Function;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import org.apache.camel.resume.cache.ResumeCache;
+import org.apache.camel.util.ObjectHelper;
/**
* This is a simple cache implementation that uses Caffeine to store the resume offsets
@@ -57,7 +58,7 @@ public class CaffeineCache<K> implements ResumeCache<K> {
@Override
public boolean contains(K key, Object entry) {
- assert key != null;
+ ObjectHelper.notNull(key, "key");
Object cachedEntry = cache.getIfPresent(key);
return entry.equals(cachedEntry);
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java
index f15cdf62731..6bf6aedc0cd 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java
@@ -137,9 +137,6 @@ public final class CassandraUtils {
select = from.all();
}
if (isWhereClause(whereColumns, whereColumnsMaxIndex)) {
- // this should never happen: isWhereClause already checks for the nullity of the whereColumns
- assert whereColumns != null;
-
for (int i = 0; i < whereColumns.length && i < whereColumnsMaxIndex; i++) {
select = select.whereColumn(whereColumns[i]).isEqualTo(bindMarker());
}
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/converter/MyCvsRecordConverter.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/converter/MyCvsRecordConverter.java
index e228e01d721..caee2f52ae4 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/converter/MyCvsRecordConverter.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/converter/MyCvsRecordConverter.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.camel.dataformat.csv.CsvRecordConverter;
+import org.apache.camel.util.ObjectHelper;
import org.apache.commons.csv.CSVRecord;
/**
@@ -33,13 +34,12 @@ public class MyCvsRecordConverter implements CsvRecordConverter<List<String>> {
private final String[] record;
public MyCvsRecordConverter(String... record) {
- assert record != null : "Unspecified record";
- this.record = record;
+ this.record = ObjectHelper.notNull(record, "Unspecified record");
}
@Override
public List<String> convertRecord(CSVRecord record) {
- assert record != null : "Unspecified record";
+ ObjectHelper.notNull(record, "Unspecified record");
return Arrays.asList(this.record);
}
}
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/CxfMessageHelper.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/CxfMessageHelper.java
index ea5b4f0e85c..d0cfa2c5802 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/CxfMessageHelper.java
+++ b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/CxfMessageHelper.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.camel.component.cxf.common.header.CxfHeaderHelper;
import org.apache.camel.component.cxf.transport.CamelTransportConstants;
import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
@@ -43,7 +44,7 @@ public final class CxfMessageHelper {
} else {
message = exchange.getIn();
}
- assert message != null;
+ ObjectHelper.notNull(message, "message");
if (cxfExchange == null) {
cxfExchange = new ExchangeImpl();
exchange.setProperty(CamelTransportConstants.CXF_EXCHANGE, cxfExchange);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileOffsetResumeAdapter.java b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileOffsetResumeAdapter.java
index 8c20b2ef853..332c42ea242 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileOffsetResumeAdapter.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileOffsetResumeAdapter.java
@@ -23,6 +23,7 @@ import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.consumer.FileOffsetResumeAdapter;
import org.apache.camel.component.file.consumer.FileResumeAdapter;
import org.apache.camel.resume.Offset;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,8 +42,7 @@ class DefaultFileOffsetResumeAdapter extends AbstractFileResumeAdapter implement
@Override
public void setResumePayload(GenericFile<File> genericFile) {
- assert genericFile != null;
- this.genericFile = genericFile;
+ this.genericFile = ObjectHelper.notNull(genericFile, "genericFile");
}
public boolean add(Object key, Object offset) {
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/KafkaErrorStrategies.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/KafkaErrorStrategies.java
index c02bf78d1eb..0e00c649bdf 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/KafkaErrorStrategies.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/KafkaErrorStrategies.java
@@ -22,6 +22,7 @@ import org.apache.camel.component.kafka.KafkaEndpoint;
import org.apache.camel.component.kafka.KafkaFetchRecords;
import org.apache.camel.component.kafka.PollExceptionStrategy;
import org.apache.camel.component.kafka.PollOnError;
+import org.apache.camel.util.ObjectHelper;
import org.apache.kafka.clients.consumer.Consumer;
public final class KafkaErrorStrategies {
@@ -32,7 +33,7 @@ public final class KafkaErrorStrategies {
public static PollExceptionStrategy strategies(
KafkaFetchRecords recordFetcher, KafkaEndpoint endpoint, Consumer<?, ?> consumer) {
- assert consumer != null;
+ ObjectHelper.notNull(consumer, "consumer");
PollExceptionStrategy strategy = endpoint.getComponent().getPollExceptionStrategy();
if (strategy != null) {
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/producer/support/KafkaProducerCallBack.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/producer/support/KafkaProducerCallBack.java
index 09b6a3dfdd5..2b7de255f49 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/producer/support/KafkaProducerCallBack.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/producer/support/KafkaProducerCallBack.java
@@ -22,6 +22,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.LongAdder;
import org.apache.camel.AsyncCallback;
+import org.apache.camel.util.ObjectHelper;
import org.apache.kafka.clients.producer.Callback;
import org.apache.kafka.clients.producer.RecordMetadata;
import org.slf4j.Logger;
@@ -46,8 +47,7 @@ public final class KafkaProducerCallBack implements Callback {
this.callback = callback;
// The worker pool should be created for both sync and async modes, so checking it
// is merely a safeguard
- assert workerPool != null;
- this.workerPool = workerPool;
+ this.workerPool = ObjectHelper.notNull(workerPool, "workerPool");
this.record = record;
count.increment();
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 20de5f0128e..3e2d3ca0193 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
@@ -359,10 +359,9 @@ public class KafkaIdempotentRepository extends ServiceSupport implements Idempot
private void broadcastAction(String key, CacheAction action) {
try {
log.debug("Broadcasting action:{} for key:{}", action, key);
- assert producer != null;
+ ObjectHelper.notNull(producer, "producer");
- producer.send(new ProducerRecord<>(topic, key, action.toString())).get(); // sync
- // send
+ producer.send(new ProducerRecord<>(topic, key, action.toString())).get(); // sync send
} catch (ExecutionException | InterruptedException e) {
throw new RuntimeCamelException(e);
}
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/KafkaResumeStrategyConfiguration.java b/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/KafkaResumeStrategyConfiguration.java
index 3ce847cee0e..7f91628fa75 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/KafkaResumeStrategyConfiguration.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/KafkaResumeStrategyConfiguration.java
@@ -21,6 +21,7 @@ import java.time.Duration;
import java.util.Properties;
import org.apache.camel.resume.ResumeStrategyConfiguration;
+import org.apache.camel.util.ObjectHelper;
/**
* A configuration suitable for using with the {@link KafkaResumeStrategy} and any of its implementations
@@ -37,9 +38,7 @@ public class KafkaResumeStrategyConfiguration extends ResumeStrategyConfiguratio
}
void setProducerProperties(Properties producerProperties) {
- assert producerProperties != null;
-
- this.producerProperties = producerProperties;
+ this.producerProperties = ObjectHelper.notNull(producerProperties, "producerProperties");
}
public Properties getConsumerProperties() {
@@ -47,9 +46,7 @@ public class KafkaResumeStrategyConfiguration extends ResumeStrategyConfiguratio
}
void setConsumerProperties(Properties consumerProperties) {
- assert consumerProperties != null;
-
- this.consumerProperties = consumerProperties;
+ this.consumerProperties = ObjectHelper.notNull(consumerProperties, "consumerProperties");
}
public String getTopic() {
@@ -57,9 +54,7 @@ public class KafkaResumeStrategyConfiguration extends ResumeStrategyConfiguratio
}
void setTopic(String topic) {
- assert topic != null;
-
- this.topic = topic;
+ this.topic = ObjectHelper.notNull(topic, "topic");
}
public Duration getMaxInitializationDuration() {
diff --git a/components/camel-wal/src/main/java/org/apache/camel/component/wal/LogWriter.java b/components/camel-wal/src/main/java/org/apache/camel/component/wal/LogWriter.java
index 74b450c3f88..08b852f6c60 100644
--- a/components/camel-wal/src/main/java/org/apache/camel/component/wal/LogWriter.java
+++ b/components/camel-wal/src/main/java/org/apache/camel/component/wal/LogWriter.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -239,7 +240,7 @@ public final class LogWriter implements AutoCloseable {
Trying to update a persisted entry here is not acceptable
*/
- assert layerInfo != null;
+ ObjectHelper.notNull(layerInfo, "layerInfo");
final LogEntry logEntry = transactionLog.update(layerInfo, state);
diff --git a/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java b/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
index e5c1bc14e12..a01a588afbf 100644
--- a/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
+++ b/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
@@ -35,6 +35,7 @@ import javax.xml.stream.XMLStreamReader;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
+import org.apache.camel.util.ObjectHelper;
/**
* XML Json bridge. Explicitly using XMLStreamReader and not XMLEventReader because saxon wants that.
@@ -110,7 +111,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
removeStackElement(previousElement.jsonToken);
removeStackElement(JsonToken.FIELD_NAME);
- assert tokenStack.peek() != null;
+ ObjectHelper.notNull(tokenStack.peek(), "tokenStack.peek()");
tokenStack.peek().xmlEvent = XMLStreamConstants.END_ELEMENT;
return XMLStreamConstants.END_ELEMENT;
default:
@@ -441,7 +442,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
final StackElement stackElement = tokenStack.peek();
try {
- assert stackElement != null;
+ ObjectHelper.notNull(stackElement, "stackElement");
setXmlText(stackElement, jsonParser);
return stackElement.value.length;
} catch (IOException e) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
index fcad2c683ac..4b11cd86bfa 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
@@ -26,6 +26,7 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.camel.CamelContext;
import org.apache.camel.component.xslt.XsltUriResolver;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
@@ -55,7 +56,7 @@ public class XsltUriResolverTest {
private static String readFileFromClasspathAsString(String path) throws IOException {
try (InputStream is = XsltUriResolverTest.class.getClassLoader().getResourceAsStream(path)) {
- assert is != null;
+ ObjectHelper.notNull(is, "is");
return new String(is.readAllBytes(), StandardCharsets.UTF_8);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentPropertiesSourceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentPropertiesSourceTest.java
index ebc10a042c1..b17ff325f59 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentPropertiesSourceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentPropertiesSourceTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Ordered;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.LoadablePropertiesSource;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -123,7 +124,7 @@ public class PropertiesComponentPropertiesSourceTest {
}
public PropertiesPropertiesSource(int order, String name, String... kv) {
- assert kv.length % 2 == 0;
+ ObjectHelper.equal(kv.length % 2, 0);
this.name = name;
this.order = order;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
index 9f0dee10431..3eff3ced3ef 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,7 +104,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
// add method name alias
String alias = matcher.replaceAll(aliasEntry.getValue());
// convert first character to lowercase
- assert alias.length() > 1;
+ ObjectHelper.isNotEmpty(alias);
final char firstChar = alias.charAt(0);
if (!Character.isLowerCase(firstChar)) {
final StringBuilder builder = new StringBuilder();
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
index 0487acdd0c8..77e0386e38e 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
@@ -114,8 +114,8 @@ public class JndiContext implements Context, Serializable {
* (the names are suitably extended by the segment originally lopped off).
*/
protected Map<String, Object> internalBind(String name, Object value) throws NamingException {
- assert name != null && name.length() > 0;
- assert !frozen;
+ org.apache.camel.util.ObjectHelper.isNotEmpty(name);
+ org.apache.camel.util.ObjectHelper.notNull(frozen, "frozen");
Map<String, Object> newBindings = new HashMap<>();
int pos = name.indexOf('/');
@@ -127,8 +127,7 @@ public class JndiContext implements Context, Serializable {
newBindings.put(name, value);
} else {
String segment = name.substring(0, pos);
- assert segment != null;
- assert !segment.equals("");
+ org.apache.camel.util.ObjectHelper.isNotEmpty(segment);
Object o = treeBindings.get(segment);
if (o == null) {
o = newContext();
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/resume/AdapterHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/resume/AdapterHelper.java
index 56bac5a8db1..c552b509bec 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/resume/AdapterHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/resume/AdapterHelper.java
@@ -29,6 +29,7 @@ import org.apache.camel.resume.ResumeStrategy;
import org.apache.camel.resume.ResumeStrategyConfiguration;
import org.apache.camel.resume.cache.ResumeCache;
import org.apache.camel.spi.FactoryFinder;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,9 +42,9 @@ public final class AdapterHelper {
}
public static ResumeAdapter eval(CamelContext context, ResumeAware resumeAware, ResumeStrategy resumeStrategy) {
- assert context != null;
- assert resumeAware != null;
- assert resumeStrategy != null;
+ ObjectHelper.notNull(context, "context");
+ ObjectHelper.notNull(resumeAware, "resumeAware");
+ ObjectHelper.notNull(resumeStrategy, "resumeStrategy");
LOG.debug("Using the factory finder to search for the resume adapter");
final FactoryFinder factoryFinder
diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultAnnotationProcessor.java b/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultAnnotationProcessor.java
index 8f425ad88b2..6fd9ef9433a 100644
--- a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultAnnotationProcessor.java
+++ b/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/DefaultAnnotationProcessor.java
@@ -32,6 +32,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -151,13 +152,12 @@ public class DefaultAnnotationProcessor implements AnnotationProcessor {
if (field.getType() == MockEndpoint.class) {
final MockEndpoint mockEndpoint = contextExtension.getMockEndpoint(uri);
- assert mockEndpoint != null;
-
+ ObjectHelper.notNull(mockEndpoint, "mockEndpoint");
field.set(instance, mockEndpoint);
} else {
final Endpoint endpoint = context.getEndpoint(uri);
- assert endpoint != null;
+ ObjectHelper.notNull(endpoint, "endpoint");
field.set(instance, endpoint);
}
diff --git a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/CamelTestSupportHelper.java b/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/CamelTestSupportHelper.java
index 023c63b3a61..910ce35020b 100644
--- a/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/CamelTestSupportHelper.java
+++ b/test-infra/camel-test-infra-core/src/test/java/org/apache/camel/test/infra/core/api/CamelTestSupportHelper.java
@@ -20,6 +20,7 @@ package org.apache.camel.test.infra.core.api;
import org.apache.camel.Endpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.util.ObjectHelper;
/**
* Helper interface for simplifying the conversion from the older CamelTestSupport to the new extension
@@ -30,7 +31,7 @@ public interface CamelTestSupportHelper {
default <T extends Endpoint> T getMandatoryEndpoint(String uri, Class<T> type) {
T endpoint = getCamelContextExtension().getContext().getEndpoint(uri, type);
- assert endpoint != null : "No endpoint found for uri: " + uri;
+ ObjectHelper.notNull(endpoint, "No endpoint found for uri: " + uri);
return endpoint;
}