You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/01/04 16:21:09 UTC
[camel] branch master updated: CAMEL-14020 - Migrate deprecate
getOut to getMessage in tests, camel-aws-ec2
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 18553fe CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-ec2
18553fe is described below
commit 18553fe7666198a8ee661d9724725348ba981d23
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Jan 4 17:18:19 2020 +0100
CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-ec2
---
.../apache/camel/component/aws/ec2/EC2Producer.java | 7 +------
.../component/aws/ec2/EC2ComponentSpringTest.java | 18 +++++++++---------
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
index c9f3050..371b2d0 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
@@ -417,11 +417,6 @@ public class EC2Producer extends DefaultProducer {
}
public static Message getMessageForResponse(final Exchange exchange) {
- if (exchange.getPattern().isOutCapable()) {
- Message out = exchange.getOut();
- out.copyFrom(exchange.getIn());
- return out;
- }
- return exchange.getIn();
+ return exchange.getMessage();
}
}
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
index 27c1be5..1250f42 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
@@ -52,7 +52,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- RunInstancesResult resultGet = (RunInstancesResult)exchange.getOut().getBody();
+ RunInstancesResult resultGet = (RunInstancesResult)exchange.getMessage().getBody();
assertEquals(resultGet.getReservation().getInstances().get(0).getImageId(), "test-1");
assertEquals(resultGet.getReservation().getInstances().get(0).getInstanceType(), InstanceType.T2Micro.toString());
assertEquals(resultGet.getReservation().getInstances().get(0).getInstanceId(), "instance-1");
@@ -73,7 +73,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- RunInstancesResult resultGet = (RunInstancesResult)exchange.getOut().getBody();
+ RunInstancesResult resultGet = (RunInstancesResult)exchange.getMessage().getBody();
assertEquals(resultGet.getReservation().getInstances().get(0).getImageId(), "test-1");
assertEquals(resultGet.getReservation().getInstances().get(0).getInstanceType(), InstanceType.T2Micro.toString());
assertEquals(resultGet.getReservation().getInstances().get(0).getInstanceId(), "instance-1");
@@ -94,7 +94,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- StartInstancesResult resultGet = (StartInstancesResult)exchange.getOut().getBody();
+ StartInstancesResult resultGet = (StartInstancesResult)exchange.getMessage().getBody();
assertEquals(resultGet.getStartingInstances().get(0).getInstanceId(), "test-1");
assertEquals(resultGet.getStartingInstances().get(0).getPreviousState().getName(), InstanceStateName.Stopped.toString());
assertEquals(resultGet.getStartingInstances().get(0).getCurrentState().getName(), InstanceStateName.Running.toString());
@@ -112,7 +112,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- StopInstancesResult resultGet = (StopInstancesResult)exchange.getOut().getBody();
+ StopInstancesResult resultGet = (StopInstancesResult)exchange.getMessage().getBody();
assertEquals(resultGet.getStoppingInstances().get(0).getInstanceId(), "test-1");
assertEquals(resultGet.getStoppingInstances().get(0).getPreviousState().getName(), InstanceStateName.Running.toString());
assertEquals(resultGet.getStoppingInstances().get(0).getCurrentState().getName(), InstanceStateName.Stopped.toString());
@@ -130,7 +130,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- TerminateInstancesResult resultGet = (TerminateInstancesResult)exchange.getOut().getBody();
+ TerminateInstancesResult resultGet = (TerminateInstancesResult)exchange.getMessage().getBody();
assertEquals(resultGet.getTerminatingInstances().get(0).getInstanceId(), "test-1");
assertEquals(resultGet.getTerminatingInstances().get(0).getPreviousState().getName(), InstanceStateName.Running.toString());
assertEquals(resultGet.getTerminatingInstances().get(0).getCurrentState().getName(), InstanceStateName.Terminated.toString());
@@ -149,7 +149,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- DescribeInstancesResult resultGet = (DescribeInstancesResult)exchange.getOut().getBody();
+ DescribeInstancesResult resultGet = (DescribeInstancesResult)exchange.getMessage().getBody();
assertEquals(resultGet.getReservations().size(), 1);
assertEquals(resultGet.getReservations().get(0).getInstances().size(), 1);
}
@@ -169,7 +169,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
assertMockEndpointsSatisfied();
- DescribeInstanceStatusResult resultGet = (DescribeInstanceStatusResult)exchange.getOut().getBody();
+ DescribeInstanceStatusResult resultGet = (DescribeInstanceStatusResult)exchange.getMessage().getBody();
assertEquals(resultGet.getInstanceStatuses().size(), 1);
assertEquals(resultGet.getInstanceStatuses().get(0).getInstanceState().getName(), InstanceStateName.Running.toString());
}
@@ -201,7 +201,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- MonitorInstancesResult resultGet = (MonitorInstancesResult)exchange.getOut().getBody();
+ MonitorInstancesResult resultGet = (MonitorInstancesResult)exchange.getMessage().getBody();
assertEquals(resultGet.getInstanceMonitorings().size(), 1);
assertEquals(resultGet.getInstanceMonitorings().get(0).getInstanceId(), "test-1");
@@ -221,7 +221,7 @@ public class EC2ComponentSpringTest extends CamelSpringTestSupport {
}
});
- UnmonitorInstancesResult resultGet = (UnmonitorInstancesResult)exchange.getOut().getBody();
+ UnmonitorInstancesResult resultGet = (UnmonitorInstancesResult)exchange.getMessage().getBody();
assertEquals(resultGet.getInstanceMonitorings().size(), 1);
assertEquals(resultGet.getInstanceMonitorings().get(0).getInstanceId(), "test-1");