Skip to content

Cross-build java-extensions-avro with Avro 1.12 #38109

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

Open
cjordn wants to merge 9 commits into
base: master
Choose a base branch
from
+7 −1
Open

Cross-build java-extensions-avro with Avro 1.12 #38109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5ea184
Add Avro version 1.12.0 to build.gradle
cjordn Apr 8, 2026
c63806e
Update AvroUtilsTest.java
cjordn Apr 8, 2026
067969a
Update AvroUtilsTest.java
cjordn Apr 8, 2026
efdc40a
Updating to Avro 1.12.1
cjordn Apr 8, 2026
fefe497
Revert "Updating to Avro 1.12.1"
cjordn Apr 8, 2026
8da54c3
Update AvroUtilsTest.java
cjordn Apr 8, 2026
70dff9a
Update AvroUtilsTest.java
cjordn Apr 8, 2026
869edde
retrigger CI
cjordn Apr 9, 2026
89da936
retrigger CI
cjordn Apr 9, 2026
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
1 change: 1 addition & 0 deletions sdks/java/extensions/avro/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def avroVersions = [
'182' : "1.8.2",
'192' : "1.9.2",
'1102': "1.10.2",
'1120': "1.12.0",
]

avroVersions.each { k, v ->
Expand Down
7 changes: 6 additions & 1 deletion ...s/avro/src/test/java/org/apache/beam/sdk/extensions/avro/schemas/utils/AvroUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.pholser.junit.quickcheck.From;
import com.pholser.junit.quickcheck.Property;
import com.pholser.junit.quickcheck.runner.JUnitQuickcheck;
Expand Down Expand Up @@ -284,10 +285,14 @@ public void avroToBeamRoundTrip(
Iterable iterable = randomData(avroSchema, 10);
List<GenericRecord> records = Lists.newArrayList((Iterable<GenericRecord>) iterable);

// Use JSON tree comparison to avoid Avro 1.12.0 GenericRecord.equals() throwing
// "Can't compare maps!" for records with nested map types
// (see AVRO-4139)
ObjectMapper mapper = new ObjectMapper();
for (GenericRecord record : records) {
Row row = AvroUtils.toBeamRowStrict(record, schema);
GenericRecord out = AvroUtils.toGenericRecord(row, avroSchema);
assertEquals(record, out);
assertEquals(mapper.readTree(record.toString()), mapper.readTree(out.toString()));
}
}

Expand Down
Loading