8000 Avro Compact Format by alexec · Pull Request #578 · cloudevents/sdk-java · GitHub
[go: up one dir, main page]
Skip to content

Avro Compact Format #578

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 29 commits into from
Jul 20, 2023
Merged

Avro Compact Format #578

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
989c0fa
feat: Add Avro EvenFormat
alexec Apr 7, 2023
3d055ae
docs
alexec Apr 7, 2023
ad728dd
docs
alexec Apr 7, 2023
80b4de7
fix: simpler
alexec Apr 13, 2023
663a050
use fields
alexec Apr 13, 2023
3338bf6
fix: tidy
alexec Apr 18, 2023
6c30e27
fix: change to long
alexec Apr 20, 2023
21aea4c
fix: simplify
alexec Apr 20, 2023
9e0a4c7
Refactor to Facilitate Decoupling from Concrete Implementations of Ev…
skepticoitusInteruptus Apr 21, 2023
a18e04d
feat: add rocketmq binding (#554)
aaron-ai May 23, 2023
98d6b90
Bump to 3.0.0-SNAPSHOT (#571)
github-actions[bot] May 23, 2023
5c44a32
Bump maven-gpg-plugin from 1.6 to 3.1.0 (#564)
dependabot[bot] May 23, 2023
eceb42a
fix: avroturbo
alexec Jun 6, 2023
274df7a
Merge branch 'master' into avro
alexec Jun 6, 2023
aafa403
ok
alexec Jun 6, 2023
659bfe9
ok
alexec Jun 6, 2023
6a36420
ok
alexec Jun 6, 2023
846d64c
ok
alexec Jun 6, 2023
5842be2
ok
alexec Jun 6, 2023
e9397bd
ok
alexec Jun 6, 2023
d2149f9
ok
alexec Jun 7, 2023
1e5d61a
turbo -> compact
alexec Jun 21, 2023
9d70377
ok
alexec Jun 21, 2023
d579575
ok
alexec Jun 29, 2023
8fc3ae6
bump Avro version
alexec Jul 7, 2023
4a75921
Update docs/avro.md
alexec Jul 14, 2023
68501d3
Update formats/avro-compact/pom.xml
alexec Jul 14, 2023
c080666
Update formats/avro-compact/pom.xml
alexec Jul 14, 2023
0d853ab
ok
alexec Jul 14, 2023
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
Prev Previous commit
Next Next commit
fix: change to long 
Signed-off-by: Alex Collins <alex_collins@intuit.com>
  • Loading branch information
@alexec
alexec committed Jun 6, 2023
commit 6c30e27d144b48d040bbbbc67e40af2f6fc5616c
26 changes: 21 additions & 5 deletions formats/avro/src/main/avro/cloudevents.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"version": "1.0",
"doc": "Avro Event Format for CloudEvents",
"fields": [
{
{
"name": "id",
"type": "string"
},
Expand All @@ -19,19 +19,35 @@
},
{
"name": "datacontenttype",
"type": ["null", "string"]
"type": [
"null",
"string"
],
"default": null
},
{
"name": "dataschema",
"type": ["null", "string"]
"type": [
"null",
"string"
],
"default": null
},
{
"name": "subject",
"type": ["null", "string"]
"type": [
"null",
"string"
],
"default": null
},
{
"name": "time",
"type": ["null", "string"]
"type": [
"null",
"long"
],
"default": null
},
{
"name": "attribute",
Expand Down
6 changes: 4 additions & 2 deletions formats/avro/src/main/java/io/cloudevents/avro/AvroFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@

import java.net.URI;
import java.nio.ByteBuffer;
import java.time.Instant;
import java.time.ZoneOffset;
import java.util.HashMap;
import java.util.Map;

Expand Down Expand Up @@ -64,7 +66,7 @@ public byte[] serialize(CloudEvent ce) throws EventSerializationException {
.setAttribute(attribute);

if (ce.getTime() != null)
builder.setTime(Time.writeTime(ce.getTime()));
builder.setTime(ce.getTime().toInstant().toEpochMilli());
if (ce.getDataSchema() != null)
builder.setDataschema(ce.getDataSchema().toString());

Expand All @@ -89,7 +91,7 @@ public CloudEvent deserialize(byte[] bytes, CloudEventDataMapper<? extends Cloud
.withDataContentType(avroCe.getDatacontenttype());

if (avroCe.getTime() != null)
builder.withTime(Time.parseTime(avroCe.getTime()));
builder.withTime(Instant.ofEpochMilli(avroCe.getTime()).atOffset(ZoneOffset.UTC));
if (avroCe.getDataschema() != null)
builder.withDataSchema(URI.create(avroCe.getDataschema()));

Expand Down
4 changes: 3 additions & 1 deletion formats/avro/src/test/java/io/cloudevents/avro/AvroFormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
import org.junit.jupiter.api.Test;

import java.net.URI;
import java.time.Instant;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.Collections;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -52,7 +54,7 @@ void format() {
.withSource(URI.create(""))
.withType("")
// optional
.withTime(OffsetDateTime.MIN)
.withTime(Instant.EPOCH.atOffset(ZoneOffset.UTC))
.withSubject("")
.withDataSchema(URI.create(""))
// extension
Expand Down
0