diff --git a/wire-compiler/src/main/java/com/squareup/wire/WireCompiler.java b/wire-compiler/src/main/java/com/squareup/wire/WireCompiler.java index a0488217c3..28ed2ed203 100644 --- a/wire-compiler/src/main/java/com/squareup/wire/WireCompiler.java +++ b/wire-compiler/src/main/java/com/squareup/wire/WireCompiler.java @@ -108,7 +108,7 @@ private void writeJavaFile(ClassName javaTypeName, TypeSpec typeSpec, Location l JavaFile.Builder builder = JavaFile.builder(javaTypeName.packageName(), typeSpec) .addFileComment("$L", CODE_GENERATED_BY_WIRE); if (location != null) { - builder.addFileComment("\nSource file: $L", location); + builder.addFileComment("\nSource file: $L", location.withoutBase()); } JavaFile javaFile = builder.build(); diff --git a/wire-gson-support/src/test/java/com/squareup/wire/protos/alltypes/AllTypes.java b/wire-gson-support/src/test/java/com/squareup/wire/protos/alltypes/AllTypes.java index e020b66b60..df4c13b865 100644 --- a/wire-gson-support/src/test/java/com/squareup/wire/protos/alltypes/AllTypes.java +++ b/wire-gson-support/src/test/java/com/squareup/wire/protos/alltypes/AllTypes.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/all_types.proto at 21:1 +// Source file: all_types.proto at 21:1 package com.squareup.wire.protos.alltypes; import com.squareup.wire.Message; @@ -685,108 +685,162 @@ public final class AllTypes extends Message { ) public final NestedEnum default_nested_enum; + /** + * Extension source: all_types.proto at 123:3 + */ @WireField( tag = 1001, adapter = "com.squareup.wire.ProtoAdapter#INT32" ) public final Integer ext_opt_int32; + /** + * Extension source: all_types.proto at 124:3 + */ @WireField( tag = 1002, adapter = "com.squareup.wire.ProtoAdapter#UINT32" ) public final Integer ext_opt_uint32; + /** + * Extension source: all_types.proto at 125:3 + */ @WireField( tag = 1003, adapter = "com.squareup.wire.ProtoAdapter#SINT32" ) public final Integer ext_opt_sint32; + /** + * Extension source: all_types.proto at 126:3 + */ @WireField( tag = 1004, adapter = "com.squareup.wire.ProtoAdapter#FIXED32" ) public final Integer ext_opt_fixed32; + /** + * Extension source: all_types.proto at 127:3 + */ @WireField( tag = 1005, adapter = "com.squareup.wire.ProtoAdapter#SFIXED32" ) public final Integer ext_opt_sfixed32; + /** + * Extension source: all_types.proto at 128:3 + */ @WireField( tag = 1006, adapter = "com.squareup.wire.ProtoAdapter#INT64" ) public final Long ext_opt_int64; + /** + * Extension source: all_types.proto at 129:3 + */ @WireField( tag = 1007, adapter = "com.squareup.wire.ProtoAdapter#UINT64" ) public final Long ext_opt_uint64; + /** + * Extension source: all_types.proto at 130:3 + */ @WireField( tag = 1008, adapter = "com.squareup.wire.ProtoAdapter#SINT64" ) public final Long ext_opt_sint64; + /** + * Extension source: all_types.proto at 131:3 + */ @WireField( tag = 1009, adapter = "com.squareup.wire.ProtoAdapter#FIXED64" ) public final Long ext_opt_fixed64; + /** + * Extension source: all_types.proto at 132:3 + */ @WireField( tag = 1010, adapter = "com.squareup.wire.ProtoAdapter#SFIXED64" ) public final Long ext_opt_sfixed64; + /** + * Extension source: all_types.proto at 133:3 + */ @WireField( tag = 1011, adapter = "com.squareup.wire.ProtoAdapter#BOOL" ) public final Boolean ext_opt_bool; + /** + * Extension source: all_types.proto at 134:3 + */ @WireField( tag = 1012, adapter = "com.squareup.wire.ProtoAdapter#FLOAT" ) public final Float ext_opt_float; + /** + * Extension source: all_types.proto at 135:3 + */ @WireField( tag = 1013, adapter = "com.squareup.wire.ProtoAdapter#DOUBLE" ) public final Double ext_opt_double; + /** + * Extension source: all_types.proto at 136:3 + */ @WireField( tag = 1014, adapter = "com.squareup.wire.ProtoAdapter#STRING" ) public final String ext_opt_string; + /** + * Extension source: all_types.proto at 137:3 + */ @WireField( tag = 1015, adapter = "com.squareup.wire.ProtoAdapter#BYTES" ) public final ByteString ext_opt_bytes; + /** + * Extension source: all_types.proto at 138:3 + */ @WireField( tag = 1016, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedEnum#ADAPTER" ) public final NestedEnum ext_opt_nested_enum; + /** + * Extension source: all_types.proto at 139:3 + */ @WireField( tag = 1017, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedMessage#ADAPTER" ) public final NestedMessage ext_opt_nested_message; + /** + * Extension source: all_types.proto at 141:3 + */ @WireField( tag = 1101, adapter = "com.squareup.wire.ProtoAdapter#INT32", @@ -794,6 +848,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_int32; + /** + * Extension source: all_types.proto at 142:3 + */ @WireField( tag = 1102, adapter = "com.squareup.wire.ProtoAdapter#UINT32", @@ -801,6 +858,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_uint32; + /** + * Extension source: all_types.proto at 143:3 + */ @WireField( tag = 1103, adapter = "com.squareup.wire.ProtoAdapter#SINT32", @@ -808,6 +868,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_sint32; + /** + * Extension source: all_types.proto at 144:3 + */ @WireField( tag = 1104, adapter = "com.squareup.wire.ProtoAdapter#FIXED32", @@ -815,6 +878,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_fixed32; + /** + * Extension source: all_types.proto at 145:3 + */ @WireField( tag = 1105, adapter = "com.squareup.wire.ProtoAdapter#SFIXED32", @@ -822,6 +888,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_sfixed32; + /** + * Extension source: all_types.proto at 146:3 + */ @WireField( tag = 1106, adapter = "com.squareup.wire.ProtoAdapter#INT64", @@ -829,6 +898,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_int64; + /** + * Extension source: all_types.proto at 147:3 + */ @WireField( tag = 1107, adapter = "com.squareup.wire.ProtoAdapter#UINT64", @@ -836,6 +908,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_uint64; + /** + * Extension source: all_types.proto at 148:3 + */ @WireField( tag = 1108, adapter = "com.squareup.wire.ProtoAdapter#SINT64", @@ -843,6 +918,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_sint64; + /** + * Extension source: all_types.proto at 149:3 + */ @WireField( tag = 1109, adapter = "com.squareup.wire.ProtoAdapter#FIXED64", @@ -850,6 +928,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_fixed64; + /** + * Extension source: all_types.proto at 150:3 + */ @WireField( tag = 1110, adapter = "com.squareup.wire.ProtoAdapter#SFIXED64", @@ -857,6 +938,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_sfixed64; + /** + * Extension source: all_types.proto at 151:3 + */ @WireField( tag = 1111, adapter = "com.squareup.wire.ProtoAdapter#BOOL", @@ -864,6 +948,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_bool; + /** + * Extension source: all_types.proto at 152:3 + */ @WireField( tag = 1112, adapter = "com.squareup.wire.ProtoAdapter#FLOAT", @@ -871,6 +958,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_float; + /** + * Extension source: all_types.proto at 153:3 + */ @WireField( tag = 1113, adapter = "com.squareup.wire.ProtoAdapter#DOUBLE", @@ -878,6 +968,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_double; + /** + * Extension source: all_types.proto at 154:3 + */ @WireField( tag = 1114, adapter = "com.squareup.wire.ProtoAdapter#STRING", @@ -885,6 +978,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_string; + /** + * Extension source: all_types.proto at 155:3 + */ @WireField( tag = 1115, adapter = "com.squareup.wire.ProtoAdapter#BYTES", @@ -892,6 +988,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_bytes; + /** + * Extension source: all_types.proto at 156:3 + */ @WireField( tag = 1116, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedEnum#ADAPTER", @@ -899,6 +998,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_nested_enum; + /** + * Extension source: all_types.proto at 157:3 + */ @WireField( tag = 1117, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedMessage#ADAPTER", @@ -906,6 +1008,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_nested_message; + /** + * Extension source: all_types.proto at 159:3 + */ @WireField( tag = 1201, adapter = "com.squareup.wire.ProtoAdapter#INT32", @@ -913,6 +1018,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_int32; + /** + * Extension source: all_types.proto at 160:3 + */ @WireField( tag = 1202, adapter = "com.squareup.wire.ProtoAdapter#UINT32", @@ -920,6 +1028,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_uint32; + /** + * Extension source: all_types.proto at 161:3 + */ @WireField( tag = 1203, adapter = "com.squareup.wire.ProtoAdapter#SINT32", @@ -927,6 +1038,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_sint32; + /** + * Extension source: all_types.proto at 162:3 + */ @WireField( tag = 1204, adapter = "com.squareup.wire.ProtoAdapter#FIXED32", @@ -934,6 +1048,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_fixed32; + /** + * Extension source: all_types.proto at 163:3 + */ @WireField( tag = 1205, adapter = "com.squareup.wire.ProtoAdapter#SFIXED32", @@ -941,6 +1058,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_sfixed32; + /** + * Extension source: all_types.proto at 164:3 + */ @WireField( tag = 1206, adapter = "com.squareup.wire.ProtoAdapter#INT64", @@ -948,6 +1068,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_int64; + /** + * Extension source: all_types.proto at 165:3 + */ @WireField( tag = 1207, adapter = "com.squareup.wire.ProtoAdapter#UINT64", @@ -955,6 +1078,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_uint64; + /** + * Extension source: all_types.proto at 166:3 + */ @WireField( tag = 1208, adapter = "com.squareup.wire.ProtoAdapter#SINT64", @@ -962,6 +1088,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_sint64; + /** + * Extension source: all_types.proto at 167:3 + */ @WireField( tag = 1209, adapter = "com.squareup.wire.ProtoAdapter#FIXED64", @@ -969,6 +1098,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_fixed64; + /** + * Extension source: all_types.proto at 168:3 + */ @WireField( tag = 1210, adapter = "com.squareup.wire.ProtoAdapter#SFIXED64", @@ -976,6 +1108,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_sfixed64; + /** + * Extension source: all_types.proto at 169:3 + */ @WireField( tag = 1211, adapter = "com.squareup.wire.ProtoAdapter#BOOL", @@ -983,6 +1118,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_bool; + /** + * Extension source: all_types.proto at 170:3 + */ @WireField( tag = 1212, adapter = "com.squareup.wire.ProtoAdapter#FLOAT", @@ -990,6 +1128,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_float; + /** + * Extension source: all_types.proto at 171:3 + */ @WireField( tag = 1213, adapter = "com.squareup.wire.ProtoAdapter#DOUBLE", @@ -997,6 +1138,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_double; + /** + * Extension source: all_types.proto at 172:3 + */ @WireField( tag = 1216, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedEnum#ADAPTER", 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 230f569687..569c7ba338 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 @@ -422,6 +422,9 @@ public TypeSpec generateMessage(MessageType type) { if (!field.documentation().isEmpty()) { fieldBuilder.addJavadoc("$L\n", sanitizeJavadoc(field.documentation())); } + if (field.isExtension()) { + fieldBuilder.addJavadoc("Extension source: $L\n", field.location().withoutBase()); + } if (field.isDeprecated()) { fieldBuilder.addAnnotation(Deprecated.class); } diff --git a/wire-maven-plugin/src/main/java/com/squareup/wire/mojo/WireGenerateSourcesMojo.java b/wire-maven-plugin/src/main/java/com/squareup/wire/mojo/WireGenerateSourcesMojo.java index be737325aa..8cc2c5b279 100644 --- a/wire-maven-plugin/src/main/java/com/squareup/wire/mojo/WireGenerateSourcesMojo.java +++ b/wire-maven-plugin/src/main/java/com/squareup/wire/mojo/WireGenerateSourcesMojo.java @@ -104,7 +104,7 @@ public class WireGenerateSourcesMojo extends AbstractMojo { TypeSpec typeSpec = type instanceof MessageType ? javaGenerator.generateMessage((MessageType) type) : javaGenerator.generateEnum((EnumType) type); - writeJavaFile(javaTypeName, typeSpec, type.location()); + writeJavaFile(javaTypeName, typeSpec, type.location().withoutBase()); getLog().info(String.format("Generated %s in %s", javaTypeName, stopwatch)); } } diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/DescriptorProto.java b/wire-runtime/src/test/proto-java/com/google/protobuf/DescriptorProto.java index 7f154acbdd..193955210c 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/DescriptorProto.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/DescriptorProto.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 79:1 +// Source file: google/protobuf/descriptor.proto at 79:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/EnumDescriptorProto.java b/wire-runtime/src/test/proto-java/com/google/protobuf/EnumDescriptorProto.java index 730cd599d5..e346c40bf1 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/EnumDescriptorProto.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/EnumDescriptorProto.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 168:1 +// Source file: google/protobuf/descriptor.proto at 168:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/EnumOptions.java b/wire-runtime/src/test/proto-java/com/google/protobuf/EnumOptions.java index fd22e884c8..b8a64e1bf9 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/EnumOptions.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/EnumOptions.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 380:1 +// Source file: google/protobuf/descriptor.proto at 380:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; @@ -69,6 +69,9 @@ public EnumOptions redact(EnumOptions value) { */ public final List uninterpreted_option; + /** + * Extension source: custom_options.proto at 76:3 + */ public final Boolean enum_option; public EnumOptions(List uninterpreted_option, Boolean enum_option) { diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/EnumValueDescriptorProto.java b/wire-runtime/src/test/proto-java/com/google/protobuf/EnumValueDescriptorProto.java index 7621e55dca..30b0a5cc7e 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/EnumValueDescriptorProto.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/EnumValueDescriptorProto.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 178:1 +// Source file: google/protobuf/descriptor.proto at 178:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/EnumValueOptions.java b/wire-runtime/src/test/proto-java/com/google/protobuf/EnumValueOptions.java index 743ae682c5..d74fd32950 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/EnumValueOptions.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/EnumValueOptions.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 389:1 +// Source file: google/protobuf/descriptor.proto at 389:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; @@ -80,10 +80,19 @@ public EnumValueOptions redact(EnumValueOptions value) { */ public final List uninterpreted_option; + /** + * Extension source: custom_options.proto at 71:3 + */ public final Integer enum_value_option; + /** + * Extension source: custom_options.proto at 72:3 + */ public final FooBar.More complex_enum_value_option; + /** + * Extension source: foreign.proto at 39:3 + */ public final Boolean foreign_enum_value_option; public EnumValueOptions(List uninterpreted_option, Integer enum_value_option, FooBar.More complex_enum_value_option, Boolean foreign_enum_value_option) { diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/FieldDescriptorProto.java b/wire-runtime/src/test/proto-java/com/google/protobuf/FieldDescriptorProto.java index 068f0a6480..1d98ea7e95 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/FieldDescriptorProto.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/FieldDescriptorProto.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 99:1 +// Source file: google/protobuf/descriptor.proto at 99:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/FieldOptions.java b/wire-runtime/src/test/proto-java/com/google/protobuf/FieldOptions.java index cc10504918..68adb41fae 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/FieldOptions.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/FieldOptions.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 332:1 +// Source file: google/protobuf/descriptor.proto at 332:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; @@ -166,16 +166,29 @@ public FieldOptions redact(FieldOptions value) { */ public final List uninterpreted_option; + /** + * Extension source: custom_options.proto at 64:3 + */ public final Integer my_field_option_one; + /** + * Extension source: custom_options.proto at 65:3 + */ public final Float my_field_option_two; + /** + * Extension source: custom_options.proto at 66:3 + */ public final FooBar.FooBarBazEnum my_field_option_three; + /** + * Extension source: custom_options.proto at 67:3 + */ public final FooBar my_field_option_four; /** * Fields marked with redacted are not to be logged, generally for PCI or PII. + * Extension source: redacted_test.proto at 62:3 */ public final Boolean redacted; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/FileDescriptorProto.java b/wire-runtime/src/test/proto-java/com/google/protobuf/FileDescriptorProto.java index 3d8c6d357a..f5ee7d6409 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/FileDescriptorProto.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/FileDescriptorProto.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 56:1 +// Source file: google/protobuf/descriptor.proto at 56:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/FileDescriptorSet.java b/wire-runtime/src/test/proto-java/com/google/protobuf/FileDescriptorSet.java index a8ad0ccff6..38e1f52962 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/FileDescriptorSet.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/FileDescriptorSet.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 51:1 +// Source file: google/protobuf/descriptor.proto at 51:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/FileOptions.java b/wire-runtime/src/test/proto-java/com/google/protobuf/FileOptions.java index 9df32b4192..aafdf47a0d 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/FileOptions.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/FileOptions.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 236:1 +// Source file: google/protobuf/descriptor.proto at 236:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/MessageOptions.java b/wire-runtime/src/test/proto-java/com/google/protobuf/MessageOptions.java index 8a7a8f9667..e6f9f08887 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/MessageOptions.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/MessageOptions.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 299:1 +// Source file: google/protobuf/descriptor.proto at 299:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; @@ -143,18 +143,39 @@ public MessageOptions redact(MessageOptions value) { */ public final List uninterpreted_option; + /** + * Extension source: custom_options.proto at 55:3 + */ public final FooBar my_message_option_one; + /** + * Extension source: custom_options.proto at 56:3 + */ public final Float my_message_option_two; + /** + * Extension source: custom_options.proto at 57:3 + */ public final FooBar my_message_option_three; + /** + * Extension source: custom_options.proto at 58:3 + */ public final FooBar.FooBarBazEnum my_message_option_four; + /** + * Extension source: custom_options.proto at 59:3 + */ public final FooBar my_message_option_five; + /** + * Extension source: custom_options.proto at 60:3 + */ public final FooBar my_message_option_six; + /** + * Extension source: foreign.proto at 35:3 + */ public final ForeignMessage foreign_message_option; public MessageOptions(Boolean message_set_wire_format, Boolean no_standard_descriptor_accessor, List uninterpreted_option, FooBar my_message_option_one, Float my_message_option_two, FooBar my_message_option_three, FooBar.FooBarBazEnum my_message_option_four, FooBar my_message_option_five, FooBar my_message_option_six, ForeignMessage foreign_message_option) { diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/MethodDescriptorProto.java b/wire-runtime/src/test/proto-java/com/google/protobuf/MethodDescriptorProto.java index 0695335359..b1acdfe0c5 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/MethodDescriptorProto.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/MethodDescriptorProto.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 196:1 +// Source file: google/protobuf/descriptor.proto at 196:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/MethodOptions.java b/wire-runtime/src/test/proto-java/com/google/protobuf/MethodOptions.java index fb5856b795..ac1f46ad66 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/MethodOptions.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/MethodOptions.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 411:1 +// Source file: google/protobuf/descriptor.proto at 411:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/ServiceDescriptorProto.java b/wire-runtime/src/test/proto-java/com/google/protobuf/ServiceDescriptorProto.java index 07170fad3c..b51927b910 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/ServiceDescriptorProto.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/ServiceDescriptorProto.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 187:1 +// Source file: google/protobuf/descriptor.proto at 187:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/ServiceOptions.java b/wire-runtime/src/test/proto-java/com/google/protobuf/ServiceOptions.java index 96706475af..d118de3095 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/ServiceOptions.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/ServiceOptions.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 397:1 +// Source file: google/protobuf/descriptor.proto at 397:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/SourceCodeInfo.java b/wire-runtime/src/test/proto-java/com/google/protobuf/SourceCodeInfo.java index 413e7d2bda..ef887214ae 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/SourceCodeInfo.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/SourceCodeInfo.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 458:1 +// Source file: google/protobuf/descriptor.proto at 458:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/google/protobuf/UninterpretedOption.java b/wire-runtime/src/test/proto-java/com/google/protobuf/UninterpretedOption.java index 8f91a31471..e293a82e07 100644 --- a/wire-runtime/src/test/proto-java/com/google/protobuf/UninterpretedOption.java +++ b/wire-runtime/src/test/proto-java/com/google/protobuf/UninterpretedOption.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/google/protobuf/descriptor.proto at 431:1 +// Source file: google/protobuf/descriptor.proto at 431:1 package com.google.protobuf; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/differentpackage/protos/bar/Bar.java b/wire-runtime/src/test/proto-java/com/squareup/differentpackage/protos/bar/Bar.java index ccf21a203b..5349e81dde 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/differentpackage/protos/bar/Bar.java +++ b/wire-runtime/src/test/proto-java/com/squareup/differentpackage/protos/bar/Bar.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/differentpackage/bar.proto at 5:1 +// Source file: differentpackage/bar.proto at 5:1 package com.squareup.differentpackage.protos.bar; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/differentpackage/protos/foo/Foo.java b/wire-runtime/src/test/proto-java/com/squareup/differentpackage/protos/foo/Foo.java index 7e302b33e6..9e6a5d8334 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/differentpackage/protos/foo/Foo.java +++ b/wire-runtime/src/test/proto-java/com/squareup/differentpackage/protos/foo/Foo.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/differentpackage/foo.proto at 7:1 +// Source file: differentpackage/foo.proto at 7:1 package com.squareup.differentpackage.protos.foo; import com.squareup.differentpackage.protos.bar.Bar; diff --git a/wire-runtime/src/test/proto-java/com/squareup/foobar/protos/bar/Bar.java b/wire-runtime/src/test/proto-java/com/squareup/foobar/protos/bar/Bar.java index f0039b494e..0d10361065 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/foobar/protos/bar/Bar.java +++ b/wire-runtime/src/test/proto-java/com/squareup/foobar/protos/bar/Bar.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/bar.proto at 5:1 +// Source file: bar.proto at 5:1 package com.squareup.foobar.protos.bar; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/foobar/protos/foo/Foo.java b/wire-runtime/src/test/proto-java/com/squareup/foobar/protos/foo/Foo.java index e9aa62fd11..33c1f1ef9b 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/foobar/protos/foo/Foo.java +++ b/wire-runtime/src/test/proto-java/com/squareup/foobar/protos/foo/Foo.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/foo.proto at 7:1 +// Source file: foo.proto at 7:1 package com.squareup.foobar.protos.foo; import com.squareup.foobar.protos.bar.Bar; diff --git a/wire-runtime/src/test/proto-java/com/squareup/services/HeresAllTheDataRequest.java b/wire-runtime/src/test/proto-java/com/squareup/services/HeresAllTheDataRequest.java index 0fea216169..097148601a 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/services/HeresAllTheDataRequest.java +++ b/wire-runtime/src/test/proto-java/com/squareup/services/HeresAllTheDataRequest.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/simple_service2.proto at 5:1 +// Source file: simple_service2.proto at 5:1 package com.squareup.services; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/services/HeresAllTheDataResponse.java b/wire-runtime/src/test/proto-java/com/squareup/services/HeresAllTheDataResponse.java index 371f61917e..cdcc0a0072 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/services/HeresAllTheDataResponse.java +++ b/wire-runtime/src/test/proto-java/com/squareup/services/HeresAllTheDataResponse.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/simple_service2.proto at 9:1 +// Source file: simple_service2.proto at 9:1 package com.squareup.services; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/services/LetsDataRequest.java b/wire-runtime/src/test/proto-java/com/squareup/services/LetsDataRequest.java index 713ea8f8c2..955b3f6217 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/services/LetsDataRequest.java +++ b/wire-runtime/src/test/proto-java/com/squareup/services/LetsDataRequest.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/simple_service2.proto at 13:1 +// Source file: simple_service2.proto at 13:1 package com.squareup.services; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/services/LetsDataResponse.java b/wire-runtime/src/test/proto-java/com/squareup/services/LetsDataResponse.java index 16b0a6b956..fcbf81e7f0 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/services/LetsDataResponse.java +++ b/wire-runtime/src/test/proto-java/com/squareup/services/LetsDataResponse.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/simple_service2.proto at 17:1 +// Source file: simple_service2.proto at 17:1 package com.squareup.services; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java b/wire-runtime/src/test/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java index 6200cd64cd..9785b1016d 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java +++ b/wire-runtime/src/test/proto-java/com/squareup/services/anotherpackage/SendDataRequest.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/request_response.proto at 3:1 +// Source file: request_response.proto at 3:1 package com.squareup.services.anotherpackage; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java b/wire-runtime/src/test/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java index 2be0ccfda1..98f7b27bb4 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java +++ b/wire-runtime/src/test/proto-java/com/squareup/services/anotherpackage/SendDataResponse.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/request_response.proto at 7:1 +// Source file: request_response.proto at 7:1 package com.squareup.services.anotherpackage; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/ChildPackage.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/ChildPackage.java index 63ba4836ef..132c5c859a 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/ChildPackage.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/ChildPackage.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/child_pkg.proto at 22:1 +// Source file: child_pkg.proto at 22:1 package com.squareup.wire.protos; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/RepeatedAndPacked.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/RepeatedAndPacked.java index 0912e7743f..52c5c13528 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/RepeatedAndPacked.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/RepeatedAndPacked.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/repeated_and_packed.proto at 20:1 +// Source file: repeated_and_packed.proto at 20:1 package com.squareup.wire.protos; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java index 944b35b281..a72bc47b1d 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/all_types.proto at 21:1 +// Source file: all_types.proto at 21:1 package com.squareup.wire.protos.alltypes; import com.squareup.wire.FieldEncoding; @@ -799,100 +799,244 @@ public AllTypes redact(AllTypes value) { public final NestedEnum default_nested_enum; + /** + * Extension source: all_types.proto at 123:3 + */ public final Integer ext_opt_int32; + /** + * Extension source: all_types.proto at 124:3 + */ public final Integer ext_opt_uint32; + /** + * Extension source: all_types.proto at 125:3 + */ public final Integer ext_opt_sint32; + /** + * Extension source: all_types.proto at 126:3 + */ public final Integer ext_opt_fixed32; + /** + * Extension source: all_types.proto at 127:3 + */ public final Integer ext_opt_sfixed32; + /** + * Extension source: all_types.proto at 128:3 + */ public final Long ext_opt_int64; + /** + * Extension source: all_types.proto at 129:3 + */ public final Long ext_opt_uint64; + /** + * Extension source: all_types.proto at 130:3 + */ public final Long ext_opt_sint64; + /** + * Extension source: all_types.proto at 131:3 + */ public final Long ext_opt_fixed64; + /** + * Extension source: all_types.proto at 132:3 + */ public final Long ext_opt_sfixed64; + /** + * Extension source: all_types.proto at 133:3 + */ public final Boolean ext_opt_bool; + /** + * Extension source: all_types.proto at 134:3 + */ public final Float ext_opt_float; + /** + * Extension source: all_types.proto at 135:3 + */ public final Double ext_opt_double; + /** + * Extension source: all_types.proto at 136:3 + */ public final String ext_opt_string; + /** + * Extension source: all_types.proto at 137:3 + */ public final ByteString ext_opt_bytes; + /** + * Extension source: all_types.proto at 138:3 + */ public final NestedEnum ext_opt_nested_enum; + /** + * Extension source: all_types.proto at 139:3 + */ public final NestedMessage ext_opt_nested_message; + /** + * Extension source: all_types.proto at 141:3 + */ public final List ext_rep_int32; + /** + * Extension source: all_types.proto at 142:3 + */ public final List ext_rep_uint32; + /** + * Extension source: all_types.proto at 143:3 + */ public final List ext_rep_sint32; + /** + * Extension source: all_types.proto at 144:3 + */ public final List ext_rep_fixed32; + /** + * Extension source: all_types.proto at 145:3 + */ public final List ext_rep_sfixed32; + /** + * Extension source: all_types.proto at 146:3 + */ public final List ext_rep_int64; + /** + * Extension source: all_types.proto at 147:3 + */ public final List ext_rep_uint64; + /** + * Extension source: all_types.proto at 148:3 + */ public final List ext_rep_sint64; + /** + * Extension source: all_types.proto at 149:3 + */ public final List ext_rep_fixed64; + /** + * Extension source: all_types.proto at 150:3 + */ public final List ext_rep_sfixed64; + /** + * Extension source: all_types.proto at 151:3 + */ public final List ext_rep_bool; + /** + * Extension source: all_types.proto at 152:3 + */ public final List ext_rep_float; + /** + * Extension source: all_types.proto at 153:3 + */ public final List ext_rep_double; + /** + * Extension source: all_types.proto at 154:3 + */ public final List ext_rep_string; + /** + * Extension source: all_types.proto at 155:3 + */ public final List ext_rep_bytes; + /** + * Extension source: all_types.proto at 156:3 + */ public final List ext_rep_nested_enum; + /** + * Extension source: all_types.proto at 157:3 + */ public final List ext_rep_nested_message; + /** + * Extension source: all_types.proto at 159:3 + */ public final List ext_pack_int32; + /** + * Extension source: all_types.proto at 160:3 + */ public final List ext_pack_uint32; + /** + * Extension source: all_types.proto at 161:3 + */ public final List ext_pack_sint32; + /** + * Extension source: all_types.proto at 162:3 + */ public final List ext_pack_fixed32; + /** + * Extension source: all_types.proto at 163:3 + */ public final List ext_pack_sfixed32; + /** + * Extension source: all_types.proto at 164:3 + */ public final List ext_pack_int64; + /** + * Extension source: all_types.proto at 165:3 + */ public final List ext_pack_uint64; + /** + * Extension source: all_types.proto at 166:3 + */ public final List ext_pack_sint64; + /** + * Extension source: all_types.proto at 167:3 + */ public final List ext_pack_fixed64; + /** + * Extension source: all_types.proto at 168:3 + */ public final List ext_pack_sfixed64; + /** + * Extension source: all_types.proto at 169:3 + */ public final List ext_pack_bool; + /** + * Extension source: all_types.proto at 170:3 + */ public final List ext_pack_float; + /** + * Extension source: all_types.proto at 171:3 + */ public final List ext_pack_double; + /** + * Extension source: all_types.proto at 172:3 + */ public final List ext_pack_nested_enum; public AllTypes(Integer opt_int32, Integer opt_uint32, Integer opt_sint32, Integer opt_fixed32, Integer opt_sfixed32, Long opt_int64, Long opt_uint64, Long opt_sint64, Long opt_fixed64, Long opt_sfixed64, Boolean opt_bool, Float opt_float, Double opt_double, String opt_string, ByteString opt_bytes, NestedEnum opt_nested_enum, NestedMessage opt_nested_message, Integer req_int32, Integer req_uint32, Integer req_sint32, Integer req_fixed32, Integer req_sfixed32, Long req_int64, Long req_uint64, Long req_sint64, Long req_fixed64, Long req_sfixed64, Boolean req_bool, Float req_float, Double req_double, String req_string, ByteString req_bytes, NestedEnum req_nested_enum, NestedMessage req_nested_message, List rep_int32, List rep_uint32, List rep_sint32, List rep_fixed32, List rep_sfixed32, List rep_int64, List rep_uint64, List rep_sint64, List rep_fixed64, List rep_sfixed64, List rep_bool, List rep_float, List rep_double, List rep_string, List rep_bytes, List rep_nested_enum, List rep_nested_message, List pack_int32, List pack_uint32, List pack_sint32, List pack_fixed32, List pack_sfixed32, List pack_int64, List pack_uint64, List pack_sint64, List pack_fixed64, List pack_sfixed64, List pack_bool, List pack_float, List pack_double, List pack_nested_enum, Integer default_int32, Integer default_uint32, Integer default_sint32, Integer default_fixed32, Integer default_sfixed32, Long default_int64, Long default_uint64, Long default_sint64, Long default_fixed64, Long default_sfixed64, Boolean default_bool, Float default_float, Double default_double, String default_string, ByteString default_bytes, NestedEnum default_nested_enum, Integer ext_opt_int32, Integer ext_opt_uint32, Integer ext_opt_sint32, Integer ext_opt_fixed32, Integer ext_opt_sfixed32, Long ext_opt_int64, Long ext_opt_uint64, Long ext_opt_sint64, Long ext_opt_fixed64, Long ext_opt_sfixed64, Boolean ext_opt_bool, Float ext_opt_float, Double ext_opt_double, String ext_opt_string, ByteString ext_opt_bytes, NestedEnum ext_opt_nested_enum, NestedMessage ext_opt_nested_message, List ext_rep_int32, List ext_rep_uint32, List ext_rep_sint32, List ext_rep_fixed32, List ext_rep_sfixed32, List ext_rep_int64, List ext_rep_uint64, List ext_rep_sint64, List ext_rep_fixed64, List ext_rep_sfixed64, List ext_rep_bool, List ext_rep_float, List ext_rep_double, List ext_rep_string, List ext_rep_bytes, List ext_rep_nested_enum, List ext_rep_nested_message, List ext_pack_int32, List ext_pack_uint32, List ext_pack_sint32, List ext_pack_fixed32, List ext_pack_sfixed32, List ext_pack_int64, List ext_pack_uint64, List ext_pack_sint64, List ext_pack_fixed64, List ext_pack_sfixed64, List ext_pack_bool, List ext_pack_float, List ext_pack_double, List ext_pack_nested_enum) { diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java.compact b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java.compact index e020b66b60..df4c13b865 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java.compact +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/alltypes/AllTypes.java.compact @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/all_types.proto at 21:1 +// Source file: all_types.proto at 21:1 package com.squareup.wire.protos.alltypes; import com.squareup.wire.Message; @@ -685,108 +685,162 @@ public final class AllTypes extends Message { ) public final NestedEnum default_nested_enum; + /** + * Extension source: all_types.proto at 123:3 + */ @WireField( tag = 1001, adapter = "com.squareup.wire.ProtoAdapter#INT32" ) public final Integer ext_opt_int32; + /** + * Extension source: all_types.proto at 124:3 + */ @WireField( tag = 1002, adapter = "com.squareup.wire.ProtoAdapter#UINT32" ) public final Integer ext_opt_uint32; + /** + * Extension source: all_types.proto at 125:3 + */ @WireField( tag = 1003, adapter = "com.squareup.wire.ProtoAdapter#SINT32" ) public final Integer ext_opt_sint32; + /** + * Extension source: all_types.proto at 126:3 + */ @WireField( tag = 1004, adapter = "com.squareup.wire.ProtoAdapter#FIXED32" ) public final Integer ext_opt_fixed32; + /** + * Extension source: all_types.proto at 127:3 + */ @WireField( tag = 1005, adapter = "com.squareup.wire.ProtoAdapter#SFIXED32" ) public final Integer ext_opt_sfixed32; + /** + * Extension source: all_types.proto at 128:3 + */ @WireField( tag = 1006, adapter = "com.squareup.wire.ProtoAdapter#INT64" ) public final Long ext_opt_int64; + /** + * Extension source: all_types.proto at 129:3 + */ @WireField( tag = 1007, adapter = "com.squareup.wire.ProtoAdapter#UINT64" ) public final Long ext_opt_uint64; + /** + * Extension source: all_types.proto at 130:3 + */ @WireField( tag = 1008, adapter = "com.squareup.wire.ProtoAdapter#SINT64" ) public final Long ext_opt_sint64; + /** + * Extension source: all_types.proto at 131:3 + */ @WireField( tag = 1009, adapter = "com.squareup.wire.ProtoAdapter#FIXED64" ) public final Long ext_opt_fixed64; + /** + * Extension source: all_types.proto at 132:3 + */ @WireField( tag = 1010, adapter = "com.squareup.wire.ProtoAdapter#SFIXED64" ) public final Long ext_opt_sfixed64; + /** + * Extension source: all_types.proto at 133:3 + */ @WireField( tag = 1011, adapter = "com.squareup.wire.ProtoAdapter#BOOL" ) public final Boolean ext_opt_bool; + /** + * Extension source: all_types.proto at 134:3 + */ @WireField( tag = 1012, adapter = "com.squareup.wire.ProtoAdapter#FLOAT" ) public final Float ext_opt_float; + /** + * Extension source: all_types.proto at 135:3 + */ @WireField( tag = 1013, adapter = "com.squareup.wire.ProtoAdapter#DOUBLE" ) public final Double ext_opt_double; + /** + * Extension source: all_types.proto at 136:3 + */ @WireField( tag = 1014, adapter = "com.squareup.wire.ProtoAdapter#STRING" ) public final String ext_opt_string; + /** + * Extension source: all_types.proto at 137:3 + */ @WireField( tag = 1015, adapter = "com.squareup.wire.ProtoAdapter#BYTES" ) public final ByteString ext_opt_bytes; + /** + * Extension source: all_types.proto at 138:3 + */ @WireField( tag = 1016, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedEnum#ADAPTER" ) public final NestedEnum ext_opt_nested_enum; + /** + * Extension source: all_types.proto at 139:3 + */ @WireField( tag = 1017, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedMessage#ADAPTER" ) public final NestedMessage ext_opt_nested_message; + /** + * Extension source: all_types.proto at 141:3 + */ @WireField( tag = 1101, adapter = "com.squareup.wire.ProtoAdapter#INT32", @@ -794,6 +848,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_int32; + /** + * Extension source: all_types.proto at 142:3 + */ @WireField( tag = 1102, adapter = "com.squareup.wire.ProtoAdapter#UINT32", @@ -801,6 +858,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_uint32; + /** + * Extension source: all_types.proto at 143:3 + */ @WireField( tag = 1103, adapter = "com.squareup.wire.ProtoAdapter#SINT32", @@ -808,6 +868,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_sint32; + /** + * Extension source: all_types.proto at 144:3 + */ @WireField( tag = 1104, adapter = "com.squareup.wire.ProtoAdapter#FIXED32", @@ -815,6 +878,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_fixed32; + /** + * Extension source: all_types.proto at 145:3 + */ @WireField( tag = 1105, adapter = "com.squareup.wire.ProtoAdapter#SFIXED32", @@ -822,6 +888,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_sfixed32; + /** + * Extension source: all_types.proto at 146:3 + */ @WireField( tag = 1106, adapter = "com.squareup.wire.ProtoAdapter#INT64", @@ -829,6 +898,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_int64; + /** + * Extension source: all_types.proto at 147:3 + */ @WireField( tag = 1107, adapter = "com.squareup.wire.ProtoAdapter#UINT64", @@ -836,6 +908,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_uint64; + /** + * Extension source: all_types.proto at 148:3 + */ @WireField( tag = 1108, adapter = "com.squareup.wire.ProtoAdapter#SINT64", @@ -843,6 +918,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_sint64; + /** + * Extension source: all_types.proto at 149:3 + */ @WireField( tag = 1109, adapter = "com.squareup.wire.ProtoAdapter#FIXED64", @@ -850,6 +928,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_fixed64; + /** + * Extension source: all_types.proto at 150:3 + */ @WireField( tag = 1110, adapter = "com.squareup.wire.ProtoAdapter#SFIXED64", @@ -857,6 +938,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_sfixed64; + /** + * Extension source: all_types.proto at 151:3 + */ @WireField( tag = 1111, adapter = "com.squareup.wire.ProtoAdapter#BOOL", @@ -864,6 +948,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_bool; + /** + * Extension source: all_types.proto at 152:3 + */ @WireField( tag = 1112, adapter = "com.squareup.wire.ProtoAdapter#FLOAT", @@ -871,6 +958,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_float; + /** + * Extension source: all_types.proto at 153:3 + */ @WireField( tag = 1113, adapter = "com.squareup.wire.ProtoAdapter#DOUBLE", @@ -878,6 +968,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_double; + /** + * Extension source: all_types.proto at 154:3 + */ @WireField( tag = 1114, adapter = "com.squareup.wire.ProtoAdapter#STRING", @@ -885,6 +978,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_string; + /** + * Extension source: all_types.proto at 155:3 + */ @WireField( tag = 1115, adapter = "com.squareup.wire.ProtoAdapter#BYTES", @@ -892,6 +988,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_bytes; + /** + * Extension source: all_types.proto at 156:3 + */ @WireField( tag = 1116, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedEnum#ADAPTER", @@ -899,6 +998,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_nested_enum; + /** + * Extension source: all_types.proto at 157:3 + */ @WireField( tag = 1117, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedMessage#ADAPTER", @@ -906,6 +1008,9 @@ public final class AllTypes extends Message { ) public final List ext_rep_nested_message; + /** + * Extension source: all_types.proto at 159:3 + */ @WireField( tag = 1201, adapter = "com.squareup.wire.ProtoAdapter#INT32", @@ -913,6 +1018,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_int32; + /** + * Extension source: all_types.proto at 160:3 + */ @WireField( tag = 1202, adapter = "com.squareup.wire.ProtoAdapter#UINT32", @@ -920,6 +1028,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_uint32; + /** + * Extension source: all_types.proto at 161:3 + */ @WireField( tag = 1203, adapter = "com.squareup.wire.ProtoAdapter#SINT32", @@ -927,6 +1038,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_sint32; + /** + * Extension source: all_types.proto at 162:3 + */ @WireField( tag = 1204, adapter = "com.squareup.wire.ProtoAdapter#FIXED32", @@ -934,6 +1048,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_fixed32; + /** + * Extension source: all_types.proto at 163:3 + */ @WireField( tag = 1205, adapter = "com.squareup.wire.ProtoAdapter#SFIXED32", @@ -941,6 +1058,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_sfixed32; + /** + * Extension source: all_types.proto at 164:3 + */ @WireField( tag = 1206, adapter = "com.squareup.wire.ProtoAdapter#INT64", @@ -948,6 +1068,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_int64; + /** + * Extension source: all_types.proto at 165:3 + */ @WireField( tag = 1207, adapter = "com.squareup.wire.ProtoAdapter#UINT64", @@ -955,6 +1078,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_uint64; + /** + * Extension source: all_types.proto at 166:3 + */ @WireField( tag = 1208, adapter = "com.squareup.wire.ProtoAdapter#SINT64", @@ -962,6 +1088,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_sint64; + /** + * Extension source: all_types.proto at 167:3 + */ @WireField( tag = 1209, adapter = "com.squareup.wire.ProtoAdapter#FIXED64", @@ -969,6 +1098,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_fixed64; + /** + * Extension source: all_types.proto at 168:3 + */ @WireField( tag = 1210, adapter = "com.squareup.wire.ProtoAdapter#SFIXED64", @@ -976,6 +1108,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_sfixed64; + /** + * Extension source: all_types.proto at 169:3 + */ @WireField( tag = 1211, adapter = "com.squareup.wire.ProtoAdapter#BOOL", @@ -983,6 +1118,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_bool; + /** + * Extension source: all_types.proto at 170:3 + */ @WireField( tag = 1212, adapter = "com.squareup.wire.ProtoAdapter#FLOAT", @@ -990,6 +1128,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_float; + /** + * Extension source: all_types.proto at 171:3 + */ @WireField( tag = 1213, adapter = "com.squareup.wire.ProtoAdapter#DOUBLE", @@ -997,6 +1138,9 @@ public final class AllTypes extends Message { ) public final List ext_pack_double; + /** + * Extension source: all_types.proto at 172:3 + */ @WireField( tag = 1216, adapter = "com.squareup.wire.protos.alltypes.AllTypes$NestedEnum#ADAPTER", diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/FooBar.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/FooBar.java index 1e9649c80f..7463913e24 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/FooBar.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/FooBar.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/custom_options.proto at 23:1 +// Source file: custom_options.proto at 23:1 package com.squareup.wire.protos.custom_options; import com.google.protobuf.EnumOptions; @@ -176,8 +176,14 @@ public FooBar redact(FooBar value) { public final List nested; + /** + * Extension source: custom_options.proto at 80:3 + */ public final FooBarBazEnum ext; + /** + * Extension source: custom_options.proto at 81:3 + */ public final List rep; public FooBar(Integer foo, String bar, Nested baz, Long qux, List fred, Double daisy, List nested, FooBarBazEnum ext, List rep) { diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/FooBar.java.noOptions b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/FooBar.java.noOptions index 5bfe2504c4..cbe4d22bde 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/FooBar.java.noOptions +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/FooBar.java.noOptions @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/custom_options.proto at 23:1 +// Source file: custom_options.proto at 23:1 package com.squareup.wire.protos.custom_options; import com.squareup.wire.FieldEncoding; @@ -126,8 +126,14 @@ public final class FooBar extends Message { public final List nested; + /** + * Extension source: custom_options.proto at 80:3 + */ public final FooBarBazEnum ext; + /** + * Extension source: custom_options.proto at 81:3 + */ public final List rep; public FooBar(Integer foo, String bar, Nested baz, Long qux, List fred, Double daisy, List nested, FooBarBazEnum ext, List rep) { diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java index 67f46658b3..f911530aa4 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/custom_options.proto at 84:1 +// Source file: custom_options.proto at 84:1 package com.squareup.wire.protos.custom_options; import com.google.protobuf.MessageOptions; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java.noOptions b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java.noOptions index dfd12dd646..b35eec69f2 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java.noOptions +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/custom_options/MessageWithOptions.java.noOptions @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/custom_options.proto at 84:1 +// Source file: custom_options.proto at 84:1 package com.squareup.wire.protos.custom_options; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/NoFields.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/NoFields.java index fa5494afb8..543a6aba31 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/NoFields.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/NoFields.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/edge_cases.proto at 20:1 +// Source file: edge_cases.proto at 20:1 package com.squareup.wire.protos.edgecases; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java index 79afdb63ea..4dd5de0d86 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/OneBytesField.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/edge_cases.proto at 27:1 +// Source file: edge_cases.proto at 27:1 package com.squareup.wire.protos.edgecases; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/OneField.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/OneField.java index f55e22e6ef..2f2fc576d3 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/OneField.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/OneField.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/edge_cases.proto at 23:1 +// Source file: edge_cases.proto at 23:1 package com.squareup.wire.protos.edgecases; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/Recursive.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/Recursive.java index 431f41e070..6a1e898876 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/Recursive.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/edgecases/Recursive.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/edge_cases.proto at 31:1 +// Source file: edge_cases.proto at 31:1 package com.squareup.wire.protos.edgecases; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java index 19cc1444d4..31bc1906ac 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/foreign/ForeignEnum.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/foreign.proto at 23:1 +// Source file: foreign.proto at 23:1 package com.squareup.wire.protos.foreign; import com.squareup.wire.ProtoAdapter; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java index 69dcc63424..a268d25fd1 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/foreign/ForeignMessage.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/foreign.proto at 28:1 +// Source file: foreign.proto at 28:1 package com.squareup.wire.protos.foreign; import com.squareup.wire.FieldEncoding; @@ -66,6 +66,9 @@ public ForeignMessage redact(ForeignMessage value) { public final Integer i; + /** + * Extension source: simple_message.proto at 77:3 + */ public final Integer j; public ForeignMessage(Integer i, Integer j) { diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/namecollisions/Message.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/namecollisions/Message.java index 361c2050ae..6d365a3571 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/namecollisions/Message.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/namecollisions/Message.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/name_collisions.proto at 20:1 +// Source file: name_collisions.proto at 20:1 package com.squareup.wire.protos.namecollisions; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/one_extension/Foo.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/one_extension/Foo.java index f4f27c3814..ad1eb65c5e 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/one_extension/Foo.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/one_extension/Foo.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/one_extension.proto at 26:1 +// Source file: one_extension.proto at 26:1 package com.squareup.wire.protos.one_extension; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java index c8b35b1658..19a05782b4 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/one_extension/OneExtension.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/one_extension.proto at 20:1 +// Source file: one_extension.proto at 20:1 package com.squareup.wire.protos.one_extension; import com.squareup.wire.FieldEncoding; @@ -64,6 +64,9 @@ public OneExtension redact(OneExtension value) { public final String id; + /** + * Extension source: one_extension.proto at 31:3 + */ public final Foo foo; public OneExtension(String id, Foo foo) { diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java index 83268ad54c..2505d58600 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/oneof/OneOfMessage.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/one_of.proto at 20:1 +// Source file: one_of.proto at 20:1 package com.squareup.wire.protos.oneof; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/person/Person.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/person/Person.java index f2023079ed..c169ab280a 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/person/Person.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/person/Person.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/person.proto at 21:1 +// Source file: person.proto at 21:1 package com.squareup.wire.protos.person; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/person/Person.java.android b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/person/Person.java.android index 8ee14cda66..44ffbd9dab 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/person/Person.java.android +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/person/Person.java.android @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/person.proto at 21:1 +// Source file: person.proto at 21:1 package com.squareup.wire.protos.person; import android.os.Parcel; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java index 6b0365dcab..bf4938a1e1 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/NotRedacted.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/redacted_test.proto at 22:1 +// Source file: redacted_test.proto at 22:1 package com.squareup.wire.protos.redacted; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/Redacted.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/Redacted.java index d8f066e972..941b078418 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/Redacted.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/Redacted.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/redacted_test.proto at 27:1 +// Source file: redacted_test.proto at 27:1 package com.squareup.wire.protos.redacted; import com.google.protobuf.FieldOptions; @@ -88,6 +88,9 @@ public Redacted redact(Redacted value) { public final String c; + /** + * Extension source: redacted_test.proto at 71:3 + */ public final RedactedExtension extension; public Redacted(String a, String b, String c, RedactedExtension extension) { diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java index 1550246b55..3532bb5bc5 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedChild.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/redacted_test.proto at 34:1 +// Source file: redacted_test.proto at 34:1 package com.squareup.wire.protos.redacted; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java index c354821388..ade3c68779 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedCycleA.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/redacted_test.proto at 40:1 +// Source file: redacted_test.proto at 40:1 package com.squareup.wire.protos.redacted; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java index 93cc14ae47..575134a284 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedCycleB.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/redacted_test.proto at 44:1 +// Source file: redacted_test.proto at 44:1 package com.squareup.wire.protos.redacted; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java index 295e8dadd8..dfbac9f7bb 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedExtension.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/redacted_test.proto at 65:1 +// Source file: redacted_test.proto at 65:1 package com.squareup.wire.protos.redacted; import com.google.protobuf.FieldOptions; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java index 8f554a587f..1fc3850f8c 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedRepeated.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/redacted_test.proto at 48:1 +// Source file: redacted_test.proto at 48:1 package com.squareup.wire.protos.redacted; import com.google.protobuf.FieldOptions; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java index b6e6bca3eb..3019f92b92 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/redacted/RedactedRequired.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/redacted_test.proto at 55:1 +// Source file: redacted_test.proto at 55:1 package com.squareup.wire.protos.redacted; import com.google.protobuf.FieldOptions; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/A.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/A.java index 564c378bfd..d1e47b0dcc 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/A.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/A.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 34:1 +// Source file: roots.proto at 34:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/B.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/B.java index cf6f268537..7509dfb249 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/B.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/B.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 39:1 +// Source file: roots.proto at 39:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/C.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/C.java index 4b52b375ea..e709512f5c 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/C.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/C.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 43:1 +// Source file: roots.proto at 43:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/D.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/D.java index 268758c332..fffad3653b 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/D.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/D.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 47:1 +// Source file: roots.proto at 47:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/E.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/E.java index c24c82139f..78f60a5599 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/E.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/E.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 51:1 +// Source file: roots.proto at 51:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/G.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/G.java index 7d98d329b2..e026923335 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/G.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/G.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 60:1 +// Source file: roots.proto at 60:1 package com.squareup.wire.protos.roots; import com.squareup.wire.ProtoAdapter; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/H.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/H.java index 4f1fcd259d..de4615c567 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/H.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/H.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 65:1 +// Source file: roots.proto at 65:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/I.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/I.java index d66ab6bb97..d247b356f9 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/I.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/I.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 69:1 +// Source file: roots.proto at 69:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; @@ -65,6 +65,9 @@ public I redact(I value) { public final Integer i; + /** + * Extension source: roots.proto at 84:3 + */ public final J j; public I(Integer i, J j) { diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/J.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/J.java index cfce3d499a..dbc2f182ee 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/J.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/J.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 75:1 +// Source file: roots.proto at 75:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/K.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/K.java index de246b48b4..5fe844c882 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/K.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/K.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/roots.proto at 79:1 +// Source file: roots.proto at 79:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/TheRequest.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/TheRequest.java index 3eea72e32a..a34457df75 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/TheRequest.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/TheRequest.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/service_root.proto at 5:1 +// Source file: service_root.proto at 5:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/TheResponse.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/TheResponse.java index b7baf1026e..2095b197eb 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/TheResponse.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/TheResponse.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/service_root.proto at 6:1 +// Source file: service_root.proto at 6:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java index 59c8bc4cc8..01c00300f9 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/roots/UnnecessaryResponse.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/service_root.proto at 7:1 +// Source file: service_root.proto at 7:1 package com.squareup.wire.protos.roots; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java index f3ee58b2eb..90729de58d 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/simple/ExternalMessage.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/external_message.proto at 20:1 +// Source file: external_message.proto at 20:1 package com.squareup.wire.protos.simple; import com.squareup.wire.FieldEncoding; @@ -92,14 +92,29 @@ public ExternalMessage redact(ExternalMessage value) { public final Float f; + /** + * Extension source: simple_message.proto at 69:3 + */ public final List fooext; + /** + * Extension source: simple_message.proto at 70:3 + */ public final Integer barext; + /** + * Extension source: simple_message.proto at 71:3 + */ public final Integer bazext; + /** + * Extension source: simple_message.proto at 72:3 + */ public final SimpleMessage.NestedMessage nested_message_ext; + /** + * Extension source: simple_message.proto at 73:3 + */ public final SimpleMessage.NestedEnum nested_enum_ext; public ExternalMessage(Float f, List fooext, Integer barext, Integer bazext, SimpleMessage.NestedMessage nested_message_ext, SimpleMessage.NestedEnum nested_enum_ext) { diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java index d412f51acc..3b1ee8905a 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/simple/SimpleMessage.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/simple_message.proto at 24:1 +// Source file: simple_message.proto at 24:1 package com.squareup.wire.protos.simple; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Bar.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Bar.java index 6951d68699..a0e7f8ab1d 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Bar.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Bar.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/samebasename/single_level.proto at 20:1 +// Source file: samebasename/single_level.proto at 20:1 package com.squareup.wire.protos.single_level; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Bars.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Bars.java index a4abefaead..671a3d8efc 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Bars.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Bars.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/samebasename/single_level.proto at 24:1 +// Source file: samebasename/single_level.proto at 24:1 package com.squareup.wire.protos.single_level; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Foo.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Foo.java index a05e90a4c3..c8882c4b29 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Foo.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Foo.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/single_level.proto at 20:1 +// Source file: single_level.proto at 20:1 package com.squareup.wire.protos.single_level; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Foos.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Foos.java index 8577ae4a9c..e02dc9ec61 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Foos.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/single_level/Foos.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/single_level.proto at 24:1 +// Source file: single_level.proto at 24:1 package com.squareup.wire.protos.single_level; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java index e4cb6f64d4..73376eab23 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/unknownfields/VersionOne.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/unknown_fields.proto at 20:1 +// Source file: unknown_fields.proto at 20:1 package com.squareup.wire.protos.unknownfields; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java index 5f832cce4c..f7e470d210 100644 --- a/wire-runtime/src/test/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java +++ b/wire-runtime/src/test/proto-java/com/squareup/wire/protos/unknownfields/VersionTwo.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/unknown_fields.proto at 24:1 +// Source file: unknown_fields.proto at 24:1 package com.squareup.wire.protos.unknownfields; import com.squareup.wire.FieldEncoding; diff --git a/wire-runtime/src/test/proto-java/squareup/protos/extension_collision/CollisionSubject.java b/wire-runtime/src/test/proto-java/squareup/protos/extension_collision/CollisionSubject.java index 274404720a..c39b50f476 100644 --- a/wire-runtime/src/test/proto-java/squareup/protos/extension_collision/CollisionSubject.java +++ b/wire-runtime/src/test/proto-java/squareup/protos/extension_collision/CollisionSubject.java @@ -1,5 +1,5 @@ // Code generated by Wire protocol buffer compiler, do not edit. -// Source file: ../wire-runtime/src/test/proto/extension_collision.proto at 3:1 +// Source file: extension_collision.proto at 3:1 package squareup.protos.extension_collision; import com.squareup.wire.FieldEncoding; @@ -73,12 +73,24 @@ public CollisionSubject redact(CollisionSubject value) { public static final String DEFAULT_C = ""; + /** + * Extension source: extension_collision_1.proto at 6:3 + */ public final String squareup_protos_extension_collision_1_a; + /** + * Extension source: extension_collision_1.proto at 7:3 + */ public final String b; + /** + * Extension source: extension_collision_2.proto at 6:3 + */ public final String squareup_protos_extension_collision_2_a; + /** + * Extension source: extension_collision_2.proto at 7:3 + */ public final String c; public CollisionSubject(String squareup_protos_extension_collision_1_a, String b, String squareup_protos_extension_collision_2_a, String c) { diff --git a/wire-schema/src/main/java/com/squareup/wire/schema/Location.java b/wire-schema/src/main/java/com/squareup/wire/schema/Location.java index 2fb13074db..bbe76289ab 100644 --- a/wire-schema/src/main/java/com/squareup/wire/schema/Location.java +++ b/wire-schema/src/main/java/com/squareup/wire/schema/Location.java @@ -39,6 +39,11 @@ public Location at(int line, int column) { return new AutoValue_Location(base(), path(), line, column); } + /** Returns a copy of this location with an empty base. */ + public Location withoutBase() { + return new AutoValue_Location("", path(), line(), column()); + } + /** Returns the base of this location; typically a directory or .jar file. */ public abstract String base();