Skip to content

CAMEL-24277: camel-aws2-msk - throw when pojoRequest=true and the body is the wrong type #25170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oscerd merged 1 commit into from
Jul 28, 2026
Merged

CAMEL-24277: camel-aws2-msk - throw when pojoRequest=true and the body is the wrong type #25170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...el-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Producer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ private void listClusters(KafkaClient mskClient, Exchange exchange) throws Inval
message.setBody(result);
message.setHeader(MSK2Constants.NEXT_TOKEN, result.nextToken());
message.setHeader(MSK2Constants.IS_TRUNCATED, ObjectHelper.isNotEmpty(result.nextToken()));
} else {
throw new IllegalArgumentException(
"listClusters operation requires ListClustersRequest in POJO mode");
}
} else {
ListClustersRequest.Builder builder = ListClustersRequest.builder();
Expand Down Expand Up @@ -157,6 +160,9 @@ private void createCluster(KafkaClient mskClient, Exchange exchange) throws Inva
}
Message message = getMessageForResponse(exchange);
message.setBody(response);
} else {
throw new IllegalArgumentException(
"createCluster operation requires CreateClusterRequest in POJO mode");
}
} else {
CreateClusterRequest.Builder builder = CreateClusterRequest.builder();
Expand Down Expand Up @@ -212,6 +218,9 @@ private void deleteCluster(KafkaClient mskClient, Exchange exchange) throws Inva
}
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"deleteCluster operation requires DeleteClusterRequest in POJO mode");
}
} else {
DeleteClusterRequest.Builder builder = DeleteClusterRequest.builder();
Expand Down Expand Up @@ -246,6 +255,9 @@ private void describeCluster(KafkaClient mskClient, Exchange exchange) throws In
}
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"describeCluster operation requires DescribeClusterRequest in POJO mode");
}
} else {
DescribeClusterRequest.Builder builder = DescribeClusterRequest.builder();
Expand Down
34 changes: 34 additions & 0 deletions ...aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,34 @@ public void process(Exchange exchange) {
assertEquals(ClusterState.ACTIVE.name(), resultGet.clusterInfo().state().toString());
}

@Test
void listClustersWithPojoRequestAndWrongBodyTypeThrows() {
assertThatThrownBy(() -> template.requestBody("direct:listClustersPojo", "not a ListClustersRequest"))
.hasRootCauseInstanceOf(IllegalArgumentException.class)
.hasRootCauseMessage("listClusters operation requires ListClustersRequest in POJO mode");
}

@Test
void createClusterWithPojoRequestAndWrongBodyTypeThrows() {
assertThatThrownBy(() -> template.requestBody("direct:createClusterPojo", "not a CreateClusterRequest"))
.hasRootCauseInstanceOf(IllegalArgumentException.class)
.hasRootCauseMessage("createCluster operation requires CreateClusterRequest in POJO mode");
}

@Test
void deleteClusterWithPojoRequestAndWrongBodyTypeThrows() {
assertThatThrownBy(() -> template.requestBody("direct:deleteClusterPojo", "not a DeleteClusterRequest"))
.hasRootCauseInstanceOf(IllegalArgumentException.class)
.hasRootCauseMessage("deleteCluster operation requires DeleteClusterRequest in POJO mode");
}

@Test
void describeClusterWithPojoRequestAndWrongBodyTypeThrows() {
assertThatThrownBy(() -> template.requestBody("direct:describeClusterPojo", "not a DescribeClusterRequest"))
.hasRootCauseInstanceOf(IllegalArgumentException.class)
.hasRootCauseMessage("describeCluster operation requires DescribeClusterRequest in POJO mode");
}

@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
Expand All @@ -165,6 +193,12 @@ public void configure() {
.to("mock:result");
from("direct:describeCluster").to("aws2-msk://test?mskClient=#amazonMskClient&operation=describeCluster")
.to("mock:result");
from("direct:createClusterPojo")
.to("aws2-msk://test?mskClient=#amazonMskClient&operation=createCluster&pojoRequest=true");
from("direct:deleteClusterPojo")
.to("aws2-msk://test?mskClient=#amazonMskClient&operation=deleteCluster&pojoRequest=true");
from("direct:describeClusterPojo")
.to("aws2-msk://test?mskClient=#amazonMskClient&operation=describeCluster&pojoRequest=true");
}
};
}
Expand Down
Loading