Skip to content
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

Jump to bottom

Fix Deserialize (avro_specific) and improve tests for avro_specific/avro_generic #849

Merged
merged 1 commit into from
Aug 29, 2022
Merged

Fix Deserialize (avro_specific) and improve tests for avro_specific/avro_generic #849

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
36 changes: 33 additions & 3 deletions schemaregistry/serde/avro/avro_generic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,31 @@
package avro

import (
"errors"
"testing"

"github.com/confluentinc/confluent-kafka-go/schemaregistry"
"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
"github.com/confluentinc/confluent-kafka-go/schemaregistry/test"
)

func testMessageFactoryGeneric(subject string, name string) (interface{}, error) {
if subject != "topic1-value" {
return nil, errors.New("Message factory only handles topic1.")
}

switch name {
case "GenericDemoSchema":
return &GenericDemoSchema{}, nil
case "GenericLinkedList":
return &GenericLinkedList{}, nil
case "GenericNestedTestRecord":
return &GenericNestedTestRecord{}, nil
}

return nil, errors.New("Schema not found.")
}

func TestGenericAvroSerdeWithSimple(t *testing.T) {
serde.MaybeFail = serde.InitFailFunc(t)
var err error
Expand All @@ -47,10 +65,14 @@ func TestGenericAvroSerdeWithSimple(t *testing.T) {
deser, err := NewGenericDeserializer(client, serde.ValueSerde, NewDeserializerConfig())
serde.MaybeFail("Deserializer configuration", err)
deser.Client = ser.Client
deser.MessageFactory = testMessageFactoryGeneric

var newobj GenericDemoSchema
err = deser.DeserializeInto("topic1", bytes, &newobj)
serde.MaybeFail("deserialization", err, serde.Expect(newobj, obj))
serde.MaybeFail("deserialization into", err, serde.Expect(newobj, obj))

msg, err := deser.Deserialize("topic1", bytes)
serde.MaybeFail("deserialization", err, serde.Expect(msg, &obj))
}

func TestGenericAvroSerdeWithNested(t *testing.T) {
Expand Down Expand Up @@ -80,10 +102,14 @@ func TestGenericAvroSerdeWithNested(t *testing.T) {
deser, err := NewGenericDeserializer(client, serde.ValueSerde, NewDeserializerConfig())
serde.MaybeFail("Deserializer configuration", err)
deser.Client = ser.Client
deser.MessageFactory = testMessageFactoryGeneric

var newobj GenericNestedTestRecord
err = deser.DeserializeInto("topic1", bytes, &newobj)
serde.MaybeFail("deserialization", err, serde.Expect(newobj, obj))
serde.MaybeFail("deserialization into", err, serde.Expect(newobj, obj))

msg, err := deser.Deserialize("topic1", bytes)
serde.MaybeFail("deserialization", err, serde.Expect(msg, &obj))
}

func TestGenericAvroSerdeWithCycle(t *testing.T) {
Expand Down Expand Up @@ -111,10 +137,14 @@ func TestGenericAvroSerdeWithCycle(t *testing.T) {
deser, err := NewGenericDeserializer(client, serde.ValueSerde, NewDeserializerConfig())
serde.MaybeFail("Deserializer configuration", err)
deser.Client = ser.Client
deser.MessageFactory = testMessageFactoryGeneric

var newobj GenericLinkedList
err = deser.DeserializeInto("topic1", bytes, &newobj)
serde.MaybeFail("deserialization", err, serde.Expect(newobj, obj))
serde.MaybeFail("deserialization into", err, serde.Expect(newobj, obj))

msg, err := deser.Deserialize("topic1", bytes)
serde.MaybeFail("deserialization", err, serde.Expect(msg, &obj))
}

type GenericDemoSchema struct {
Expand Down
6 changes: 5 additions & 1 deletion schemaregistry/serde/avro/avro_specific.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ func (s *SpecificDeserializer) Deserialize(topic string, payload []byte) (interf
return nil, err
}
r := bytes.NewReader(payload[5:])
return vm.Eval(r, deser, avroMsg), nil

if err = vm.Eval(r, deser, avroMsg); err != nil {
return nil, err
}
return avroMsg, nil
}

// DeserializeInto implements deserialization of specific Avro data to the given object
Expand Down
36 changes: 33 additions & 3 deletions schemaregistry/serde/avro/avro_specific_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,31 @@
package avro

import (
"errors"
"testing"

"github.com/confluentinc/confluent-kafka-go/schemaregistry"
"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
"github.com/confluentinc/confluent-kafka-go/schemaregistry/test"
)

func testMessageFactorySpecific(subject string, name string) (interface{}, error) {
if subject != "topic1-value" {
return nil, errors.New("Message factory only handles topic1.")
}

switch name {
case "DemoSchema":
return &test.DemoSchema{}, nil
case "NestedTestRecord":
return &test.NestedTestRecord{}, nil
case "RecursiveUnionTestRecord":
return &test.RecursiveUnionTestRecord{}, nil
}

return nil, errors.New("Schema not found.")
}

func TestSpecificAvroSerdeWithSimple(t *testing.T) {
serde.MaybeFail = serde.InitFailFunc(t)
var err error
Expand All @@ -47,10 +65,14 @@ func TestSpecificAvroSerdeWithSimple(t *testing.T) {
deser, err := NewSpecificDeserializer(client, serde.ValueSerde, NewDeserializerConfig())
serde.MaybeFail("Deserializer configuration", err)
deser.Client = ser.Client
deser.MessageFactory = testMessageFactorySpecific

var newobj test.DemoSchema
err = deser.DeserializeInto("topic1", bytes, &newobj)
serde.MaybeFail("deserialization", err, serde.Expect(newobj, obj))
serde.MaybeFail("deserialization into", err, serde.Expect(newobj, obj))

msg, err := deser.Deserialize("topic1", bytes)
serde.MaybeFail("deserialization", err, serde.Expect(msg, &obj))
}

func TestSpecificAvroSerdeWithNested(t *testing.T) {
Expand Down Expand Up @@ -85,10 +107,14 @@ func TestSpecificAvroSerdeWithNested(t *testing.T) {
deser, err := NewSpecificDeserializer(client, serde.ValueSerde, NewDeserializerConfig())
serde.MaybeFail("Deserializer configuration", err)
deser.Client = ser.Client
deser.MessageFactory = testMessageFactorySpecific

var newobj test.NestedTestRecord
err = deser.DeserializeInto("topic1", bytes, &newobj)
serde.MaybeFail("deserialization", err, serde.Expect(newobj, obj))
serde.MaybeFail("deserialization into", err, serde.Expect(newobj, obj))

msg, err := deser.Deserialize("topic1", bytes)
serde.MaybeFail("deserialization", err, serde.Expect(msg, &obj))
}

func TestSpecificAvroSerdeWithCycle(t *testing.T) {
Expand Down Expand Up @@ -118,8 +144,12 @@ func TestSpecificAvroSerdeWithCycle(t *testing.T) {
deser, err := NewSpecificDeserializer(client, serde.ValueSerde, NewDeserializerConfig())
serde.MaybeFail("Deserializer configuration", err)
deser.Client = ser.Client
deser.MessageFactory = testMessageFactorySpecific

var newobj test.RecursiveUnionTestRecord
err = deser.DeserializeInto("topic1", bytes, &newobj)
serde.MaybeFail("deserialization", err, serde.Expect(newobj, obj))
serde.MaybeFail("deserialization into", err, serde.Expect(newobj, obj))

msg, err := deser.Deserialize("topic1", bytes)
serde.MaybeFail("deserialization", err, serde.Expect(msg, &obj))
}