Compile error when proto contains a oneof field with same name as the enclosing message

[garyp]

From #18 (comment):

A proto definition such as:

message Value {
  oneof value {
    string string_value = 1;
    bool boolean_value = 2;
    int32 integer_value = 3;
    int64 long_value = 4;
    float float_value = 5;
    double double_value = 6;
    int64 date_value = 7;
  }
}

Generates code like:

data class Value(
    val value: Value<*>? = null
) {
    sealed class Value<V>(value: V) : pbandk.Message.OneOf<V>(value) {
        class StringValue(stringValue: String = "") : Value<String>(stringValue)
        ...
    }
    ...
}

Which fails to compile because there are two types named Value and the type of value in val value: Value<*>? = null can't be resolved correctly.

[sujithkris]

@garyp - Any update ? :)

[garyp]

@sujithkris Haven't had a chance to fix this yet. Should be pretty straightforward, if you happen to be interested in looking into it. I'm guessing the fix would be to change the code in pbandk's CodeGenerator.writeConstructorField() method to use the type's fully-qualified name rather than the short name.

[nbaztec]

Hi, went overt he code real quick but could you perhaps point out to a test that could be used to validate the fix?
CodeGenerator takes in a file context, but I couldn't find any single point to test with a sample proto file.

[jan-xyz]

I would suggest to generate something like

syntax = "proto3";
package example;

message Person {
  oneof person {
    Foo foo = 1;
  }
}

message Foo {
}

into

package tutorial

data class Person(
    val person: Person<*>? = null,
    override val unknownFields: Map<Int, pbandk.UnknownField> = emptyMap()
) : pbandk.Message {
    sealed class Person<V>(value: V) : pbandk.Message.OneOf<V>(value) {
        class Foo(foo: tutorial.Foo) : Person<tutorial.Foo>(foo)
    }

    val foo: tutorial.Foo?
        get() = (person as? Person.Foo)?.value

    override operator fun plus(other: pbandk.Message?) = protoMergeImpl(other)
    override val descriptor get() = Companion.descriptor
    override val protoSize by lazy { super.protoSize }
    companion object : pbandk.Message.Companion<tutorial.Person> {
        val defaultInstance by lazy { Person() }
        override fun decodeWith(u: pbandk.MessageDecoder) = decodeWithImpl(u)

        override val descriptor: pbandk.MessageDescriptor<tutorial.Person> by lazy {
            pbandk.MessageDescriptor(
                messageClass = tutorial.Person::class,
                messageCompanion = this,
                fields = listOf(
                    pbandk.FieldDescriptor(
                        messageDescriptor = this::descriptor,
                        name = "foo",
                        number = 99,
                        type = pbandk.FieldDescriptor.Type.Message(messageCompanion = tutorial.Foo.Companion),
                        oneofMember = true,
                        jsonName = "foo",
                        value = tutorial.Person::foo
                    )
                )
            )
        }
    }
}

this is the diff:

20c20
<     companion object : pbandk.Message.Companion<tutorial.Person> {
---
>     companion object : pbandk.Message.Companion<Person> {
22c22
<         override fun decodeWith(u: pbandk.MessageDecoder) = decodeWithImpl(u)
---
>         override fun decodeWith(u: pbandk.MessageDecoder) = Person.decodeWithImpl(u)
24c24
<         override val descriptor: pbandk.MessageDescriptor<tutorial.Person> by lazy {
---
>         override val descriptor: pbandk.MessageDescriptor<Person> by lazy {
26c26
<                     messageClass = tutorial.Person::class,
---
>                     messageClass = Person::class,
36c36
<                                     value = tutorial.Person::foo
---
>                                     value = Person::foo

[garyp]

Fixed in #104 for the upcoming 0.9.1 release. I've also cherry-picked the fix into the master branch in #115.