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 b798e19 Use isEmpty for checking whether collections are empty since it runs in constant time (#5462) b798e19 is described below commit b798e191f1809250242785e313f317646e95435a Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Fri Apr 23 16:43:07 2021 +0200 Use isEmpty for checking whether collections are empty since it runs in constant time (#5462) --- .../camel/parser/helper/CamelJavaParserHelper.java | 2 +- .../aws2/s3/stream/AWS2S3StreamUploadProducer.java | 2 +- .../dataformat/bindy/csv/BindyCsvDataFormat.java | 2 +- .../bindy/kvp/BindyKeyValuePairDataFormat.java | 20 +++++++++----------- .../java/org/apache/camel/cdi/CdiCamelExtension.java | 2 +- .../java/org/apache/camel/cdi/CdiEventEndpoint.java | 2 +- .../apache/camel/component/elsql/ElsqlEndpoint.java | 2 +- .../bigquery/sql/GoogleBigQuerySQLProducer.java | 2 +- .../apache/camel/component/grok/GrokDataFormat.java | 2 +- .../apache/camel/component/ipfs/IPFSProducer.java | 2 +- .../component/jms/reply/MessageSelectorCreator.java | 2 +- .../leveldb/LevelDBAggregationRepository.java | 2 +- .../org/apache/camel/openapi/RestOpenApiReader.java | 11 +++++------ .../reactive/streams/engine/CamelPublisher.java | 4 ++-- .../reactive/streams/engine/CamelSubscription.java | 2 +- .../component/sjms/reply/MessageSelectorCreator.java | 2 +- .../apache/camel/component/solr/SolrProducer.java | 2 +- .../soroushbot/component/SoroushBotEndpoint.java | 2 +- .../org/apache/camel/swagger/RestSwaggerReader.java | 2 +- .../camel/component/telegram/TelegramConsumer.java | 2 +- .../apache/camel/test/CamelRouteCoverageDumper.java | 2 +- .../test/spring/junit5/CamelAnnotationsHandler.java | 2 +- .../camel/component/xj/JsonXmlStreamReader.java | 6 +++--- .../camel/component/xj/XmlJsonStreamWriter.java | 2 +- .../simple/ast/SimpleFunctionExpression.java | 2 +- .../java/org/apache/camel/processor/Resequencer.java | 2 +- .../processor/aggregate/AggregateProcessor.java | 2 +- .../core/xml/AbstractCamelContextFactoryBean.java | 2 +- .../apache/camel/main/DefaultRoutesCollector.java | 2 +- .../apache/camel/tooling/util/srcgen/JavaClass.java | 2 +- .../camel/maven/bom/generator/BomGeneratorMojo.java | 2 +- .../maven/packaging/EndpointSchemaGeneratorMojo.java | 10 +++++----- .../camel/maven/packaging/SchemaGeneratorMojo.java | 6 +++--- 33 files changed, 54 insertions(+), 57 deletions(-) diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java index 5d66ba0..7d93ca2 100644 --- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java +++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java @@ -657,7 +657,7 @@ public final class CamelJavaParserHelper { if (expression instanceof MethodInvocation) { MethodInvocation mi = (MethodInvocation) expression; List args = mi.arguments(); - if (args != null && args.size() > 0) { + if (args != null && !args.isEmpty()) { // the first argument has the endpoint uri expression = (Expression) args.get(0); return getLiteralValue(clazz, block, expression); diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java index 934e734..a14bd6d 100644 --- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java +++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java @@ -294,7 +294,7 @@ public class AWS2S3StreamUploadProducer extends DefaultProducer { listRes.stream() .flatMap(r -> r.contents().stream()) .forEach(content -> list.add(content)); - if (list.size() > 0) { + if (!list.isEmpty()) { list.sort(Comparator.comparing(S3Object::lastModified)); int listSize = list.size(); String fileName = AWS2S3Utils.determineFileName(list.get(listSize - 1).key()); diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java index 67c61b1..055d147 100644 --- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java +++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java @@ -229,7 +229,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat { separators.add(matcher.group()); } // Add terminal separator - if (separators.size() > 0) { + if (!separators.isEmpty()) { separators.add(separators.get(separators.size() - 1)); } diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java index 0c40950..2cb40d7 100644 --- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java +++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java @@ -157,23 +157,21 @@ public class BindyKeyValuePairDataFormat extends BindyAbstractDataFormat { .map(x -> x.replace("\u0085", "")) .collect(Collectors.toList()); - if (result.size() == 0 || result.isEmpty()) { + if (result.isEmpty()) { throw new IllegalArgumentException("No records have been defined in the KVP"); } - if (result.size() > 0) { - // Bind data from message with model classes - // Counter is used to detect line where error occurs - factory.bind(getCamelContext(), result, model, count.get(), lists); + // Bind data from message with model classes + // Counter is used to detect line where error occurs + factory.bind(getCamelContext(), result, model, count.get(), lists); - // Link objects together - factory.link(model); + // Link objects together + factory.link(model); - // Add objects graph to the list - models.add(model); + // Add objects graph to the list + models.add(model); - LOG.debug("Graph of objects created: {}", model); - } + LOG.debug("Graph of objects created: {}", model); } } catch (Exception e) { throw new WrappedException(e); diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java index 89d2f81..f766053 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java @@ -281,7 +281,7 @@ public class CdiCamelExtension implements Extension { .filter(hasType(CamelContext.class)) .collect(toSet()); - if (contexts.size() == 0 && shouldDeployDefaultCamelContext(allBeans)) { + if (contexts.isEmpty() && shouldDeployDefaultCamelContext(allBeans)) { // Add @Default Camel context bean if any extraBeans.add(camelContextBean(manager, null, ANY, DEFAULT, APPLICATION_SCOPED)); } else if (contexts.size() == 1) { diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java index aebfdbc..ef5d5c5 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java @@ -110,7 +110,7 @@ public final class CdiEventEndpoint<T> extends DefaultEndpoint { static String eventEndpointUri(Type type, Set<Annotation> qualifiers) { return "cdi-event://" + authorityFromType(type) + qualifiers.stream() .map(CdiSpiHelper::createAnnotationId) - .collect(joining("%2C", qualifiers.size() > 0 ? "?qualifiers=" : "", "")); + .collect(joining("%2C", !qualifiers.isEmpty() ? "?qualifiers=" : "", "")); } private static String authorityFromType(Type type) { diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java index b408d7e..22b9eaf 100644 --- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java +++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java @@ -151,7 +151,7 @@ public class ElsqlEndpoint extends DefaultSqlEndpoint { } } - if (list.size() > 0) { + if (!list.isEmpty()) { final URL[] urls = list.toArray(new URL[list.size()]); elSql = ElSql.parse(elSqlConfig, urls); } diff --git a/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java b/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java index 7ab6b7a..ba49a7a 100644 --- a/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java +++ b/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java @@ -117,7 +117,7 @@ public class GoogleBigQuerySQLProducer extends DefaultProducer { } private Map<String, Object> extractParameters(Exchange exchange) { - if (queryParameterNames == null || queryParameterNames.size() == 0) { + if (queryParameterNames == null || queryParameterNames.isEmpty()) { return null; } diff --git a/components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java b/components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java index af4d7b4..a2a9ac9 100644 --- a/components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java +++ b/components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java @@ -138,7 +138,7 @@ public class GrokDataFormat extends ServiceSupport implements DataFormat, DataFo lines.forEachOrdered(line -> processLine(line, result)); } - if (result.size() == 0) { + if (result.isEmpty()) { return null; } diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java index 77c2d8b..18a27c7 100644 --- a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java +++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java @@ -82,7 +82,7 @@ public class IPFSProducer extends DefaultProducer { List<String> cids = ipfsAdd(path); Object resp = cids; if (path.toFile().isFile()) { - resp = cids.size() > 0 ? cids.get(0) : null; + resp = !cids.isEmpty() ? cids.get(0) : null; } exchange.getMessage().setBody(resp); } else if (IPFSCommand.cat == cmd) { diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java index 3e6e685..b33c809 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/MessageSelectorCreator.java @@ -51,7 +51,7 @@ public class MessageSelectorCreator { expression = new StringBuilder("JMSCorrelationID='"); - if (correlationIds.size() == 0) { + if (correlationIds.isEmpty()) { // no id's so use a dummy to select nothing expression.append("CamelDummyJmsMessageSelector'"); } else { diff --git a/components/camel-leveldb-legacy/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java b/components/camel-leveldb-legacy/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java index 374c7a0..2d1d648 100644 --- a/components/camel-leveldb-legacy/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java +++ b/components/camel-leveldb-legacy/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java @@ -267,7 +267,7 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco IOHelper.close(it); } - if (answer.size() == 0) { + if (answer.isEmpty()) { LOG.trace("Scanned and found no exchange to recover."); } else { if (LOG.isDebugEnabled()) { diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java index 90241cb..90262c9 100644 --- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java +++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java @@ -222,8 +222,7 @@ public class RestOpenApiReader { // setup security definitions RestSecuritiesDefinition sd = rest.getSecurityDefinitions(); - if (sd != null && sd.getSecurityDefinitions().size() != 0 - && openApi.components == null) { + if (sd != null && !sd.getSecurityDefinitions().isEmpty() && openApi.components == null) { openApi.components = openApi .createComponents(); } @@ -297,7 +296,7 @@ public class RestOpenApiReader { // setup security definitions RestSecuritiesDefinition sd = rest.getSecurityDefinitions(); - if (sd != null && sd.getSecurityDefinitions().size() != 0 && openApi.securityDefinitions == null) { + if (sd != null && !sd.getSecurityDefinitions().isEmpty() && openApi.securityDefinitions == null) { openApi.securityDefinitions = openApi.createSecurityDefinitions(); } if (sd != null) { @@ -338,7 +337,7 @@ public class RestOpenApiReader { auth.flow = flow; auth.authorizationUrl = getValue(camelContext, rs.getAuthorizationUrl()); auth.tokenUrl = getValue(camelContext, rs.getTokenUrl()); - if (rs.getScopes().size() != 0 && auth.scopes == null) { + if (!rs.getScopes().isEmpty() && auth.scopes == null) { auth.scopes = auth.createScopes(); } for (RestPropertyDefinition scope : rs.getScopes()) { @@ -529,7 +528,7 @@ public class RestOpenApiReader { oas30Schema.default_ = getValue(camelContext, param.getDefaultValue()); } // add examples - if (param.getExamples() != null && param.getExamples().size() >= 1) { + if (param.getExamples() != null && !param.getExamples().isEmpty()) { // we can only set one example on the parameter Extension exampleExtension = parameter30.createExtension(); boolean emptyKey = param.getExamples().get(0).getKey().length() == 0; @@ -750,7 +749,7 @@ public class RestOpenApiReader { serializableParameter.default_ = getValue(camelContext, param.getDefaultValue()); } // add examples - if (param.getExamples() != null && param.getExamples().size() >= 1) { + if (param.getExamples() != null && !param.getExamples().isEmpty()) { // we can only set one example on the parameter Extension exampleExtension = serializableParameter.createExtension(); boolean emptyKey = param.getExamples().get(0).getKey().length() == 0; diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/CamelPublisher.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/CamelPublisher.java index be29e83..1918c32 100644 --- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/CamelPublisher.java +++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/CamelPublisher.java @@ -81,7 +81,7 @@ public class CamelPublisher implements Publisher<Exchange>, AutoCloseable { DispatchCallback<Exchange> originalCallback = ReactiveStreamsHelper.getCallback(data); DispatchCallback<Exchange> callback = originalCallback; - if (originalCallback != null && subs.size() > 0) { + if (originalCallback != null && !subs.isEmpty()) { // When multiple subscribers have an active subscription, // we acknowledge the exchange once it has been delivered to every // subscriber (or their subscription is cancelled) @@ -97,7 +97,7 @@ public class CamelPublisher implements Publisher<Exchange>, AutoCloseable { }); } - if (subs.size() > 0) { + if (!subs.isEmpty()) { if (LOG.isDebugEnabled()) { LOG.debug("Exchange published to {} subscriptions for the stream {}: {}", subs.size(), name, data); } diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/CamelSubscription.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/CamelSubscription.java index c2a378d..40993a8 100644 --- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/CamelSubscription.java +++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/CamelSubscription.java @@ -116,7 +116,7 @@ public class CamelSubscription implements Subscription { protected void checkAndFlush() { mutex.lock(); - boolean shouldFlush = !terminated && !sending && requested > 0 && buffer.size() > 0; + boolean shouldFlush = !terminated && !sending && requested > 0 && !buffer.isEmpty(); if (shouldFlush) { sending = true; } diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/MessageSelectorCreator.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/MessageSelectorCreator.java index 669476a..b0d5c61 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/MessageSelectorCreator.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/MessageSelectorCreator.java @@ -51,7 +51,7 @@ public class MessageSelectorCreator { expression = new StringBuilder("JMSCorrelationID='"); - if (correlationIds.size() == 0) { + if (correlationIds.isEmpty()) { // no id's so use a dummy to select nothing expression.append("CamelDummyJmsMessageSelector'"); } else { diff --git a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java index 3c045dd..75bb21c 100644 --- a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java +++ b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java @@ -222,7 +222,7 @@ public class SolrProducer extends DefaultProducer { } else if (body instanceof List<?>) { List<?> list = (List<?>) body; - if (list.size() > 0 && list.get(0) instanceof SolrInputDocument) { + if (!list.isEmpty() && list.get(0) instanceof SolrInputDocument) { UpdateRequest updateRequest = createUpdateRequest(); updateRequest.add((List<SolrInputDocument>) list); diff --git a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java index 4fdb84a..d18d601 100644 --- a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java +++ b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java @@ -193,7 +193,7 @@ public class SoroushBotEndpoint extends DefaultEndpoint { } } - if (pathParts.size() > 2 || pathParts.size() == 0) { + if (pathParts.size() > 2 || pathParts.isEmpty()) { throw new IllegalArgumentException( "Unexpected URI format. Expected soroush://" + getSupportedEndpointAsString() + "[/<authorizationToken>][?options]', found " + uri); diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java index dc32a3e..f496891 100644 --- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java +++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java @@ -385,7 +385,7 @@ public class RestSwaggerReader { qp.setDefaultValue(param.getDefaultValue()); } // add examples - if (param.getExamples() != null && param.getExamples().size() >= 1) { + if (param.getExamples() != null && !param.getExamples().isEmpty()) { // we can only set one example on the parameter qp.example(param.getExamples().get(0).getValue()); } diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConsumer.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConsumer.java index e5b86d2..76acd8f 100644 --- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConsumer.java +++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramConsumer.java @@ -70,7 +70,7 @@ public class TelegramConsumer extends ScheduledPollConsumer { List<Update> updates = updateResult.getUpdates(); - if (updates.size() > 0) { + if (!updates.isEmpty()) { LOG.debug("Received {} updates from Telegram service", updates.size()); } else { LOG.debug("No updates received from Telegram service"); diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java index a04d9fd..85553b3 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java @@ -188,7 +188,7 @@ public class CamelRouteCoverageDumper { builder.append("\t\tCamelContext (").append(managedCamelContext.getCamelId()).append(") total: ") .append(contextExchangesTotal).append("\n"); - if (uncoveredRoutes.size() > 0) { + if (!uncoveredRoutes.isEmpty()) { builder.append("\t\tUncovered routes: ").append(uncoveredRoutes.stream().collect(Collectors.joining(", "))) .append("\n"); } diff --git a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java index f11f331..390601c 100644 --- a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java +++ b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java @@ -204,7 +204,7 @@ public final class CamelAnnotationsHandler { } } - if (breakpoints.size() != 0) { + if (!breakpoints.isEmpty()) { CamelSpringTestHelper.doToSpringCamelContexts(context, new CamelSpringTestHelper.DoToSpringCamelContextsStrategy() { public void execute(String contextName, SpringCamelContext camelContext) 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 9e8f901..fd26365 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 @@ -157,14 +157,14 @@ public class JsonXmlStreamReader implements XMLStreamReader { removeStackElement(JsonToken.END_OBJECT); removeStackElement(JsonToken.START_OBJECT); removeStackElement(JsonToken.FIELD_NAME); - eof = tokenStack.size() == 0; + eof = tokenStack.isEmpty(); return XMLStreamConstants.END_ELEMENT; case END_ARRAY: removeStackElement(JsonToken.END_ARRAY); removeStackElement(JsonToken.START_ARRAY); removeStackElement(JsonToken.FIELD_NAME); - eof = tokenStack.size() == 0; + eof = tokenStack.isEmpty(); return XMLStreamConstants.END_ELEMENT; default: @@ -395,7 +395,7 @@ public class JsonXmlStreamReader implements XMLStreamReader { return XMLStreamConstants.END_DOCUMENT; } - if (tokenStack.size() == 0) { + if (tokenStack.isEmpty()) { return XMLStreamConstants.START_DOCUMENT; } diff --git a/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java b/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java index 70a5b26..88204c9 100644 --- a/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java +++ b/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java @@ -224,7 +224,7 @@ public class XmlJsonStreamWriter implements XMLStreamWriter { public void writeCharacters(String text) { // check for non coalescing read final List<TreeElement> childs = currentTreeElement.childs; - if (childs.size() > 0) { + if (!childs.isEmpty()) { final TreeElement child = childs.get(childs.size() - 1); if (child.getXmlEvent() == XMLStreamConstants.CHARACTERS) { child.appendValue(text); diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java index 8fb4156..5212c57 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java @@ -1091,7 +1091,7 @@ public class SimpleFunctionExpression extends LiteralExpression { // and the key can also be OGNL (eg if there is a dot) boolean index = false; List<String> parts = splitOgnl(key); - if (parts.size() > 0) { + if (!parts.isEmpty()) { String s = parts.get(0); int pos = s.indexOf('['); if (pos != -1) { diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java index 12822b2..c1ad5e9 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java @@ -309,7 +309,7 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce // out batch is disabled, so go ahead and send. return true; } - return collection.size() > 0 && collection.size() >= outBatchSize; + return !collection.isEmpty() && collection.size() >= outBatchSize; } /** diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java index 2d88e57..4b67c4c 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java @@ -1652,7 +1652,7 @@ public class AggregateProcessor extends AsyncProcessorSupport int expected = forceCompletionOfAllGroups(); StopWatch watch = new StopWatch(); - while (inProgressCompleteExchanges.size() > 0) { + while (!inProgressCompleteExchanges.isEmpty()) { LOG.trace("Waiting for {} inflight exchanges to complete", getInProgressCompleteExchanges()); try { Thread.sleep(100); diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java index a0b3be8..2e88712 100644 --- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java +++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java @@ -1259,7 +1259,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex // package scan addPackageElementContentsToScanDefinition(); PackageScanDefinition packageScanDef = getPackageScan(); - if (packageScanDef != null && packageScanDef.getPackages().size() > 0) { + if (packageScanDef != null && !packageScanDef.getPackages().isEmpty()) { // use package scan filter PatternBasedPackageScanFilter filter = new PatternBasedPackageScanFilter(); // support property placeholders in include and exclude diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java index 7570a66..9f80d27 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java @@ -172,7 +172,7 @@ public class DefaultRoutesCollector implements RoutesCollector { } catch (Exception e) { throw RuntimeCamelException.wrapRuntimeException(e); } - if (answer.size() > 0) { + if (!answer.isEmpty()) { log.info("Loaded {} ({} millis) additional RoutesBuilder from: {}, pattern: {}", answer.size(), watch.taken(), include, includePattern); diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java index 59031ce..4ebf5b2 100644 --- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java +++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java @@ -534,7 +534,7 @@ public class JavaClass { sb.append(" "); } sb.append(method.name); - if (method.parameters.size() > 0) { + if (!method.parameters.isEmpty()) { sb.append("(\n"); sb.append(method.parameters.stream() .map(p -> p.vararg diff --git a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java index 9ea19e5..82c016d 100644 --- a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java +++ b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java @@ -328,7 +328,7 @@ public class BomGeneratorMojo extends AbstractMojo { } } - if (errors.size() > 0) { + if (!errors.isEmpty()) { StringBuilder msg = new StringBuilder(); msg.append("Found ").append(errors.size()) .append(" conflicts between the current managed dependencies and the external BOMS:\n"); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java index e5e07c5..4f67567 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java @@ -650,7 +650,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { boolean annotationBasedOptions = fields.stream().anyMatch(f -> f.getAnnotation(Metadata.class) != null) || methods.stream().anyMatch(m -> m.getAnnotation(Metadata.class) != null); - if (methods.size() > 0 && !annotationBasedOptions) { + if (!methods.isEmpty() && !annotationBasedOptions) { getLog().warn("Component class " + classElement.getName() + " has not been marked up with @Metadata for " + methods.size() + " options."); } @@ -1376,7 +1376,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { String propName = Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1); for (MethodSource<JavaClassSource> getter : source.getMethods()) { - if (getter.getParameters().size() == 0 + if (getter.getParameters().isEmpty() && (getter.getName().equals("get" + propName) || getter.getName().equals("is" + propName))) { String doc = getJavaDocText(loadJavaSource(classElement.getName()), getter); if (!Strings.isNullOrEmpty(doc)) { @@ -1396,7 +1396,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { } } for (MethodSource<JavaClassSource> builder : source.getMethods()) { - if (builder.getParameters().size() == 0 && builder.getName().equals(name)) { + if (builder.getParameters().isEmpty() && builder.getName().equals(name)) { String doc = getJavaDocText(loadJavaSource(classElement.getName()), builder); if (!Strings.isNullOrEmpty(doc)) { return doc; @@ -1413,7 +1413,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { } } for (MethodSource<JavaClassSource> builder : source.getMethods()) { - if (builder.getParameters().size() == 0 && builder.getName().equals(fieldName)) { + if (builder.getParameters().isEmpty() && builder.getName().equals(fieldName)) { String doc = getJavaDocText(loadJavaSource(classElement.getName()), builder); if (!Strings.isNullOrEmpty(doc)) { return doc; @@ -1431,7 +1431,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { } JavaDoc<?> javaDoc = member.getJavaDoc(); Javadoc jd = (Javadoc) javaDoc.getInternal(); - if (source != null && jd.tags().size() > 0) { + if (source != null && !jd.tags().isEmpty()) { ASTNode n = (ASTNode) jd.tags().get(0); String txt = source.substring(n.getStartPosition(), n.getStartPosition() + n.getLength()); return txt diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java index ab64a27..0971095 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java @@ -1115,7 +1115,7 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo { String getterName = "get" + Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1); for (MethodSource<JavaClassSource> setter : source.getMethods()) { - if (setter.getParameters().size() == 0 + if (setter.getParameters().isEmpty() && setter.getName().equals(getterName)) { String doc = setter.getJavaDoc().getFullText(); if (!Strings.isNullOrEmpty(doc)) { @@ -1135,7 +1135,7 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo { } } for (MethodSource<JavaClassSource> builder : source.getMethods()) { - if (builder.getParameters().size() == 0 && builder.getName().equals(name)) { + if (builder.getParameters().isEmpty() && builder.getName().equals(name)) { String doc = builder.getJavaDoc().getFullText(); if (!Strings.isNullOrEmpty(doc)) { return doc; @@ -1152,7 +1152,7 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo { } } for (MethodSource<JavaClassSource> builder : source.getMethods()) { - if (builder.getParameters().size() == 0 && builder.getName().equals(fieldName)) { + if (builder.getParameters().isEmpty() && builder.getName().equals(fieldName)) { String doc = builder.getJavaDoc().getFullText(); if (!Strings.isNullOrEmpty(doc)) { return doc;