Upgrade to Avro 1.12 #38373
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ | |
| import static org.apache.avro.file.DataFileConstants.NULL_CODEC; | ||
| import static org.apache.avro.file.DataFileConstants.SNAPPY_CODEC; | ||
| import static org.apache.avro.file.DataFileConstants.XZ_CODEC; | ||
| import static org.apache.beam.sdk.extensions.avro.schemas.utils.AvroUtils.VERSION_AVRO; | ||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
|
|
@@ -40,9 +41,6 @@ | |
| /** Tests of SerializableAvroCodecFactory. */ | ||
| @RunWith(JUnit4.class) | ||
| public class SerializableAvroCodecFactoryTest { | ||
| private static final List<String> avroCodecs = new ArrayList<>(); | ||
|
|
||
| static { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,15 +17,14 @@ | |
| */ | ||
| package org.apache.beam.sdk.extensions.avro.schemas; | ||
|
|
||
| import static org.apache.beam.sdk.extensions.avro.schemas.utils.AvroUtils.VERSION_AVRO; | ||
|
|
||
| import java.lang.reflect.Constructor; | ||
| import org.joda.time.LocalDate; | ||
|
|
||
| /** Create a {@link TestAvroConversion} instance with different constructors. */ | ||
| public class TestAvroConversionFactory { | ||
|
|
||
| public static TestAvroConversion newInstance(LocalDate date) throws Exception { | ||
| if (VERSION_AVRO.equals("1.8.2")) { | ||
| Constructor<?> constructor = TestAvroConversion.class.getDeclaredConstructor(LocalDate.class); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,11 +17,12 @@ | |
| */ | ||
| package org.apache.beam.sdk.extensions.avro.schemas; | ||
|
|
||
| import static org.apache.beam.sdk.extensions.avro.schemas.utils.AvroUtils.VERSION_AVRO; | ||
|
|
||
| import java.lang.reflect.Constructor; | ||
| import java.nio.ByteBuffer; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.joda.time.DateTime; | ||
| import org.joda.time.LocalDate; | ||
| import org.slf4j.Logger; | ||
|
|
@@ -30,7 +31,6 @@ | |
| /** Create a {@link TestAvro} instance with different constructors. */ | ||
| public class TestAvroFactory { | ||
| private static final Logger LOG = LoggerFactory.getLogger(TestAvroFactory.class); | ||
|
|
||
| public static TestAvro newInstance( | ||
| Boolean boolNonNullable, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ | |
| */ | ||
| package org.apache.beam.sdk.extensions.avro.schemas.utils; | ||
|
|
||
| import static org.apache.beam.sdk.extensions.avro.schemas.utils.AvroUtils.VERSION_AVRO; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
@@ -86,9 +87,6 @@ public class AvroUtilsTest { | |
| private static final org.apache.avro.Schema NULL_SCHEMA = | ||
| org.apache.avro.Schema.create(org.apache.avro.Schema.Type.NULL); | ||
|
|
||
| private Iterable<?> randomData(org.apache.avro.Schema schema, int maxLength) throws Exception { | ||
| Iterable<?> data; | ||
| if (VERSION_AVRO.equals("1.8.2")) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,8 +35,6 @@ applyJavaNature( | |
| configurations.runtimeClasspath { | ||
| // Pin kafka-clients version due to <3.4.0 missing auth callback classes. | ||
| resolutionStrategy.force 'org.apache.kafka:kafka-clients:3.9.0' | ||
| // force parquet-avro:1.15.2 to fix CVE-2025-46762 | ||
| resolutionStrategy.force 'org.apache.parquet:parquet-avro:1.15.2' | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,12 +26,6 @@ applyJavaNature( | |
| shadowClosure: {}, | ||
| ) | ||
|
|
||
| description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform :: Expansion Service" | ||
| ext.summary = "Expansion service serving GCP Java IOs" | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
getImplementationVersion()method can returnnullif the manifest information is not available (e.g., when running tests in certain IDEs or environments). SinceVERSION_AVROis used in comparisons likeVERSION_AVRO.equals("1.8.2")in other classes (e.g.,TestAvroConversionFactory), this could lead to aNullPointerException. It is safer to handle the null case here by providing a default value like an empty string.