diff --git a/wire-golden-files/build.gradle.kts b/wire-golden-files/build.gradle.kts index 31534da057..90821e13a8 100644 --- a/wire-golden-files/build.gradle.kts +++ b/wire-golden-files/build.gradle.kts @@ -28,6 +28,11 @@ wire { boxOneOfsMinSize = 1 } + java { + includes = listOf("squareup.java.*") + out = "src/main/java" + } + kotlin { out = "src/main/kotlin" } diff --git a/wire-golden-files/src/main/java/squareup/java/dinosaurs/Dinosaur.java b/wire-golden-files/src/main/java/squareup/java/dinosaurs/Dinosaur.java new file mode 100644 index 0000000000..cf711723d3 --- /dev/null +++ b/wire-golden-files/src/main/java/squareup/java/dinosaurs/Dinosaur.java @@ -0,0 +1,264 @@ +// Code generated by Wire protocol buffer compiler, do not edit. +// Source: squareup.java.dinosaurs.Dinosaur in squareup/wire/java/dinosaurs/dinosaur.proto +package squareup.java.dinosaurs; + +import com.squareup.wire.FieldEncoding; +import com.squareup.wire.Message; +import com.squareup.wire.ProtoAdapter; +import com.squareup.wire.ProtoReader; +import com.squareup.wire.ProtoWriter; +import com.squareup.wire.ReverseProtoWriter; +import com.squareup.wire.Syntax; +import com.squareup.wire.WireField; +import com.squareup.wire.internal.Internal; +import java.io.IOException; +import java.lang.Double; +import java.lang.Object; +import java.lang.Override; +import java.lang.String; +import java.lang.StringBuilder; +import java.util.List; +import okio.ByteString; +import squareup.java.geology.Period; + +public final class Dinosaur extends Message { + public static final ProtoAdapter ADAPTER = new ProtoAdapter_Dinosaur(); + + private static final long serialVersionUID = 0L; + + public static final String DEFAULT_NAME = ""; + + public static final Double DEFAULT_LENGTH_METERS = 0.0d; + + public static final Double DEFAULT_MASS_KILOGRAMS = 0.0d; + + public static final Period DEFAULT_PERIOD = Period.CRETACEOUS; + + /** + * Common name of this dinosaur, like "Stegosaurus". + */ + @WireField( + tag = 1, + adapter = "com.squareup.wire.ProtoAdapter#STRING" + ) + public final String name; + + /** + * URLs with images of this dinosaur. + */ + @WireField( + tag = 2, + adapter = "com.squareup.wire.ProtoAdapter#STRING", + label = WireField.Label.REPEATED + ) + public final List picture_urls; + + @WireField( + tag = 3, + adapter = "com.squareup.wire.ProtoAdapter#DOUBLE" + ) + public final Double length_meters; + + @WireField( + tag = 4, + adapter = "com.squareup.wire.ProtoAdapter#DOUBLE" + ) + public final Double mass_kilograms; + + @WireField( + tag = 5, + adapter = "squareup.java.geology.Period#ADAPTER" + ) + public final Period period; + + public Dinosaur(String name, List picture_urls, Double length_meters, + Double mass_kilograms, Period period) { + this(name, picture_urls, length_meters, mass_kilograms, period, ByteString.EMPTY); + } + + public Dinosaur(String name, List picture_urls, Double length_meters, + Double mass_kilograms, Period period, ByteString unknownFields) { + super(ADAPTER, unknownFields); + this.name = name; + this.picture_urls = Internal.immutableCopyOf("picture_urls", picture_urls); + this.length_meters = length_meters; + this.mass_kilograms = mass_kilograms; + this.period = period; + } + + @Override + public Builder newBuilder() { + Builder builder = new Builder(); + builder.name = name; + builder.picture_urls = Internal.copyOf(picture_urls); + builder.length_meters = length_meters; + builder.mass_kilograms = mass_kilograms; + builder.period = period; + builder.addUnknownFields(unknownFields()); + return builder; + } + + @Override + public boolean equals(Object other) { + if (other == this) return true; + if (!(other instanceof Dinosaur)) return false; + Dinosaur o = (Dinosaur) other; + return unknownFields().equals(o.unknownFields()) + && Internal.equals(name, o.name) + && picture_urls.equals(o.picture_urls) + && Internal.equals(length_meters, o.length_meters) + && Internal.equals(mass_kilograms, o.mass_kilograms) + && Internal.equals(period, o.period); + } + + @Override + public int hashCode() { + int result = super.hashCode; + if (result == 0) { + result = unknownFields().hashCode(); + result = result * 37 + (name != null ? name.hashCode() : 0); + result = result * 37 + picture_urls.hashCode(); + result = result * 37 + (length_meters != null ? length_meters.hashCode() : 0); + result = result * 37 + (mass_kilograms != null ? mass_kilograms.hashCode() : 0); + result = result * 37 + (period != null ? period.hashCode() : 0); + super.hashCode = result; + } + return result; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + if (name != null) builder.append(", name=").append(Internal.sanitize(name)); + if (!picture_urls.isEmpty()) builder.append(", picture_urls=").append(Internal.sanitize(picture_urls)); + if (length_meters != null) builder.append(", length_meters=").append(length_meters); + if (mass_kilograms != null) builder.append(", mass_kilograms=").append(mass_kilograms); + if (period != null) builder.append(", period=").append(period); + return builder.replace(0, 2, "Dinosaur{").append('}').toString(); + } + + public static final class Builder extends Message.Builder { + public String name; + + public List picture_urls; + + public Double length_meters; + + public Double mass_kilograms; + + public Period period; + + public Builder() { + picture_urls = Internal.newMutableList(); + } + + /** + * Common name of this dinosaur, like "Stegosaurus". + */ + public Builder name(String name) { + this.name = name; + return this; + } + + /** + * URLs with images of this dinosaur. + */ + public Builder picture_urls(List picture_urls) { + Internal.checkElementsNotNull(picture_urls); + this.picture_urls = picture_urls; + return this; + } + + public Builder length_meters(Double length_meters) { + this.length_meters = length_meters; + return this; + } + + public Builder mass_kilograms(Double mass_kilograms) { + this.mass_kilograms = mass_kilograms; + return this; + } + + public Builder period(Period period) { + this.period = period; + return this; + } + + @Override + public Dinosaur build() { + return new Dinosaur(name, picture_urls, length_meters, mass_kilograms, period, super.buildUnknownFields()); + } + } + + private static final class ProtoAdapter_Dinosaur extends ProtoAdapter { + public ProtoAdapter_Dinosaur() { + super(FieldEncoding.LENGTH_DELIMITED, Dinosaur.class, "type.googleapis.com/squareup.java.dinosaurs.Dinosaur", Syntax.PROTO_2.INSTANCE, null, "squareup/wire/java/dinosaurs/dinosaur.proto"); + } + + @Override + public int encodedSize(Dinosaur value) { + int result = 0; + result += ProtoAdapter.STRING.encodedSizeWithTag(1, value.name); + result += ProtoAdapter.STRING.asRepeated().encodedSizeWithTag(2, value.picture_urls); + result += ProtoAdapter.DOUBLE.encodedSizeWithTag(3, value.length_meters); + result += ProtoAdapter.DOUBLE.encodedSizeWithTag(4, value.mass_kilograms); + result += Period.ADAPTER.encodedSizeWithTag(5, value.period); + result += value.unknownFields().size(); + return result; + } + + @Override + public void encode(ProtoWriter writer, Dinosaur value) throws IOException { + ProtoAdapter.STRING.encodeWithTag(writer, 1, value.name); + ProtoAdapter.STRING.asRepeated().encodeWithTag(writer, 2, value.picture_urls); + ProtoAdapter.DOUBLE.encodeWithTag(writer, 3, value.length_meters); + ProtoAdapter.DOUBLE.encodeWithTag(writer, 4, value.mass_kilograms); + Period.ADAPTER.encodeWithTag(writer, 5, value.period); + writer.writeBytes(value.unknownFields()); + } + + @Override + public void encode(ReverseProtoWriter writer, Dinosaur value) throws IOException { + writer.writeBytes(value.unknownFields()); + Period.ADAPTER.encodeWithTag(writer, 5, value.period); + ProtoAdapter.DOUBLE.encodeWithTag(writer, 4, value.mass_kilograms); + ProtoAdapter.DOUBLE.encodeWithTag(writer, 3, value.length_meters); + ProtoAdapter.STRING.asRepeated().encodeWithTag(writer, 2, value.picture_urls); + ProtoAdapter.STRING.encodeWithTag(writer, 1, value.name); + } + + @Override + public Dinosaur decode(ProtoReader reader) throws IOException { + Builder builder = new Builder(); + long token = reader.beginMessage(); + for (int tag; (tag = reader.nextTag()) != -1;) { + switch (tag) { + case 1: builder.name(ProtoAdapter.STRING.decode(reader)); break; + case 2: builder.picture_urls.add(ProtoAdapter.STRING.decode(reader)); break; + case 3: builder.length_meters(ProtoAdapter.DOUBLE.decode(reader)); break; + case 4: builder.mass_kilograms(ProtoAdapter.DOUBLE.decode(reader)); break; + case 5: { + try { + builder.period(Period.ADAPTER.decode(reader)); + } catch (ProtoAdapter.EnumConstantNotFoundException e) { + builder.addUnknownField(tag, FieldEncoding.VARINT, (long) e.value); + } + break; + } + default: { + reader.readUnknownField(tag); + } + } + } + builder.addUnknownFields(reader.endMessageAndGetUnknownFields(token)); + return builder.build(); + } + + @Override + public Dinosaur redact(Dinosaur value) { + Builder builder = value.newBuilder(); + builder.clearUnknownFields(); + return builder.build(); + } + } +} diff --git a/wire-golden-files/src/main/java/squareup/java/geology/Period.java b/wire-golden-files/src/main/java/squareup/java/geology/Period.java new file mode 100644 index 0000000000..542cab9d5c --- /dev/null +++ b/wire-golden-files/src/main/java/squareup/java/geology/Period.java @@ -0,0 +1,62 @@ +// Code generated by Wire protocol buffer compiler, do not edit. +// Source: squareup.java.geology.Period in squareup/wire/java/geology/period.proto +package squareup.java.geology; + +import com.squareup.wire.EnumAdapter; +import com.squareup.wire.ProtoAdapter; +import com.squareup.wire.Syntax; +import com.squareup.wire.WireEnum; +import java.lang.Override; + +public enum Period implements WireEnum { + /** + * 145.5 million years ago — 66.0 million years ago. + */ + CRETACEOUS(1), + + /** + * 201.3 million years ago — 145.0 million years ago. + */ + JURASSIC(2), + + /** + * 252.17 million years ago — 201.3 million years ago. + */ + TRIASSIC(3); + + public static final ProtoAdapter ADAPTER = new ProtoAdapter_Period(); + + private final int value; + + Period(int value) { + this.value = value; + } + + /** + * Return the constant for {@code value} or null. + */ + public static Period fromValue(int value) { + switch (value) { + case 1: return CRETACEOUS; + case 2: return JURASSIC; + case 3: return TRIASSIC; + default: return null; + } + } + + @Override + public int getValue() { + return value; + } + + private static final class ProtoAdapter_Period extends EnumAdapter { + ProtoAdapter_Period() { + super(Period.class, Syntax.PROTO_2.INSTANCE, null); + } + + @Override + protected Period fromValue(int value) { + return Period.fromValue(value); + } + } +} diff --git a/wire-golden-files/src/main/proto/squareup/wire/java/dinosaurs/dinosaur.proto b/wire-golden-files/src/main/proto/squareup/wire/java/dinosaurs/dinosaur.proto new file mode 100644 index 0000000000..f2a4e5f7be --- /dev/null +++ b/wire-golden-files/src/main/proto/squareup/wire/java/dinosaurs/dinosaur.proto @@ -0,0 +1,17 @@ +syntax = "proto2"; + +package squareup.java.dinosaurs; + +import "squareup/wire/java/geology/period.proto"; + +message Dinosaur { + /** Common name of this dinosaur, like "Stegosaurus". */ + optional string name = 1; + + /** URLs with images of this dinosaur. */ + repeated string picture_urls = 2; + + optional double length_meters = 3; + optional double mass_kilograms = 4; + optional squareup.java.geology.Period period = 5; +} diff --git a/wire-golden-files/src/main/proto/squareup/wire/java/geology/period.proto b/wire-golden-files/src/main/proto/squareup/wire/java/geology/period.proto new file mode 100644 index 0000000000..eb8fd6be97 --- /dev/null +++ b/wire-golden-files/src/main/proto/squareup/wire/java/geology/period.proto @@ -0,0 +1,14 @@ +syntax = "proto2"; + +package squareup.java.geology; + +enum Period { + /** 145.5 million years ago — 66.0 million years ago. */ + CRETACEOUS = 1; + + /** 201.3 million years ago — 145.0 million years ago. */ + JURASSIC = 2; + + /** 252.17 million years ago — 201.3 million years ago. */ + TRIASSIC = 3; +} diff --git a/wire-gson-support/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java b/wire-gson-support/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java index 202e489284..bc8bc3a024 100644 --- a/wire-gson-support/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java +++ b/wire-gson-support/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java @@ -144,7 +144,7 @@ private static final class ProtoAdapter_RepeatedPackedAndMap extends ProtoAdapte private ProtoAdapter> map_int32_int32; public ProtoAdapter_RepeatedPackedAndMap() { - super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.proto2.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2, null, "collection_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.proto2.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2.INSTANCE, null, "collection_types.proto"); } @Override diff --git a/wire-gson-support/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java b/wire-gson-support/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java index 08d7f77512..084900ad58 100644 --- a/wire-gson-support/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java +++ b/wire-gson-support/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java @@ -21,7 +21,7 @@ import okio.ByteString; public final class AllTypes extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto2.AllTypes", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto2.AllTypes", Syntax.PROTO_2.INSTANCE); private static final long serialVersionUID = 0L; @@ -2946,7 +2946,7 @@ public int getValue() { } public static final class NestedMessage extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto2.AllTypes.NestedMessage", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto2.AllTypes.NestedMessage", Syntax.PROTO_2.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-gson-support/src/test/java/com/squareup/wire/proto2/dinosaurs/java/Dinosaur.java b/wire-gson-support/src/test/java/com/squareup/wire/proto2/dinosaurs/java/Dinosaur.java index 16aafc8494..34fa86fa0d 100644 --- a/wire-gson-support/src/test/java/com/squareup/wire/proto2/dinosaurs/java/Dinosaur.java +++ b/wire-gson-support/src/test/java/com/squareup/wire/proto2/dinosaurs/java/Dinosaur.java @@ -192,7 +192,7 @@ public Dinosaur build() { private static final class ProtoAdapter_Dinosaur extends ProtoAdapter { public ProtoAdapter_Dinosaur() { - super(FieldEncoding.LENGTH_DELIMITED, Dinosaur.class, "type.googleapis.com/squareup.dinosaurs.java.Dinosaur", Syntax.PROTO_2, null, "dinosaur_java.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Dinosaur.class, "type.googleapis.com/squareup.dinosaurs.java.Dinosaur", Syntax.PROTO_2.INSTANCE, null, "dinosaur_java.proto"); } @Override diff --git a/wire-gson-support/src/test/java/com/squareup/wire/proto2/geology/java/Period.java b/wire-gson-support/src/test/java/com/squareup/wire/proto2/geology/java/Period.java index c5cd29f125..abf892a7f2 100644 --- a/wire-gson-support/src/test/java/com/squareup/wire/proto2/geology/java/Period.java +++ b/wire-gson-support/src/test/java/com/squareup/wire/proto2/geology/java/Period.java @@ -51,7 +51,7 @@ public int getValue() { private static final class ProtoAdapter_Period extends EnumAdapter { ProtoAdapter_Period() { - super(Period.class, Syntax.PROTO_2, null); + super(Period.class, Syntax.PROTO_2.INSTANCE, null); } @Override diff --git a/wire-gson-support/src/test/java/squareup/proto2/keywords/KeywordJava.java b/wire-gson-support/src/test/java/squareup/proto2/keywords/KeywordJava.java index 9ff3429154..3316a2b559 100644 --- a/wire-gson-support/src/test/java/squareup/proto2/keywords/KeywordJava.java +++ b/wire-gson-support/src/test/java/squareup/proto2/keywords/KeywordJava.java @@ -240,7 +240,7 @@ public int getValue() { private static final class ProtoAdapter_KeywordJavaEnum extends EnumAdapter { ProtoAdapter_KeywordJavaEnum() { - super(KeywordJavaEnum.class, Syntax.PROTO_2, KeywordJavaEnum.final_); + super(KeywordJavaEnum.class, Syntax.PROTO_2.INSTANCE, KeywordJavaEnum.final_); } @Override @@ -254,7 +254,7 @@ private static final class ProtoAdapter_KeywordJava extends ProtoAdapter> package_; public ProtoAdapter_KeywordJava() { - super(FieldEncoding.LENGTH_DELIMITED, KeywordJava.class, "type.googleapis.com/squareup.proto2.keywords.KeywordJava", Syntax.PROTO_2, null, "keyword_java.proto"); + super(FieldEncoding.LENGTH_DELIMITED, KeywordJava.class, "type.googleapis.com/squareup.proto2.keywords.KeywordJava", Syntax.PROTO_2.INSTANCE, null, "keyword_java.proto"); } @Override diff --git a/wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java b/wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java index 31f7a22208..ccad600258 100644 --- a/wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java +++ b/wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java @@ -950,7 +950,7 @@ private FieldSpec messageAdapterField( FieldSpec.builder(adapterOf(javaType), adapterName).addModifiers(PUBLIC, STATIC, FINAL); if (emitCompact) { result.initializer( - "$T.newMessageAdapter($T.class, $S, $T.$L)", + "$T.newMessageAdapter($T.class, $S, $T.$L.INSTANCE)", ProtoAdapter.class, javaType, protoType.getTypeUrl(), @@ -1095,7 +1095,7 @@ private TypeSpec enumAdapter(ClassName javaType, ClassName adapterJavaType, Enum .addMethod( MethodSpec.constructorBuilder() .addStatement( - "super($T.class, $T.$L, $L)", + "super($T.class, $T.$L.INSTANCE, $L)", javaType, Syntax.class, enumType.getSyntax().name(), @@ -1132,7 +1132,7 @@ private TypeSpec messageAdapter( MethodSpec.constructorBuilder() .addModifiers(PUBLIC) .addStatement( - "super($T.LENGTH_DELIMITED, $T.class, $S, $T.$L, null, $S)", + "super($T.LENGTH_DELIMITED, $T.class, $S, $T.$L.INSTANCE, null, $S)", FieldEncoding.class, javaType, type.getType().getTypeUrl(), diff --git a/wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorTest.java b/wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorTest.java index 947803380b..747b64ac17 100644 --- a/wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorTest.java +++ b/wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorTest.java @@ -189,7 +189,7 @@ public void generateAbstractAdapter() throws Exception { + " private ProtoAdapter> bars;\n" + "\n" + " public AbstractProtoMessageAdapter() {\n" - + " super(FieldEncoding.LENGTH_DELIMITED, JavaMessage.class, \"type.googleapis.com/original.proto.ProtoMessage\", Syntax.PROTO_2, null, \"message.proto\");\n" + + " super(FieldEncoding.LENGTH_DELIMITED, JavaMessage.class, \"type.googleapis.com/original.proto.ProtoMessage\", Syntax.PROTO_2.INSTANCE, null, \"message.proto\");\n" + " }\n" + "\n" + " public abstract Foo field(JavaMessage value);\n" diff --git a/wire-kotlin-generator/src/main/java/com/squareup/wire/kotlin/KotlinGenerator.kt b/wire-kotlin-generator/src/main/java/com/squareup/wire/kotlin/KotlinGenerator.kt index 432c112678..9ef5ccefb4 100644 --- a/wire-kotlin-generator/src/main/java/com/squareup/wire/kotlin/KotlinGenerator.kt +++ b/wire-kotlin-generator/src/main/java/com/squareup/wire/kotlin/KotlinGenerator.kt @@ -1555,7 +1555,7 @@ class KotlinGenerator private constructor( .addSuperclassConstructorParameter("\n%S", type.type.typeUrl!!) .addSuperclassConstructorParameter( "\n%M", - MemberName(Syntax::class.asClassName(), type.syntax.name), + MemberName(Syntax::class.asClassName(), type.syntax.name()), ) .addSuperclassConstructorParameter("\nnull") .addSuperclassConstructorParameter("\n%S\n⇤", type.location.path) @@ -2469,7 +2469,7 @@ class KotlinGenerator private constructor( .addSuperclassConstructorParameter("\n⇥%T::class", parentClassName) .addSuperclassConstructorParameter( "\n%M", - MemberName(Syntax::class.asClassName(), message.syntax.name), + MemberName(Syntax::class.asClassName(), message.syntax.name()), ) .addSuperclassConstructorParameter("\n%L\n⇤", message.identity()) .addFunction( diff --git a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java index 202e489284..bc8bc3a024 100644 --- a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java +++ b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java @@ -144,7 +144,7 @@ private static final class ProtoAdapter_RepeatedPackedAndMap extends ProtoAdapte private ProtoAdapter> map_int32_int32; public ProtoAdapter_RepeatedPackedAndMap() { - super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.proto2.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2, null, "collection_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.proto2.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2.INSTANCE, null, "collection_types.proto"); } @Override diff --git a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java index 08d7f77512..084900ad58 100644 --- a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java +++ b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java @@ -21,7 +21,7 @@ import okio.ByteString; public final class AllTypes extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto2.AllTypes", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto2.AllTypes", Syntax.PROTO_2.INSTANCE); private static final long serialVersionUID = 0L; @@ -2946,7 +2946,7 @@ public int getValue() { } public static final class NestedMessage extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto2.AllTypes.NestedMessage", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto2.AllTypes.NestedMessage", Syntax.PROTO_2.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/dinosaurs/java/Dinosaur.java b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/dinosaurs/java/Dinosaur.java index 16aafc8494..34fa86fa0d 100644 --- a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/dinosaurs/java/Dinosaur.java +++ b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/dinosaurs/java/Dinosaur.java @@ -192,7 +192,7 @@ public Dinosaur build() { private static final class ProtoAdapter_Dinosaur extends ProtoAdapter { public ProtoAdapter_Dinosaur() { - super(FieldEncoding.LENGTH_DELIMITED, Dinosaur.class, "type.googleapis.com/squareup.dinosaurs.java.Dinosaur", Syntax.PROTO_2, null, "dinosaur_java.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Dinosaur.class, "type.googleapis.com/squareup.dinosaurs.java.Dinosaur", Syntax.PROTO_2.INSTANCE, null, "dinosaur_java.proto"); } @Override diff --git a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/geology/java/Period.java b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/geology/java/Period.java index c5cd29f125..abf892a7f2 100644 --- a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/geology/java/Period.java +++ b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/geology/java/Period.java @@ -51,7 +51,7 @@ public int getValue() { private static final class ProtoAdapter_Period extends EnumAdapter { ProtoAdapter_Period() { - super(Period.class, Syntax.PROTO_2, null); + super(Period.class, Syntax.PROTO_2.INSTANCE, null); } @Override diff --git a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/person/java/Person.java b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/person/java/Person.java index e161ad20a6..d05d9614f1 100644 --- a/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/person/java/Person.java +++ b/wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/person/java/Person.java @@ -232,7 +232,7 @@ public int getValue() { private static final class ProtoAdapter_PhoneType extends EnumAdapter { ProtoAdapter_PhoneType() { - super(PhoneType.class, Syntax.PROTO_2, PhoneType.MOBILE); + super(PhoneType.class, Syntax.PROTO_2.INSTANCE, PhoneType.MOBILE); } @Override @@ -354,7 +354,7 @@ public PhoneNumber build() { private static final class ProtoAdapter_PhoneNumber extends ProtoAdapter { public ProtoAdapter_PhoneNumber() { - super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.proto2.person.java.Person.PhoneNumber", Syntax.PROTO_2, null, "person_java.proto"); + super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.proto2.person.java.Person.PhoneNumber", Syntax.PROTO_2.INSTANCE, null, "person_java.proto"); } @Override @@ -415,7 +415,7 @@ public PhoneNumber redact(PhoneNumber value) { private static final class ProtoAdapter_Person extends ProtoAdapter { public ProtoAdapter_Person() { - super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.proto2.person.java.Person", Syntax.PROTO_2, null, "person_java.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.proto2.person.java.Person", Syntax.PROTO_2.INSTANCE, null, "person_java.proto"); } @Override diff --git a/wire-moshi-adapter/src/test/java/squareup/proto2/keywords/KeywordJava.java b/wire-moshi-adapter/src/test/java/squareup/proto2/keywords/KeywordJava.java index 9ff3429154..3316a2b559 100644 --- a/wire-moshi-adapter/src/test/java/squareup/proto2/keywords/KeywordJava.java +++ b/wire-moshi-adapter/src/test/java/squareup/proto2/keywords/KeywordJava.java @@ -240,7 +240,7 @@ public int getValue() { private static final class ProtoAdapter_KeywordJavaEnum extends EnumAdapter { ProtoAdapter_KeywordJavaEnum() { - super(KeywordJavaEnum.class, Syntax.PROTO_2, KeywordJavaEnum.final_); + super(KeywordJavaEnum.class, Syntax.PROTO_2.INSTANCE, KeywordJavaEnum.final_); } @Override @@ -254,7 +254,7 @@ private static final class ProtoAdapter_KeywordJava extends ProtoAdapter> package_; public ProtoAdapter_KeywordJava() { - super(FieldEncoding.LENGTH_DELIMITED, KeywordJava.class, "type.googleapis.com/squareup.proto2.keywords.KeywordJava", Syntax.PROTO_2, null, "keyword_java.proto"); + super(FieldEncoding.LENGTH_DELIMITED, KeywordJava.class, "type.googleapis.com/squareup.proto2.keywords.KeywordJava", Syntax.PROTO_2.INSTANCE, null, "keyword_java.proto"); } @Override diff --git a/wire-runtime/api/wire-runtime.api b/wire-runtime/api/wire-runtime.api index 462c86d03a..a0540cb124 100644 --- a/wire-runtime/api/wire-runtime.api +++ b/wire-runtime/api/wire-runtime.api @@ -334,18 +334,40 @@ public final class com/squareup/wire/RuntimeEnumAdapter$Companion { public abstract interface class com/squareup/wire/Service { } -public final class com/squareup/wire/Syntax : java/lang/Enum { +public abstract class com/squareup/wire/Syntax { public static final field Companion Lcom/squareup/wire/Syntax$Companion; - public static final field PROTO_2 Lcom/squareup/wire/Syntax; - public static final field PROTO_3 Lcom/squareup/wire/Syntax; - public static fun getEntries ()Lkotlin/enums/EnumEntries; - public fun toString ()Ljava/lang/String; - public static fun valueOf (Ljava/lang/String;)Lcom/squareup/wire/Syntax; - public static fun values ()[Lcom/squareup/wire/Syntax; + public synthetic fun (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun name ()Ljava/lang/String; } public final class com/squareup/wire/Syntax$Companion { public final fun get (Ljava/lang/String;)Lcom/squareup/wire/Syntax; + public final fun get (Ljava/lang/String;Z)Lcom/squareup/wire/Syntax; +} + +public final class com/squareup/wire/Syntax$Edition : com/squareup/wire/Syntax { + public fun (Ljava/lang/String;)V + public final fun component1 ()Ljava/lang/String; + public final fun copy (Ljava/lang/String;)Lcom/squareup/wire/Syntax$Edition; + public static synthetic fun copy$default (Lcom/squareup/wire/Syntax$Edition;Ljava/lang/String;ILjava/lang/Object;)Lcom/squareup/wire/Syntax$Edition; + public fun equals (Ljava/lang/Object;)Z + public final fun getValue ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class com/squareup/wire/Syntax$PROTO_2 : com/squareup/wire/Syntax { + public static final field INSTANCE Lcom/squareup/wire/Syntax$PROTO_2; + public fun equals (Ljava/lang/Object;)Z + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class com/squareup/wire/Syntax$PROTO_3 : com/squareup/wire/Syntax { + public static final field INSTANCE Lcom/squareup/wire/Syntax$PROTO_3; + public fun equals (Ljava/lang/Object;)Z + public fun hashCode ()I + public fun toString ()Ljava/lang/String; } public final class com/squareup/wire/Wire { diff --git a/wire-runtime/api/wire-runtime.klib.api b/wire-runtime/api/wire-runtime.klib.api index 659da165d3..6858b8a5e2 100644 --- a/wire-runtime/api/wire-runtime.klib.api +++ b/wire-runtime/api/wire-runtime.klib.api @@ -415,18 +415,6 @@ final enum class com.squareup.wire/FieldEncoding : kotlin/Enum(): kotlin.enums/EnumEntries // com.squareup.wire/FieldEncoding.entries.|#static(){}[0] } -final enum class com.squareup.wire/Syntax : kotlin/Enum { // com.squareup.wire/Syntax|null[0] - enum entry PROTO_2 // com.squareup.wire/Syntax.PROTO_2|null[0] - enum entry PROTO_3 // com.squareup.wire/Syntax.PROTO_3|null[0] - final fun toString(): kotlin/String // com.squareup.wire/Syntax.toString|toString(){}[0] - final fun valueOf(kotlin/String): com.squareup.wire/Syntax // com.squareup.wire/Syntax.valueOf|valueOf#static(kotlin.String){}[0] - final fun values(): kotlin/Array // com.squareup.wire/Syntax.values|values#static(){}[0] - final object Companion { // com.squareup.wire/Syntax.Companion|null[0] - final fun get(kotlin/String): com.squareup.wire/Syntax // com.squareup.wire/Syntax.Companion.get|get(kotlin.String){}[0] - } - final val entries // com.squareup.wire/Syntax.entries|#static{}entries[0] - final fun (): kotlin.enums/EnumEntries // com.squareup.wire/Syntax.entries.|#static(){}[0] -} final fun <#A: kotlin/Any?, #B: kotlin/Any?> (kotlin.collections/Map<#A, #B>).com.squareup.wire.internal/redactElements(com.squareup.wire/ProtoAdapter<#B>): kotlin.collections/Map<#A, #B> // com.squareup.wire.internal/redactElements|redactElements@kotlin.collections.Map<0:0,0:1>(com.squareup.wire.ProtoAdapter<0:1>){0§;1§}[0] final fun <#A: kotlin/Any?, #B: kotlin/Any?> com.squareup.wire.internal/copyOf(kotlin.collections/Map<#A, #B>): kotlin.collections/MutableMap<#A, #B> // com.squareup.wire.internal/copyOf|copyOf(kotlin.collections.Map<0:0,0:1>){0§;1§}[0] final fun <#A: kotlin/Any?, #B: kotlin/Any?> com.squareup.wire.internal/copyOf(kotlin/String, kotlin.collections/Map<#A, #B>?): kotlin.collections/MutableMap<#A, #B> // com.squareup.wire.internal/copyOf|copyOf(kotlin.String;kotlin.collections.Map<0:0,0:1>?){0§;1§}[0] @@ -552,5 +540,33 @@ open annotation class com.squareup.wire/WireRpc : kotlin/Annotation { // com.squ final val sourceFile // com.squareup.wire/WireRpc.sourceFile|{}sourceFile[0] final fun (): kotlin/String // com.squareup.wire/WireRpc.sourceFile.|(){}[0] } +sealed class com.squareup.wire/Syntax { // com.squareup.wire/Syntax|null[0] + constructor (kotlin/String) // com.squareup.wire/Syntax.|(kotlin.String){}[0] + final class Edition : com.squareup.wire/Syntax { // com.squareup.wire/Syntax.Edition|null[0] + constructor (kotlin/String) // com.squareup.wire/Syntax.Edition.|(kotlin.String){}[0] + final fun component1(): kotlin/String // com.squareup.wire/Syntax.Edition.component1|component1(){}[0] + final fun copy(kotlin/String =...): com.squareup.wire/Syntax.Edition // com.squareup.wire/Syntax.Edition.copy|copy(kotlin.String){}[0] + final fun equals(kotlin/Any?): kotlin/Boolean // com.squareup.wire/Syntax.Edition.equals|equals(kotlin.Any?){}[0] + final fun hashCode(): kotlin/Int // com.squareup.wire/Syntax.Edition.hashCode|hashCode(){}[0] + final fun toString(): kotlin/String // com.squareup.wire/Syntax.Edition.toString|toString(){}[0] + final val value // com.squareup.wire/Syntax.Edition.value|{}value[0] + final fun (): kotlin/String // com.squareup.wire/Syntax.Edition.value.|(){}[0] + } + final fun name(): kotlin/String // com.squareup.wire/Syntax.name|name(){}[0] + final object Companion { // com.squareup.wire/Syntax.Companion|null[0] + final fun get(kotlin/String): com.squareup.wire/Syntax // com.squareup.wire/Syntax.Companion.get|get(kotlin.String){}[0] + final fun get(kotlin/String, kotlin/Boolean): com.squareup.wire/Syntax // com.squareup.wire/Syntax.Companion.get|get(kotlin.String;kotlin.Boolean){}[0] + } + final object PROTO_2 : com.squareup.wire/Syntax { // com.squareup.wire/Syntax.PROTO_2|null[0] + final fun equals(kotlin/Any?): kotlin/Boolean // com.squareup.wire/Syntax.PROTO_2.equals|equals(kotlin.Any?){}[0] + final fun hashCode(): kotlin/Int // com.squareup.wire/Syntax.PROTO_2.hashCode|hashCode(){}[0] + final fun toString(): kotlin/String // com.squareup.wire/Syntax.PROTO_2.toString|toString(){}[0] + } + final object PROTO_3 : com.squareup.wire/Syntax { // com.squareup.wire/Syntax.PROTO_3|null[0] + final fun equals(kotlin/Any?): kotlin/Boolean // com.squareup.wire/Syntax.PROTO_3.equals|equals(kotlin.Any?){}[0] + final fun hashCode(): kotlin/Int // com.squareup.wire/Syntax.PROTO_3.hashCode|hashCode(){}[0] + final fun toString(): kotlin/String // com.squareup.wire/Syntax.PROTO_3.toString|toString(){}[0] + } +} // Targets: [iosArm64, iosX64, macos, tvosArm64, tvosX64] final fun <#A: kotlin/Any?> (com.squareup.wire/ProtoAdapter<#A>).com.squareup.wire/decode(platform.Foundation/NSData): #A // com.squareup.wire/decode|decode@com.squareup.wire.ProtoAdapter<0:0>(platform.Foundation.NSData){0§}[0] diff --git a/wire-runtime/src/commonMain/kotlin/com/squareup/wire/Syntax.kt b/wire-runtime/src/commonMain/kotlin/com/squareup/wire/Syntax.kt index 72a983ff55..391035ea80 100644 --- a/wire-runtime/src/commonMain/kotlin/com/squareup/wire/Syntax.kt +++ b/wire-runtime/src/commonMain/kotlin/com/squareup/wire/Syntax.kt @@ -15,20 +15,51 @@ */ package com.squareup.wire -/** Syntax version. */ -enum class Syntax(private val string: String) { - PROTO_2("proto2"), - PROTO_3("proto3"), - ; +/** Syntax and edition version. */ +sealed class Syntax(internal val string: String) { + data object PROTO_2 : Syntax("proto2") { + override fun toString(): String = string + } + data object PROTO_3 : Syntax("proto3") { + override fun toString(): String = string + } + data class Edition(val value: String) : Syntax(value) { + override fun toString(): String = value + } - override fun toString(): String = string + // Created for backward capability with when Syntax used to be an enum. + fun name(): String { + return when (this) { + // TODO(Benoit) Edition needs to return something like `Edition()`. + is Edition, + PROTO_2, + -> "PROTO_2" + PROTO_3 -> "PROTO_3" + } + } companion object { + @Deprecated("Use get(string: String, edition: Boolean) instead", ReplaceWith("Syntax.get(string, edition)")) operator fun get(string: String): Syntax { - for (syntax in values()) { - if (syntax.string == string) return syntax - } + if (string == PROTO_2.toString()) return PROTO_2 + if (string == PROTO_3.toString()) return PROTO_3 throw IllegalArgumentException("unexpected syntax: $string") } + + fun get(string: String, edition: Boolean): Syntax { + if (edition) { + if (string in KNOWN_EDITIONS) return Edition(string) + throw IllegalArgumentException("unknown edition: $string") + } else { + if (string == PROTO_2.toString()) return PROTO_2 + if (string == PROTO_3.toString()) return PROTO_3 + throw IllegalArgumentException("unexpected syntax: $string") + } + } + + private val KNOWN_EDITIONS = listOf( + "2023", + "2024", + ) } } diff --git a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/SyntaxRules.kt b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/SyntaxRules.kt index 21160b5902..2858f70c15 100644 --- a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/SyntaxRules.kt +++ b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/SyntaxRules.kt @@ -40,8 +40,9 @@ interface SyntaxRules { companion object { fun get(syntax: Syntax?): SyntaxRules { return when (syntax) { - PROTO_3 -> PROTO_3_SYNTAX_RULES - PROTO_2, + is PROTO_3 -> PROTO_3_SYNTAX_RULES + is Syntax.Edition, + is PROTO_2, null, -> PROTO_2_SYNTAX_RULES } diff --git a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/internal/parser/ProtoFileElement.kt b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/internal/parser/ProtoFileElement.kt index af2bbce211..dbf3850f49 100644 --- a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/internal/parser/ProtoFileElement.kt +++ b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/internal/parser/ProtoFileElement.kt @@ -16,6 +16,7 @@ package com.squareup.wire.schema.internal.parser import com.squareup.wire.Syntax +import com.squareup.wire.Syntax.Edition import com.squareup.wire.schema.Location import kotlin.jvm.JvmStatic @@ -37,7 +38,11 @@ data class ProtoFileElement( if (syntax != null) { append('\n') - append("syntax = \"$syntax\";\n") + when (syntax) { + is Edition -> append("edition") + else -> append("syntax") + } + append(" = \"$syntax\";\n") } if (packageName != null) { append('\n') diff --git a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/internal/parser/ProtoParser.kt b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/internal/parser/ProtoParser.kt index e010a188eb..fbaa187b8a 100644 --- a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/internal/parser/ProtoParser.kt +++ b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/internal/parser/ProtoParser.kt @@ -121,15 +121,15 @@ class ProtoParser internal constructor( null } - label == "syntax" && context.permitsSyntax() -> { - reader.expect(syntax == null, location) { "too many syntax definitions" } + (label == "syntax" || label == "edition") && context.permitsSyntax() -> { + reader.expect(syntax == null, location) { "too many syntax or edition definitions" } reader.require('=') reader.expect(index == 0, location) { - "'syntax' element must be the first declaration in a file" + "'syntax' or 'edition' element must be the first declaration in a file" } val syntaxString = reader.readQuotedString() try { - syntax = Syntax[syntaxString] + syntax = Syntax.get(syntaxString, edition = label == "edition") } catch (e: IllegalArgumentException) { throw reader.unexpected(e.message!!, location) } diff --git a/wire-schema/src/commonTest/kotlin/com/squareup/wire/schema/internal/parser/ProtoParserTest.kt b/wire-schema/src/commonTest/kotlin/com/squareup/wire/schema/internal/parser/ProtoParserTest.kt index 9d081abf53..eccf91578b 100644 --- a/wire-schema/src/commonTest/kotlin/com/squareup/wire/schema/internal/parser/ProtoParserTest.kt +++ b/wire-schema/src/commonTest/kotlin/com/squareup/wire/schema/internal/parser/ProtoParserTest.kt @@ -21,6 +21,7 @@ import assertk.assertions.hasMessage import assertk.assertions.isEqualTo import assertk.assertions.isNull import assertk.assertions.messageContains +import com.squareup.wire.Syntax.Edition import com.squareup.wire.Syntax.PROTO_2 import com.squareup.wire.Syntax.PROTO_3 import com.squareup.wire.schema.Field.Label.OPTIONAL @@ -627,6 +628,48 @@ class ProtoParserTest { assertThat(parsed.syntax).isNull() } + @Test + fun editionParsing() { + val proto = """ + |edition = "2024"; + |message Foo {} + """.trimMargin() + val parsed = ProtoParser.parse(location, proto) + assertThat(parsed.syntax).isEqualTo(Edition("2024")) + } + + @Test + fun syntaxAndEditionConflictAreNotAllowed() { + val proto = """ + |edition = "2024"; + |syntax = "proto2"; + |message Foo {} + """.trimMargin() + try { + ProtoParser.parse(location, proto) + fail() + } catch (e: IllegalStateException) { + assertThat(e).hasMessage("Syntax error in file.proto:2:1: too many syntax or edition definitions") + } + } + + @Test + fun rejectUnknownEditions() { + for (edition in listOf("something", "EDITION_2023", "2025")) { + val proto = """ + |edition = "2025"; + |syntax = "proto2"; + |message Foo {} + """.trimMargin() + try { + ProtoParser.parse(location, proto) + fail("Excepted to fail for edition $edition") + } catch (e: IllegalStateException) { + assertThat(e).hasMessage("Syntax error in file.proto:1:1: unknown edition: 2025") + } + } + } + @Test fun syntaxSpecified() { val proto = """ @@ -671,7 +714,7 @@ class ProtoParserTest { fail() } catch (expected: IllegalStateException) { assertThat(expected).hasMessage( - "Syntax error in file.proto:2:1: 'syntax' element must be the first declaration in a file", + "Syntax error in file.proto:2:1: 'syntax' or 'edition' element must be the first declaration in a file", ) } } @@ -3174,7 +3217,7 @@ class ProtoParserTest { fail() } catch (expected: IllegalStateException) { assertThat(expected) - .messageContains("Syntax error in file.proto:2:3: too many syntax definitions") + .messageContains("Syntax error in file.proto:2:3: too many syntax or edition definitions") } } diff --git a/wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt b/wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt index b0172e8f1f..10dd72902f 100644 --- a/wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt +++ b/wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt @@ -15,6 +15,7 @@ */ package com.squareup.wire.swift +import com.squareup.wire.Syntax.Edition import com.squareup.wire.Syntax.PROTO_2 import com.squareup.wire.Syntax.PROTO_3 import com.squareup.wire.internal.camelCase @@ -601,7 +602,9 @@ class SwiftGenerator private constructor( // Declare locals into which everything is written before promoting to members. type.declaredFields.forEach { field -> val localType = when (type.syntax) { - PROTO_2 -> if (field.isRepeated || field.isMap) { + is Edition, + PROTO_2, + -> if (field.isRepeated || field.isMap) { field.typeName } else { field.typeName.makeOptional() @@ -614,7 +617,9 @@ class SwiftGenerator private constructor( } val initializer = when (type.syntax) { - PROTO_2 -> when { + is Edition, + PROTO_2, + -> when { field.isMap -> "[:]" field.isRepeated -> "[]" else -> "nil" @@ -696,7 +701,9 @@ class SwiftGenerator private constructor( val hasPropertyWrapper = !isIndirect(type, field) && (field.defaultedValue != null || field.isProtoDefaulted) val initializer = when (type.syntax) { - PROTO_2 -> if (field.isOptional || field.isRepeated || field.isMap) { + is Edition, + PROTO_2, + -> if (field.isOptional || field.isRepeated || field.isMap) { CodeBlock.of("%N", field.safeName) } else { CodeBlock.of("try %1T.checkIfMissing(%2N, %3S)", structType, field.safeName, field.name) @@ -780,13 +787,17 @@ class SwiftGenerator private constructor( private val MessageType.protoCodableType: DeclaredTypeName get() = when (syntax) { - PROTO_2 -> proto2Codable + is Edition, + PROTO_2, + -> proto2Codable PROTO_3 -> proto3Codable } private val EnumType.protoCodableType: DeclaredTypeName get() = when (syntax) { - PROTO_2 -> proto2Enum + is Edition, + PROTO_2, + -> proto2Enum PROTO_3 -> proto3Enum } diff --git a/wire-tests/src/jvmJavaAndroidCompactTest/proto-java/com/squareup/wire/protos/person/Person.java b/wire-tests/src/jvmJavaAndroidCompactTest/proto-java/com/squareup/wire/protos/person/Person.java index 88d0299fd3..6ce8c42a0c 100644 --- a/wire-tests/src/jvmJavaAndroidCompactTest/proto-java/com/squareup/wire/protos/person/Person.java +++ b/wire-tests/src/jvmJavaAndroidCompactTest/proto-java/com/squareup/wire/protos/person/Person.java @@ -18,7 +18,7 @@ import okio.ByteString; public final class Person extends AndroidMessage { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(Person.class, "type.googleapis.com/squareup.protos.person.Person", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(Person.class, "type.googleapis.com/squareup.protos.person.Person", Syntax.PROTO_2.INSTANCE); public static final Parcelable.Creator CREATOR = AndroidMessage.newCreator(ADAPTER); @@ -234,7 +234,7 @@ public int getValue() { } public static final class PhoneNumber extends AndroidMessage { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(PhoneNumber.class, "type.googleapis.com/squareup.protos.person.Person.PhoneNumber", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(PhoneNumber.class, "type.googleapis.com/squareup.protos.person.Person.PhoneNumber", Syntax.PROTO_2.INSTANCE); public static final Parcelable.Creator CREATOR = AndroidMessage.newCreator(ADAPTER); diff --git a/wire-tests/src/jvmJavaAndroidTest/proto-java/com/squareup/wire/protos/person/Person.java b/wire-tests/src/jvmJavaAndroidTest/proto-java/com/squareup/wire/protos/person/Person.java index 95cdbce598..41b855df20 100644 --- a/wire-tests/src/jvmJavaAndroidTest/proto-java/com/squareup/wire/protos/person/Person.java +++ b/wire-tests/src/jvmJavaAndroidTest/proto-java/com/squareup/wire/protos/person/Person.java @@ -252,7 +252,7 @@ public int getValue() { private static final class ProtoAdapter_PhoneType extends EnumAdapter { ProtoAdapter_PhoneType() { - super(PhoneType.class, Syntax.PROTO_2, PhoneType.MOBILE); + super(PhoneType.class, Syntax.PROTO_2.INSTANCE, PhoneType.MOBILE); } @Override @@ -376,7 +376,7 @@ public PhoneNumber build() { private static final class ProtoAdapter_PhoneNumber extends ProtoAdapter { public ProtoAdapter_PhoneNumber() { - super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.protos.person.Person.PhoneNumber", Syntax.PROTO_2, null, "person.proto"); + super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.protos.person.Person.PhoneNumber", Syntax.PROTO_2.INSTANCE, null, "person.proto"); } @Override @@ -437,7 +437,7 @@ public PhoneNumber redact(PhoneNumber value) { private static final class ProtoAdapter_Person extends ProtoAdapter { public ProtoAdapter_Person() { - super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.protos.person.Person", Syntax.PROTO_2, null, "person.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.protos.person.Person", Syntax.PROTO_2.INSTANCE, null, "person.proto"); } @Override diff --git a/wire-tests/src/jvmJavaCompactTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java b/wire-tests/src/jvmJavaCompactTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java index 38cb275a57..2930f5aeea 100644 --- a/wire-tests/src/jvmJavaCompactTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java +++ b/wire-tests/src/jvmJavaCompactTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java @@ -21,7 +21,7 @@ import okio.ByteString; public final class AllTypes extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes", Syntax.PROTO_2.INSTANCE); private static final long serialVersionUID = 0L; @@ -2885,7 +2885,7 @@ public int getValue() { } public static final class NestedMessage extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes.NestedMessage", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes.NestedMessage", Syntax.PROTO_2.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/differentpackage/protos/bar/Bar.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/differentpackage/protos/bar/Bar.java index edb16e7b02..d7100e6252 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/differentpackage/protos/bar/Bar.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/differentpackage/protos/bar/Bar.java @@ -192,7 +192,7 @@ public Moo build() { private static final class ProtoAdapter_Moo extends ProtoAdapter { public ProtoAdapter_Moo() { - super(FieldEncoding.LENGTH_DELIMITED, Moo.class, "type.googleapis.com/squareup.differentpackage.bar.Bar.Baz.Moo", Syntax.PROTO_2, null, "differentpackage/bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Moo.class, "type.googleapis.com/squareup.differentpackage.bar.Bar.Baz.Moo", Syntax.PROTO_2.INSTANCE, null, "differentpackage/bar.proto"); } @Override @@ -242,7 +242,7 @@ public Moo redact(Moo value) { private static final class ProtoAdapter_Baz extends ProtoAdapter { public ProtoAdapter_Baz() { - super(FieldEncoding.LENGTH_DELIMITED, Baz.class, "type.googleapis.com/squareup.differentpackage.bar.Bar.Baz", Syntax.PROTO_2, null, "differentpackage/bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Baz.class, "type.googleapis.com/squareup.differentpackage.bar.Bar.Baz", Syntax.PROTO_2.INSTANCE, null, "differentpackage/bar.proto"); } @Override @@ -288,7 +288,7 @@ public Baz redact(Baz value) { private static final class ProtoAdapter_Bar extends ProtoAdapter { public ProtoAdapter_Bar() { - super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/squareup.differentpackage.bar.Bar", Syntax.PROTO_2, null, "differentpackage/bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/squareup.differentpackage.bar.Bar", Syntax.PROTO_2.INSTANCE, null, "differentpackage/bar.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/differentpackage/protos/foo/Foo.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/differentpackage/protos/foo/Foo.java index 40b107414a..eaa9e89b2b 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/differentpackage/protos/foo/Foo.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/differentpackage/protos/foo/Foo.java @@ -93,7 +93,7 @@ public Foo build() { private static final class ProtoAdapter_Foo extends ProtoAdapter { public ProtoAdapter_Foo() { - super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.differentpackage.foo.Foo", Syntax.PROTO_2, null, "differentpackage/foo.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.differentpackage.foo.Foo", Syntax.PROTO_2.INSTANCE, null, "differentpackage/foo.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/foobar/protos/bar/Bar.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/foobar/protos/bar/Bar.java index 6438064606..7f852ee94f 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/foobar/protos/bar/Bar.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/foobar/protos/bar/Bar.java @@ -192,7 +192,7 @@ public Moo build() { private static final class ProtoAdapter_Moo extends ProtoAdapter { public ProtoAdapter_Moo() { - super(FieldEncoding.LENGTH_DELIMITED, Moo.class, "type.googleapis.com/squareup.foobar.Bar.Baz.Moo", Syntax.PROTO_2, null, "bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Moo.class, "type.googleapis.com/squareup.foobar.Bar.Baz.Moo", Syntax.PROTO_2.INSTANCE, null, "bar.proto"); } @Override @@ -242,7 +242,7 @@ public Moo redact(Moo value) { private static final class ProtoAdapter_Baz extends ProtoAdapter { public ProtoAdapter_Baz() { - super(FieldEncoding.LENGTH_DELIMITED, Baz.class, "type.googleapis.com/squareup.foobar.Bar.Baz", Syntax.PROTO_2, null, "bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Baz.class, "type.googleapis.com/squareup.foobar.Bar.Baz", Syntax.PROTO_2.INSTANCE, null, "bar.proto"); } @Override @@ -288,7 +288,7 @@ public Baz redact(Baz value) { private static final class ProtoAdapter_Bar extends ProtoAdapter { public ProtoAdapter_Bar() { - super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/squareup.foobar.Bar", Syntax.PROTO_2, null, "bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/squareup.foobar.Bar", Syntax.PROTO_2.INSTANCE, null, "bar.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/foobar/protos/foo/Foo.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/foobar/protos/foo/Foo.java index 2828591a2b..694aa5d497 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/foobar/protos/foo/Foo.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/foobar/protos/foo/Foo.java @@ -95,7 +95,7 @@ public Foo build() { private static final class ProtoAdapter_Foo extends ProtoAdapter { public ProtoAdapter_Foo() { - super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.foobar.Foo", Syntax.PROTO_2, null, "foo.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.foobar.Foo", Syntax.PROTO_2.INSTANCE, null, "foo.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/HeresAllTheDataRequest.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/HeresAllTheDataRequest.java index 87fda7bd77..d48f8150e7 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/HeresAllTheDataRequest.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/HeresAllTheDataRequest.java @@ -94,7 +94,7 @@ public HeresAllTheDataRequest build() { private static final class ProtoAdapter_HeresAllTheDataRequest extends ProtoAdapter { public ProtoAdapter_HeresAllTheDataRequest() { - super(FieldEncoding.LENGTH_DELIMITED, HeresAllTheDataRequest.class, "type.googleapis.com/com.squareup.services.HeresAllTheDataRequest", Syntax.PROTO_2, null, "simple_service2.proto"); + super(FieldEncoding.LENGTH_DELIMITED, HeresAllTheDataRequest.class, "type.googleapis.com/com.squareup.services.HeresAllTheDataRequest", Syntax.PROTO_2.INSTANCE, null, "simple_service2.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/HeresAllTheDataResponse.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/HeresAllTheDataResponse.java index 231b77e53e..9aee0945e9 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/HeresAllTheDataResponse.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/HeresAllTheDataResponse.java @@ -94,7 +94,7 @@ public HeresAllTheDataResponse build() { private static final class ProtoAdapter_HeresAllTheDataResponse extends ProtoAdapter { public ProtoAdapter_HeresAllTheDataResponse() { - super(FieldEncoding.LENGTH_DELIMITED, HeresAllTheDataResponse.class, "type.googleapis.com/com.squareup.services.HeresAllTheDataResponse", Syntax.PROTO_2, null, "simple_service2.proto"); + super(FieldEncoding.LENGTH_DELIMITED, HeresAllTheDataResponse.class, "type.googleapis.com/com.squareup.services.HeresAllTheDataResponse", Syntax.PROTO_2.INSTANCE, null, "simple_service2.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/LetsDataRequest.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/LetsDataRequest.java index 1948bffd86..a369192d4e 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/LetsDataRequest.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/LetsDataRequest.java @@ -94,7 +94,7 @@ public LetsDataRequest build() { private static final class ProtoAdapter_LetsDataRequest extends ProtoAdapter { public ProtoAdapter_LetsDataRequest() { - super(FieldEncoding.LENGTH_DELIMITED, LetsDataRequest.class, "type.googleapis.com/com.squareup.services.LetsDataRequest", Syntax.PROTO_2, null, "simple_service2.proto"); + super(FieldEncoding.LENGTH_DELIMITED, LetsDataRequest.class, "type.googleapis.com/com.squareup.services.LetsDataRequest", Syntax.PROTO_2.INSTANCE, null, "simple_service2.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/LetsDataResponse.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/LetsDataResponse.java index ebac8d48f5..478393a331 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/LetsDataResponse.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/LetsDataResponse.java @@ -94,7 +94,7 @@ public LetsDataResponse build() { private static final class ProtoAdapter_LetsDataResponse extends ProtoAdapter { public ProtoAdapter_LetsDataResponse() { - super(FieldEncoding.LENGTH_DELIMITED, LetsDataResponse.class, "type.googleapis.com/com.squareup.services.LetsDataResponse", Syntax.PROTO_2, null, "simple_service2.proto"); + super(FieldEncoding.LENGTH_DELIMITED, LetsDataResponse.class, "type.googleapis.com/com.squareup.services.LetsDataResponse", Syntax.PROTO_2.INSTANCE, null, "simple_service2.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java index 263051f1db..00b8f1dbfd 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java @@ -94,7 +94,7 @@ public SendDataRequest build() { private static final class ProtoAdapter_SendDataRequest extends ProtoAdapter { public ProtoAdapter_SendDataRequest() { - super(FieldEncoding.LENGTH_DELIMITED, SendDataRequest.class, "type.googleapis.com/com.squareup.services.anotherpackage.SendDataRequest", Syntax.PROTO_2, null, "request_response.proto"); + super(FieldEncoding.LENGTH_DELIMITED, SendDataRequest.class, "type.googleapis.com/com.squareup.services.anotherpackage.SendDataRequest", Syntax.PROTO_2.INSTANCE, null, "request_response.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java index 7858441523..5238e55e82 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java @@ -94,7 +94,7 @@ public SendDataResponse build() { private static final class ProtoAdapter_SendDataResponse extends ProtoAdapter { public ProtoAdapter_SendDataResponse() { - super(FieldEncoding.LENGTH_DELIMITED, SendDataResponse.class, "type.googleapis.com/com.squareup.services.anotherpackage.SendDataResponse", Syntax.PROTO_2, null, "request_response.proto"); + super(FieldEncoding.LENGTH_DELIMITED, SendDataResponse.class, "type.googleapis.com/com.squareup.services.anotherpackage.SendDataResponse", Syntax.PROTO_2.INSTANCE, null, "request_response.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/Mappy.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/Mappy.java index 794d1e2d98..752e015026 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/Mappy.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/Mappy.java @@ -98,7 +98,7 @@ private static final class ProtoAdapter_Mappy extends ProtoAdapter { private ProtoAdapter> things; public ProtoAdapter_Mappy() { - super(FieldEncoding.LENGTH_DELIMITED, Mappy.class, "type.googleapis.com/com.squareup.wire.map.Mappy", Syntax.PROTO_2, null, "map.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Mappy.class, "type.googleapis.com/com.squareup.wire.map.Mappy", Syntax.PROTO_2.INSTANCE, null, "map.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/MappyTwo.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/MappyTwo.java index 02d56e1365..933dc12f4d 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/MappyTwo.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/MappyTwo.java @@ -197,7 +197,7 @@ public int getValue() { private static final class ProtoAdapter_ValueEnum extends EnumAdapter { ProtoAdapter_ValueEnum() { - super(ValueEnum.class, Syntax.PROTO_2, ValueEnum.DEFAULT); + super(ValueEnum.class, Syntax.PROTO_2.INSTANCE, ValueEnum.DEFAULT); } @Override @@ -217,7 +217,7 @@ private static final class ProtoAdapter_MappyTwo extends ProtoAdapter private ProtoAdapter> int_things_two; public ProtoAdapter_MappyTwo() { - super(FieldEncoding.LENGTH_DELIMITED, MappyTwo.class, "type.googleapis.com/com.squareup.wire.map.MappyTwo", Syntax.PROTO_2, null, "map.proto"); + super(FieldEncoding.LENGTH_DELIMITED, MappyTwo.class, "type.googleapis.com/com.squareup.wire.map.MappyTwo", Syntax.PROTO_2.INSTANCE, null, "map.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/Thing.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/Thing.java index 3fab2d0ac2..72962cba2c 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/Thing.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/map/Thing.java @@ -94,7 +94,7 @@ public Thing build() { private static final class ProtoAdapter_Thing extends ProtoAdapter { public ProtoAdapter_Thing() { - super(FieldEncoding.LENGTH_DELIMITED, Thing.class, "type.googleapis.com/com.squareup.wire.map.Thing", Syntax.PROTO_2, null, "map.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Thing.class, "type.googleapis.com/com.squareup.wire.map.Thing", Syntax.PROTO_2.INSTANCE, null, "map.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/ChildPackage.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/ChildPackage.java index ed80996dc5..d577255bdb 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/ChildPackage.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/ChildPackage.java @@ -95,7 +95,7 @@ public ChildPackage build() { private static final class ProtoAdapter_ChildPackage extends ProtoAdapter { public ProtoAdapter_ChildPackage() { - super(FieldEncoding.LENGTH_DELIMITED, ChildPackage.class, "type.googleapis.com/squareup.protos.ChildPackage", Syntax.PROTO_2, null, "child_pkg.proto"); + super(FieldEncoding.LENGTH_DELIMITED, ChildPackage.class, "type.googleapis.com/squareup.protos.ChildPackage", Syntax.PROTO_2.INSTANCE, null, "child_pkg.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/RepeatedPackedAndMap.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/RepeatedPackedAndMap.java index d7b3c98d41..73c8fe918d 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/RepeatedPackedAndMap.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/RepeatedPackedAndMap.java @@ -144,7 +144,7 @@ private static final class ProtoAdapter_RepeatedPackedAndMap extends ProtoAdapte private ProtoAdapter> map_int32_int32; public ProtoAdapter_RepeatedPackedAndMap() { - super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.protos.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2, null, "collection_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.protos.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2.INSTANCE, null, "collection_types.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java index 906c5f8d39..1fa8164beb 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java @@ -3031,7 +3031,7 @@ public int getValue() { private static final class ProtoAdapter_NestedEnum extends EnumAdapter { ProtoAdapter_NestedEnum() { - super(NestedEnum.class, Syntax.PROTO_2, NestedEnum.UNKNOWN); + super(NestedEnum.class, Syntax.PROTO_2.INSTANCE, NestedEnum.UNKNOWN); } @Override @@ -3117,7 +3117,7 @@ public NestedMessage build() { private static final class ProtoAdapter_NestedMessage extends ProtoAdapter { public ProtoAdapter_NestedMessage() { - super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes.NestedMessage", Syntax.PROTO_2, null, "all_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes.NestedMessage", Syntax.PROTO_2.INSTANCE, null, "all_types.proto"); } @Override @@ -3175,7 +3175,7 @@ private static final class ProtoAdapter_AllTypes extends ProtoAdapter private ProtoAdapter> map_string_enum; public ProtoAdapter_AllTypes() { - super(FieldEncoding.LENGTH_DELIMITED, AllTypes.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes", Syntax.PROTO_2, null, "all_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, AllTypes.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes", Syntax.PROTO_2.INSTANCE, null, "all_types.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/custom_options/FooBar.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/custom_options/FooBar.java index 57778f21f3..392872004c 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/custom_options/FooBar.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/custom_options/FooBar.java @@ -370,7 +370,7 @@ public Nested build() { private static final class ProtoAdapter_Nested extends ProtoAdapter { public ProtoAdapter_Nested() { - super(FieldEncoding.LENGTH_DELIMITED, Nested.class, "type.googleapis.com/squareup.protos.custom_options.FooBar.Nested", Syntax.PROTO_2, null, "custom_options.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Nested.class, "type.googleapis.com/squareup.protos.custom_options.FooBar.Nested", Syntax.PROTO_2.INSTANCE, null, "custom_options.proto"); } @Override @@ -502,7 +502,7 @@ public More build() { private static final class ProtoAdapter_More extends ProtoAdapter { public ProtoAdapter_More() { - super(FieldEncoding.LENGTH_DELIMITED, More.class, "type.googleapis.com/squareup.protos.custom_options.FooBar.More", Syntax.PROTO_2, null, "custom_options.proto"); + super(FieldEncoding.LENGTH_DELIMITED, More.class, "type.googleapis.com/squareup.protos.custom_options.FooBar.More", Syntax.PROTO_2.INSTANCE, null, "custom_options.proto"); } @Override @@ -584,7 +584,7 @@ public int getValue() { private static final class ProtoAdapter_FooBarBazEnum extends EnumAdapter { ProtoAdapter_FooBarBazEnum() { - super(FooBarBazEnum.class, Syntax.PROTO_2, null); + super(FooBarBazEnum.class, Syntax.PROTO_2.INSTANCE, null); } @Override @@ -596,7 +596,7 @@ protected FooBarBazEnum fromValue(int value) { private static final class ProtoAdapter_FooBar extends ProtoAdapter { public ProtoAdapter_FooBar() { - super(FieldEncoding.LENGTH_DELIMITED, FooBar.class, "type.googleapis.com/squareup.protos.custom_options.FooBar", Syntax.PROTO_2, null, "custom_options.proto"); + super(FieldEncoding.LENGTH_DELIMITED, FooBar.class, "type.googleapis.com/squareup.protos.custom_options.FooBar", Syntax.PROTO_2.INSTANCE, null, "custom_options.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java index 2bcc9e4a22..9f85f4a81b 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java @@ -67,7 +67,7 @@ public MessageWithOptions build() { private static final class ProtoAdapter_MessageWithOptions extends ProtoAdapter { public ProtoAdapter_MessageWithOptions() { - super(FieldEncoding.LENGTH_DELIMITED, MessageWithOptions.class, "type.googleapis.com/squareup.protos.custom_options.MessageWithOptions", Syntax.PROTO_2, null, "custom_options.proto"); + super(FieldEncoding.LENGTH_DELIMITED, MessageWithOptions.class, "type.googleapis.com/squareup.protos.custom_options.MessageWithOptions", Syntax.PROTO_2.INSTANCE, null, "custom_options.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java index 85662255d9..b0cbf516c8 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java @@ -94,7 +94,7 @@ public Letter build() { private static final class ProtoAdapter_Letter extends ProtoAdapter { public ProtoAdapter_Letter() { - super(FieldEncoding.LENGTH_DELIMITED, Letter.class, "type.googleapis.com/squareup.protos.depend_on_kotlin_option.Letter", Syntax.PROTO_2, null, "depend_on_kotlin_option.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Letter.class, "type.googleapis.com/squareup.protos.depend_on_kotlin_option.Letter", Syntax.PROTO_2.INSTANCE, null, "depend_on_kotlin_option.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/NoFields.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/NoFields.java index 24b8cfdafa..d8aaf78342 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/NoFields.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/NoFields.java @@ -67,7 +67,7 @@ public NoFields build() { private static final class ProtoAdapter_NoFields extends ProtoAdapter { public ProtoAdapter_NoFields() { - super(FieldEncoding.LENGTH_DELIMITED, NoFields.class, "type.googleapis.com/squareup.protos.edgecases.NoFields", Syntax.PROTO_2, null, "edge_cases.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NoFields.class, "type.googleapis.com/squareup.protos.edgecases.NoFields", Syntax.PROTO_2.INSTANCE, null, "edge_cases.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java index 5232e75eb5..b25eb4b1ef 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java @@ -94,7 +94,7 @@ public OneBytesField build() { private static final class ProtoAdapter_OneBytesField extends ProtoAdapter { public ProtoAdapter_OneBytesField() { - super(FieldEncoding.LENGTH_DELIMITED, OneBytesField.class, "type.googleapis.com/squareup.protos.edgecases.OneBytesField", Syntax.PROTO_2, null, "edge_cases.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OneBytesField.class, "type.googleapis.com/squareup.protos.edgecases.OneBytesField", Syntax.PROTO_2.INSTANCE, null, "edge_cases.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/OneField.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/OneField.java index c0496a55c8..ae269dcd72 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/OneField.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/OneField.java @@ -95,7 +95,7 @@ public OneField build() { private static final class ProtoAdapter_OneField extends ProtoAdapter { public ProtoAdapter_OneField() { - super(FieldEncoding.LENGTH_DELIMITED, OneField.class, "type.googleapis.com/squareup.protos.edgecases.OneField", Syntax.PROTO_2, null, "edge_cases.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OneField.class, "type.googleapis.com/squareup.protos.edgecases.OneField", Syntax.PROTO_2.INSTANCE, null, "edge_cases.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/Recursive.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/Recursive.java index 3d85873c8c..9f9c9e94c3 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/Recursive.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/edgecases/Recursive.java @@ -113,7 +113,7 @@ public Recursive build() { private static final class ProtoAdapter_Recursive extends ProtoAdapter { public ProtoAdapter_Recursive() { - super(FieldEncoding.LENGTH_DELIMITED, Recursive.class, "type.googleapis.com/squareup.protos.edgecases.Recursive", Syntax.PROTO_2, null, "edge_cases.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Recursive.class, "type.googleapis.com/squareup.protos.edgecases.Recursive", Syntax.PROTO_2.INSTANCE, null, "edge_cases.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java index f5349a7470..287a908784 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java @@ -39,7 +39,7 @@ public int getValue() { private static final class ProtoAdapter_ForeignEnum extends EnumAdapter { ProtoAdapter_ForeignEnum() { - super(ForeignEnum.class, Syntax.PROTO_2, ForeignEnum.BAV); + super(ForeignEnum.class, Syntax.PROTO_2.INSTANCE, ForeignEnum.BAV); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java index cbead3a36c..b765cb4a7f 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java @@ -118,7 +118,7 @@ public ForeignMessage build() { private static final class ProtoAdapter_ForeignMessage extends ProtoAdapter { public ProtoAdapter_ForeignMessage() { - super(FieldEncoding.LENGTH_DELIMITED, ForeignMessage.class, "type.googleapis.com/squareup.protos.foreign.ForeignMessage", Syntax.PROTO_2, null, "foreign.proto"); + super(FieldEncoding.LENGTH_DELIMITED, ForeignMessage.class, "type.googleapis.com/squareup.protos.foreign.ForeignMessage", Syntax.PROTO_2.INSTANCE, null, "foreign.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/namecollisions/Message.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/namecollisions/Message.java index 0bc2e29806..c32aac6a29 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/namecollisions/Message.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/namecollisions/Message.java @@ -281,7 +281,7 @@ public Message build() { private static final class ProtoAdapter_Message extends ProtoAdapter { public ProtoAdapter_Message() { - super(FieldEncoding.LENGTH_DELIMITED, Message.class, "type.googleapis.com/squareup.protos.namecollisions.Message", Syntax.PROTO_2, null, "name_collisions.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Message.class, "type.googleapis.com/squareup.protos.namecollisions.Message", Syntax.PROTO_2.INSTANCE, null, "name_collisions.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/one_extension/Foo.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/one_extension/Foo.java index 9ab024b3a6..798013c6f1 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/one_extension/Foo.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/one_extension/Foo.java @@ -94,7 +94,7 @@ public Foo build() { private static final class ProtoAdapter_Foo extends ProtoAdapter { public ProtoAdapter_Foo() { - super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.protos.one_extension.Foo", Syntax.PROTO_2, null, "one_extension.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.protos.one_extension.Foo", Syntax.PROTO_2.INSTANCE, null, "one_extension.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java index 6f89b40756..3e08880cd0 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java @@ -115,7 +115,7 @@ public OneExtension build() { private static final class ProtoAdapter_OneExtension extends ProtoAdapter { public ProtoAdapter_OneExtension() { - super(FieldEncoding.LENGTH_DELIMITED, OneExtension.class, "type.googleapis.com/squareup.protos.one_extension.OneExtension", Syntax.PROTO_2, null, "one_extension.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OneExtension.class, "type.googleapis.com/squareup.protos.one_extension.OneExtension", Syntax.PROTO_2.INSTANCE, null, "one_extension.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java index ec3edf22f8..11fb8d57db 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java @@ -165,7 +165,7 @@ public OneOfMessage build() { private static final class ProtoAdapter_OneOfMessage extends ProtoAdapter { public ProtoAdapter_OneOfMessage() { - super(FieldEncoding.LENGTH_DELIMITED, OneOfMessage.class, "type.googleapis.com/squareup.protos.oneof.OneOfMessage", Syntax.PROTO_2, null, "one_of.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OneOfMessage.class, "type.googleapis.com/squareup.protos.oneof.OneOfMessage", Syntax.PROTO_2.INSTANCE, null, "one_of.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/person/Person.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/person/Person.java index 20199d32c5..1b5a52601e 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/person/Person.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/person/Person.java @@ -248,7 +248,7 @@ public int getValue() { private static final class ProtoAdapter_PhoneType extends EnumAdapter { ProtoAdapter_PhoneType() { - super(PhoneType.class, Syntax.PROTO_2, PhoneType.MOBILE); + super(PhoneType.class, Syntax.PROTO_2.INSTANCE, PhoneType.MOBILE); } @Override @@ -370,7 +370,7 @@ public PhoneNumber build() { private static final class ProtoAdapter_PhoneNumber extends ProtoAdapter { public ProtoAdapter_PhoneNumber() { - super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.protos.person.Person.PhoneNumber", Syntax.PROTO_2, null, "person.proto"); + super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.protos.person.Person.PhoneNumber", Syntax.PROTO_2.INSTANCE, null, "person.proto"); } @Override @@ -431,7 +431,7 @@ public PhoneNumber redact(PhoneNumber value) { private static final class ProtoAdapter_Person extends ProtoAdapter { public ProtoAdapter_Person() { - super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.protos.person.Person", Syntax.PROTO_2, null, "person.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.protos.person.Person", Syntax.PROTO_2.INSTANCE, null, "person.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java index 11cfc7d5dd..77ff73e4a8 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java @@ -114,7 +114,7 @@ public NotRedacted build() { private static final class ProtoAdapter_NotRedacted extends ProtoAdapter { public ProtoAdapter_NotRedacted() { - super(FieldEncoding.LENGTH_DELIMITED, NotRedacted.class, "type.googleapis.com/squareup.protos.redacted_test.NotRedacted", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NotRedacted.class, "type.googleapis.com/squareup.protos.redacted_test.NotRedacted", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java index 2ba2210a1a..cfa82ac33e 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java @@ -130,7 +130,7 @@ public RedactedChild build() { private static final class ProtoAdapter_RedactedChild extends ProtoAdapter { public ProtoAdapter_RedactedChild() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedChild.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedChild", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedChild.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedChild", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java index c5f890b2af..dd1d4e3de3 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java @@ -92,7 +92,7 @@ public RedactedCycleA build() { private static final class ProtoAdapter_RedactedCycleA extends ProtoAdapter { public ProtoAdapter_RedactedCycleA() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedCycleA.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedCycleA", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedCycleA.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedCycleA", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java index a04f7f8954..18de2b1d01 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java @@ -92,7 +92,7 @@ public RedactedCycleB build() { private static final class ProtoAdapter_RedactedCycleB extends ProtoAdapter { public ProtoAdapter_RedactedCycleB() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedCycleB.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedCycleB", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedCycleB.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedCycleB", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java index 19a70ae13c..65ace6b08d 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java @@ -115,7 +115,7 @@ public RedactedExtension build() { private static final class ProtoAdapter_RedactedExtension extends ProtoAdapter { public ProtoAdapter_RedactedExtension() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedExtension.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedExtension", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedExtension.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedExtension", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedFields.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedFields.java index 4beb685c09..4ea4341224 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedFields.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedFields.java @@ -157,7 +157,7 @@ public RedactedFields build() { private static final class ProtoAdapter_RedactedFields extends ProtoAdapter { public ProtoAdapter_RedactedFields() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedFields.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedFields", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedFields.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedFields", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java index a45d1a0b4a..a5589d538e 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java @@ -125,7 +125,7 @@ public RedactedRepeated build() { private static final class ProtoAdapter_RedactedRepeated extends ProtoAdapter { public ProtoAdapter_RedactedRepeated() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedRepeated.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedRepeated", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedRepeated.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedRepeated", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java index ab13e4632c..d218983a5a 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java @@ -100,7 +100,7 @@ public RedactedRequired build() { private static final class ProtoAdapter_RedactedRequired extends ProtoAdapter { public ProtoAdapter_RedactedRequired() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedRequired.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedRequired", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedRequired.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedRequired", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/A.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/A.java index b37d7739ba..0508cf8e70 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/A.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/A.java @@ -125,7 +125,7 @@ public A build() { private static final class ProtoAdapter_A extends ProtoAdapter { public ProtoAdapter_A() { - super(FieldEncoding.LENGTH_DELIMITED, A.class, "type.googleapis.com/squareup.protos.roots.A", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, A.class, "type.googleapis.com/squareup.protos.roots.A", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/B.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/B.java index ba37828edd..0ac565afd9 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/B.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/B.java @@ -96,7 +96,7 @@ public B build() { private static final class ProtoAdapter_B extends ProtoAdapter { public ProtoAdapter_B() { - super(FieldEncoding.LENGTH_DELIMITED, B.class, "type.googleapis.com/squareup.protos.roots.B", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, B.class, "type.googleapis.com/squareup.protos.roots.B", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/C.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/C.java index b7367a11a6..f5a60beba9 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/C.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/C.java @@ -95,7 +95,7 @@ public C build() { private static final class ProtoAdapter_C extends ProtoAdapter { public ProtoAdapter_C() { - super(FieldEncoding.LENGTH_DELIMITED, C.class, "type.googleapis.com/squareup.protos.roots.C", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, C.class, "type.googleapis.com/squareup.protos.roots.C", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/D.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/D.java index 6c22b66e2a..f822f94bc0 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/D.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/D.java @@ -95,7 +95,7 @@ public D build() { private static final class ProtoAdapter_D extends ProtoAdapter { public ProtoAdapter_D() { - super(FieldEncoding.LENGTH_DELIMITED, D.class, "type.googleapis.com/squareup.protos.roots.D", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, D.class, "type.googleapis.com/squareup.protos.roots.D", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/E.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/E.java index 0d90b574a7..20c82b90a6 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/E.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/E.java @@ -187,7 +187,7 @@ public F build() { private static final class ProtoAdapter_F extends ProtoAdapter { public ProtoAdapter_F() { - super(FieldEncoding.LENGTH_DELIMITED, F.class, "type.googleapis.com/squareup.protos.roots.E.F", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, F.class, "type.googleapis.com/squareup.protos.roots.E.F", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override @@ -237,7 +237,7 @@ public F redact(F value) { private static final class ProtoAdapter_E extends ProtoAdapter { public ProtoAdapter_E() { - super(FieldEncoding.LENGTH_DELIMITED, E.class, "type.googleapis.com/squareup.protos.roots.E", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, E.class, "type.googleapis.com/squareup.protos.roots.E", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/G.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/G.java index d116d13ef4..1113e6e646 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/G.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/G.java @@ -39,7 +39,7 @@ public int getValue() { private static final class ProtoAdapter_G extends EnumAdapter { ProtoAdapter_G() { - super(G.class, Syntax.PROTO_2, null); + super(G.class, Syntax.PROTO_2.INSTANCE, null); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/H.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/H.java index 18b694e0a9..a650e30922 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/H.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/H.java @@ -92,7 +92,7 @@ public H build() { private static final class ProtoAdapter_H extends ProtoAdapter { public ProtoAdapter_H() { - super(FieldEncoding.LENGTH_DELIMITED, H.class, "type.googleapis.com/squareup.protos.roots.H", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, H.class, "type.googleapis.com/squareup.protos.roots.H", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/I.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/I.java index 4325984c4f..8af01a1e89 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/I.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/I.java @@ -116,7 +116,7 @@ public I build() { private static final class ProtoAdapter_I extends ProtoAdapter { public ProtoAdapter_I() { - super(FieldEncoding.LENGTH_DELIMITED, I.class, "type.googleapis.com/squareup.protos.roots.I", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, I.class, "type.googleapis.com/squareup.protos.roots.I", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/J.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/J.java index 04479e2767..21ab05b7f1 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/J.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/J.java @@ -92,7 +92,7 @@ public J build() { private static final class ProtoAdapter_J extends ProtoAdapter { public ProtoAdapter_J() { - super(FieldEncoding.LENGTH_DELIMITED, J.class, "type.googleapis.com/squareup.protos.roots.J", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, J.class, "type.googleapis.com/squareup.protos.roots.J", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/K.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/K.java index 59f70a0555..1fb52815db 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/K.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/K.java @@ -95,7 +95,7 @@ public K build() { private static final class ProtoAdapter_K extends ProtoAdapter { public ProtoAdapter_K() { - super(FieldEncoding.LENGTH_DELIMITED, K.class, "type.googleapis.com/squareup.protos.roots.K", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, K.class, "type.googleapis.com/squareup.protos.roots.K", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/TheRequest.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/TheRequest.java index 8b1d3ad239..b20b0c5791 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/TheRequest.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/TheRequest.java @@ -67,7 +67,7 @@ public TheRequest build() { private static final class ProtoAdapter_TheRequest extends ProtoAdapter { public ProtoAdapter_TheRequest() { - super(FieldEncoding.LENGTH_DELIMITED, TheRequest.class, "type.googleapis.com/squareup.wire.protos.roots.TheRequest", Syntax.PROTO_2, null, "service_root.proto"); + super(FieldEncoding.LENGTH_DELIMITED, TheRequest.class, "type.googleapis.com/squareup.wire.protos.roots.TheRequest", Syntax.PROTO_2.INSTANCE, null, "service_root.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/TheResponse.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/TheResponse.java index 0b0be3a8a3..401e8a1ef1 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/TheResponse.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/TheResponse.java @@ -67,7 +67,7 @@ public TheResponse build() { private static final class ProtoAdapter_TheResponse extends ProtoAdapter { public ProtoAdapter_TheResponse() { - super(FieldEncoding.LENGTH_DELIMITED, TheResponse.class, "type.googleapis.com/squareup.wire.protos.roots.TheResponse", Syntax.PROTO_2, null, "service_root.proto"); + super(FieldEncoding.LENGTH_DELIMITED, TheResponse.class, "type.googleapis.com/squareup.wire.protos.roots.TheResponse", Syntax.PROTO_2.INSTANCE, null, "service_root.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java index 73017c993f..c85faef467 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java @@ -67,7 +67,7 @@ public UnnecessaryResponse build() { private static final class ProtoAdapter_UnnecessaryResponse extends ProtoAdapter { public ProtoAdapter_UnnecessaryResponse() { - super(FieldEncoding.LENGTH_DELIMITED, UnnecessaryResponse.class, "type.googleapis.com/squareup.wire.protos.roots.UnnecessaryResponse", Syntax.PROTO_2, null, "service_root.proto"); + super(FieldEncoding.LENGTH_DELIMITED, UnnecessaryResponse.class, "type.googleapis.com/squareup.wire.protos.roots.UnnecessaryResponse", Syntax.PROTO_2.INSTANCE, null, "service_root.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java index 08acbf9b46..edf000edcb 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java @@ -214,7 +214,7 @@ public ExternalMessage build() { private static final class ProtoAdapter_ExternalMessage extends ProtoAdapter { public ProtoAdapter_ExternalMessage() { - super(FieldEncoding.LENGTH_DELIMITED, ExternalMessage.class, "type.googleapis.com/squareup.protos.simple.ExternalMessage", Syntax.PROTO_2, null, "external_message.proto"); + super(FieldEncoding.LENGTH_DELIMITED, ExternalMessage.class, "type.googleapis.com/squareup.protos.simple.ExternalMessage", Syntax.PROTO_2.INSTANCE, null, "external_message.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java index a9ec770427..5f1ea154a2 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java @@ -483,7 +483,7 @@ public NestedMessage build() { private static final class ProtoAdapter_NestedMessage extends ProtoAdapter { public ProtoAdapter_NestedMessage() { - super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/squareup.protos.simple.SimpleMessage.NestedMessage", Syntax.PROTO_2, null, "simple_message.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/squareup.protos.simple.SimpleMessage.NestedMessage", Syntax.PROTO_2.INSTANCE, null, "simple_message.proto"); } @Override @@ -568,7 +568,7 @@ public int getValue() { private static final class ProtoAdapter_NestedEnum extends EnumAdapter { ProtoAdapter_NestedEnum() { - super(NestedEnum.class, Syntax.PROTO_2, null); + super(NestedEnum.class, Syntax.PROTO_2.INSTANCE, null); } @Override @@ -580,7 +580,7 @@ protected NestedEnum fromValue(int value) { private static final class ProtoAdapter_SimpleMessage extends ProtoAdapter { public ProtoAdapter_SimpleMessage() { - super(FieldEncoding.LENGTH_DELIMITED, SimpleMessage.class, "type.googleapis.com/squareup.protos.simple.SimpleMessage", Syntax.PROTO_2, null, "simple_message.proto"); + super(FieldEncoding.LENGTH_DELIMITED, SimpleMessage.class, "type.googleapis.com/squareup.protos.simple.SimpleMessage", Syntax.PROTO_2.INSTANCE, null, "simple_message.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Bar.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Bar.java index a290b14208..89f29eb4d0 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Bar.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Bar.java @@ -95,7 +95,7 @@ public Bar build() { private static final class ProtoAdapter_Bar extends ProtoAdapter { public ProtoAdapter_Bar() { - super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/samebasename.single_level.Bar", Syntax.PROTO_2, null, "samebasename/single_level.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/samebasename.single_level.Bar", Syntax.PROTO_2.INSTANCE, null, "samebasename/single_level.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Bars.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Bars.java index 7c895d3ce0..a127b40b38 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Bars.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Bars.java @@ -96,7 +96,7 @@ public Bars build() { private static final class ProtoAdapter_Bars extends ProtoAdapter { public ProtoAdapter_Bars() { - super(FieldEncoding.LENGTH_DELIMITED, Bars.class, "type.googleapis.com/samebasename.single_level.Bars", Syntax.PROTO_2, null, "samebasename/single_level.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Bars.class, "type.googleapis.com/samebasename.single_level.Bars", Syntax.PROTO_2.INSTANCE, null, "samebasename/single_level.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Foo.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Foo.java index 9c5cad48f0..8933706dff 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Foo.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Foo.java @@ -95,7 +95,7 @@ public Foo build() { private static final class ProtoAdapter_Foo extends ProtoAdapter { public ProtoAdapter_Foo() { - super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/single_level.Foo", Syntax.PROTO_2, null, "single_level.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/single_level.Foo", Syntax.PROTO_2.INSTANCE, null, "single_level.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Foos.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Foos.java index d1d9e94ed7..4aa50c1546 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Foos.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/single_level/Foos.java @@ -96,7 +96,7 @@ public Foos build() { private static final class ProtoAdapter_Foos extends ProtoAdapter { public ProtoAdapter_Foos() { - super(FieldEncoding.LENGTH_DELIMITED, Foos.class, "type.googleapis.com/single_level.Foos", Syntax.PROTO_2, null, "single_level.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foos.class, "type.googleapis.com/single_level.Foos", Syntax.PROTO_2.INSTANCE, null, "single_level.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionOne.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionOne.java index 40ab0c76bb..95fd9e2902 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionOne.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionOne.java @@ -42,7 +42,7 @@ public int getValue() { private static final class ProtoAdapter_EnumVersionOne extends EnumAdapter { ProtoAdapter_EnumVersionOne() { - super(EnumVersionOne.class, Syntax.PROTO_2, null); + super(EnumVersionOne.class, Syntax.PROTO_2.INSTANCE, null); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionTwo.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionTwo.java index 912b525397..bbd70bda17 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionTwo.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionTwo.java @@ -45,7 +45,7 @@ public int getValue() { private static final class ProtoAdapter_EnumVersionTwo extends EnumAdapter { ProtoAdapter_EnumVersionTwo() { - super(EnumVersionTwo.class, Syntax.PROTO_2, null); + super(EnumVersionTwo.class, Syntax.PROTO_2.INSTANCE, null); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionOne.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionOne.java index 156fa840f8..3c081e81a8 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionOne.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionOne.java @@ -95,7 +95,7 @@ public NestedVersionOne build() { private static final class ProtoAdapter_NestedVersionOne extends ProtoAdapter { public ProtoAdapter_NestedVersionOne() { - super(FieldEncoding.LENGTH_DELIMITED, NestedVersionOne.class, "type.googleapis.com/squareup.protos.unknownfields.NestedVersionOne", Syntax.PROTO_2, null, "unknown_fields.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedVersionOne.class, "type.googleapis.com/squareup.protos.unknownfields.NestedVersionOne", Syntax.PROTO_2.INSTANCE, null, "unknown_fields.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionTwo.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionTwo.java index fd6981b677..83aaa968a7 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionTwo.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionTwo.java @@ -200,7 +200,7 @@ public NestedVersionTwo build() { private static final class ProtoAdapter_NestedVersionTwo extends ProtoAdapter { public ProtoAdapter_NestedVersionTwo() { - super(FieldEncoding.LENGTH_DELIMITED, NestedVersionTwo.class, "type.googleapis.com/squareup.protos.unknownfields.NestedVersionTwo", Syntax.PROTO_2, null, "unknown_fields.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedVersionTwo.class, "type.googleapis.com/squareup.protos.unknownfields.NestedVersionTwo", Syntax.PROTO_2.INSTANCE, null, "unknown_fields.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java index b8a1dd0c9c..b24f875ce0 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java @@ -133,7 +133,7 @@ public VersionOne build() { private static final class ProtoAdapter_VersionOne extends ProtoAdapter { public ProtoAdapter_VersionOne() { - super(FieldEncoding.LENGTH_DELIMITED, VersionOne.class, "type.googleapis.com/squareup.protos.unknownfields.VersionOne", Syntax.PROTO_2, null, "unknown_fields.proto"); + super(FieldEncoding.LENGTH_DELIMITED, VersionOne.class, "type.googleapis.com/squareup.protos.unknownfields.VersionOne", Syntax.PROTO_2.INSTANCE, null, "unknown_fields.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java index 7837e62f2f..b7f455736e 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java @@ -238,7 +238,7 @@ public VersionTwo build() { private static final class ProtoAdapter_VersionTwo extends ProtoAdapter { public ProtoAdapter_VersionTwo() { - super(FieldEncoding.LENGTH_DELIMITED, VersionTwo.class, "type.googleapis.com/squareup.protos.unknownfields.VersionTwo", Syntax.PROTO_2, null, "unknown_fields.proto"); + super(FieldEncoding.LENGTH_DELIMITED, VersionTwo.class, "type.googleapis.com/squareup.protos.unknownfields.VersionTwo", Syntax.PROTO_2.INSTANCE, null, "unknown_fields.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/extension_collision/CollisionSubject.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/extension_collision/CollisionSubject.java index fbffa706f8..1540f589fa 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/extension_collision/CollisionSubject.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/extension_collision/CollisionSubject.java @@ -94,7 +94,7 @@ public CollisionSubject build() { private static final class ProtoAdapter_CollisionSubject extends ProtoAdapter { public ProtoAdapter_CollisionSubject() { - super(FieldEncoding.LENGTH_DELIMITED, CollisionSubject.class, "type.googleapis.com/squareup.protos.extension_collision.CollisionSubject", Syntax.PROTO_2, null, "extension_collision.proto"); + super(FieldEncoding.LENGTH_DELIMITED, CollisionSubject.class, "type.googleapis.com/squareup.protos.extension_collision.CollisionSubject", Syntax.PROTO_2.INSTANCE, null, "extension_collision.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/packed_encoding/EmbeddedMessage.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/packed_encoding/EmbeddedMessage.java index 1297ea6398..1bbecb04aa 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/packed_encoding/EmbeddedMessage.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/packed_encoding/EmbeddedMessage.java @@ -118,7 +118,7 @@ public EmbeddedMessage build() { private static final class ProtoAdapter_EmbeddedMessage extends ProtoAdapter { public ProtoAdapter_EmbeddedMessage() { - super(FieldEncoding.LENGTH_DELIMITED, EmbeddedMessage.class, "type.googleapis.com/squareup.protos.packed_encoding.EmbeddedMessage", Syntax.PROTO_2, null, "packed_encoding.proto"); + super(FieldEncoding.LENGTH_DELIMITED, EmbeddedMessage.class, "type.googleapis.com/squareup.protos.packed_encoding.EmbeddedMessage", Syntax.PROTO_2.INSTANCE, null, "packed_encoding.proto"); } @Override diff --git a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/packed_encoding/OuterMessage.java b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/packed_encoding/OuterMessage.java index 21923fbe23..d5fa7a7c21 100644 --- a/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/packed_encoding/OuterMessage.java +++ b/wire-tests/src/jvmJavaNoOptionsTest/proto-java/squareup/protos/packed_encoding/OuterMessage.java @@ -114,7 +114,7 @@ public OuterMessage build() { private static final class ProtoAdapter_OuterMessage extends ProtoAdapter { public ProtoAdapter_OuterMessage() { - super(FieldEncoding.LENGTH_DELIMITED, OuterMessage.class, "type.googleapis.com/squareup.protos.packed_encoding.OuterMessage", Syntax.PROTO_2, null, "packed_encoding.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OuterMessage.class, "type.googleapis.com/squareup.protos.packed_encoding.OuterMessage", Syntax.PROTO_2.INSTANCE, null, "packed_encoding.proto"); } @Override diff --git a/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/A.java b/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/A.java index 08cf355ca1..929d85413e 100644 --- a/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/A.java +++ b/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/A.java @@ -107,7 +107,7 @@ public A build() { private static final class ProtoAdapter_A extends ProtoAdapter { public ProtoAdapter_A() { - super(FieldEncoding.LENGTH_DELIMITED, A.class, "type.googleapis.com/squareup.protos.roots.A", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, A.class, "type.googleapis.com/squareup.protos.roots.A", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/D.java b/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/D.java index 6c22b66e2a..f822f94bc0 100644 --- a/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/D.java +++ b/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/D.java @@ -95,7 +95,7 @@ public D build() { private static final class ProtoAdapter_D extends ProtoAdapter { public ProtoAdapter_D() { - super(FieldEncoding.LENGTH_DELIMITED, D.class, "type.googleapis.com/squareup.protos.roots.D", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, D.class, "type.googleapis.com/squareup.protos.roots.D", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/E.java b/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/E.java index c7817c167b..f10ece4ca9 100644 --- a/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/E.java +++ b/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/E.java @@ -104,7 +104,7 @@ public F build() { private static final class ProtoAdapter_F extends ProtoAdapter { public ProtoAdapter_F() { - super(FieldEncoding.LENGTH_DELIMITED, F.class, "type.googleapis.com/squareup.protos.roots.E.F", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, F.class, "type.googleapis.com/squareup.protos.roots.E.F", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/H.java b/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/H.java index 18b694e0a9..a650e30922 100644 --- a/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/H.java +++ b/wire-tests/src/jvmJavaPrunedTest/proto-java/com/squareup/wire/protos/roots/H.java @@ -92,7 +92,7 @@ public H build() { private static final class ProtoAdapter_H extends ProtoAdapter { public ProtoAdapter_H() { - super(FieldEncoding.LENGTH_DELIMITED, H.class, "type.googleapis.com/squareup.protos.roots.H", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, H.class, "type.googleapis.com/squareup.protos.roots.H", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/differentpackage/protos/bar/Bar.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/differentpackage/protos/bar/Bar.java index edb16e7b02..d7100e6252 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/differentpackage/protos/bar/Bar.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/differentpackage/protos/bar/Bar.java @@ -192,7 +192,7 @@ public Moo build() { private static final class ProtoAdapter_Moo extends ProtoAdapter { public ProtoAdapter_Moo() { - super(FieldEncoding.LENGTH_DELIMITED, Moo.class, "type.googleapis.com/squareup.differentpackage.bar.Bar.Baz.Moo", Syntax.PROTO_2, null, "differentpackage/bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Moo.class, "type.googleapis.com/squareup.differentpackage.bar.Bar.Baz.Moo", Syntax.PROTO_2.INSTANCE, null, "differentpackage/bar.proto"); } @Override @@ -242,7 +242,7 @@ public Moo redact(Moo value) { private static final class ProtoAdapter_Baz extends ProtoAdapter { public ProtoAdapter_Baz() { - super(FieldEncoding.LENGTH_DELIMITED, Baz.class, "type.googleapis.com/squareup.differentpackage.bar.Bar.Baz", Syntax.PROTO_2, null, "differentpackage/bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Baz.class, "type.googleapis.com/squareup.differentpackage.bar.Bar.Baz", Syntax.PROTO_2.INSTANCE, null, "differentpackage/bar.proto"); } @Override @@ -288,7 +288,7 @@ public Baz redact(Baz value) { private static final class ProtoAdapter_Bar extends ProtoAdapter { public ProtoAdapter_Bar() { - super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/squareup.differentpackage.bar.Bar", Syntax.PROTO_2, null, "differentpackage/bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/squareup.differentpackage.bar.Bar", Syntax.PROTO_2.INSTANCE, null, "differentpackage/bar.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/differentpackage/protos/foo/Foo.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/differentpackage/protos/foo/Foo.java index 40b107414a..eaa9e89b2b 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/differentpackage/protos/foo/Foo.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/differentpackage/protos/foo/Foo.java @@ -93,7 +93,7 @@ public Foo build() { private static final class ProtoAdapter_Foo extends ProtoAdapter { public ProtoAdapter_Foo() { - super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.differentpackage.foo.Foo", Syntax.PROTO_2, null, "differentpackage/foo.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.differentpackage.foo.Foo", Syntax.PROTO_2.INSTANCE, null, "differentpackage/foo.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/foobar/protos/bar/Bar.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/foobar/protos/bar/Bar.java index 6438064606..7f852ee94f 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/foobar/protos/bar/Bar.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/foobar/protos/bar/Bar.java @@ -192,7 +192,7 @@ public Moo build() { private static final class ProtoAdapter_Moo extends ProtoAdapter { public ProtoAdapter_Moo() { - super(FieldEncoding.LENGTH_DELIMITED, Moo.class, "type.googleapis.com/squareup.foobar.Bar.Baz.Moo", Syntax.PROTO_2, null, "bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Moo.class, "type.googleapis.com/squareup.foobar.Bar.Baz.Moo", Syntax.PROTO_2.INSTANCE, null, "bar.proto"); } @Override @@ -242,7 +242,7 @@ public Moo redact(Moo value) { private static final class ProtoAdapter_Baz extends ProtoAdapter { public ProtoAdapter_Baz() { - super(FieldEncoding.LENGTH_DELIMITED, Baz.class, "type.googleapis.com/squareup.foobar.Bar.Baz", Syntax.PROTO_2, null, "bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Baz.class, "type.googleapis.com/squareup.foobar.Bar.Baz", Syntax.PROTO_2.INSTANCE, null, "bar.proto"); } @Override @@ -288,7 +288,7 @@ public Baz redact(Baz value) { private static final class ProtoAdapter_Bar extends ProtoAdapter { public ProtoAdapter_Bar() { - super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/squareup.foobar.Bar", Syntax.PROTO_2, null, "bar.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/squareup.foobar.Bar", Syntax.PROTO_2.INSTANCE, null, "bar.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/foobar/protos/foo/Foo.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/foobar/protos/foo/Foo.java index 2828591a2b..694aa5d497 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/foobar/protos/foo/Foo.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/foobar/protos/foo/Foo.java @@ -95,7 +95,7 @@ public Foo build() { private static final class ProtoAdapter_Foo extends ProtoAdapter { public ProtoAdapter_Foo() { - super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.foobar.Foo", Syntax.PROTO_2, null, "foo.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.foobar.Foo", Syntax.PROTO_2.INSTANCE, null, "foo.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/HeresAllTheDataRequest.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/HeresAllTheDataRequest.java index 87fda7bd77..d48f8150e7 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/HeresAllTheDataRequest.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/HeresAllTheDataRequest.java @@ -94,7 +94,7 @@ public HeresAllTheDataRequest build() { private static final class ProtoAdapter_HeresAllTheDataRequest extends ProtoAdapter { public ProtoAdapter_HeresAllTheDataRequest() { - super(FieldEncoding.LENGTH_DELIMITED, HeresAllTheDataRequest.class, "type.googleapis.com/com.squareup.services.HeresAllTheDataRequest", Syntax.PROTO_2, null, "simple_service2.proto"); + super(FieldEncoding.LENGTH_DELIMITED, HeresAllTheDataRequest.class, "type.googleapis.com/com.squareup.services.HeresAllTheDataRequest", Syntax.PROTO_2.INSTANCE, null, "simple_service2.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/HeresAllTheDataResponse.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/HeresAllTheDataResponse.java index 231b77e53e..9aee0945e9 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/HeresAllTheDataResponse.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/HeresAllTheDataResponse.java @@ -94,7 +94,7 @@ public HeresAllTheDataResponse build() { private static final class ProtoAdapter_HeresAllTheDataResponse extends ProtoAdapter { public ProtoAdapter_HeresAllTheDataResponse() { - super(FieldEncoding.LENGTH_DELIMITED, HeresAllTheDataResponse.class, "type.googleapis.com/com.squareup.services.HeresAllTheDataResponse", Syntax.PROTO_2, null, "simple_service2.proto"); + super(FieldEncoding.LENGTH_DELIMITED, HeresAllTheDataResponse.class, "type.googleapis.com/com.squareup.services.HeresAllTheDataResponse", Syntax.PROTO_2.INSTANCE, null, "simple_service2.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/LetsDataRequest.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/LetsDataRequest.java index 1948bffd86..a369192d4e 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/LetsDataRequest.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/LetsDataRequest.java @@ -94,7 +94,7 @@ public LetsDataRequest build() { private static final class ProtoAdapter_LetsDataRequest extends ProtoAdapter { public ProtoAdapter_LetsDataRequest() { - super(FieldEncoding.LENGTH_DELIMITED, LetsDataRequest.class, "type.googleapis.com/com.squareup.services.LetsDataRequest", Syntax.PROTO_2, null, "simple_service2.proto"); + super(FieldEncoding.LENGTH_DELIMITED, LetsDataRequest.class, "type.googleapis.com/com.squareup.services.LetsDataRequest", Syntax.PROTO_2.INSTANCE, null, "simple_service2.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/LetsDataResponse.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/LetsDataResponse.java index ebac8d48f5..478393a331 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/LetsDataResponse.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/LetsDataResponse.java @@ -94,7 +94,7 @@ public LetsDataResponse build() { private static final class ProtoAdapter_LetsDataResponse extends ProtoAdapter { public ProtoAdapter_LetsDataResponse() { - super(FieldEncoding.LENGTH_DELIMITED, LetsDataResponse.class, "type.googleapis.com/com.squareup.services.LetsDataResponse", Syntax.PROTO_2, null, "simple_service2.proto"); + super(FieldEncoding.LENGTH_DELIMITED, LetsDataResponse.class, "type.googleapis.com/com.squareup.services.LetsDataResponse", Syntax.PROTO_2.INSTANCE, null, "simple_service2.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java index 263051f1db..00b8f1dbfd 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java @@ -94,7 +94,7 @@ public SendDataRequest build() { private static final class ProtoAdapter_SendDataRequest extends ProtoAdapter { public ProtoAdapter_SendDataRequest() { - super(FieldEncoding.LENGTH_DELIMITED, SendDataRequest.class, "type.googleapis.com/com.squareup.services.anotherpackage.SendDataRequest", Syntax.PROTO_2, null, "request_response.proto"); + super(FieldEncoding.LENGTH_DELIMITED, SendDataRequest.class, "type.googleapis.com/com.squareup.services.anotherpackage.SendDataRequest", Syntax.PROTO_2.INSTANCE, null, "request_response.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java index 7858441523..5238e55e82 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java @@ -94,7 +94,7 @@ public SendDataResponse build() { private static final class ProtoAdapter_SendDataResponse extends ProtoAdapter { public ProtoAdapter_SendDataResponse() { - super(FieldEncoding.LENGTH_DELIMITED, SendDataResponse.class, "type.googleapis.com/com.squareup.services.anotherpackage.SendDataResponse", Syntax.PROTO_2, null, "request_response.proto"); + super(FieldEncoding.LENGTH_DELIMITED, SendDataResponse.class, "type.googleapis.com/com.squareup.services.anotherpackage.SendDataResponse", Syntax.PROTO_2.INSTANCE, null, "request_response.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/ModelEvaluation.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/ModelEvaluation.java index e2cc6497f9..4bccc27851 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/ModelEvaluation.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/ModelEvaluation.java @@ -132,7 +132,7 @@ private static final class ProtoAdapter_ModelEvaluation extends ProtoAdapter> models; public ProtoAdapter_ModelEvaluation() { - super(FieldEncoding.LENGTH_DELIMITED, ModelEvaluation.class, "type.googleapis.com/com.squareup.wire.ModelEvaluation", Syntax.PROTO_2, null, "recursive_map.proto"); + super(FieldEncoding.LENGTH_DELIMITED, ModelEvaluation.class, "type.googleapis.com/com.squareup.wire.ModelEvaluation", Syntax.PROTO_2.INSTANCE, null, "recursive_map.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/Mappy.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/Mappy.java index 794d1e2d98..752e015026 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/Mappy.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/Mappy.java @@ -98,7 +98,7 @@ private static final class ProtoAdapter_Mappy extends ProtoAdapter { private ProtoAdapter> things; public ProtoAdapter_Mappy() { - super(FieldEncoding.LENGTH_DELIMITED, Mappy.class, "type.googleapis.com/com.squareup.wire.map.Mappy", Syntax.PROTO_2, null, "map.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Mappy.class, "type.googleapis.com/com.squareup.wire.map.Mappy", Syntax.PROTO_2.INSTANCE, null, "map.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/MappyTwo.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/MappyTwo.java index 02d56e1365..933dc12f4d 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/MappyTwo.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/MappyTwo.java @@ -197,7 +197,7 @@ public int getValue() { private static final class ProtoAdapter_ValueEnum extends EnumAdapter { ProtoAdapter_ValueEnum() { - super(ValueEnum.class, Syntax.PROTO_2, ValueEnum.DEFAULT); + super(ValueEnum.class, Syntax.PROTO_2.INSTANCE, ValueEnum.DEFAULT); } @Override @@ -217,7 +217,7 @@ private static final class ProtoAdapter_MappyTwo extends ProtoAdapter private ProtoAdapter> int_things_two; public ProtoAdapter_MappyTwo() { - super(FieldEncoding.LENGTH_DELIMITED, MappyTwo.class, "type.googleapis.com/com.squareup.wire.map.MappyTwo", Syntax.PROTO_2, null, "map.proto"); + super(FieldEncoding.LENGTH_DELIMITED, MappyTwo.class, "type.googleapis.com/com.squareup.wire.map.MappyTwo", Syntax.PROTO_2.INSTANCE, null, "map.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/Thing.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/Thing.java index 3fab2d0ac2..72962cba2c 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/Thing.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/map/Thing.java @@ -94,7 +94,7 @@ public Thing build() { private static final class ProtoAdapter_Thing extends ProtoAdapter { public ProtoAdapter_Thing() { - super(FieldEncoding.LENGTH_DELIMITED, Thing.class, "type.googleapis.com/com.squareup.wire.map.Thing", Syntax.PROTO_2, null, "map.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Thing.class, "type.googleapis.com/com.squareup.wire.map.Thing", Syntax.PROTO_2.INSTANCE, null, "map.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/proto3/java/all_types/AllTypes.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/proto3/java/all_types/AllTypes.java index c4efe0d9e0..a1b6cd10d0 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/proto3/java/all_types/AllTypes.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/proto3/java/all_types/AllTypes.java @@ -2346,7 +2346,7 @@ public int getValue() { private static final class ProtoAdapter_NestedEnum extends EnumAdapter { ProtoAdapter_NestedEnum() { - super(NestedEnum.class, Syntax.PROTO_3, NestedEnum.UNKNOWN); + super(NestedEnum.class, Syntax.PROTO_3.INSTANCE, NestedEnum.UNKNOWN); } @Override @@ -2432,7 +2432,7 @@ public NestedMessage build() { private static final class ProtoAdapter_NestedMessage extends ProtoAdapter { public ProtoAdapter_NestedMessage() { - super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/proto3.java.AllTypes.NestedMessage", Syntax.PROTO_3, null, "all_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/proto3.java.AllTypes.NestedMessage", Syntax.PROTO_3.INSTANCE, null, "all_types.proto"); } @Override @@ -2508,7 +2508,7 @@ private static final class ProtoAdapter_AllTypes extends ProtoAdapter private ProtoAdapter> map_int32_timestamp; public ProtoAdapter_AllTypes() { - super(FieldEncoding.LENGTH_DELIMITED, AllTypes.class, "type.googleapis.com/proto3.java.AllTypes", Syntax.PROTO_3, null, "all_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, AllTypes.class, "type.googleapis.com/proto3.java.AllTypes", Syntax.PROTO_3.INSTANCE, null, "all_types.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/proto3/java/person/Person.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/proto3/java/person/Person.java index 9e1531d58a..2797985a0a 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/proto3/java/person/Person.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/proto3/java/person/Person.java @@ -301,7 +301,7 @@ public int getValue() { private static final class ProtoAdapter_PhoneType extends EnumAdapter { ProtoAdapter_PhoneType() { - super(PhoneType.class, Syntax.PROTO_3, PhoneType.MOBILE); + super(PhoneType.class, Syntax.PROTO_3.INSTANCE, PhoneType.MOBILE); } @Override @@ -425,7 +425,7 @@ public PhoneNumber build() { private static final class ProtoAdapter_PhoneNumber extends ProtoAdapter { public ProtoAdapter_PhoneNumber() { - super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.protos3.java.person.Person.PhoneNumber", Syntax.PROTO_3, null, "person.proto"); + super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.protos3.java.person.Person.PhoneNumber", Syntax.PROTO_3.INSTANCE, null, "person.proto"); } @Override @@ -490,7 +490,7 @@ public PhoneNumber redact(PhoneNumber value) { private static final class ProtoAdapter_Person extends ProtoAdapter { public ProtoAdapter_Person() { - super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.protos3.java.person.Person", Syntax.PROTO_3, null, "person.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.protos3.java.person.Person", Syntax.PROTO_3.INSTANCE, null, "person.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/ChildPackage.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/ChildPackage.java index ed80996dc5..d577255bdb 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/ChildPackage.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/ChildPackage.java @@ -95,7 +95,7 @@ public ChildPackage build() { private static final class ProtoAdapter_ChildPackage extends ProtoAdapter { public ProtoAdapter_ChildPackage() { - super(FieldEncoding.LENGTH_DELIMITED, ChildPackage.class, "type.googleapis.com/squareup.protos.ChildPackage", Syntax.PROTO_2, null, "child_pkg.proto"); + super(FieldEncoding.LENGTH_DELIMITED, ChildPackage.class, "type.googleapis.com/squareup.protos.ChildPackage", Syntax.PROTO_2.INSTANCE, null, "child_pkg.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/RepeatedPackedAndMap.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/RepeatedPackedAndMap.java index d7b3c98d41..73c8fe918d 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/RepeatedPackedAndMap.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/RepeatedPackedAndMap.java @@ -144,7 +144,7 @@ private static final class ProtoAdapter_RepeatedPackedAndMap extends ProtoAdapte private ProtoAdapter> map_int32_int32; public ProtoAdapter_RepeatedPackedAndMap() { - super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.protos.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2, null, "collection_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.protos.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2.INSTANCE, null, "collection_types.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java index 906c5f8d39..1fa8164beb 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java @@ -3031,7 +3031,7 @@ public int getValue() { private static final class ProtoAdapter_NestedEnum extends EnumAdapter { ProtoAdapter_NestedEnum() { - super(NestedEnum.class, Syntax.PROTO_2, NestedEnum.UNKNOWN); + super(NestedEnum.class, Syntax.PROTO_2.INSTANCE, NestedEnum.UNKNOWN); } @Override @@ -3117,7 +3117,7 @@ public NestedMessage build() { private static final class ProtoAdapter_NestedMessage extends ProtoAdapter { public ProtoAdapter_NestedMessage() { - super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes.NestedMessage", Syntax.PROTO_2, null, "all_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes.NestedMessage", Syntax.PROTO_2.INSTANCE, null, "all_types.proto"); } @Override @@ -3175,7 +3175,7 @@ private static final class ProtoAdapter_AllTypes extends ProtoAdapter private ProtoAdapter> map_string_enum; public ProtoAdapter_AllTypes() { - super(FieldEncoding.LENGTH_DELIMITED, AllTypes.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes", Syntax.PROTO_2, null, "all_types.proto"); + super(FieldEncoding.LENGTH_DELIMITED, AllTypes.class, "type.googleapis.com/squareup.protos.alltypes.AllTypes", Syntax.PROTO_2.INSTANCE, null, "all_types.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/custom_options/FooBar.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/custom_options/FooBar.java index 8b683b151c..600365889d 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/custom_options/FooBar.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/custom_options/FooBar.java @@ -390,7 +390,7 @@ public Nested build() { private static final class ProtoAdapter_Nested extends ProtoAdapter { public ProtoAdapter_Nested() { - super(FieldEncoding.LENGTH_DELIMITED, Nested.class, "type.googleapis.com/squareup.protos.custom_options.FooBar.Nested", Syntax.PROTO_2, null, "custom_options.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Nested.class, "type.googleapis.com/squareup.protos.custom_options.FooBar.Nested", Syntax.PROTO_2.INSTANCE, null, "custom_options.proto"); } @Override @@ -522,7 +522,7 @@ public More build() { private static final class ProtoAdapter_More extends ProtoAdapter { public ProtoAdapter_More() { - super(FieldEncoding.LENGTH_DELIMITED, More.class, "type.googleapis.com/squareup.protos.custom_options.FooBar.More", Syntax.PROTO_2, null, "custom_options.proto"); + super(FieldEncoding.LENGTH_DELIMITED, More.class, "type.googleapis.com/squareup.protos.custom_options.FooBar.More", Syntax.PROTO_2.INSTANCE, null, "custom_options.proto"); } @Override @@ -615,7 +615,7 @@ public int getValue() { private static final class ProtoAdapter_FooBarBazEnum extends EnumAdapter { ProtoAdapter_FooBarBazEnum() { - super(FooBarBazEnum.class, Syntax.PROTO_2, null); + super(FooBarBazEnum.class, Syntax.PROTO_2.INSTANCE, null); } @Override @@ -633,7 +633,7 @@ protected FooBarBazEnum fromValue(int value) { private static final class ProtoAdapter_FooBar extends ProtoAdapter { public ProtoAdapter_FooBar() { - super(FieldEncoding.LENGTH_DELIMITED, FooBar.class, "type.googleapis.com/squareup.protos.custom_options.FooBar", Syntax.PROTO_2, null, "custom_options.proto"); + super(FieldEncoding.LENGTH_DELIMITED, FooBar.class, "type.googleapis.com/squareup.protos.custom_options.FooBar", Syntax.PROTO_2.INSTANCE, null, "custom_options.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java index 5a44b3b5f4..10cff12c26 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java @@ -77,7 +77,7 @@ public MessageWithOptions build() { private static final class ProtoAdapter_MessageWithOptions extends ProtoAdapter { public ProtoAdapter_MessageWithOptions() { - super(FieldEncoding.LENGTH_DELIMITED, MessageWithOptions.class, "type.googleapis.com/squareup.protos.custom_options.MessageWithOptions", Syntax.PROTO_2, null, "custom_options.proto"); + super(FieldEncoding.LENGTH_DELIMITED, MessageWithOptions.class, "type.googleapis.com/squareup.protos.custom_options.MessageWithOptions", Syntax.PROTO_2.INSTANCE, null, "custom_options.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java index 67b1ebb98c..4583ef67a2 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java @@ -96,7 +96,7 @@ public Letter build() { private static final class ProtoAdapter_Letter extends ProtoAdapter { public ProtoAdapter_Letter() { - super(FieldEncoding.LENGTH_DELIMITED, Letter.class, "type.googleapis.com/squareup.protos.depend_on_kotlin_option.Letter", Syntax.PROTO_2, null, "depend_on_kotlin_option.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Letter.class, "type.googleapis.com/squareup.protos.depend_on_kotlin_option.Letter", Syntax.PROTO_2.INSTANCE, null, "depend_on_kotlin_option.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/NoFields.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/NoFields.java index 24b8cfdafa..d8aaf78342 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/NoFields.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/NoFields.java @@ -67,7 +67,7 @@ public NoFields build() { private static final class ProtoAdapter_NoFields extends ProtoAdapter { public ProtoAdapter_NoFields() { - super(FieldEncoding.LENGTH_DELIMITED, NoFields.class, "type.googleapis.com/squareup.protos.edgecases.NoFields", Syntax.PROTO_2, null, "edge_cases.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NoFields.class, "type.googleapis.com/squareup.protos.edgecases.NoFields", Syntax.PROTO_2.INSTANCE, null, "edge_cases.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java index 5232e75eb5..b25eb4b1ef 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java @@ -94,7 +94,7 @@ public OneBytesField build() { private static final class ProtoAdapter_OneBytesField extends ProtoAdapter { public ProtoAdapter_OneBytesField() { - super(FieldEncoding.LENGTH_DELIMITED, OneBytesField.class, "type.googleapis.com/squareup.protos.edgecases.OneBytesField", Syntax.PROTO_2, null, "edge_cases.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OneBytesField.class, "type.googleapis.com/squareup.protos.edgecases.OneBytesField", Syntax.PROTO_2.INSTANCE, null, "edge_cases.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/OneField.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/OneField.java index c0496a55c8..ae269dcd72 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/OneField.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/OneField.java @@ -95,7 +95,7 @@ public OneField build() { private static final class ProtoAdapter_OneField extends ProtoAdapter { public ProtoAdapter_OneField() { - super(FieldEncoding.LENGTH_DELIMITED, OneField.class, "type.googleapis.com/squareup.protos.edgecases.OneField", Syntax.PROTO_2, null, "edge_cases.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OneField.class, "type.googleapis.com/squareup.protos.edgecases.OneField", Syntax.PROTO_2.INSTANCE, null, "edge_cases.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/Recursive.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/Recursive.java index 3d85873c8c..9f9c9e94c3 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/Recursive.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/edgecases/Recursive.java @@ -113,7 +113,7 @@ public Recursive build() { private static final class ProtoAdapter_Recursive extends ProtoAdapter { public ProtoAdapter_Recursive() { - super(FieldEncoding.LENGTH_DELIMITED, Recursive.class, "type.googleapis.com/squareup.protos.edgecases.Recursive", Syntax.PROTO_2, null, "edge_cases.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Recursive.class, "type.googleapis.com/squareup.protos.edgecases.Recursive", Syntax.PROTO_2.INSTANCE, null, "edge_cases.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java index f5349a7470..287a908784 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java @@ -39,7 +39,7 @@ public int getValue() { private static final class ProtoAdapter_ForeignEnum extends EnumAdapter { ProtoAdapter_ForeignEnum() { - super(ForeignEnum.class, Syntax.PROTO_2, ForeignEnum.BAV); + super(ForeignEnum.class, Syntax.PROTO_2.INSTANCE, ForeignEnum.BAV); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java index cbead3a36c..b765cb4a7f 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java @@ -118,7 +118,7 @@ public ForeignMessage build() { private static final class ProtoAdapter_ForeignMessage extends ProtoAdapter { public ProtoAdapter_ForeignMessage() { - super(FieldEncoding.LENGTH_DELIMITED, ForeignMessage.class, "type.googleapis.com/squareup.protos.foreign.ForeignMessage", Syntax.PROTO_2, null, "foreign.proto"); + super(FieldEncoding.LENGTH_DELIMITED, ForeignMessage.class, "type.googleapis.com/squareup.protos.foreign.ForeignMessage", Syntax.PROTO_2.INSTANCE, null, "foreign.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/namecollisions/Message.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/namecollisions/Message.java index 0bc2e29806..c32aac6a29 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/namecollisions/Message.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/namecollisions/Message.java @@ -281,7 +281,7 @@ public Message build() { private static final class ProtoAdapter_Message extends ProtoAdapter { public ProtoAdapter_Message() { - super(FieldEncoding.LENGTH_DELIMITED, Message.class, "type.googleapis.com/squareup.protos.namecollisions.Message", Syntax.PROTO_2, null, "name_collisions.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Message.class, "type.googleapis.com/squareup.protos.namecollisions.Message", Syntax.PROTO_2.INSTANCE, null, "name_collisions.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/one_extension/Foo.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/one_extension/Foo.java index 9ab024b3a6..798013c6f1 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/one_extension/Foo.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/one_extension/Foo.java @@ -94,7 +94,7 @@ public Foo build() { private static final class ProtoAdapter_Foo extends ProtoAdapter { public ProtoAdapter_Foo() { - super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.protos.one_extension.Foo", Syntax.PROTO_2, null, "one_extension.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/squareup.protos.one_extension.Foo", Syntax.PROTO_2.INSTANCE, null, "one_extension.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java index 6f89b40756..3e08880cd0 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java @@ -115,7 +115,7 @@ public OneExtension build() { private static final class ProtoAdapter_OneExtension extends ProtoAdapter { public ProtoAdapter_OneExtension() { - super(FieldEncoding.LENGTH_DELIMITED, OneExtension.class, "type.googleapis.com/squareup.protos.one_extension.OneExtension", Syntax.PROTO_2, null, "one_extension.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OneExtension.class, "type.googleapis.com/squareup.protos.one_extension.OneExtension", Syntax.PROTO_2.INSTANCE, null, "one_extension.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java index ec3edf22f8..11fb8d57db 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java @@ -165,7 +165,7 @@ public OneOfMessage build() { private static final class ProtoAdapter_OneOfMessage extends ProtoAdapter { public ProtoAdapter_OneOfMessage() { - super(FieldEncoding.LENGTH_DELIMITED, OneOfMessage.class, "type.googleapis.com/squareup.protos.oneof.OneOfMessage", Syntax.PROTO_2, null, "one_of.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OneOfMessage.class, "type.googleapis.com/squareup.protos.oneof.OneOfMessage", Syntax.PROTO_2.INSTANCE, null, "one_of.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/person/Person.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/person/Person.java index 20199d32c5..1b5a52601e 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/person/Person.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/person/Person.java @@ -248,7 +248,7 @@ public int getValue() { private static final class ProtoAdapter_PhoneType extends EnumAdapter { ProtoAdapter_PhoneType() { - super(PhoneType.class, Syntax.PROTO_2, PhoneType.MOBILE); + super(PhoneType.class, Syntax.PROTO_2.INSTANCE, PhoneType.MOBILE); } @Override @@ -370,7 +370,7 @@ public PhoneNumber build() { private static final class ProtoAdapter_PhoneNumber extends ProtoAdapter { public ProtoAdapter_PhoneNumber() { - super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.protos.person.Person.PhoneNumber", Syntax.PROTO_2, null, "person.proto"); + super(FieldEncoding.LENGTH_DELIMITED, PhoneNumber.class, "type.googleapis.com/squareup.protos.person.Person.PhoneNumber", Syntax.PROTO_2.INSTANCE, null, "person.proto"); } @Override @@ -431,7 +431,7 @@ public PhoneNumber redact(PhoneNumber value) { private static final class ProtoAdapter_Person extends ProtoAdapter { public ProtoAdapter_Person() { - super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.protos.person.Person", Syntax.PROTO_2, null, "person.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Person.class, "type.googleapis.com/squareup.protos.person.Person", Syntax.PROTO_2.INSTANCE, null, "person.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java index 11cfc7d5dd..77ff73e4a8 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java @@ -114,7 +114,7 @@ public NotRedacted build() { private static final class ProtoAdapter_NotRedacted extends ProtoAdapter { public ProtoAdapter_NotRedacted() { - super(FieldEncoding.LENGTH_DELIMITED, NotRedacted.class, "type.googleapis.com/squareup.protos.redacted_test.NotRedacted", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NotRedacted.class, "type.googleapis.com/squareup.protos.redacted_test.NotRedacted", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java index 2ba2210a1a..cfa82ac33e 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java @@ -130,7 +130,7 @@ public RedactedChild build() { private static final class ProtoAdapter_RedactedChild extends ProtoAdapter { public ProtoAdapter_RedactedChild() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedChild.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedChild", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedChild.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedChild", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java index c5f890b2af..dd1d4e3de3 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java @@ -92,7 +92,7 @@ public RedactedCycleA build() { private static final class ProtoAdapter_RedactedCycleA extends ProtoAdapter { public ProtoAdapter_RedactedCycleA() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedCycleA.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedCycleA", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedCycleA.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedCycleA", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java index a04f7f8954..18de2b1d01 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java @@ -92,7 +92,7 @@ public RedactedCycleB build() { private static final class ProtoAdapter_RedactedCycleB extends ProtoAdapter { public ProtoAdapter_RedactedCycleB() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedCycleB.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedCycleB", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedCycleB.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedCycleB", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java index 19a70ae13c..65ace6b08d 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java @@ -115,7 +115,7 @@ public RedactedExtension build() { private static final class ProtoAdapter_RedactedExtension extends ProtoAdapter { public ProtoAdapter_RedactedExtension() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedExtension.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedExtension", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedExtension.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedExtension", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedFields.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedFields.java index 4beb685c09..4ea4341224 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedFields.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedFields.java @@ -157,7 +157,7 @@ public RedactedFields build() { private static final class ProtoAdapter_RedactedFields extends ProtoAdapter { public ProtoAdapter_RedactedFields() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedFields.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedFields", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedFields.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedFields", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java index a45d1a0b4a..a5589d538e 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java @@ -125,7 +125,7 @@ public RedactedRepeated build() { private static final class ProtoAdapter_RedactedRepeated extends ProtoAdapter { public ProtoAdapter_RedactedRepeated() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedRepeated.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedRepeated", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedRepeated.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedRepeated", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java index ab13e4632c..d218983a5a 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java @@ -100,7 +100,7 @@ public RedactedRequired build() { private static final class ProtoAdapter_RedactedRequired extends ProtoAdapter { public ProtoAdapter_RedactedRequired() { - super(FieldEncoding.LENGTH_DELIMITED, RedactedRequired.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedRequired", Syntax.PROTO_2, null, "redacted_test.proto"); + super(FieldEncoding.LENGTH_DELIMITED, RedactedRequired.class, "type.googleapis.com/squareup.protos.redacted_test.RedactedRequired", Syntax.PROTO_2.INSTANCE, null, "redacted_test.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/A.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/A.java index b37d7739ba..0508cf8e70 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/A.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/A.java @@ -125,7 +125,7 @@ public A build() { private static final class ProtoAdapter_A extends ProtoAdapter { public ProtoAdapter_A() { - super(FieldEncoding.LENGTH_DELIMITED, A.class, "type.googleapis.com/squareup.protos.roots.A", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, A.class, "type.googleapis.com/squareup.protos.roots.A", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/B.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/B.java index ba37828edd..0ac565afd9 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/B.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/B.java @@ -96,7 +96,7 @@ public B build() { private static final class ProtoAdapter_B extends ProtoAdapter { public ProtoAdapter_B() { - super(FieldEncoding.LENGTH_DELIMITED, B.class, "type.googleapis.com/squareup.protos.roots.B", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, B.class, "type.googleapis.com/squareup.protos.roots.B", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/C.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/C.java index b7367a11a6..f5a60beba9 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/C.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/C.java @@ -95,7 +95,7 @@ public C build() { private static final class ProtoAdapter_C extends ProtoAdapter { public ProtoAdapter_C() { - super(FieldEncoding.LENGTH_DELIMITED, C.class, "type.googleapis.com/squareup.protos.roots.C", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, C.class, "type.googleapis.com/squareup.protos.roots.C", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/D.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/D.java index 6c22b66e2a..f822f94bc0 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/D.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/D.java @@ -95,7 +95,7 @@ public D build() { private static final class ProtoAdapter_D extends ProtoAdapter { public ProtoAdapter_D() { - super(FieldEncoding.LENGTH_DELIMITED, D.class, "type.googleapis.com/squareup.protos.roots.D", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, D.class, "type.googleapis.com/squareup.protos.roots.D", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/E.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/E.java index 0d90b574a7..20c82b90a6 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/E.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/E.java @@ -187,7 +187,7 @@ public F build() { private static final class ProtoAdapter_F extends ProtoAdapter { public ProtoAdapter_F() { - super(FieldEncoding.LENGTH_DELIMITED, F.class, "type.googleapis.com/squareup.protos.roots.E.F", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, F.class, "type.googleapis.com/squareup.protos.roots.E.F", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override @@ -237,7 +237,7 @@ public F redact(F value) { private static final class ProtoAdapter_E extends ProtoAdapter { public ProtoAdapter_E() { - super(FieldEncoding.LENGTH_DELIMITED, E.class, "type.googleapis.com/squareup.protos.roots.E", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, E.class, "type.googleapis.com/squareup.protos.roots.E", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/G.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/G.java index d116d13ef4..1113e6e646 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/G.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/G.java @@ -39,7 +39,7 @@ public int getValue() { private static final class ProtoAdapter_G extends EnumAdapter { ProtoAdapter_G() { - super(G.class, Syntax.PROTO_2, null); + super(G.class, Syntax.PROTO_2.INSTANCE, null); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/H.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/H.java index 18b694e0a9..a650e30922 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/H.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/H.java @@ -92,7 +92,7 @@ public H build() { private static final class ProtoAdapter_H extends ProtoAdapter { public ProtoAdapter_H() { - super(FieldEncoding.LENGTH_DELIMITED, H.class, "type.googleapis.com/squareup.protos.roots.H", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, H.class, "type.googleapis.com/squareup.protos.roots.H", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/I.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/I.java index 4325984c4f..8af01a1e89 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/I.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/I.java @@ -116,7 +116,7 @@ public I build() { private static final class ProtoAdapter_I extends ProtoAdapter { public ProtoAdapter_I() { - super(FieldEncoding.LENGTH_DELIMITED, I.class, "type.googleapis.com/squareup.protos.roots.I", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, I.class, "type.googleapis.com/squareup.protos.roots.I", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/J.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/J.java index 04479e2767..21ab05b7f1 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/J.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/J.java @@ -92,7 +92,7 @@ public J build() { private static final class ProtoAdapter_J extends ProtoAdapter { public ProtoAdapter_J() { - super(FieldEncoding.LENGTH_DELIMITED, J.class, "type.googleapis.com/squareup.protos.roots.J", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, J.class, "type.googleapis.com/squareup.protos.roots.J", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/K.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/K.java index 59f70a0555..1fb52815db 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/K.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/K.java @@ -95,7 +95,7 @@ public K build() { private static final class ProtoAdapter_K extends ProtoAdapter { public ProtoAdapter_K() { - super(FieldEncoding.LENGTH_DELIMITED, K.class, "type.googleapis.com/squareup.protos.roots.K", Syntax.PROTO_2, null, "roots.proto"); + super(FieldEncoding.LENGTH_DELIMITED, K.class, "type.googleapis.com/squareup.protos.roots.K", Syntax.PROTO_2.INSTANCE, null, "roots.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/TheRequest.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/TheRequest.java index 8b1d3ad239..b20b0c5791 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/TheRequest.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/TheRequest.java @@ -67,7 +67,7 @@ public TheRequest build() { private static final class ProtoAdapter_TheRequest extends ProtoAdapter { public ProtoAdapter_TheRequest() { - super(FieldEncoding.LENGTH_DELIMITED, TheRequest.class, "type.googleapis.com/squareup.wire.protos.roots.TheRequest", Syntax.PROTO_2, null, "service_root.proto"); + super(FieldEncoding.LENGTH_DELIMITED, TheRequest.class, "type.googleapis.com/squareup.wire.protos.roots.TheRequest", Syntax.PROTO_2.INSTANCE, null, "service_root.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/TheResponse.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/TheResponse.java index 0b0be3a8a3..401e8a1ef1 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/TheResponse.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/TheResponse.java @@ -67,7 +67,7 @@ public TheResponse build() { private static final class ProtoAdapter_TheResponse extends ProtoAdapter { public ProtoAdapter_TheResponse() { - super(FieldEncoding.LENGTH_DELIMITED, TheResponse.class, "type.googleapis.com/squareup.wire.protos.roots.TheResponse", Syntax.PROTO_2, null, "service_root.proto"); + super(FieldEncoding.LENGTH_DELIMITED, TheResponse.class, "type.googleapis.com/squareup.wire.protos.roots.TheResponse", Syntax.PROTO_2.INSTANCE, null, "service_root.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java index 73017c993f..c85faef467 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java @@ -67,7 +67,7 @@ public UnnecessaryResponse build() { private static final class ProtoAdapter_UnnecessaryResponse extends ProtoAdapter { public ProtoAdapter_UnnecessaryResponse() { - super(FieldEncoding.LENGTH_DELIMITED, UnnecessaryResponse.class, "type.googleapis.com/squareup.wire.protos.roots.UnnecessaryResponse", Syntax.PROTO_2, null, "service_root.proto"); + super(FieldEncoding.LENGTH_DELIMITED, UnnecessaryResponse.class, "type.googleapis.com/squareup.wire.protos.roots.UnnecessaryResponse", Syntax.PROTO_2.INSTANCE, null, "service_root.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java index 08acbf9b46..edf000edcb 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java @@ -214,7 +214,7 @@ public ExternalMessage build() { private static final class ProtoAdapter_ExternalMessage extends ProtoAdapter { public ProtoAdapter_ExternalMessage() { - super(FieldEncoding.LENGTH_DELIMITED, ExternalMessage.class, "type.googleapis.com/squareup.protos.simple.ExternalMessage", Syntax.PROTO_2, null, "external_message.proto"); + super(FieldEncoding.LENGTH_DELIMITED, ExternalMessage.class, "type.googleapis.com/squareup.protos.simple.ExternalMessage", Syntax.PROTO_2.INSTANCE, null, "external_message.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java index a9ec770427..5f1ea154a2 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java @@ -483,7 +483,7 @@ public NestedMessage build() { private static final class ProtoAdapter_NestedMessage extends ProtoAdapter { public ProtoAdapter_NestedMessage() { - super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/squareup.protos.simple.SimpleMessage.NestedMessage", Syntax.PROTO_2, null, "simple_message.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedMessage.class, "type.googleapis.com/squareup.protos.simple.SimpleMessage.NestedMessage", Syntax.PROTO_2.INSTANCE, null, "simple_message.proto"); } @Override @@ -568,7 +568,7 @@ public int getValue() { private static final class ProtoAdapter_NestedEnum extends EnumAdapter { ProtoAdapter_NestedEnum() { - super(NestedEnum.class, Syntax.PROTO_2, null); + super(NestedEnum.class, Syntax.PROTO_2.INSTANCE, null); } @Override @@ -580,7 +580,7 @@ protected NestedEnum fromValue(int value) { private static final class ProtoAdapter_SimpleMessage extends ProtoAdapter { public ProtoAdapter_SimpleMessage() { - super(FieldEncoding.LENGTH_DELIMITED, SimpleMessage.class, "type.googleapis.com/squareup.protos.simple.SimpleMessage", Syntax.PROTO_2, null, "simple_message.proto"); + super(FieldEncoding.LENGTH_DELIMITED, SimpleMessage.class, "type.googleapis.com/squareup.protos.simple.SimpleMessage", Syntax.PROTO_2.INSTANCE, null, "simple_message.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Bar.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Bar.java index a290b14208..89f29eb4d0 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Bar.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Bar.java @@ -95,7 +95,7 @@ public Bar build() { private static final class ProtoAdapter_Bar extends ProtoAdapter { public ProtoAdapter_Bar() { - super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/samebasename.single_level.Bar", Syntax.PROTO_2, null, "samebasename/single_level.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Bar.class, "type.googleapis.com/samebasename.single_level.Bar", Syntax.PROTO_2.INSTANCE, null, "samebasename/single_level.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Bars.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Bars.java index 7c895d3ce0..a127b40b38 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Bars.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Bars.java @@ -96,7 +96,7 @@ public Bars build() { private static final class ProtoAdapter_Bars extends ProtoAdapter { public ProtoAdapter_Bars() { - super(FieldEncoding.LENGTH_DELIMITED, Bars.class, "type.googleapis.com/samebasename.single_level.Bars", Syntax.PROTO_2, null, "samebasename/single_level.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Bars.class, "type.googleapis.com/samebasename.single_level.Bars", Syntax.PROTO_2.INSTANCE, null, "samebasename/single_level.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Foo.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Foo.java index 9c5cad48f0..8933706dff 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Foo.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Foo.java @@ -95,7 +95,7 @@ public Foo build() { private static final class ProtoAdapter_Foo extends ProtoAdapter { public ProtoAdapter_Foo() { - super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/single_level.Foo", Syntax.PROTO_2, null, "single_level.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foo.class, "type.googleapis.com/single_level.Foo", Syntax.PROTO_2.INSTANCE, null, "single_level.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Foos.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Foos.java index d1d9e94ed7..4aa50c1546 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Foos.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/single_level/Foos.java @@ -96,7 +96,7 @@ public Foos build() { private static final class ProtoAdapter_Foos extends ProtoAdapter { public ProtoAdapter_Foos() { - super(FieldEncoding.LENGTH_DELIMITED, Foos.class, "type.googleapis.com/single_level.Foos", Syntax.PROTO_2, null, "single_level.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Foos.class, "type.googleapis.com/single_level.Foos", Syntax.PROTO_2.INSTANCE, null, "single_level.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionOne.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionOne.java index 40ab0c76bb..95fd9e2902 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionOne.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionOne.java @@ -42,7 +42,7 @@ public int getValue() { private static final class ProtoAdapter_EnumVersionOne extends EnumAdapter { ProtoAdapter_EnumVersionOne() { - super(EnumVersionOne.class, Syntax.PROTO_2, null); + super(EnumVersionOne.class, Syntax.PROTO_2.INSTANCE, null); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionTwo.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionTwo.java index 912b525397..bbd70bda17 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionTwo.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/EnumVersionTwo.java @@ -45,7 +45,7 @@ public int getValue() { private static final class ProtoAdapter_EnumVersionTwo extends EnumAdapter { ProtoAdapter_EnumVersionTwo() { - super(EnumVersionTwo.class, Syntax.PROTO_2, null); + super(EnumVersionTwo.class, Syntax.PROTO_2.INSTANCE, null); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionOne.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionOne.java index 156fa840f8..3c081e81a8 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionOne.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionOne.java @@ -95,7 +95,7 @@ public NestedVersionOne build() { private static final class ProtoAdapter_NestedVersionOne extends ProtoAdapter { public ProtoAdapter_NestedVersionOne() { - super(FieldEncoding.LENGTH_DELIMITED, NestedVersionOne.class, "type.googleapis.com/squareup.protos.unknownfields.NestedVersionOne", Syntax.PROTO_2, null, "unknown_fields.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedVersionOne.class, "type.googleapis.com/squareup.protos.unknownfields.NestedVersionOne", Syntax.PROTO_2.INSTANCE, null, "unknown_fields.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionTwo.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionTwo.java index fd6981b677..83aaa968a7 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionTwo.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/NestedVersionTwo.java @@ -200,7 +200,7 @@ public NestedVersionTwo build() { private static final class ProtoAdapter_NestedVersionTwo extends ProtoAdapter { public ProtoAdapter_NestedVersionTwo() { - super(FieldEncoding.LENGTH_DELIMITED, NestedVersionTwo.class, "type.googleapis.com/squareup.protos.unknownfields.NestedVersionTwo", Syntax.PROTO_2, null, "unknown_fields.proto"); + super(FieldEncoding.LENGTH_DELIMITED, NestedVersionTwo.class, "type.googleapis.com/squareup.protos.unknownfields.NestedVersionTwo", Syntax.PROTO_2.INSTANCE, null, "unknown_fields.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java index b8a1dd0c9c..b24f875ce0 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java @@ -133,7 +133,7 @@ public VersionOne build() { private static final class ProtoAdapter_VersionOne extends ProtoAdapter { public ProtoAdapter_VersionOne() { - super(FieldEncoding.LENGTH_DELIMITED, VersionOne.class, "type.googleapis.com/squareup.protos.unknownfields.VersionOne", Syntax.PROTO_2, null, "unknown_fields.proto"); + super(FieldEncoding.LENGTH_DELIMITED, VersionOne.class, "type.googleapis.com/squareup.protos.unknownfields.VersionOne", Syntax.PROTO_2.INSTANCE, null, "unknown_fields.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java index 7837e62f2f..b7f455736e 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java +++ b/wire-tests/src/jvmJavaTest/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java @@ -238,7 +238,7 @@ public VersionTwo build() { private static final class ProtoAdapter_VersionTwo extends ProtoAdapter { public ProtoAdapter_VersionTwo() { - super(FieldEncoding.LENGTH_DELIMITED, VersionTwo.class, "type.googleapis.com/squareup.protos.unknownfields.VersionTwo", Syntax.PROTO_2, null, "unknown_fields.proto"); + super(FieldEncoding.LENGTH_DELIMITED, VersionTwo.class, "type.googleapis.com/squareup.protos.unknownfields.VersionTwo", Syntax.PROTO_2.INSTANCE, null, "unknown_fields.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/extension_collision/CollisionSubject.java b/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/extension_collision/CollisionSubject.java index 03123fce08..ebfe5925b8 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/extension_collision/CollisionSubject.java +++ b/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/extension_collision/CollisionSubject.java @@ -101,7 +101,7 @@ public CollisionSubject build() { private static final class ProtoAdapter_CollisionSubject extends ProtoAdapter { public ProtoAdapter_CollisionSubject() { - super(FieldEncoding.LENGTH_DELIMITED, CollisionSubject.class, "type.googleapis.com/squareup.protos.extension_collision.CollisionSubject", Syntax.PROTO_2, null, "extension_collision.proto"); + super(FieldEncoding.LENGTH_DELIMITED, CollisionSubject.class, "type.googleapis.com/squareup.protos.extension_collision.CollisionSubject", Syntax.PROTO_2.INSTANCE, null, "extension_collision.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/packed_encoding/EmbeddedMessage.java b/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/packed_encoding/EmbeddedMessage.java index 1297ea6398..1bbecb04aa 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/packed_encoding/EmbeddedMessage.java +++ b/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/packed_encoding/EmbeddedMessage.java @@ -118,7 +118,7 @@ public EmbeddedMessage build() { private static final class ProtoAdapter_EmbeddedMessage extends ProtoAdapter { public ProtoAdapter_EmbeddedMessage() { - super(FieldEncoding.LENGTH_DELIMITED, EmbeddedMessage.class, "type.googleapis.com/squareup.protos.packed_encoding.EmbeddedMessage", Syntax.PROTO_2, null, "packed_encoding.proto"); + super(FieldEncoding.LENGTH_DELIMITED, EmbeddedMessage.class, "type.googleapis.com/squareup.protos.packed_encoding.EmbeddedMessage", Syntax.PROTO_2.INSTANCE, null, "packed_encoding.proto"); } @Override diff --git a/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/packed_encoding/OuterMessage.java b/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/packed_encoding/OuterMessage.java index 21923fbe23..d5fa7a7c21 100644 --- a/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/packed_encoding/OuterMessage.java +++ b/wire-tests/src/jvmJavaTest/proto-java/squareup/protos/packed_encoding/OuterMessage.java @@ -114,7 +114,7 @@ public OuterMessage build() { private static final class ProtoAdapter_OuterMessage extends ProtoAdapter { public ProtoAdapter_OuterMessage() { - super(FieldEncoding.LENGTH_DELIMITED, OuterMessage.class, "type.googleapis.com/squareup.protos.packed_encoding.OuterMessage", Syntax.PROTO_2, null, "packed_encoding.proto"); + super(FieldEncoding.LENGTH_DELIMITED, OuterMessage.class, "type.googleapis.com/squareup.protos.packed_encoding.OuterMessage", Syntax.PROTO_2.INSTANCE, null, "packed_encoding.proto"); } @Override diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/com/squareup/wire/proto2/alltypes/AllTypes.java b/wire-tests/src/jvmJsonJavaTest/proto-java/com/squareup/wire/proto2/alltypes/AllTypes.java index 08d7f77512..084900ad58 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/com/squareup/wire/proto2/alltypes/AllTypes.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/com/squareup/wire/proto2/alltypes/AllTypes.java @@ -21,7 +21,7 @@ import okio.ByteString; public final class AllTypes extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto2.AllTypes", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto2.AllTypes", Syntax.PROTO_2.INSTANCE); private static final long serialVersionUID = 0L; @@ -2946,7 +2946,7 @@ public int getValue() { } public static final class NestedMessage extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto2.AllTypes.NestedMessage", Syntax.PROTO_2); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto2.AllTypes.NestedMessage", Syntax.PROTO_2.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/com/squareup/wire/proto3/alltypes/AllTypes.java b/wire-tests/src/jvmJsonJavaTest/proto-java/com/squareup/wire/proto3/alltypes/AllTypes.java index efa54caf33..521c6c2a69 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/com/squareup/wire/proto3/alltypes/AllTypes.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/com/squareup/wire/proto3/alltypes/AllTypes.java @@ -21,7 +21,7 @@ import okio.ByteString; public final class AllTypes extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto3.AllTypes", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto3.AllTypes", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; @@ -1548,7 +1548,7 @@ public int getValue() { } public static final class NestedMessage extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto3.AllTypes.NestedMessage", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto3.AllTypes.NestedMessage", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/All32.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/All32.java index b29179b465..ecb64ffaf7 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/All32.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/All32.java @@ -15,7 +15,7 @@ import okio.ByteString; public final class All32 extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(All32.class, "type.googleapis.com/squareup.proto3.All32", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(All32.class, "type.googleapis.com/squareup.proto3.All32", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/All64.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/All64.java index 3e65476124..e86981bebf 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/All64.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/All64.java @@ -15,7 +15,7 @@ import okio.ByteString; public final class All64 extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(All64.class, "type.googleapis.com/squareup.proto3.All64", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(All64.class, "type.googleapis.com/squareup.proto3.All64", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/AllStructs.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/AllStructs.java index ed0ea312bd..1bfffb4369 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/AllStructs.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/AllStructs.java @@ -17,7 +17,7 @@ import okio.ByteString; public final class AllStructs extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllStructs.class, "type.googleapis.com/squareup.proto3.AllStructs", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllStructs.class, "type.googleapis.com/squareup.proto3.AllStructs", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/AllWrappers.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/AllWrappers.java index 58f88072fa..9c4eb5508a 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/AllWrappers.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/AllWrappers.java @@ -20,7 +20,7 @@ import okio.ByteString; public final class AllWrappers extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllWrappers.class, "type.googleapis.com/squareup.proto3.AllWrappers", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(AllWrappers.class, "type.googleapis.com/squareup.proto3.AllWrappers", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/BuyOneGetOnePromotion.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/BuyOneGetOnePromotion.java index d4ae18156f..3f163aa65f 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/BuyOneGetOnePromotion.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/BuyOneGetOnePromotion.java @@ -13,7 +13,7 @@ import okio.ByteString; public final class BuyOneGetOnePromotion extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(BuyOneGetOnePromotion.class, "type.googleapis.com/squareup.proto3.BuyOneGetOnePromotion", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(BuyOneGetOnePromotion.class, "type.googleapis.com/squareup.proto3.BuyOneGetOnePromotion", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/CamelCase.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/CamelCase.java index 35e931d848..108a75fec6 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/CamelCase.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/CamelCase.java @@ -16,7 +16,7 @@ import okio.ByteString; public final class CamelCase extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(CamelCase.class, "type.googleapis.com/squareup.proto3.CamelCase", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(CamelCase.class, "type.googleapis.com/squareup.proto3.CamelCase", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; @@ -150,7 +150,7 @@ public CamelCase build() { } public static final class NestedCamelCase extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedCamelCase.class, "type.googleapis.com/squareup.proto3.CamelCase.NestedCamelCase", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(NestedCamelCase.class, "type.googleapis.com/squareup.proto3.CamelCase.NestedCamelCase", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/FreeDrinkPromotion.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/FreeDrinkPromotion.java index 94e7b62ea2..687de99590 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/FreeDrinkPromotion.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/FreeDrinkPromotion.java @@ -13,7 +13,7 @@ import okio.ByteString; public final class FreeDrinkPromotion extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(FreeDrinkPromotion.class, "type.googleapis.com/squareup.proto3.FreeDrinkPromotion", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(FreeDrinkPromotion.class, "type.googleapis.com/squareup.proto3.FreeDrinkPromotion", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/FreeGarlicBreadPromotion.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/FreeGarlicBreadPromotion.java index 70a910e0f2..28a775354a 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/FreeGarlicBreadPromotion.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/FreeGarlicBreadPromotion.java @@ -13,7 +13,7 @@ import okio.ByteString; public final class FreeGarlicBreadPromotion extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(FreeGarlicBreadPromotion.class, "type.googleapis.com/squareup.proto3.FreeGarlicBreadPromotion", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(FreeGarlicBreadPromotion.class, "type.googleapis.com/squareup.proto3.FreeGarlicBreadPromotion", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/MapTypes.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/MapTypes.java index 240d1f530a..c0013ea1a9 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/MapTypes.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/MapTypes.java @@ -16,7 +16,7 @@ import okio.ByteString; public final class MapTypes extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(MapTypes.class, "type.googleapis.com/squareup.proto3.MapTypes", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(MapTypes.class, "type.googleapis.com/squareup.proto3.MapTypes", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/Pizza.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/Pizza.java index 47bceb9f9c..9275ba1bae 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/Pizza.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/Pizza.java @@ -14,7 +14,7 @@ import okio.ByteString; public final class Pizza extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(Pizza.class, "type.googleapis.com/squareup.proto3.Pizza", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(Pizza.class, "type.googleapis.com/squareup.proto3.Pizza", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/PizzaDelivery.java b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/PizzaDelivery.java index 403d0547c8..2fc43ea353 100644 --- a/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/PizzaDelivery.java +++ b/wire-tests/src/jvmJsonJavaTest/proto-java/squareup/proto3/PizzaDelivery.java @@ -18,7 +18,7 @@ import okio.ByteString; public final class PizzaDelivery extends Message { - public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(PizzaDelivery.class, "type.googleapis.com/squareup.proto3.PizzaDelivery", Syntax.PROTO_3); + public static final ProtoAdapter ADAPTER = ProtoAdapter.newMessageAdapter(PizzaDelivery.class, "type.googleapis.com/squareup.proto3.PizzaDelivery", Syntax.PROTO_3.INSTANCE); private static final long serialVersionUID = 0L; diff --git a/wire-tests/src/jvmKotlinInteropTest/proto-kotlin/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java b/wire-tests/src/jvmKotlinInteropTest/proto-kotlin/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java index 67b1ebb98c..4583ef67a2 100644 --- a/wire-tests/src/jvmKotlinInteropTest/proto-kotlin/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java +++ b/wire-tests/src/jvmKotlinInteropTest/proto-kotlin/com/squareup/wire/protos/depend_on_kotlin_option/Letter.java @@ -96,7 +96,7 @@ public Letter build() { private static final class ProtoAdapter_Letter extends ProtoAdapter { public ProtoAdapter_Letter() { - super(FieldEncoding.LENGTH_DELIMITED, Letter.class, "type.googleapis.com/squareup.protos.depend_on_kotlin_option.Letter", Syntax.PROTO_2, null, "depend_on_kotlin_option.proto"); + super(FieldEncoding.LENGTH_DELIMITED, Letter.class, "type.googleapis.com/squareup.protos.depend_on_kotlin_option.Letter", Syntax.PROTO_2.INSTANCE, null, "depend_on_kotlin_option.proto"); } @Override