Skip to content

[backport camel-4.14.x] CAMEL-24200: camel-aws2-timestream - createScheduledQuery sets the time column correctly #24949

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
davsclaus merged 1 commit into from
Jul 20, 2026
Merged

[backport camel-4.14.x] CAMEL-24200: camel-aws2-timestream - createScheduledQuery sets the time column correctly #24949

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
7 changes: 1 addition & 6 deletions .../main/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,6 @@ private void createScheduledQuery(TimestreamQueryClient timestreamQueryClient, E
= ErrorReportConfiguration.builder().s3Configuration(s3Configuration.build()).build();
builder.errorReportConfiguration(errorReportConfiguration);
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Timestream2Constants.SCHEDULED_QUERY_EXECUTION_ROLE_ARN))) {
String roleArn
= exchange.getIn().getHeader(Timestream2Constants.SCHEDULED_QUERY_EXECUTION_ROLE_ARN, String.class);
builder.scheduledQueryExecutionRoleArn(roleArn);
}

TargetConfiguration.Builder targetConfiguration = TargetConfiguration.builder();
TimestreamConfiguration.Builder timestreamConfigBuilder = TimestreamConfiguration.builder();
Expand All @@ -217,7 +212,7 @@ private void createScheduledQuery(TimestreamQueryClient timestreamQueryClient, E
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Timestream2Constants.TIME_COLUMN))) {
String timeColumn = exchange.getIn().getHeader(Timestream2Constants.TIME_COLUMN, String.class);
timestreamConfigBuilder.tableName(timeColumn);
timestreamConfigBuilder.timeColumn(timeColumn);
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Timestream2Constants.MEASURE_NAME_COLUMN))) {
String measureNameColumn = exchange.getIn().getHeader(Timestream2Constants.MEASURE_NAME_COLUMN, String.class);
Expand Down
10 changes: 10 additions & 0 deletions ...ava/org/apache/camel/component/aws2/timestream/query/AmazonTimestreamQueryClientMock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,18 @@

public class AmazonTimestreamQueryClientMock implements TimestreamQueryClient {

private CreateScheduledQueryRequest lastCreateScheduledQueryRequest;

public AmazonTimestreamQueryClientMock() {
}

/**
* The last request passed to {@link #createScheduledQuery}, so tests can assert how it was built.
*/
public CreateScheduledQueryRequest getLastCreateScheduledQueryRequest() {
return lastCreateScheduledQueryRequest;
}

@Override
public DescribeEndpointsResponse describeEndpoints(DescribeEndpointsRequest describeEndpointsRequest) {
DescribeEndpointsResponse.Builder result = DescribeEndpointsResponse.builder();
Expand All @@ -47,6 +56,7 @@ public CancelQueryResponse cancelQuery(CancelQueryRequest cancelQueryRequest) {

@Override
public CreateScheduledQueryResponse createScheduledQuery(CreateScheduledQueryRequest createScheduledQueryRequest) {
this.lastCreateScheduledQueryRequest = createScheduledQueryRequest;
CreateScheduledQueryResponse.Builder result = CreateScheduledQueryResponse.builder();
result.arn("aws-timestream:test:scheduled-query:arn");
return result.build();
Expand Down
7 changes: 7 additions & 0 deletions ...t/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ public void process(Exchange exchange) {

CreateScheduledQueryResponse resultGet = (CreateScheduledQueryResponse) exchange.getIn().getBody();
assertEquals("aws-timestream:test:scheduled-query:arn", resultGet.arn());

// The time-column header must land in timeColumn and must not overwrite the table name.
TimestreamConfiguration timestreamConfiguration
= clientMock.getLastCreateScheduledQueryRequest().targetConfiguration().timestreamConfiguration();
assertEquals("TESTDB", timestreamConfiguration.databaseName());
assertEquals("TESTTABLE", timestreamConfiguration.tableName());
assertEquals("time", timestreamConfiguration.timeColumn());
}

@Test
Expand Down
Loading