[protobuf] fix calling _skipUnknownValue() twice

[marsqing]

When continue, will _skipUnknownValue(wireType) again. Is this the right way to fix?

[cowtowncoder]

Would be great to have a unit test to reproduce the problem... I'll need to see if I can do that.

[cowtowncoder]

And yes, just looking at code I think you are right, that should be removed.

[marsqing]

Reproduction unit test. Two unknown fields are required to reproduce.

import static org.junit.Assert.assertEquals;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
import com.fasterxml.jackson.dataformat.protobuf.schemagen.ProtobufSchemaGenerator;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import org.junit.Test;

public class PBSkipFieldTest {

  @Test
  public void test() throws Exception {
    ProtobufMapper mapper = new ProtobufMapper();
    mapper.configure(JsonParser.Feature.IGNORE_UNDEFINED, true);

    ThreeField threeField = new ThreeField();
    threeField.setF1(1);
    threeField.setF2(2);
    threeField.setF3(3);

    ByteArrayOutputStream out = new ByteArrayOutputStream();
    ObjectWriter writer = mapper.writerFor(ThreeField.class).with(schemaForClass(ThreeField.class, mapper));
    writer.writeValue(out, threeField);

    ObjectReader reader = mapper.readerFor(OneField.class).with(schemaForClass(OneField.class, mapper));
    OneField oneField = reader.readValue(new ByteArrayInputStream(out.toByteArray()));

    assertEquals(threeField.getF3(), oneField.getF3());
  }

  private ProtobufSchema schemaForClass(Class<?> clazz, ProtobufMapper mapper) throws Exception {
    ProtobufSchemaGenerator gen = new ProtobufSchemaGenerator();
    mapper.acceptJsonFormatVisitor(clazz, gen);
    return gen.getGeneratedSchema();
  }


  public static class OneField {

    @JsonProperty(value = "f3", index = 3)
    private int f3;

    public int getF3() {
      return f3;
    }

    public void setF3(int f3) {
      this.f3 = f3;
    }
  }

  public static class ThreeField {

    @JsonProperty(value = "f1", index = 1)
    private int f1;

    @JsonProperty(value = "f2", index = 2)
    private int f2;

    @JsonProperty(value = "f3", index = 3)
    private int f3;

    public int getF1() {
      return f1;
    }

    public void setF1(int f1) {
      this.f1 = f1;
    }

    public int getF2() {
      return f2;
    }

    public void setF2(int f2) {
      this.f2 = f2;
    }

    public int getF3() {
      return f3;
    }

    public void setF3(int f3) {
      this.f3 = f3;
    }
  }

}

[cowtowncoder]

Excellent, thank you! I was about to write it so this saves me some time.