Skip to content

Add support for tumbling windows events serialization #342

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
merged 1 commit into from
May 30, 2022
Merged

Add support for tumbling windows events serialization #342

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
17 changes: 17 additions & 0 deletions ...va/com/amazonaws/services/lambda/runtime/serialization/events/LambdaEventSerializers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.CodeCommitEventMixin;
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.ConnectEventMixin;
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.DynamodbEventMixin;
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.DynamodbTimeWindowEventMixin;
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.KinesisEventMixin;
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.KinesisTimeWindowEventMixin;
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.SNSEventMixin;
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.SQSEventMixin;
import com.amazonaws.services.lambda.runtime.serialization.events.mixins.ScheduledEventMixin;
Expand Down Expand Up @@ -63,8 +65,10 @@ public class LambdaEventSerializers {
"com.amazonaws.services.lambda.runtime.events.ConfigEvent",
"com.amazonaws.services.lambda.runtime.events.ConnectEvent",
"com.amazonaws.services.lambda.runtime.events.DynamodbEvent",
"com.amazonaws.services.lambda.runtime.events.DynamodbTimeWindowEvent",
"com.amazonaws.services.lambda.runtime.events.IoTButtonEvent",
"com.amazonaws.services.lambda.runtime.events.KinesisEvent",
"com.amazonaws.services.lambda.runtime.events.KinesisTimeWindowEvent",
"com.amazonaws.services.lambda.runtime.events.KinesisFirehoseEvent",
"com.amazonaws.services.lambda.runtime.events.LambdaDestinationEvent",
"com.amazonaws.services.lambda.runtime.events.LexEvent",
Expand Down Expand Up @@ -128,10 +132,14 @@ public class LambdaEventSerializers {
DynamodbEventMixin.AttributeValueMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.models.dynamodb.AttributeValue",
DynamodbEventMixin.AttributeValueMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.DynamodbTimeWindowEvent",
DynamodbTimeWindowEventMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.KinesisEvent",
KinesisEventMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.KinesisEvent$Record",
KinesisEventMixin.RecordMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.KinesisTimeWindowEvent",
KinesisTimeWindowEventMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ScheduledEvent",
ScheduledEventMixin.class),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.SecretsManagerRotationEvent",
Expand Down Expand Up @@ -172,6 +180,15 @@ public class LambdaEventSerializers {
"com.amazonaws.services.lambda.runtime.events.models.dynamodb.StreamRecord",
"com.amazonaws.services.dynamodbv2.model.StreamRecord"),
new NestedClass("com.amazonaws.services.lambda.runtime.events.DynamodbEvent$DynamodbStreamRecord"))),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.DynamodbTimeWindowEvent",
Arrays.asList(
new AlternateNestedClass(
"com.amazonaws.services.lambda.runtime.events.models.dynamodb.AttributeValue",
"com.amazonaws.services.dynamodbv2.model.AttributeValue"),
new AlternateNestedClass(
"com.amazonaws.services.lambda.runtime.events.models.dynamodb.StreamRecord",
"com.amazonaws.services.dynamodbv2.model.StreamRecord"),
new NestedClass("com.amazonaws.services.lambda.runtime.events.DynamodbEvent$DynamodbStreamRecord"))),
new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.KinesisEvent",
Arrays.asList(
new NestedClass("com.amazonaws.services.lambda.runtime.events.KinesisEvent$Record"))),
Expand Down
14 changes: 14 additions & 0 deletions ...aws/services/lambda/runtime/serialization/events/mixins/DynamodbTimeWindowEventMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*/

package com.amazonaws.services.lambda.runtime.serialization.events.mixins;

import com.fasterxml.jackson.annotation.JsonProperty;

public abstract class DynamodbTimeWindowEventMixin extends DynamodbEventMixin {

// needed because Jackson expects "eventSourceArn" instead of "eventSourceARN"
@JsonProperty("eventSourceARN") abstract String getEventSourceArn();
@JsonProperty("eventSourceARN") abstract void setEventSourceArn(String eventSourceArn);
}
14 changes: 14 additions & 0 deletions ...naws/services/lambda/runtime/serialization/events/mixins/KinesisTimeWindowEventMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*/

package com.amazonaws.services.lambda.runtime.serialization.events.mixins;

import com.fasterxml.jackson.annotation.JsonProperty;

