This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8122b827d9971f2ae49d305ba506e849a5151c26
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue May 14 14:39:51 2024 +0200
Various small code enhancements
---
.../main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java | 1 +
.../src/main/java/org/apache/camel/builder/RouteBuilder.java | 6 +++---
.../main/java/org/apache/camel/support/ScheduledPollConsumer.java | 1 -
core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java | 1 +
core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java | 1 +
.../src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java | 1 +
.../src/main/java/org/apache/camel/xml/io/MXParser.java | 3 +--
7 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
index 3dcef35376d..81da7ca1925 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
@@ -542,6 +542,7 @@ public class DefaultDumpRoutesStrategy extends
ServiceSupport implements DumpRou
}
}
+ @SuppressWarnings("ResultOfMethodCallIgnored")
protected void doDumpToDirectory(Resource resource, StringBuilder sbLocal,
String kind, String ext, Set<String> files) {
if (output != null && !sbLocal.isEmpty()) {
// make sure directory exists
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index ac284692b9e..08de3c7147e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -77,7 +77,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
private final List<TransformerBuilder> transformerBuilders = new
ArrayList<>();
private final List<ValidatorBuilder> validatorBuilders = new ArrayList<>();
// XML and YAML DSL allows to define custom beans which we need to capture
- private final List<BeanFactoryDefinition> beans = new ArrayList<>();
+ private final List<BeanFactoryDefinition<?>> beans = new ArrayList<>();
private RestsDefinition restCollection = new RestsDefinition();
private RestConfigurationDefinition restConfiguration;
@@ -928,7 +928,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
CamelContext camelContext = notNullCamelContext();
Model model =
camelContext.getCamelContextExtension().getContextPlugin(Model.class);
- for (BeanFactoryDefinition def : beans) {
+ for (BeanFactoryDefinition<?> def : beans) {
// add to model
model.addCustomBean(def);
}
@@ -944,7 +944,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
return getRestCollection();
}
- public List<BeanFactoryDefinition> getBeans() {
+ public List<BeanFactoryDefinition<?>> getBeans() {
return beans;
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
index 98e26fb6b26..6d02602c9c6 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
@@ -186,7 +186,6 @@ public abstract class ScheduledPollConsumer extends
DefaultConsumer
while (!done) {
try {
- cause = null;
// eager assume we are done
done = true;
if (isPollAllowed()) {
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
index c5babf65459..b85832c4625 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
@@ -83,6 +83,7 @@ public final class FileUtil {
return IS_WINDOWS;
}
+ @SuppressWarnings("ResultOfMethodCallIgnored")
public static File createTempFile(String prefix, String suffix, File
parentDir) throws IOException {
Objects.requireNonNull(parentDir);
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
index 925cc7cb32a..239b861de57 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
@@ -517,6 +517,7 @@ public final class IOHelper {
doWriteText(text, file, false);
}
+ @SuppressWarnings("ResultOfMethodCallIgnored")
private static void doWriteText(String text, File file, boolean append)
throws IOException {
if (!file.exists()) {
String path = FileUtil.onlyPath(file.getPath());
diff --git
a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
index 16fea056326..f86a9587aa7 100644
---
a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
+++
b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
@@ -649,6 +649,7 @@ public class XmlStreamReader extends Reader {
// returns the BOM in the stream, NULL if not present,
// if there was BOM the in the stream it is consumed
+ @SuppressWarnings("ResultOfMethodCallIgnored")
private static String getBOMEncoding(final BufferedInputStream is) throws
IOException {
String encoding = null;
final int[] bytes = new int[3];
diff --git
a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
index 701d70876bb..f19457d9ae8 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
@@ -2858,10 +2858,9 @@ public class MXParser implements XmlPullParser {
if (!compact) {
// freeSpace
// if at least half of buffer can be reclaimed -->
worthwhile effort!!!
+ // else less than half buffer available for compacting -->
expand instead!!!
if (bufStart >= buf.length / 2) {
compact = true;
- } else {
- // less than half buffer available for compacting -->
expand instead!!!
}
}
}
