Skip to content

CAMEL-24300: camel-aws2-ec2 - throw when pojoRequest=true and the body is the wrong type #25215

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 29, 2026
Merged

CAMEL-24300: camel-aws2-ec2 - throw when pojoRequest=true and the body is the wrong type #25215

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
5 changes: 5 additions & 0 deletions components/camel-aws/camel-aws2-ec2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,10 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
27 changes: 27 additions & 0 deletions ...aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Producer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ private void createAndRunInstance(Ec2Client ec2Client, Exchange exchange) throws
LOG.trace("Creating and running instances requests performing");
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"createAndRunInstances operation requires RunInstancesRequest in POJO mode");
}
} else {
RunInstancesRequest.Builder builder = RunInstancesRequest.builder();
Expand Down Expand Up @@ -251,6 +254,9 @@ private void startInstances(Ec2Client ec2Client, Exchange exchange) throws Inval
LOG.trace("Starting instances with Ids [{}] ", startInstancesRequest.instanceIds());
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"startInstances operation requires StartInstancesRequest in POJO mode");
}
} else {
StartInstancesRequest.Builder builder = StartInstancesRequest.builder();
Expand Down Expand Up @@ -293,6 +299,9 @@ private void stopInstances(Ec2Client ec2Client, Exchange exchange) throws Invali
LOG.trace("Stopping instances with Ids [{}] ", stopInstancesRequest.instanceIds());
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"stopInstances operation requires StopInstancesRequest in POJO mode");
}
} else {
StopInstancesRequest.Builder builder = StopInstancesRequest.builder();
Expand Down Expand Up @@ -335,6 +344,9 @@ private void terminateInstances(Ec2Client ec2Client, Exchange exchange) throws I
LOG.trace("Terminating instances with Ids [{}] ", terminateInstancesRequest.instanceIds());
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"terminateInstances operation requires TerminateInstancesRequest in POJO mode");
}
} else {
TerminateInstancesRequest.Builder builder = TerminateInstancesRequest.builder();
Expand Down Expand Up @@ -434,6 +446,9 @@ private void rebootInstances(Ec2Client ec2Client, Exchange exchange) throws Inva
LOG.trace("Reboot Instances command returned the error code {}", ase.awsErrorDetails().errorCode());
throw ase;
}
} else {
throw new IllegalArgumentException(
"rebootInstances operation requires RebootInstancesRequest in POJO mode");
}
} else {
RebootInstancesRequest.Builder builder = RebootInstancesRequest.builder();
Expand Down Expand Up @@ -472,6 +487,9 @@ private void monitorInstances(Ec2Client ec2Client, Exchange exchange) throws Inv
LOG.trace("Start Monitoring instances with Ids [{}] ", monitorInstancesRequest.instanceIds());
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"monitorInstances operation requires MonitorInstancesRequest in POJO mode");
}
} else {
MonitorInstancesRequest.Builder builder = MonitorInstancesRequest.builder();
Expand Down Expand Up @@ -514,6 +532,9 @@ private void unmonitorInstances(Ec2Client ec2Client, Exchange exchange) throws I
LOG.trace("Stop Monitoring instances with Ids [{}] ", unmonitorInstancesRequest.instanceIds());
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"unmonitorInstances operation requires UnmonitorInstancesRequest in POJO mode");
}
} else {
UnmonitorInstancesRequest.Builder builder = UnmonitorInstancesRequest.builder();
Expand Down Expand Up @@ -556,6 +577,9 @@ private void createTags(Ec2Client ec2Client, Exchange exchange) throws InvalidPa
LOG.trace("Created tags [{}] ", createTagsRequest.tags());
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"createTags operation requires CreateTagsRequest in POJO mode");
}
} else {
Collection<Tag> tags;
Expand Down Expand Up @@ -605,6 +629,9 @@ private void deleteTags(Ec2Client ec2Client, Exchange exchange) throws InvalidPa
LOG.trace("Delete tags [{}] ", deleteTagsRequest.tags());
Message message = getMessageForResponse(exchange);
message.setBody(result);
} else {
throw new IllegalArgumentException(
"deleteTags operation requires DeleteTagsRequest in POJO mode");
}
} else {
Collection<Tag> tags;
Expand Down
37 changes: 37 additions & 0 deletions ...aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import software.amazon.awssdk.services.ec2.model.DescribeInstanceStatusResponse;
import software.amazon.awssdk.services.ec2.model.DescribeInstancesResponse;
import software.amazon.awssdk.services.ec2.model.InstanceStateName;
Expand All @@ -40,6 +42,7 @@
import software.amazon.awssdk.services.ec2.model.TerminateInstancesResponse;
import software.amazon.awssdk.services.ec2.model.UnmonitorInstancesResponse;

import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;

Expand Down Expand Up @@ -256,6 +259,24 @@ public void process(Exchange exchange) {
assertEquals(MonitoringState.DISABLED, resultGet.instanceMonitorings().get(0).monitoring().state());
}

@ParameterizedTest
@CsvSource({
"direct:createAndRunPojo,createAndRunInstances operation requires RunInstancesRequest in POJO mode",
"direct:startPojo,startInstances operation requires StartInstancesRequest in POJO mode",
"direct:stopPojo,stopInstances operation requires StopInstancesRequest in POJO mode",
"direct:terminatePojo,terminateInstances operation requires TerminateInstancesRequest in POJO mode",
"direct:rebootPojo,rebootInstances operation requires RebootInstancesRequest in POJO mode",
"direct:monitorPojo,monitorInstances operation requires MonitorInstancesRequest in POJO mode",
"direct:unmonitorPojo,unmonitorInstances operation requires UnmonitorInstancesRequest in POJO mode",
"direct:createTagsPojo,createTags operation requires CreateTagsRequest in POJO mode",
"direct:deleteTagsPojo,deleteTags operation requires DeleteTagsRequest in POJO mode",
})
void pojoRequestWithWrongBodyTypeThrows(String route, String expectedMessage) {
assertThatThrownBy(() -> template.requestBody(route, "not the expected request type"))
.hasRootCauseInstanceOf(IllegalArgumentException.class)
.hasRootCauseMessage(expectedMessage);
}

@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
Expand Down Expand Up @@ -288,6 +309,22 @@ public void configure() {
.to("mock:result");
from("direct:deleteTags").to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=deleteTags")
.to("mock:result");
from("direct:startPojo")
.to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=startInstances&pojoRequest=true");
from("direct:stopPojo")
.to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=stopInstances&pojoRequest=true");
from("direct:terminatePojo")
.to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=terminateInstances&pojoRequest=true");
from("direct:rebootPojo")
.to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=rebootInstances&pojoRequest=true");
from("direct:monitorPojo")
.to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=monitorInstances&pojoRequest=true");
from("direct:unmonitorPojo")
.to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=unmonitorInstances&pojoRequest=true");
from("direct:createTagsPojo")
.to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=createTags&pojoRequest=true");
from("direct:deleteTagsPojo")
.to("aws2-ec2://test?amazonEc2Client=#amazonEc2Client&operation=deleteTags&pojoRequest=true");
}
};
}
Expand Down