This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 40729612a48a fix(components): aws potential NPE and class name
hardening
40729612a48a is described below
commit 40729612a48a86a2e9f12a4e7b553feb178e0188
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Wed Dec 10 10:54:21 2025 +0100
fix(components): aws potential NPE and class name hardening
Additionally minor compilation warnings.
---
.../java/org/apache/camel/component/aws2/s3/AWS2S3Console.java | 4 ++--
.../camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java | 7 ++-----
.../aws2/s3/integration/S3CreateDownloadLinkOperationIT.java | 1 -
.../S3CreateDownloadLinkWithProvidedPresignerOperationIT.java | 1 -
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Console.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Console.java
index b205d40a25e1..1d7a957274de 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Console.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Console.java
@@ -40,7 +40,7 @@ public class AWS2S3Console extends AbstractDevConsole {
List<Consumer> list = getCamelContext().getRoutes()
.stream().map(Route::getConsumer)
- .filter(c ->
AWS2S3Consumer.class.getName().equals(c.getClass().getName()))
+ .filter(c -> c instanceof AWS2S3Consumer)
.collect(Collectors.toList());
sb.append(String.format(" %s:%s:%s:%s:%s:%s:%s\n", "bucket",
"accessKeys", "defaultCredentialsProvider",
@@ -62,7 +62,7 @@ public class AWS2S3Console extends AbstractDevConsole {
List<Consumer> list = getCamelContext().getRoutes()
.stream().map(Route::getConsumer)
- .filter(c ->
AWS2S3Consumer.class.getName().equals(c.getClass().getName()))
+ .filter(c -> c instanceof AWS2S3Consumer)
.collect(Collectors.toList());
List<JsonObject> arr = new ArrayList<>();
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 87acfcec40be..cd3a0905975e 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
@@ -182,8 +182,7 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
maxRead -= uploadAggregate.buffer.size();
}
- while ((b = AWS2S3Utils.toByteArray(is, maxRead)).length
- > 0) {
+ while ((b = AWS2S3Utils.toByteArray(is, maxRead)) != null && b.length
> 0) {
totalSize += b.length;
if (getConfiguration().isMultiPartUpload())
maxRead -= b.length;
@@ -325,7 +324,6 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
long timestampWindow = getTimestampWindow(messageTimestamp);
byte[] b;
- int totalSize = 0;
int maxRead = (getConfiguration().isMultiPartUpload()
? Math.toIntExact(getConfiguration().getPartSize()) :
getConfiguration().getBufferSize());
@@ -336,8 +334,7 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
maxRead -= state.buffer.size();
}
- while ((b = AWS2S3Utils.toByteArray(is, maxRead)).length > 0) {
- totalSize += b.length;
+ while ((b = AWS2S3Utils.toByteArray(is, maxRead)) != null && b.length
> 0) {
if (getConfiguration().isMultiPartUpload())
maxRead -= b.length;
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkOperationIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkOperationIT.java
index 45c37a803da5..ccb79444cee3 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkOperationIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkOperationIT.java
@@ -38,7 +38,6 @@ public class S3CreateDownloadLinkOperationIT extends
Aws2S3Base {
@EndpointInject("mock:result")
private MockEndpoint result;
- @SuppressWarnings("unchecked")
@Test
public void sendIn() throws Exception {
result.expectedMessageCount(1);
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
index 4cc97593d38a..4db9492025ad 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
@@ -48,7 +48,6 @@ public class
S3CreateDownloadLinkWithProvidedPresignerOperationIT extends Aws2S3
@EndpointInject("mock:result")
private MockEndpoint result;
- @SuppressWarnings("unchecked")
@Test
public void sendIn() throws Exception {
result.expectedMessageCount(1);