public abstract class KinesisTimeWindowEventMixin extends KinesisEventMixin {

// needed because Jackson expects "eventSourceArn" instead of "eventSourceARN"
@JsonProperty("eventSourceARN") abstract String getEventSourceArn();
@JsonProperty("eventSourceARN") abstract void setEventSourceArn(String eventSourceArn);
}
2 changes: 2 additions & 0 deletions ...om/amazonaws/services/lambda/runtime/serialization/events/LambdaEventSerializersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ private static Stream<Arguments> serdeArguments() {
Arguments.of("cognito_event.json", CognitoEvent.class),
Arguments.of("config_event.json", ConfigEvent.class),
Arguments.of("dynamodb_event.json", DynamodbEvent.class),
Arguments.of("dynamodb_time_window_event.json", DynamodbTimeWindowEvent.class),
Arguments.of("iot_button_event.json", IoTButtonEvent.class),
Arguments.of("kinesis_analytics_firehose_input_preprocessing_event.json", KinesisAnalyticsFirehoseInputPreprocessingEvent.class),
Arguments.of("kinesis_analytics_input_preprocessing_response_event.json", KinesisAnalyticsInputPreprocessingResponse.class),
Arguments.of("kinesis_analytics_output_delivery_event.json", KinesisAnalyticsOutputDeliveryEvent.class),
Arguments.of("kinesis_analytics_output_delivery_response_event.json", KinesisAnalyticsOutputDeliveryResponse.class),
Arguments.of("kinesis_analytics_streams_input_preprocessing_event.json", KinesisAnalyticsStreamsInputPreprocessingEvent.class),
Arguments.of("kinesis_event.json", KinesisEvent.class),
Arguments.of("kinesis_time_window_event.json", KinesisTimeWindowEvent.class),
Arguments.of("kinesis_firehose_event.json", KinesisFirehoseEvent.class),
Arguments.of("lex_event.json", LexEvent.class),
Arguments.of("s3_event.json", S3Event.class),
Expand Down
101 changes: 101 additions & 0 deletions ...lambda-java-serialization/src/test/resources/event_models/dynamodb_time_window_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"Records": [
{
"eventID": "1",
"eventName": "INSERT",
"eventVersion": "1.0",
"eventSource": "aws:dynamodb",
"awsRegion": "us-east-1",
"dynamodb": {
"Keys": {
"Id": {
"N": "101"
}
},
"NewImage": {
"Message": {
"S": "New item!"
},
"Id": {
"N": "101"
}
},
"SequenceNumber": "111",
"SizeBytes": 26,
"StreamViewType": "NEW_AND_OLD_IMAGES"
},
"eventSourceARN": "stream-ARN"
},
{
"eventID": "2",
"eventName": "MODIFY",
"eventVersion": "1.0",
"eventSource": "aws:dynamodb",
"awsRegion": "us-east-1",
"dynamodb": {
"Keys": {
"Id": {
"N": "101"
}
},
"NewImage": {
"Message": {
"S": "This item has changed"
},
"Id": {
"N": "101"
}
},
"OldImage": {
"Message": {
"S": "New item!"
},
"Id": {
"N": "101"
}
},
"SequenceNumber": "222",
"SizeBytes": 59,
"StreamViewType": "NEW_AND_OLD_IMAGES"
},
"eventSourceARN": "stream-ARN"
},
{
"eventID": "3",
"eventName": "REMOVE",
"eventVersion": "1.0",
"eventSource": "aws:dynamodb",
"awsRegion": "us-east-1",
"dynamodb": {
"Keys": {
"Id": {
"N": "101"
}
},
"OldImage": {
"Message": {
"S": "This item has changed"
},
"Id": {
"N": "101"
}
},
"SequenceNumber": "333",
"SizeBytes": 38,
"StreamViewType": "NEW_AND_OLD_IMAGES"
},
"eventSourceARN": "stream-ARN"
}
],
"window": {
"start": "2021-10-26T17:00:00Z",
"end": "2021-10-26T17:05:00Z"
},
"state": {
"1": "state1"
},
"shardId": "shard123456789",
"eventSourceARN": "stream-ARN",
"isFinalInvokeForWindow": false,
"isWindowTerminatedEarly": false
}
31 changes: 31 additions & 0 deletions aws-lambda-java-serialization/src/test/resources/event_models/kinesis_time_window_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"Records": [
{
"kinesis": {
"kinesisSchemaVersion": "1.0",
"partitionKey": "1",
"sequenceNumber": "49590338271490256608559692538361571095921575989136588898",
"data": "SGVsbG8sIHRoaXMgaXMgYSB0ZXN0Lg==",
"approximateArrivalTimestamp": 1545084650.987
},
"eventSource": "aws:kinesis",
"eventVersion": "1.0",
"eventID": "shardId-000000000006:49590338271490256608559692538361571095921575989136588898",
"eventName": "aws:kinesis:record",
"invokeIdentityArn": "arn:aws:iam::123456789012:role/lambda-kinesis-role",
"awsRegion": "us-east-2",
"eventSourceARN": "arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream"
}
],
"window": {
"start": "2021-10-26T17:00:00Z",
"end": "2021-10-26T17:05:00Z"
},
"state": {
"1": "state1"
},
"shardId": "shardId-000000000006",
"eventSourceARN": "arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream",
"isFinalInvokeForWindow": false,
"isWindowTerminatedEarly": false
}