Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "avro"
version = "1.1.0"
version = "1.1.1"
authors = ["Ballerina"]
export=["avro"]
keywords = ["avro", "serialization", "deserialization", "serdes"]
Expand All @@ -18,8 +18,8 @@ graalvmCompatible = true
[[platform.java21.dependency]]
groupId = "io.ballerina.lib"
artifactId = "avro-native"
version = "1.1.0"
path = "../native/build/libs/avro-native-1.1.0.jar"
version = "1.1.1"
path = "../native/build/libs/avro-native-1.1.1-SNAPSHOT.jar"

[[platform.java21.dependency]]
groupId = "org.apache.avro"
Expand Down
2 changes: 1 addition & 1 deletion ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ distribution-version = "2201.11.0"
[[package]]
org = "ballerina"
name = "avro"
version = "1.1.0"
version = "1.1.1"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
Expand Down
24 changes: 24 additions & 0 deletions ballerina/tests/record_tests.bal
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,30 @@ public isolated function testRecords() returns error? {
return verifyOperation(Student, student, schema);
}

@test:Config {
groups: ["record"]
}
public isolated function testRecordsWithAnydataType() returns error? {
string schema = string `
{
"namespace": "example.avro",
"type": "record",
"name": "Student",
"fields": [
{"name": "name", "type": "string"},
{"name": "subject", "type": "string"}
]
}`;

Student student = {
name: "Liam",
subject: "geology"
};
Schema avro = check new (schema);
byte[] serializedValue = check avro.toAvro(student);
anydata deserializedValue = check avro.fromAvro(serializedValue);
test:assertEquals(deserializedValue.cloneWithType(Student), student);
}
@test:Config {
groups: ["record"]
}
Expand Down
24 changes: 24 additions & 0 deletions native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,27 @@ spotbugsMain {
spotbugsTest {
enabled = false
}

publishing {
publications {
mavenJava(MavenPublication) {
groupId "io.ballerina.lib"
artifactId "avro-native"
version = project.version
artifact jar
}
}

repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/ballerina-platform/avro")
credentials {
username = System.getenv("packageUser")
password = System.getenv("packagePAT")
}
}
}
}

publish.dependsOn build
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@
import io.ballerina.lib.avro.deserialize.PrimitiveDeserializer;
import io.ballerina.lib.avro.deserialize.RecordDeserializer;
import io.ballerina.lib.avro.deserialize.UnionDeserializer;
import io.ballerina.runtime.api.creators.TypeCreator;
import io.ballerina.runtime.api.creators.ValueCreator;
import io.ballerina.runtime.api.types.ArrayType;
import io.ballerina.runtime.api.types.Field;
import io.ballerina.runtime.api.types.MapType;
import io.ballerina.runtime.api.types.PredefinedTypes;
import io.ballerina.runtime.api.types.RecordType;
import io.ballerina.runtime.api.types.ReferenceType;
import io.ballerina.runtime.api.types.Type;
Expand Down Expand Up @@ -113,6 +115,9 @@ public BMap<BString, Object> visit(RecordDeserializer recordDeserializer, Generi
if (originalType.isReadOnly()) {
avroRecord.freezeDirect();
}
if (type.getTag() == TypeTags.ANYDATA_TAG) {
return (BMap<BString, Object>) ValueUtils.convert(avroRecord, type);
}
return avroRecord;
}

Expand Down Expand Up @@ -283,6 +288,9 @@ public BArray visit(RecordDeserializer recordDeserializer, GenericData.Array<Obj
}

private BMap<BString, Object> createAvroRecord(Type type) {
if (type.getTag() == TypeTags.ANYDATA_TAG) {
return ValueCreator.createMapValue(TypeCreator.createMapType(PredefinedTypes.TYPE_ANYDATA));
}
return ValueCreator.createRecordValue((RecordType) getMutableType(type));
}

Expand Down
Loading