diff --git a/examples/clients/abe/a_bit_of_everything_service_api.go b/examples/clients/abe/a_bit_of_everything_service_api.go index 4cc9d609e59..a1a1f313dc0 100644 --- a/examples/clients/abe/a_bit_of_everything_service_api.go +++ b/examples/clients/abe/a_bit_of_everything_service_api.go @@ -539,9 +539,10 @@ func (a ABitOfEverythingServiceApi) GetMessageWithBody(id string, body Examplepb * @param nonConventionalNameValue * @param timestampValue * @param repeatedEnumValue repeated enum value. it is comma-separated in query. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param id * @return *ProtobufEmpty */ -func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName string, singleNestedAmount int64, singleNestedOk string, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, bytesValue string, uint32Value int64, enumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofString string, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string) (*ProtobufEmpty, *APIResponse, error) { +func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName string, singleNestedAmount int64, singleNestedOk string, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, bytesValue string, uint32Value int64, enumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofString string, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, id bool) (*ProtobufEmpty, *APIResponse, error) { var localVarHttpMethod = strings.ToUpper("Get") // create path and map variables @@ -586,6 +587,7 @@ func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName strin var repeatedEnumValueCollectionFormat = "csv" localVarQueryParams.Add("repeated_enum_value", a.Configuration.APIClient.ParameterToString(repeatedEnumValue, repeatedEnumValueCollectionFormat)) + localVarQueryParams.Add("@id", a.Configuration.APIClient.ParameterToString(id, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime", } diff --git a/examples/clients/abe/examplepb_a_bit_of_everything.go b/examples/clients/abe/examplepb_a_bit_of_everything.go index a64597c7f47..4fb52e5b15a 100644 --- a/examples/clients/abe/examplepb_a_bit_of_everything.go +++ b/examples/clients/abe/examplepb_a_bit_of_everything.go @@ -72,4 +72,6 @@ type ExamplepbABitOfEverything struct { TimestampValue time.Time `json:"timestamp_value,omitempty"` RepeatedEnumValue []ExamplepbNumericEnum `json:"repeated_enum_value,omitempty"` + + Id bool `json:"@id,omitempty"` } diff --git a/examples/proto/examplepb/a_bit_of_everything.pb.go b/examples/proto/examplepb/a_bit_of_everything.pb.go index 5e3779c36c7..60bffdd59d4 100644 --- a/examples/proto/examplepb/a_bit_of_everything.pb.go +++ b/examples/proto/examplepb/a_bit_of_everything.pb.go @@ -53,7 +53,7 @@ func (x NumericEnum) String() string { return proto.EnumName(NumericEnum_name, int32(x)) } func (NumericEnum) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_a70f672d918531b9, []int{0} + return fileDescriptor_a_bit_of_everything_fc2489611165dcf5, []int{0} } // DeepEnum is one or zero. @@ -79,7 +79,7 @@ func (x ABitOfEverything_Nested_DeepEnum) String() string { return proto.EnumName(ABitOfEverything_Nested_DeepEnum_name, int32(x)) } func (ABitOfEverything_Nested_DeepEnum) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_a70f672d918531b9, []int{0, 0, 0} + return fileDescriptor_a_bit_of_everything_fc2489611165dcf5, []int{0, 0, 0} } // Intentionaly complicated message type to cover many features of Protobuf. @@ -116,6 +116,7 @@ type ABitOfEverything struct { TimestampValue *timestamp.Timestamp `protobuf:"bytes,27,opt,name=timestamp_value,json=timestampValue,proto3" json:"timestamp_value,omitempty"` // repeated enum value. it is comma-separated in query RepeatedEnumValue []NumericEnum `protobuf:"varint,28,rep,packed,name=repeated_enum_value,json=repeatedEnumValue,proto3,enum=grpc.gateway.examples.examplepb.NumericEnum" json:"repeated_enum_value,omitempty"` + AtId bool `protobuf:"varint,30,opt,name=at_id,json=atId,proto3" json:"at_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -125,7 +126,7 @@ func (m *ABitOfEverything) Reset() { *m = ABitOfEverything{} } func (m *ABitOfEverything) String() string { return proto.CompactTextString(m) } func (*ABitOfEverything) ProtoMessage() {} func (*ABitOfEverything) Descriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_a70f672d918531b9, []int{0} + return fileDescriptor_a_bit_of_everything_fc2489611165dcf5, []int{0} } func (m *ABitOfEverything) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ABitOfEverything.Unmarshal(m, b) @@ -362,6 +363,13 @@ func (m *ABitOfEverything) GetRepeatedEnumValue() []NumericEnum { return nil } +func (m *ABitOfEverything) GetAtId() bool { + if m != nil { + return m.AtId + } + return false +} + // XXX_OneofFuncs is for the internal use of the proto package. func (*ABitOfEverything) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { return _ABitOfEverything_OneofMarshaler, _ABitOfEverything_OneofUnmarshaler, _ABitOfEverything_OneofSizer, []interface{}{ @@ -447,7 +455,7 @@ func (m *ABitOfEverything_Nested) Reset() { *m = ABitOfEverything_Nested func (m *ABitOfEverything_Nested) String() string { return proto.CompactTextString(m) } func (*ABitOfEverything_Nested) ProtoMessage() {} func (*ABitOfEverything_Nested) Descriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_a70f672d918531b9, []int{0, 0} + return fileDescriptor_a_bit_of_everything_fc2489611165dcf5, []int{0, 0} } func (m *ABitOfEverything_Nested) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ABitOfEverything_Nested.Unmarshal(m, b) @@ -499,7 +507,7 @@ func (m *Body) Reset() { *m = Body{} } func (m *Body) String() string { return proto.CompactTextString(m) } func (*Body) ProtoMessage() {} func (*Body) Descriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_a70f672d918531b9, []int{1} + return fileDescriptor_a_bit_of_everything_fc2489611165dcf5, []int{1} } func (m *Body) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Body.Unmarshal(m, b) @@ -538,7 +546,7 @@ func (m *MessageWithBody) Reset() { *m = MessageWithBody{} } func (m *MessageWithBody) String() string { return proto.CompactTextString(m) } func (*MessageWithBody) ProtoMessage() {} func (*MessageWithBody) Descriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_a70f672d918531b9, []int{2} + return fileDescriptor_a_bit_of_everything_fc2489611165dcf5, []int{2} } func (m *MessageWithBody) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageWithBody.Unmarshal(m, b) @@ -1201,148 +1209,150 @@ var _AnotherServiceWithNoBindings_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("examples/proto/examplepb/a_bit_of_everything.proto", fileDescriptor_a_bit_of_everything_a70f672d918531b9) + proto.RegisterFile("examples/proto/examplepb/a_bit_of_everything.proto", fileDescriptor_a_bit_of_everything_fc2489611165dcf5) } -var fileDescriptor_a_bit_of_everything_a70f672d918531b9 = []byte{ - // 2222 bytes of a gzipped FileDescriptorProto +var fileDescriptor_a_bit_of_everything_fc2489611165dcf5 = []byte{ + // 2245 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcb, 0x73, 0x1b, 0x49, - 0x19, 0xf7, 0x48, 0xb6, 0x62, 0x7f, 0x7e, 0xc9, 0xed, 0x3c, 0x1c, 0xc5, 0x59, 0x77, 0x94, 0x2c, - 0xab, 0x78, 0xe3, 0x99, 0x44, 0x31, 0x5b, 0x89, 0x29, 0x08, 0xb2, 0xad, 0x4d, 0xbc, 0xd9, 0x38, - 0xce, 0x24, 0x1b, 0x52, 0xa9, 0x2c, 0xa6, 0x35, 0xd3, 0x96, 0x26, 0xd1, 0x4c, 0x0f, 0xd3, 0x3d, - 0xb6, 0x85, 0x31, 0x14, 0x50, 0x05, 0x45, 0x71, 0xa0, 0xca, 0xdc, 0x38, 0xec, 0x01, 0xaa, 0x28, - 0x2e, 0x1c, 0x38, 0x70, 0x81, 0x2a, 0x38, 0x71, 0xda, 0x23, 0x55, 0x1c, 0xb8, 0xc2, 0x81, 0x3f, - 0x83, 0xea, 0x9e, 0x19, 0x79, 0x24, 0x5b, 0x38, 0x4a, 0xb6, 0xf6, 0x62, 0x4f, 0x77, 0xff, 0xbe, - 0xf7, 0xa3, 0xbf, 0x16, 0x94, 0xe9, 0x2e, 0x71, 0xfd, 0x26, 0xe5, 0x86, 0x1f, 0x30, 0xc1, 0x8c, - 0x78, 0xe9, 0xd7, 0x0c, 0xb2, 0x59, 0x73, 0xc4, 0x26, 0xdb, 0xda, 0xa4, 0xdb, 0x34, 0x68, 0x89, - 0x86, 0xe3, 0xd5, 0x75, 0x85, 0x41, 0x73, 0xf5, 0xc0, 0xb7, 0xf4, 0x3a, 0x11, 0x74, 0x87, 0xb4, - 0xf4, 0x84, 0x81, 0xde, 0x26, 0x2d, 0xcc, 0xd6, 0x19, 0xab, 0x37, 0xa9, 0x41, 0x7c, 0xc7, 0x20, - 0x9e, 0xc7, 0x04, 0x11, 0x0e, 0xf3, 0x78, 0x44, 0x5e, 0xb8, 0x10, 0x9f, 0xaa, 0x55, 0x2d, 0xdc, - 0x32, 0xa8, 0xeb, 0x8b, 0x56, 0x7c, 0xf8, 0x4e, 0xf7, 0xa1, 0x1d, 0x06, 0x8a, 0x3a, 0x3e, 0xc7, - 0x5d, 0xfa, 0xf2, 0xb0, 0x66, 0xb8, 0x94, 0x73, 0x52, 0xa7, 0x31, 0xe2, 0xd2, 0x51, 0x44, 0xb9, - 0x0b, 0x32, 0xd7, 0x2d, 0x44, 0x38, 0x2e, 0xe5, 0x82, 0xb8, 0x7e, 0x0c, 0xb8, 0xa6, 0xfe, 0x59, - 0x0b, 0x75, 0xea, 0x2d, 0xf0, 0x1d, 0x52, 0xaf, 0xd3, 0xc0, 0x60, 0xbe, 0x32, 0xe2, 0xa8, 0x41, - 0xc5, 0xdf, 0x4c, 0x41, 0xbe, 0xb2, 0xec, 0x88, 0x87, 0x5b, 0xd5, 0xb6, 0xab, 0xd0, 0xa7, 0x30, - 0xce, 0x1d, 0xaf, 0xde, 0xa4, 0x9b, 0x1e, 0xe5, 0x82, 0xda, 0x33, 0xe7, 0xb1, 0x56, 0x1a, 0x2d, - 0xdf, 0xd2, 0x4f, 0x70, 0x9e, 0xde, 0xcd, 0x49, 0x5f, 0x57, 0xf4, 0xe6, 0x58, 0xc4, 0x2e, 0x5a, - 0x21, 0x04, 0x83, 0x61, 0xe8, 0xd8, 0x33, 0x1a, 0xd6, 0x4a, 0x23, 0xa6, 0xfa, 0x46, 0x1b, 0x90, - 0x8b, 0x65, 0x65, 0x70, 0xf6, 0xad, 0x64, 0xc5, 0x7c, 0xd0, 0x1c, 0x8c, 0x6e, 0x35, 0x19, 0x11, - 0x9b, 0xdb, 0xa4, 0x19, 0xd2, 0x99, 0x2c, 0xd6, 0x4a, 0x19, 0x13, 0xd4, 0xd6, 0x53, 0xb9, 0x83, - 0x2e, 0xc1, 0x98, 0xcd, 0xc2, 0x5a, 0x93, 0xc6, 0x88, 0x41, 0xac, 0x95, 0x34, 0x73, 0x34, 0xda, - 0x8b, 0x20, 0x73, 0x30, 0xea, 0x78, 0xe2, 0x83, 0xc5, 0x18, 0x31, 0x84, 0xb5, 0x52, 0xd6, 0x04, - 0xb5, 0xd5, 0xe6, 0x11, 0xa6, 0x11, 0x39, 0xac, 0x95, 0x06, 0xcd, 0xd1, 0x30, 0x05, 0x89, 0x78, - 0xdc, 0x2c, 0xc7, 0x88, 0x53, 0x58, 0x2b, 0x0d, 0x29, 0x1e, 0x37, 0xcb, 0x11, 0xe0, 0x32, 0x8c, - 0x6f, 0x39, 0xbb, 0xd4, 0x6e, 0x33, 0x19, 0xc6, 0x5a, 0x29, 0x67, 0x8e, 0xc5, 0x9b, 0x9d, 0xa0, - 0x36, 0x9f, 0x11, 0xac, 0x95, 0x4e, 0xc5, 0xa0, 0x84, 0xd3, 0x45, 0x80, 0x1a, 0x63, 0xcd, 0x18, - 0x01, 0x58, 0x2b, 0x0d, 0x9b, 0x23, 0x72, 0xa7, 0xad, 0x2c, 0x17, 0x81, 0xe3, 0xd5, 0x63, 0xc0, - 0xa8, 0xf2, 0xff, 0x68, 0xb4, 0xd7, 0x56, 0xb6, 0xd6, 0x12, 0x94, 0xc7, 0x88, 0x8b, 0x58, 0x2b, - 0x8d, 0x99, 0xa0, 0xb6, 0x3a, 0x0c, 0x6e, 0xab, 0x31, 0x8e, 0xb5, 0xd2, 0x78, 0x64, 0x70, 0xa2, - 0xc5, 0x7d, 0x00, 0xea, 0x85, 0x6e, 0x0c, 0x98, 0xc0, 0x5a, 0x69, 0xa2, 0x7c, 0xed, 0xc4, 0x70, - 0xae, 0x87, 0x2e, 0x0d, 0x1c, 0xab, 0xea, 0x85, 0xae, 0x39, 0x22, 0xe9, 0x23, 0x66, 0xef, 0xc2, - 0x04, 0xef, 0x34, 0x7c, 0x12, 0x6b, 0xa5, 0x49, 0x73, 0x9c, 0x77, 0x58, 0xde, 0x86, 0xb5, 0x9d, - 0x98, 0xc7, 0x5a, 0x29, 0x9f, 0xc0, 0x52, 0xe1, 0xe2, 0x69, 0xed, 0xa7, 0xb0, 0x56, 0x9a, 0x32, - 0x47, 0x79, 0x4a, 0xfb, 0x18, 0xd2, 0xe6, 0x83, 0xb0, 0x56, 0x42, 0x11, 0x24, 0xe1, 0x52, 0x86, - 0x33, 0x01, 0xf5, 0x29, 0x11, 0xd4, 0xde, 0xec, 0x70, 0xe8, 0x34, 0xce, 0x96, 0x46, 0xcc, 0xe9, - 0xe4, 0xf0, 0x71, 0xca, 0xb1, 0xb7, 0x61, 0x94, 0x79, 0x54, 0x76, 0x24, 0xd9, 0x30, 0x66, 0x4e, - 0xab, 0x82, 0x3a, 0xab, 0x47, 0xc5, 0xac, 0x27, 0xc5, 0xac, 0x57, 0xe5, 0xe9, 0xbd, 0x01, 0x13, - 0x14, 0x58, 0xad, 0xd0, 0x65, 0x18, 0x8b, 0x48, 0x23, 0x59, 0x33, 0x67, 0x64, 0xd8, 0xee, 0x0d, - 0x98, 0x11, 0xc3, 0x48, 0x08, 0x7a, 0x01, 0x23, 0x2e, 0xf1, 0x63, 0x3d, 0xce, 0xaa, 0x12, 0xba, - 0xd3, 0x7f, 0x09, 0x3d, 0x20, 0xbe, 0x52, 0xb7, 0xea, 0x89, 0xa0, 0x65, 0x0e, 0xbb, 0xf1, 0x12, - 0xed, 0xc2, 0xb4, 0x4b, 0x7c, 0xbf, 0xdb, 0xde, 0x73, 0x4a, 0xce, 0xbd, 0x37, 0x92, 0xe3, 0x77, - 0xf8, 0x27, 0x12, 0x38, 0xe5, 0x76, 0xef, 0xa7, 0x24, 0x47, 0x65, 0x1d, 0x4b, 0x9e, 0x79, 0x3b, - 0xc9, 0x51, 0xab, 0x38, 0x2a, 0x39, 0xb5, 0x8f, 0x96, 0x60, 0xc6, 0x63, 0xde, 0x0a, 0xf3, 0xb6, - 0xa9, 0x27, 0x3b, 0x26, 0x69, 0xae, 0x13, 0x37, 0xea, 0x0b, 0x33, 0x05, 0x55, 0x39, 0x3d, 0xcf, - 0xd1, 0x0a, 0x4c, 0xb6, 0xdb, 0x72, 0xac, 0xf1, 0x05, 0x15, 0xf1, 0xc2, 0x91, 0x88, 0x3f, 0x49, - 0x70, 0xe6, 0x44, 0x9b, 0x24, 0x62, 0xf2, 0x02, 0xda, 0x99, 0xb4, 0x99, 0x2a, 0xa8, 0x59, 0x9c, - 0xed, 0xbb, 0xa0, 0xa6, 0x12, 0x46, 0xd5, 0xa4, 0xb0, 0x0a, 0xbf, 0xd7, 0x20, 0x77, 0xd8, 0x8f, - 0x3d, 0xe2, 0xd2, 0xa4, 0x1f, 0xcb, 0x6f, 0x74, 0x16, 0x72, 0xc4, 0x65, 0xa1, 0x27, 0x66, 0x32, - 0xaa, 0xc2, 0xe3, 0x15, 0x7a, 0x04, 0x19, 0xf6, 0x4a, 0x35, 0xd3, 0x89, 0x72, 0xe5, 0x4d, 0x7b, - 0xb4, 0xbe, 0x4a, 0xa9, 0xaf, 0x14, 0xcb, 0xb0, 0x57, 0xc5, 0x39, 0x18, 0x4e, 0xd6, 0x68, 0x04, - 0x86, 0x3e, 0xac, 0x7c, 0xfc, 0xb8, 0x9a, 0x1f, 0x40, 0xc3, 0x30, 0xf8, 0xc4, 0xfc, 0xa4, 0x9a, - 0xd7, 0x0a, 0x0e, 0x8c, 0x77, 0x24, 0x26, 0xca, 0x43, 0xf6, 0x15, 0x6d, 0xc5, 0xfa, 0xca, 0x4f, - 0xb4, 0x0c, 0x43, 0x91, 0x77, 0x32, 0x6f, 0xd0, 0x6e, 0x22, 0xd2, 0xa5, 0xcc, 0x2d, 0xad, 0xb0, - 0x0a, 0x67, 0x8f, 0xcf, 0xcd, 0x63, 0x64, 0x9e, 0x4e, 0xcb, 0x1c, 0x49, 0x73, 0xf9, 0x41, 0xc2, - 0xa5, 0x3b, 0xcf, 0x8e, 0xe1, 0xb2, 0x9e, 0xe6, 0xf2, 0x36, 0xf7, 0xde, 0xa1, 0xfc, 0xa5, 0xbf, - 0x6a, 0x07, 0x95, 0x3f, 0x6b, 0xf0, 0x9d, 0xf9, 0xe9, 0x0a, 0xae, 0x39, 0x02, 0xb3, 0x2d, 0x7c, - 0x38, 0x08, 0x95, 0xd7, 0xd6, 0x3c, 0x91, 0xa4, 0x6c, 0x0b, 0x5b, 0xcc, 0xf5, 0x9b, 0x8e, 0x25, - 0x93, 0x03, 0xc7, 0x93, 0x06, 0x16, 0x2d, 0x9f, 0x62, 0xc1, 0xb0, 0xc5, 0xb6, 0x69, 0x80, 0x5d, - 0xe2, 0xb5, 0xf0, 0x16, 0x25, 0x22, 0x0c, 0x28, 0x97, 0xbc, 0x36, 0x92, 0xdc, 0x9d, 0x7f, 0x0a, - 0x57, 0x3e, 0x74, 0x3c, 0x1b, 0xb3, 0x50, 0x60, 0x97, 0x05, 0x14, 0x93, 0x9a, 0xfc, 0x3c, 0x32, - 0x50, 0xe8, 0x0d, 0x21, 0x7c, 0xbe, 0x64, 0x18, 0x75, 0x47, 0x34, 0xc2, 0x9a, 0x6e, 0x31, 0xd7, - 0x90, 0x76, 0x2e, 0x50, 0x8b, 0xf1, 0x16, 0x17, 0x34, 0x5e, 0xc6, 0x66, 0x2f, 0x8f, 0x27, 0xdd, - 0x52, 0xd9, 0x54, 0x2c, 0xc0, 0xe0, 0x32, 0xb3, 0x5b, 0xc7, 0x25, 0x6a, 0xf1, 0x05, 0x4c, 0x3e, - 0x88, 0xd4, 0xfe, 0x96, 0x23, 0x1a, 0x0a, 0x36, 0x01, 0x99, 0xf6, 0x74, 0x91, 0x71, 0x6c, 0x74, - 0x1b, 0x06, 0x6d, 0x22, 0x48, 0xec, 0xe1, 0x77, 0x4f, 0xf4, 0xb0, 0x64, 0x62, 0x2a, 0x92, 0x79, - 0x0c, 0xa3, 0xa9, 0x4c, 0x91, 0x39, 0xf9, 0xbc, 0x6a, 0x3e, 0xcc, 0x0f, 0xa0, 0x53, 0x90, 0x7d, - 0xb8, 0x5e, 0xcd, 0x6b, 0xe5, 0x3f, 0x9e, 0x86, 0x73, 0xdd, 0xf6, 0x3e, 0xa6, 0xc1, 0xb6, 0x63, - 0x51, 0xf4, 0x59, 0x16, 0x72, 0x2b, 0x81, 0x2c, 0x3c, 0x74, 0xa3, 0xef, 0xb8, 0x16, 0xfa, 0x27, - 0x29, 0xfe, 0x21, 0xf3, 0xe3, 0x7f, 0xfc, 0xe7, 0x57, 0x99, 0xdf, 0x65, 0x8a, 0xbf, 0xcd, 0x18, - 0xdb, 0x37, 0x92, 0x89, 0xf8, 0xb8, 0x79, 0xd8, 0xd8, 0x4b, 0x4d, 0x47, 0xfb, 0xc6, 0x5e, 0x7a, - 0x14, 0xda, 0x37, 0xf6, 0x52, 0x57, 0xe0, 0xbe, 0xc1, 0xa9, 0x4f, 0x02, 0x22, 0x58, 0x60, 0xec, - 0x85, 0x1d, 0x07, 0x7b, 0xa9, 0xcb, 0x74, 0xdf, 0xd8, 0xeb, 0xb8, 0x81, 0x93, 0x75, 0xea, 0xfc, - 0x70, 0x38, 0xd9, 0x37, 0xf6, 0xd2, 0x37, 0xc9, 0xd7, 0xb9, 0x08, 0xfc, 0x80, 0x6e, 0x39, 0xbb, - 0xc6, 0xfc, 0x7e, 0x24, 0x24, 0x45, 0xc6, 0xbb, 0xf9, 0xf0, 0x6e, 0x41, 0xbc, 0x8b, 0xa0, 0x53, - 0xc9, 0x5e, 0x6d, 0x7a, 0x1f, 0x7d, 0xa6, 0x01, 0x44, 0x01, 0x52, 0x89, 0xf3, 0xe5, 0x04, 0x69, - 0x5e, 0xc5, 0xe8, 0x4a, 0x71, 0xee, 0x84, 0x08, 0x2d, 0x69, 0xf3, 0xe8, 0xfb, 0x90, 0xfb, 0x98, - 0xb1, 0x57, 0xa1, 0x8f, 0x26, 0x75, 0xf9, 0x18, 0xd0, 0xd7, 0xec, 0x38, 0xdb, 0xdf, 0x44, 0xb2, - 0xae, 0x24, 0x97, 0xd0, 0x57, 0x4e, 0xcc, 0x0d, 0x39, 0x93, 0xef, 0xa3, 0x9f, 0x6a, 0x90, 0xfb, - 0xc4, 0xb7, 0xdf, 0x30, 0x7f, 0x7b, 0x4c, 0x37, 0xc5, 0x1b, 0x4a, 0x8b, 0xf7, 0x0b, 0xaf, 0xa9, - 0x85, 0x74, 0xc3, 0x2f, 0x35, 0xc8, 0xad, 0xd2, 0x26, 0x15, 0xf4, 0xa8, 0x1f, 0x7a, 0x89, 0x79, - 0x71, 0x50, 0x79, 0xbf, 0x76, 0x15, 0x26, 0x00, 0x2a, 0xbe, 0x73, 0x9f, 0xb6, 0x2a, 0xa1, 0x68, - 0xa0, 0x01, 0x38, 0x07, 0xb9, 0x87, 0xf2, 0xb3, 0x8c, 0xc6, 0x61, 0x30, 0xa0, 0xc4, 0x86, 0xa1, - 0x9d, 0xc0, 0x11, 0x34, 0x72, 0xcd, 0xfc, 0xeb, 0xba, 0xe6, 0xdf, 0x1a, 0x0c, 0xdf, 0xa5, 0xe2, - 0x51, 0x48, 0x83, 0xd6, 0x17, 0xe9, 0x9c, 0x5f, 0x68, 0x07, 0x95, 0x27, 0xc5, 0x75, 0x98, 0x3d, - 0xae, 0xaf, 0xb6, 0x05, 0xf6, 0xd9, 0x4f, 0x9f, 0x69, 0xb5, 0x01, 0x65, 0x9f, 0x8e, 0xae, 0x9d, - 0x64, 0xdf, 0x77, 0xa5, 0x80, 0xc4, 0xca, 0xbf, 0x67, 0x61, 0xb0, 0x6a, 0x35, 0x18, 0x2a, 0xf5, - 0xb0, 0x90, 0x87, 0x35, 0x3d, 0xba, 0x2a, 0x93, 0x70, 0xbc, 0x36, 0xb2, 0xf8, 0xdf, 0xcc, 0x41, - 0xe5, 0x47, 0x19, 0x18, 0xa3, 0x56, 0x83, 0x61, 0x1e, 0xb5, 0x4c, 0x18, 0x56, 0xab, 0xc0, 0xb7, - 0xd0, 0xd4, 0xe3, 0xd0, 0x75, 0x49, 0xd0, 0x5a, 0xc2, 0xd5, 0x78, 0xab, 0x90, 0x5f, 0xa5, 0xdc, - 0x0a, 0x1c, 0xf5, 0x98, 0x55, 0xbb, 0xc5, 0x55, 0x40, 0x9d, 0x8e, 0x52, 0xda, 0xf6, 0xe9, 0x9e, - 0x8f, 0xee, 0x40, 0xf6, 0xab, 0xd7, 0x6f, 0xa2, 0x5b, 0xf0, 0x81, 0x49, 0x45, 0x18, 0x78, 0xd4, - 0xc6, 0x3b, 0x0d, 0xea, 0x61, 0xd1, 0xa0, 0x38, 0xa0, 0x9c, 0x85, 0x81, 0x45, 0xb1, 0xc3, 0xb1, - 0xa0, 0xae, 0xcf, 0x02, 0x12, 0x38, 0xcd, 0x16, 0x0e, 0x3d, 0xb2, 0x4d, 0x9c, 0x26, 0xa9, 0x35, - 0xa9, 0xfe, 0xd1, 0xd7, 0x20, 0xbb, 0x78, 0x7d, 0x11, 0x2d, 0xc2, 0xfc, 0xff, 0x61, 0x60, 0x33, - 0xca, 0xb1, 0xc7, 0x04, 0xa6, 0xbb, 0x0e, 0x17, 0x3a, 0xca, 0xc1, 0xe0, 0xaf, 0x33, 0x5a, 0x56, - 0x05, 0xe6, 0xd3, 0x93, 0x03, 0x23, 0x1d, 0x63, 0xec, 0x45, 0x3d, 0xed, 0xf9, 0xf9, 0x62, 0xde, - 0xd8, 0x2e, 0xb7, 0xf1, 0xf2, 0x6c, 0x29, 0x1a, 0x00, 0x9e, 0x23, 0x74, 0xe4, 0x08, 0xfd, 0x49, - 0x83, 0x31, 0x39, 0x63, 0x6d, 0x10, 0xd1, 0x50, 0x1e, 0xfa, 0x72, 0x3a, 0xdd, 0x1d, 0x65, 0xdb, - 0xed, 0xe2, 0xe2, 0x89, 0x45, 0xd5, 0xf1, 0x73, 0x83, 0x2e, 0x2f, 0x76, 0x55, 0xf7, 0x15, 0x80, - 0x75, 0xb6, 0xec, 0x78, 0xb6, 0xe3, 0xd5, 0x39, 0x3a, 0x7f, 0xa4, 0x66, 0x56, 0xe3, 0x1f, 0x58, - 0x7a, 0x96, 0xd3, 0x00, 0x7a, 0x0a, 0xa7, 0xe4, 0x88, 0xcd, 0x42, 0x81, 0x7a, 0x80, 0x7a, 0x12, - 0x5f, 0x50, 0xea, 0x9f, 0x41, 0xd3, 0x69, 0x7f, 0x8a, 0x98, 0x59, 0x03, 0xf2, 0xd5, 0x20, 0x60, - 0x81, 0x9c, 0x3a, 0x56, 0xa9, 0x20, 0x4e, 0x93, 0xf7, 0x2d, 0xe0, 0x8a, 0x12, 0xf0, 0x0e, 0x9a, - 0xed, 0x08, 0x98, 0xe4, 0xba, 0xe3, 0x88, 0x86, 0x1d, 0x73, 0xfd, 0x99, 0x06, 0xe8, 0x2e, 0x15, - 0xdd, 0x53, 0xce, 0xf5, 0x13, 0xe3, 0xd1, 0x45, 0xd1, 0x53, 0x8d, 0xf7, 0x94, 0x1a, 0x97, 0x8a, - 0xe7, 0xd3, 0x6a, 0x48, 0x0d, 0x6a, 0xcc, 0x6e, 0x19, 0x7b, 0xb2, 0x07, 0xab, 0x69, 0x08, 0xfd, - 0x44, 0x83, 0xa9, 0x0d, 0xc6, 0x85, 0xe4, 0xa8, 0x48, 0x95, 0x22, 0xaf, 0x37, 0x50, 0xf5, 0x94, - 0x6e, 0x28, 0xe9, 0x57, 0x8b, 0x57, 0xd2, 0xd2, 0x7d, 0xc6, 0x85, 0xd4, 0x40, 0xbd, 0x96, 0x23, - 0x35, 0x92, 0xa4, 0x28, 0xfc, 0x4d, 0x3b, 0xa8, 0xfc, 0x45, 0x43, 0x5b, 0x3d, 0xa6, 0x2e, 0x6c, - 0xa7, 0x9a, 0xc4, 0xc2, 0x02, 0xde, 0x69, 0x38, 0x56, 0x03, 0xf3, 0x06, 0x0b, 0x9b, 0xb6, 0x2a, - 0xbf, 0x1a, 0xc5, 0x21, 0xa7, 0x36, 0x76, 0x3c, 0xec, 0x37, 0x89, 0x45, 0xe5, 0x48, 0x2b, 0x0b, - 0xd5, 0x66, 0x56, 0xe8, 0x52, 0x2f, 0xfa, 0x7d, 0x4c, 0xce, 0xc5, 0x72, 0x71, 0xa9, 0xf0, 0x08, - 0xe6, 0x8e, 0xeb, 0xc5, 0xb2, 0x8c, 0x92, 0x39, 0xaf, 0xcf, 0x7e, 0x53, 0x7e, 0x09, 0xa7, 0x2d, - 0xe2, 0xd2, 0xe6, 0x0a, 0xe1, 0x34, 0xe6, 0x21, 0x87, 0x12, 0x64, 0xc2, 0x50, 0xf4, 0xe4, 0xef, - 0x37, 0x91, 0xce, 0x2b, 0x1f, 0x4e, 0xa3, 0xa9, 0x8e, 0x44, 0x92, 0x47, 0xe5, 0x6f, 0xc3, 0x6c, - 0xc5, 0x63, 0xa2, 0x41, 0x83, 0x58, 0x92, 0x0c, 0x5e, 0xaa, 0xa8, 0xbe, 0xd1, 0x51, 0x62, 0xfd, - 0x0a, 0x1e, 0x58, 0xfe, 0x57, 0xee, 0xa0, 0xf2, 0x79, 0x0e, 0x09, 0x98, 0xae, 0xe0, 0xe5, 0xe8, - 0xad, 0x91, 0xea, 0x00, 0xcf, 0xe0, 0x74, 0xdd, 0xdc, 0x58, 0x59, 0xb8, 0x1b, 0x59, 0x8e, 0xfd, - 0x80, 0xbd, 0xa4, 0x96, 0xe8, 0xd7, 0x63, 0x85, 0xbc, 0xc7, 0x3c, 0xfa, 0xcd, 0xd8, 0x32, 0x89, - 0x2e, 0x67, 0x6f, 0xe8, 0xd7, 0xe7, 0xb3, 0x5a, 0x66, 0xb0, 0x9c, 0x27, 0x7e, 0xf4, 0x82, 0x71, - 0x98, 0x67, 0xbc, 0xe4, 0xcc, 0x2b, 0x9f, 0x4d, 0xef, 0xec, 0x2e, 0x6c, 0x31, 0xb6, 0xe0, 0x3a, - 0x2e, 0x5d, 0x3a, 0x82, 0x5c, 0xea, 0x81, 0x34, 0x37, 0x64, 0x43, 0xbf, 0x89, 0xd6, 0xe0, 0xee, - 0xd1, 0x86, 0x1e, 0x72, 0x1a, 0x1c, 0x36, 0xf3, 0x06, 0xd9, 0xa6, 0xd8, 0xa7, 0x81, 0xeb, 0x70, - 0x2e, 0xf3, 0x46, 0x30, 0x4c, 0x2c, 0x8b, 0x72, 0xde, 0xd1, 0xfc, 0x75, 0xf3, 0x2d, 0xae, 0x88, - 0x53, 0xe6, 0x3d, 0xc8, 0x2e, 0xde, 0xb8, 0x85, 0x2a, 0x30, 0xbe, 0xf6, 0x9e, 0x8b, 0x09, 0x16, - 0x94, 0xf8, 0x4c, 0xe8, 0xe8, 0x3a, 0xe8, 0x85, 0xbe, 0xde, 0xba, 0xcf, 0x7f, 0x9e, 0x81, 0x49, - 0x18, 0x59, 0x26, 0xdc, 0xb1, 0xd4, 0x40, 0x94, 0x19, 0xd6, 0xe0, 0x62, 0xc7, 0x88, 0x34, 0x39, - 0x9c, 0x29, 0x8c, 0x3c, 0x5b, 0xa8, 0x6c, 0xac, 0x2d, 0xdc, 0xa7, 0x2d, 0x9c, 0x81, 0x7f, 0x6a, - 0xed, 0x91, 0xe9, 0x73, 0x6d, 0x38, 0x5b, 0x1a, 0x2c, 0x5f, 0x4e, 0xa2, 0x97, 0x0a, 0x88, 0xc1, - 0x48, 0x28, 0x1a, 0x86, 0xfc, 0xc3, 0x02, 0xe7, 0x7b, 0x74, 0x69, 0xae, 0x37, 0x48, 0xb0, 0x57, - 0xd4, 0x5b, 0xfe, 0x21, 0x14, 0xa2, 0x09, 0x0c, 0xa1, 0xbb, 0x01, 0xf1, 0x04, 0xc7, 0x72, 0x11, - 0x7b, 0x0f, 0x66, 0xe3, 0xb9, 0x0c, 0x4d, 0xc7, 0x87, 0x6a, 0x95, 0x9c, 0xae, 0xc0, 0x10, 0xb1, - 0x5d, 0xc7, 0x43, 0x4b, 0x1d, 0xa4, 0x9e, 0xdd, 0x01, 0x53, 0xc1, 0x90, 0x30, 0x87, 0x0b, 0x79, - 0x51, 0x6c, 0x53, 0xec, 0x78, 0x5b, 0x2c, 0x70, 0x55, 0xbc, 0x6b, 0x73, 0x30, 0x9e, 0x76, 0xc5, - 0x40, 0xf7, 0xac, 0x58, 0xbb, 0xda, 0x73, 0x5a, 0xec, 0x86, 0x06, 0x6b, 0x70, 0xee, 0xc1, 0x61, - 0x73, 0x48, 0xe7, 0x7c, 0xbf, 0xb9, 0xfe, 0x7c, 0xa4, 0x1d, 0xb9, 0x5a, 0x4e, 0x95, 0xdb, 0xcd, - 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xfc, 0xf9, 0xc9, 0xea, 0x18, 0x00, 0x00, + 0x19, 0xf7, 0x48, 0xb2, 0x62, 0x7f, 0x7e, 0xc9, 0xed, 0x6c, 0xe2, 0x28, 0x4e, 0xdc, 0x51, 0xb2, + 0xac, 0xe2, 0x8d, 0x67, 0x12, 0xc5, 0x6c, 0x25, 0xa6, 0x20, 0x2b, 0xdb, 0xda, 0xc4, 0x9b, 0x8d, + 0xe3, 0x4c, 0xb2, 0x21, 0x95, 0xca, 0x62, 0x5a, 0x9a, 0x96, 0x34, 0x89, 0x66, 0x7a, 0x98, 0xee, + 0xb1, 0x2d, 0x8c, 0xa1, 0x80, 0x2a, 0x28, 0x8a, 0x03, 0x55, 0xe6, 0xc6, 0x61, 0x2f, 0x54, 0x51, + 0x5c, 0x38, 0x70, 0xe0, 0x02, 0x55, 0xec, 0x89, 0xd3, 0x1e, 0xa9, 0xe2, 0xc0, 0x15, 0x0e, 0xfc, + 0x19, 0x54, 0xf7, 0xcc, 0xc8, 0x23, 0xd9, 0xc2, 0x51, 0x42, 0xed, 0xc5, 0x9e, 0xee, 0xfe, 0x7d, + 0xef, 0x47, 0x7f, 0x2d, 0x28, 0xd1, 0x5d, 0xe2, 0x78, 0x2d, 0xca, 0x0d, 0xcf, 0x67, 0x82, 0x19, + 0xd1, 0xd2, 0xab, 0x1a, 0x64, 0xab, 0x6a, 0x8b, 0x2d, 0x56, 0xdf, 0xa2, 0xdb, 0xd4, 0x6f, 0x8b, + 0xa6, 0xed, 0x36, 0x74, 0x85, 0x41, 0xf3, 0x0d, 0xdf, 0xab, 0xe9, 0x0d, 0x22, 0xe8, 0x0e, 0x69, + 0xeb, 0x31, 0x03, 0xbd, 0x43, 0x9a, 0x9f, 0x6b, 0x30, 0xd6, 0x68, 0x51, 0x83, 0x78, 0xb6, 0x41, + 0x5c, 0x97, 0x09, 0x22, 0x6c, 0xe6, 0xf2, 0x90, 0x3c, 0x7f, 0x3e, 0x3a, 0x55, 0xab, 0x6a, 0x50, + 0x37, 0xa8, 0xe3, 0x89, 0x76, 0x74, 0x78, 0xb1, 0xf7, 0xd0, 0x0a, 0x7c, 0x45, 0x1d, 0x9d, 0xe3, + 0x1e, 0x7d, 0x79, 0x50, 0x35, 0x1c, 0xca, 0x39, 0x69, 0xd0, 0x08, 0x71, 0xe9, 0x28, 0xa2, 0xd4, + 0x03, 0x99, 0xef, 0x15, 0x22, 0x6c, 0x87, 0x72, 0x41, 0x1c, 0x2f, 0x02, 0x5c, 0x53, 0xff, 0x6a, + 0x8b, 0x0d, 0xea, 0x2e, 0xf2, 0x1d, 0xd2, 0x68, 0x50, 0xdf, 0x60, 0x9e, 0x32, 0xe2, 0xa8, 0x41, + 0x85, 0x2f, 0xa6, 0x21, 0x57, 0x5e, 0xb1, 0xc5, 0xc3, 0x7a, 0xa5, 0xe3, 0x2a, 0xf4, 0x19, 0x4c, + 0x70, 0xdb, 0x6d, 0xb4, 0xe8, 0x96, 0x4b, 0xb9, 0xa0, 0xd6, 0xec, 0x39, 0xac, 0x15, 0xc7, 0x4a, + 0xb7, 0xf4, 0x13, 0x9c, 0xa7, 0xf7, 0x72, 0xd2, 0x37, 0x14, 0xbd, 0x39, 0x1e, 0xb2, 0x0b, 0x57, + 0x08, 0x41, 0x26, 0x08, 0x6c, 0x6b, 0x56, 0xc3, 0x5a, 0x71, 0xd4, 0x54, 0xdf, 0x68, 0x13, 0xb2, + 0x91, 0xac, 0x14, 0x4e, 0xbf, 0x95, 0xac, 0x88, 0x0f, 0x9a, 0x87, 0xb1, 0x7a, 0x8b, 0x11, 0xb1, + 0xb5, 0x4d, 0x5a, 0x01, 0x9d, 0x4d, 0x63, 0xad, 0x98, 0x32, 0x41, 0x6d, 0x3d, 0x95, 0x3b, 0xe8, + 0x12, 0x8c, 0x5b, 0x2c, 0xa8, 0xb6, 0x68, 0x84, 0xc8, 0x60, 0xad, 0xa8, 0x99, 0x63, 0xe1, 0x5e, + 0x08, 0x99, 0x87, 0x31, 0xdb, 0x15, 0x1f, 0x2c, 0x45, 0x88, 0x61, 0xac, 0x15, 0xd3, 0x26, 0xa8, + 0xad, 0x0e, 0x8f, 0x20, 0x89, 0xc8, 0x62, 0xad, 0x98, 0x31, 0xc7, 0x82, 0x04, 0x24, 0xe4, 0x71, + 0xb3, 0x14, 0x21, 0x4e, 0x61, 0xad, 0x38, 0xac, 0x78, 0xdc, 0x2c, 0x85, 0x80, 0xcb, 0x30, 0x51, + 0xb7, 0x77, 0xa9, 0xd5, 0x61, 0x32, 0x82, 0xb5, 0x62, 0xd6, 0x1c, 0x8f, 0x36, 0xbb, 0x41, 0x1d, + 0x3e, 0xa3, 0x58, 0x2b, 0x9e, 0x8a, 0x40, 0x31, 0xa7, 0x0b, 0x00, 0x55, 0xc6, 0x5a, 0x11, 0x02, + 0xb0, 0x56, 0x1c, 0x31, 0x47, 0xe5, 0x4e, 0x47, 0x59, 0x2e, 0x7c, 0xdb, 0x6d, 0x44, 0x80, 0x31, + 0xe5, 0xff, 0xb1, 0x70, 0xaf, 0xa3, 0x6c, 0xb5, 0x2d, 0x28, 0x8f, 0x10, 0x17, 0xb0, 0x56, 0x1c, + 0x37, 0x41, 0x6d, 0x75, 0x19, 0xdc, 0x51, 0x63, 0x02, 0x6b, 0xc5, 0x89, 0xd0, 0xe0, 0x58, 0x8b, + 0xfb, 0x00, 0xd4, 0x0d, 0x9c, 0x08, 0x30, 0x89, 0xb5, 0xe2, 0x64, 0xe9, 0xda, 0x89, 0xe1, 0xdc, + 0x08, 0x1c, 0xea, 0xdb, 0xb5, 0x8a, 0x1b, 0x38, 0xe6, 0xa8, 0xa4, 0x0f, 0x99, 0xbd, 0x0b, 0x93, + 0xbc, 0xdb, 0xf0, 0x29, 0xac, 0x15, 0xa7, 0xcc, 0x09, 0xde, 0x65, 0x79, 0x07, 0xd6, 0x71, 0x62, + 0x0e, 0x6b, 0xc5, 0x5c, 0x0c, 0x4b, 0x84, 0x8b, 0x27, 0xb5, 0x9f, 0xc6, 0x5a, 0x71, 0xda, 0x1c, + 0xe3, 0x09, 0xed, 0x23, 0x48, 0x87, 0x0f, 0xc2, 0x5a, 0x11, 0x85, 0x90, 0x98, 0x4b, 0x09, 0xde, + 0xf1, 0xa9, 0x47, 0x89, 0xa0, 0xd6, 0x56, 0x97, 0x43, 0x67, 0x70, 0xba, 0x38, 0x6a, 0xce, 0xc4, + 0x87, 0x8f, 0x13, 0x8e, 0xbd, 0x0d, 0x63, 0xcc, 0xa5, 0xb2, 0x23, 0xc9, 0x86, 0x31, 0x7b, 0x5a, + 0x15, 0xd4, 0x19, 0x3d, 0x2c, 0x66, 0x3d, 0x2e, 0x66, 0xbd, 0x22, 0x4f, 0xef, 0x0d, 0x99, 0xa0, + 0xc0, 0x6a, 0x85, 0x2e, 0xc3, 0x78, 0x48, 0x1a, 0xca, 0x9a, 0x7d, 0x47, 0x86, 0xed, 0xde, 0x90, + 0x19, 0x32, 0x0c, 0x85, 0xa0, 0x17, 0x30, 0xea, 0x10, 0x2f, 0xd2, 0xe3, 0x8c, 0x2a, 0xa1, 0x3b, + 0x83, 0x97, 0xd0, 0x03, 0xe2, 0x29, 0x75, 0x2b, 0xae, 0xf0, 0xdb, 0xe6, 0x88, 0x13, 0x2d, 0xd1, + 0x2e, 0xcc, 0x38, 0xc4, 0xf3, 0x7a, 0xed, 0x3d, 0xab, 0xe4, 0xdc, 0x7b, 0x23, 0x39, 0x5e, 0x97, + 0x7f, 0x42, 0x81, 0xd3, 0x4e, 0xef, 0x7e, 0x42, 0x72, 0x58, 0xd6, 0x91, 0xe4, 0xd9, 0xb7, 0x93, + 0x1c, 0xb6, 0x8a, 0xa3, 0x92, 0x13, 0xfb, 0x68, 0x19, 0x66, 0x5d, 0xe6, 0xae, 0x32, 0x77, 0x9b, + 0xba, 0xb2, 0x63, 0x92, 0xd6, 0x06, 0x71, 0xc2, 0xbe, 0x30, 0x9b, 0x57, 0x95, 0xd3, 0xf7, 0x1c, + 0xad, 0xc2, 0x54, 0xa7, 0x2d, 0x47, 0x1a, 0x9f, 0x57, 0x11, 0xcf, 0x1f, 0x89, 0xf8, 0x93, 0x18, + 0x67, 0x4e, 0x76, 0x48, 0x42, 0x26, 0x2f, 0xa0, 0x93, 0x49, 0x5b, 0x89, 0x82, 0x9a, 0xc3, 0xe9, + 0x81, 0x0b, 0x6a, 0x3a, 0x66, 0x54, 0xe9, 0x14, 0xd6, 0x79, 0x18, 0x26, 0x62, 0xcb, 0xb6, 0x66, + 0x2f, 0xca, 0x36, 0xb1, 0x92, 0x3d, 0x28, 0xa7, 0x3f, 0xb4, 0x2d, 0x33, 0x43, 0xc4, 0xba, 0x95, + 0xff, 0xbd, 0x06, 0xd9, 0xc3, 0x66, 0xed, 0x12, 0x87, 0xc6, 0xcd, 0x5a, 0x7e, 0xa3, 0x33, 0x90, + 0x25, 0x0e, 0x0b, 0x5c, 0x31, 0x9b, 0x52, 0xe5, 0x1f, 0xad, 0xd0, 0x23, 0x48, 0xb1, 0x57, 0xaa, + 0xd3, 0x4e, 0x96, 0xca, 0x6f, 0xda, 0xc0, 0xf5, 0x35, 0x4a, 0x3d, 0xa5, 0x75, 0x8a, 0xbd, 0x2a, + 0xcc, 0xc3, 0x48, 0xbc, 0x46, 0xa3, 0x30, 0xfc, 0x51, 0xf9, 0x93, 0xc7, 0x95, 0xdc, 0x10, 0x1a, + 0x81, 0xcc, 0x13, 0xf3, 0xd3, 0x4a, 0x4e, 0xcb, 0xdb, 0x30, 0xd1, 0x95, 0xb5, 0x28, 0x07, 0xe9, + 0x57, 0xb4, 0x1d, 0xe9, 0x2b, 0x3f, 0xd1, 0x0a, 0x0c, 0x87, 0xae, 0x4b, 0xbd, 0x41, 0x2f, 0x0a, + 0x49, 0x97, 0x53, 0xb7, 0xb4, 0xfc, 0x1a, 0x9c, 0x39, 0x3e, 0x71, 0x8f, 0x91, 0x79, 0x3a, 0x29, + 0x73, 0x34, 0xc9, 0xe5, 0x87, 0x31, 0x97, 0xde, 0x24, 0x3c, 0x86, 0xcb, 0x46, 0x92, 0xcb, 0xdb, + 0x5c, 0x8a, 0x87, 0xf2, 0x97, 0xff, 0xaa, 0x1d, 0x94, 0xff, 0xac, 0xc1, 0x77, 0x17, 0x66, 0xca, + 0xb8, 0x6a, 0x0b, 0xcc, 0xea, 0xf8, 0x70, 0x4a, 0x2a, 0xad, 0xaf, 0xbb, 0x22, 0xce, 0xe7, 0x36, + 0xae, 0x31, 0xc7, 0x6b, 0xd9, 0x35, 0x99, 0x39, 0x38, 0x1a, 0x43, 0xb0, 0x68, 0x7b, 0x14, 0x0b, + 0x86, 0x6b, 0x6c, 0x9b, 0xfa, 0xd8, 0x21, 0x6e, 0x1b, 0xd7, 0x29, 0x11, 0x81, 0x4f, 0xb9, 0xe4, + 0xb5, 0x19, 0x27, 0xf6, 0xc2, 0x53, 0xb8, 0xf2, 0x91, 0xed, 0x5a, 0x98, 0x05, 0x02, 0x3b, 0xcc, + 0xa7, 0x98, 0x54, 0xe5, 0xe7, 0x91, 0x69, 0x43, 0x6f, 0x0a, 0xe1, 0xf1, 0x65, 0xc3, 0x68, 0xd8, + 0xa2, 0x19, 0x54, 0xf5, 0x1a, 0x73, 0x0c, 0x69, 0xe7, 0x22, 0xad, 0x31, 0xde, 0xe6, 0x82, 0x46, + 0xcb, 0xc8, 0xec, 0x95, 0x89, 0xb8, 0x95, 0x2a, 0x9b, 0x0a, 0x79, 0xc8, 0xac, 0x30, 0xab, 0x7d, + 0x5c, 0xa2, 0x16, 0x5e, 0xc0, 0xd4, 0x83, 0x50, 0xed, 0x6f, 0xdb, 0xa2, 0xa9, 0x60, 0x93, 0x90, + 0xea, 0x8c, 0x1e, 0x29, 0xdb, 0x42, 0xb7, 0x21, 0x63, 0x11, 0x41, 0x22, 0x0f, 0xbf, 0x7b, 0xa2, + 0x87, 0x25, 0x13, 0x53, 0x91, 0x2c, 0x60, 0x18, 0x4b, 0x64, 0x8a, 0xcc, 0xc9, 0xe7, 0x15, 0xf3, + 0x61, 0x6e, 0x08, 0x9d, 0x82, 0xf4, 0xc3, 0x8d, 0x4a, 0x4e, 0x2b, 0xfd, 0xf1, 0x34, 0x9c, 0xed, + 0xb5, 0xf7, 0x31, 0xf5, 0xb7, 0xed, 0x1a, 0x45, 0x9f, 0xa7, 0x21, 0xbb, 0xea, 0xcb, 0xaa, 0x44, + 0x37, 0x06, 0x8e, 0x6b, 0x7e, 0x70, 0x92, 0xc2, 0x1f, 0x52, 0x3f, 0xf9, 0xfb, 0xbf, 0x7f, 0x9d, + 0xfa, 0x5d, 0xaa, 0xf0, 0xdb, 0x94, 0xb1, 0x7d, 0x23, 0x1e, 0x97, 0x8f, 0x1b, 0x96, 0x8d, 0xbd, + 0xc4, 0xe8, 0xb4, 0x6f, 0xec, 0x25, 0xe7, 0xa4, 0x7d, 0x63, 0x2f, 0x71, 0x3f, 0xee, 0x1b, 0x9c, + 0x7a, 0xc4, 0x27, 0x82, 0xf9, 0xc6, 0x5e, 0xd0, 0x75, 0xb0, 0x97, 0xb8, 0x69, 0xf7, 0x8d, 0xbd, + 0xae, 0xeb, 0x39, 0x5e, 0x27, 0xce, 0x0f, 0x27, 0x97, 0x7d, 0x63, 0x2f, 0x79, 0xcd, 0x7c, 0x93, + 0x0b, 0xdf, 0xf3, 0x69, 0xdd, 0xde, 0x35, 0x16, 0xf6, 0x43, 0x21, 0x09, 0x32, 0xde, 0xcb, 0x87, + 0xf7, 0x0a, 0xe2, 0x3d, 0x04, 0xdd, 0x4a, 0xf6, 0xeb, 0xe1, 0xfb, 0xe8, 0x73, 0x0d, 0x20, 0x0c, + 0x90, 0x4a, 0x9c, 0xaf, 0x26, 0x48, 0x0b, 0x2a, 0x46, 0x57, 0x0a, 0xf3, 0x27, 0x44, 0x68, 0x59, + 0x5b, 0x40, 0x3f, 0x80, 0xec, 0x27, 0x8c, 0xbd, 0x0a, 0x3c, 0x34, 0xa5, 0xcb, 0x97, 0x82, 0xbe, + 0x6e, 0x45, 0xd9, 0xfe, 0x26, 0x92, 0x75, 0x25, 0xb9, 0x88, 0xbe, 0x76, 0x62, 0x6e, 0xc8, 0x81, + 0x7d, 0x1f, 0xfd, 0x4c, 0x83, 0xec, 0xa7, 0x9e, 0xf5, 0x86, 0xf9, 0xdb, 0x67, 0xf4, 0x29, 0xdc, + 0x50, 0x5a, 0xbc, 0x9f, 0x7f, 0x4d, 0x2d, 0xa4, 0x1b, 0x7e, 0xa5, 0x41, 0x76, 0x8d, 0xb6, 0xa8, + 0xa0, 0x47, 0xfd, 0xd0, 0x4f, 0xcc, 0x8b, 0x83, 0xf2, 0xfb, 0xd5, 0xab, 0x30, 0x09, 0x50, 0xf6, + 0xec, 0xfb, 0xb4, 0x5d, 0x0e, 0x44, 0x13, 0x0d, 0xc1, 0x59, 0xc8, 0x3e, 0x94, 0x9f, 0x25, 0x34, + 0x01, 0x19, 0x9f, 0x12, 0x0b, 0x86, 0x77, 0x7c, 0x5b, 0xd0, 0xd0, 0x35, 0x0b, 0xaf, 0xeb, 0x9a, + 0x7f, 0x69, 0x30, 0x72, 0x97, 0x8a, 0x47, 0x01, 0xf5, 0xdb, 0xff, 0x4f, 0xe7, 0xfc, 0x52, 0x3b, + 0x28, 0x3f, 0x29, 0x6c, 0xc0, 0xdc, 0x71, 0x7d, 0xb5, 0x23, 0x70, 0xc0, 0x7e, 0xfa, 0x4c, 0xab, + 0x0e, 0x29, 0xfb, 0x74, 0x74, 0xed, 0x24, 0xfb, 0xbe, 0x27, 0x05, 0xc4, 0x56, 0xfe, 0x2d, 0x0d, + 0x99, 0x4a, 0xad, 0xc9, 0x50, 0xb1, 0x8f, 0x85, 0x3c, 0xa8, 0xea, 0xe1, 0x55, 0x19, 0x87, 0xe3, + 0xb5, 0x91, 0x85, 0xff, 0xa4, 0x0e, 0xca, 0x3f, 0x4e, 0xc1, 0x38, 0xad, 0x35, 0x19, 0xe6, 0x61, + 0xcb, 0x84, 0x11, 0xb5, 0xf2, 0xbd, 0x1a, 0x9a, 0x7e, 0x1c, 0x38, 0x0e, 0xf1, 0xdb, 0xcb, 0xb8, + 0x12, 0x6d, 0xe5, 0x73, 0x6b, 0x94, 0xd7, 0x7c, 0x5b, 0xbd, 0x74, 0xd5, 0x6e, 0x61, 0x0d, 0x50, + 0xb7, 0xa3, 0x94, 0xb6, 0x03, 0xba, 0xe7, 0xe3, 0x3b, 0x90, 0xfe, 0xfa, 0xf5, 0x9b, 0xe8, 0x16, + 0x7c, 0x60, 0x52, 0x11, 0xf8, 0x2e, 0xb5, 0xf0, 0x4e, 0x93, 0xba, 0x58, 0x34, 0x29, 0xf6, 0x29, + 0x67, 0x81, 0x5f, 0xa3, 0xd8, 0xe6, 0x58, 0x50, 0xc7, 0x63, 0x3e, 0xf1, 0xed, 0x56, 0x1b, 0x07, + 0x2e, 0xd9, 0x26, 0x76, 0x8b, 0x54, 0x5b, 0x54, 0xff, 0xf8, 0x1b, 0x90, 0x5e, 0xba, 0xbe, 0x84, + 0x96, 0x60, 0xe1, 0x7f, 0x30, 0xb0, 0x18, 0xe5, 0xd8, 0x65, 0x02, 0xd3, 0x5d, 0x9b, 0x0b, 0x1d, + 0x65, 0x21, 0xf3, 0x9b, 0x94, 0x96, 0x56, 0x81, 0xf9, 0xec, 0xe4, 0xc0, 0x48, 0xc7, 0x18, 0x7b, + 0x61, 0x4f, 0x7b, 0x7e, 0xae, 0x90, 0x33, 0xb6, 0x4b, 0x1d, 0xbc, 0x3c, 0x5b, 0x0e, 0x07, 0x80, + 0xe7, 0x08, 0x1d, 0x39, 0x42, 0x7f, 0xd2, 0x60, 0x5c, 0xce, 0x58, 0x9b, 0x44, 0x34, 0x95, 0x87, + 0xbe, 0x9a, 0x4e, 0x77, 0x47, 0xd9, 0x76, 0xbb, 0xb0, 0x74, 0x62, 0x51, 0x75, 0xfd, 0x16, 0xa1, + 0xcb, 0x8b, 0x5d, 0xd5, 0x7d, 0x19, 0x60, 0x83, 0xad, 0xd8, 0xae, 0x65, 0xbb, 0x0d, 0x8e, 0xce, + 0x1d, 0xa9, 0x99, 0xb5, 0xe8, 0xd7, 0x97, 0xbe, 0xe5, 0x34, 0x84, 0x9e, 0xc2, 0x29, 0x39, 0x7f, + 0xb3, 0x40, 0xa0, 0x3e, 0xa0, 0xbe, 0xc4, 0xe7, 0x95, 0xfa, 0xef, 0xa0, 0x99, 0xa4, 0x3f, 0x45, + 0xc4, 0xac, 0x09, 0xb9, 0x8a, 0xef, 0x33, 0x5f, 0x4e, 0x1d, 0x6b, 0x54, 0x10, 0xbb, 0xc5, 0x07, + 0x16, 0x70, 0x45, 0x09, 0xb8, 0x88, 0xe6, 0xba, 0x02, 0x26, 0xb9, 0xee, 0xd8, 0xa2, 0x69, 0x45, + 0x5c, 0x7f, 0xae, 0x01, 0xba, 0x4b, 0x45, 0xef, 0x94, 0x73, 0xfd, 0xc4, 0x78, 0xf4, 0x50, 0xf4, + 0x55, 0xe3, 0x3d, 0xa5, 0xc6, 0xa5, 0xc2, 0xb9, 0xa4, 0x1a, 0x52, 0x83, 0x2a, 0xb3, 0xda, 0xc6, + 0x9e, 0xec, 0xc1, 0x6a, 0x1a, 0x42, 0x3f, 0xd5, 0x60, 0x7a, 0x93, 0x71, 0x21, 0x39, 0x2a, 0x52, + 0xa5, 0xc8, 0xeb, 0x0d, 0x54, 0x7d, 0xa5, 0x1b, 0x4a, 0xfa, 0xd5, 0xc2, 0x95, 0xa4, 0x74, 0x8f, + 0x71, 0x21, 0x35, 0x50, 0x4f, 0xe9, 0x50, 0x8d, 0x38, 0x29, 0xf2, 0x5f, 0x68, 0x07, 0xe5, 0xbf, + 0x68, 0xa8, 0xde, 0x67, 0xea, 0xc2, 0x56, 0xa2, 0x49, 0x2c, 0x2e, 0xe2, 0x9d, 0xa6, 0x5d, 0x6b, + 0x62, 0xde, 0x64, 0x41, 0xcb, 0x52, 0xe5, 0x57, 0xa5, 0x38, 0xe0, 0xd4, 0xc2, 0xb6, 0x8b, 0xbd, + 0x16, 0xa9, 0x51, 0x39, 0xd2, 0xca, 0x42, 0xb5, 0x58, 0x2d, 0x70, 0xa8, 0x1b, 0xfe, 0x78, 0x26, + 0xe7, 0x62, 0xb9, 0xb8, 0x94, 0x7f, 0x04, 0xf3, 0xc7, 0xf5, 0x62, 0x59, 0x46, 0xf1, 0x9c, 0x37, + 0x60, 0xbf, 0x29, 0xbd, 0x84, 0xd3, 0x35, 0xe2, 0xd0, 0xd6, 0x2a, 0xe1, 0x34, 0xe2, 0x21, 0x87, + 0x12, 0x64, 0xc2, 0x70, 0xf8, 0x7b, 0xc0, 0xa0, 0x89, 0x74, 0x4e, 0xf9, 0x70, 0x06, 0x4d, 0x77, + 0x25, 0x92, 0x3c, 0x2a, 0x7d, 0x07, 0xe6, 0xca, 0x2e, 0x13, 0x4d, 0xea, 0x47, 0x92, 0x64, 0xf0, + 0x12, 0x45, 0xf5, 0xad, 0xae, 0x12, 0x1b, 0x54, 0xf0, 0xd0, 0xca, 0x3f, 0xb3, 0x07, 0xe5, 0x2f, + 0xb3, 0x48, 0xc0, 0x4c, 0x19, 0xaf, 0x84, 0x6f, 0x8d, 0x44, 0x07, 0x78, 0x06, 0xa7, 0x1b, 0xe6, + 0xe6, 0xea, 0xe2, 0xdd, 0xd0, 0x72, 0xec, 0xf9, 0xec, 0x25, 0xad, 0x89, 0x41, 0x3d, 0x96, 0xcf, + 0xb9, 0xcc, 0xa5, 0x1f, 0x46, 0x96, 0x49, 0x74, 0x29, 0x7d, 0x43, 0xbf, 0xbe, 0x90, 0xd6, 0x52, + 0x99, 0x52, 0x8e, 0x78, 0xe1, 0x0b, 0xc6, 0x66, 0xae, 0xf1, 0x92, 0x33, 0xb7, 0x74, 0x26, 0xb9, + 0xb3, 0xbb, 0x58, 0x67, 0x6c, 0xd1, 0xb1, 0x1d, 0xba, 0x7c, 0x04, 0xb9, 0xdc, 0x07, 0x69, 0x6e, + 0xca, 0x86, 0x7e, 0x13, 0xad, 0xc3, 0xdd, 0xa3, 0x0d, 0x3d, 0xe0, 0xd4, 0x3f, 0x6c, 0xe6, 0x4d, + 0xb2, 0x4d, 0xb1, 0x47, 0x7d, 0xc7, 0xe6, 0x5c, 0xe6, 0x8d, 0x60, 0x98, 0xd4, 0x6a, 0x94, 0xf3, + 0xae, 0xe6, 0xaf, 0x9b, 0x6f, 0x71, 0x45, 0x9c, 0x32, 0xef, 0x41, 0x7a, 0xe9, 0xc6, 0x2d, 0x54, + 0x86, 0x89, 0xf5, 0xf7, 0x1c, 0x4c, 0xb0, 0xa0, 0xc4, 0x63, 0x42, 0x47, 0xd7, 0x41, 0xcf, 0x0f, + 0xf4, 0xd6, 0x7d, 0xfe, 0x8b, 0x14, 0x4c, 0xc1, 0xe8, 0x0a, 0xe1, 0x76, 0x4d, 0x0d, 0x44, 0xa9, + 0x11, 0x0d, 0x2e, 0x74, 0x8d, 0x48, 0x53, 0x23, 0xa9, 0xfc, 0xe8, 0xb3, 0xc5, 0xf2, 0xe6, 0xfa, + 0xe2, 0x7d, 0xda, 0xc6, 0x29, 0xf8, 0x87, 0xd6, 0x19, 0x99, 0xbe, 0xd4, 0x46, 0xd2, 0xc5, 0x4c, + 0xe9, 0x72, 0x1c, 0xbd, 0x44, 0x40, 0x0c, 0x46, 0x02, 0xd1, 0x34, 0xe4, 0x1f, 0xe6, 0xdb, 0xdf, + 0xa7, 0xcb, 0xf3, 0xfd, 0x41, 0x82, 0xbd, 0xa2, 0xee, 0xca, 0x8f, 0x20, 0x1f, 0x4e, 0x60, 0x08, + 0xdd, 0xf5, 0x89, 0x2b, 0x38, 0x96, 0x8b, 0xc8, 0x7b, 0x30, 0x17, 0xcd, 0x65, 0x68, 0x26, 0x3a, + 0x54, 0xab, 0xf8, 0x74, 0x15, 0x86, 0x89, 0xe5, 0xd8, 0x2e, 0x5a, 0xee, 0x22, 0x75, 0xad, 0x2e, + 0x98, 0x0a, 0x86, 0x84, 0xd9, 0x5c, 0xc8, 0x8b, 0x62, 0x9b, 0x62, 0xdb, 0xad, 0x33, 0xdf, 0x51, + 0xf1, 0xae, 0xce, 0xc3, 0x44, 0xd2, 0x15, 0x43, 0xbd, 0xb3, 0x62, 0xf5, 0x6a, 0xdf, 0x69, 0xb1, + 0x17, 0xea, 0xaf, 0xc3, 0xd9, 0x07, 0x87, 0xcd, 0x21, 0x99, 0xf3, 0x83, 0xe6, 0xfa, 0xf3, 0xd1, + 0x4e, 0xe4, 0xaa, 0x59, 0x55, 0x6e, 0x37, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x1b, 0x06, + 0x13, 0x07, 0x19, 0x00, 0x00, } diff --git a/examples/proto/examplepb/a_bit_of_everything.proto b/examples/proto/examplepb/a_bit_of_everything.proto index 94fe07214e3..6bd6623087d 100644 --- a/examples/proto/examplepb/a_bit_of_everything.proto +++ b/examples/proto/examplepb/a_bit_of_everything.proto @@ -189,6 +189,8 @@ message ABitOfEverything { // repeated enum value. it is comma-separated in query repeated NumericEnum repeated_enum_value = 28; + + bool at_id = 30 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_json_name) = "@id"]; } message Body { diff --git a/examples/proto/examplepb/a_bit_of_everything.swagger.json b/examples/proto/examplepb/a_bit_of_everything.swagger.json index 4b82a011b2d..6fd0b5a84a5 100644 --- a/examples/proto/examplepb/a_bit_of_everything.swagger.json +++ b/examples/proto/examplepb/a_bit_of_everything.swagger.json @@ -334,6 +334,13 @@ "ONE" ] } + }, + { + "name": "@id", + "in": "query", + "required": false, + "type": "boolean", + "format": "boolean" } ], "tags": [ @@ -1113,6 +1120,10 @@ "$ref": "#/definitions/examplepbNumericEnum" }, "title": "repeated enum value. it is comma-separated in query" + }, + "@id": { + "type": "boolean", + "format": "boolean" } }, "description": "Intentionaly complicated message type to cover many features of Protobuf.", diff --git a/protoc-gen-swagger/genswagger/template.go b/protoc-gen-swagger/genswagger/template.go index 0ffe369cc9f..89dfc928f80 100644 --- a/protoc-gen-swagger/genswagger/template.go +++ b/protoc-gen-swagger/genswagger/template.go @@ -64,6 +64,17 @@ func getEnumDefault(enum *descriptor.Enum) string { return "" } +func getFieldName(f *descriptor.Field) string { + fd := f.FieldDescriptorProto + + n, err := extractJsonNameFromFieldDescriptor(fd) + if err != nil || n == "" { + return f.GetName() + } + + return n +} + // messageToQueryParameters converts a message to a list of swagger query parameters. func messageToQueryParameters(message *descriptor.Message, reg *descriptor.Registry, pathParams []descriptor.Parameter) (params []swaggerParameterObject, err error) { for _, field := range message.Fields { @@ -107,7 +118,7 @@ func queryParams(message *descriptor.Message, field *descriptor.Field, prefix st desc = strings.TrimSpace(schema.Title + ". " + schema.Description) } param := swaggerParameterObject{ - Name: prefix + field.GetName(), + Name: prefix + getFieldName(field), Description: desc, In: "query", Type: schema.Type, @@ -143,7 +154,7 @@ func queryParams(message *descriptor.Message, field *descriptor.Field, prefix st return nil, fmt.Errorf("unknown message type %s", fieldType) } for _, nestedField := range msg.Fields { - p, err := queryParams(msg, nestedField, prefix+field.GetName()+".", reg, pathParams) + p, err := queryParams(msg, nestedField, prefix+getFieldName(field)+".", reg, pathParams) if err != nil { return nil, err } @@ -251,7 +262,7 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, panic(err) } - schema.Properties = append(schema.Properties, keyVal{f.GetName(), fieldValue}) + schema.Properties = append(schema.Properties, keyVal{getFieldName(f), fieldValue}) } d[fullyQualifiedNameToSwaggerName(msg.FQMN(), reg)] = schema } @@ -1234,6 +1245,24 @@ func extractSwaggerOptionFromFileDescriptor(file *pbdescriptor.FileDescriptorPro return opts, nil } +func extractJsonNameFromFieldDescriptor(fd *pbdescriptor.FieldDescriptorProto) (string, error) { + if fd.Options == nil { + return "", nil + } + if !proto.HasExtension(fd.Options, swagger_options.E_Openapiv2JsonName) { + return "", nil + } + ext, err := proto.GetExtension(fd.Options, swagger_options.E_Openapiv2JsonName) + if err != nil { + return "", err + } + name, ok := ext.(*string) + if !ok { + return "", fmt.Errorf("extension is %T; want a string", ext) + } + return *name, nil +} + func swaggerSchemaFromProtoSchema(s *swagger_options.Schema, reg *descriptor.Registry, refs refMap) swaggerSchemaObject { ret := swaggerSchemaObject{ ExternalDocs: protoExternalDocumentationToSwaggerExternalDocumentation(s.GetExternalDocs()), diff --git a/protoc-gen-swagger/options/annotations.pb.go b/protoc-gen-swagger/options/annotations.pb.go index b8fffb69a0e..e70227f6a9e 100644 --- a/protoc-gen-swagger/options/annotations.pb.go +++ b/protoc-gen-swagger/options/annotations.pb.go @@ -55,37 +55,49 @@ var E_Openapiv2Tag = &proto.ExtensionDesc{ Filename: "protoc-gen-swagger/options/annotations.proto", } +var E_Openapiv2JsonName = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.FieldOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1042, + Name: "grpc.gateway.protoc_gen_swagger.options.openapiv2_json_name", + Tag: "bytes,1042,opt,name=openapiv2_json_name,json=openapiv2JsonName", + Filename: "protoc-gen-swagger/options/annotations.proto", +} + func init() { proto.RegisterExtension(E_Openapiv2Swagger) proto.RegisterExtension(E_Openapiv2Operation) proto.RegisterExtension(E_Openapiv2Schema) proto.RegisterExtension(E_Openapiv2Tag) + proto.RegisterExtension(E_Openapiv2JsonName) } func init() { - proto.RegisterFile("protoc-gen-swagger/options/annotations.proto", fileDescriptor_annotations_a3ffb1266b13d7a2) + proto.RegisterFile("protoc-gen-swagger/options/annotations.proto", fileDescriptor_annotations_5c08d9c4d454b0f0) } -var fileDescriptor_annotations_a3ffb1266b13d7a2 = []byte{ - // 311 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x4b, 0x03, 0x31, - 0x10, 0x85, 0xe9, 0x45, 0x64, 0x55, 0xac, 0xeb, 0x45, 0x8a, 0x68, 0x6f, 0x8a, 0xb4, 0x89, 0xd4, - 0xdb, 0xde, 0x54, 0xf0, 0x26, 0x85, 0x6d, 0x4f, 0x5e, 0x4a, 0x9a, 0x8e, 0xd3, 0x40, 0x9b, 0x09, - 0x49, 0xda, 0x52, 0xe8, 0xd1, 0x5f, 0xe0, 0x2f, 0x16, 0x93, 0xed, 0x56, 0xd6, 0x2a, 0x7b, 0xdb, - 0x99, 0x9d, 0xf7, 0xbe, 0xc7, 0x23, 0x49, 0xc7, 0x58, 0xf2, 0x24, 0xbb, 0x08, 0xba, 0xeb, 0x56, - 0x02, 0x11, 0x2c, 0x27, 0xe3, 0x15, 0x69, 0xc7, 0x85, 0xd6, 0xe4, 0x45, 0xf8, 0x66, 0xe1, 0x2c, - 0xbd, 0x41, 0x6b, 0x24, 0x43, 0xe1, 0x61, 0x25, 0xd6, 0x71, 0x27, 0x47, 0x08, 0x7a, 0x54, 0x48, - 0x59, 0x21, 0x6d, 0xdd, 0xfd, 0x63, 0x4b, 0x06, 0xb4, 0x30, 0x6a, 0xd9, 0x8b, 0x06, 0xad, 0x36, - 0x12, 0xe1, 0x0c, 0x78, 0x98, 0xc6, 0x8b, 0x77, 0x3e, 0x01, 0x27, 0xad, 0x32, 0x9e, 0x6c, 0xbc, - 0xc8, 0x36, 0xc9, 0x59, 0x29, 0xda, 0xa2, 0xd2, 0x4b, 0x16, 0x75, 0x6c, 0xab, 0x63, 0x2f, 0x6a, - 0x06, 0xfd, 0x08, 0xb9, 0xf8, 0x3c, 0x6c, 0x37, 0x6e, 0x8f, 0x7a, 0xf7, 0xac, 0x66, 0x62, 0x36, - 0x88, 0x73, 0xde, 0x2c, 0x49, 0xc5, 0x26, 0xfb, 0x68, 0x24, 0xe7, 0x3b, 0x3c, 0x19, 0xb0, 0xa1, - 0x93, 0xf4, 0xea, 0x57, 0x80, 0x57, 0xf0, 0x53, 0x9a, 0x54, 0x22, 0xf4, 0x6a, 0x47, 0xe8, 0x6f, - 0xad, 0xf3, 0xb4, 0xe4, 0x95, 0xbb, 0x6c, 0x93, 0x34, 0x7f, 0x94, 0x20, 0xa7, 0x30, 0x17, 0xe9, - 0xf5, 0x9e, 0x08, 0xce, 0x09, 0xac, 0xd6, 0xc0, 0xeb, 0xd7, 0x10, 0x8c, 0xf3, 0xd3, 0x5d, 0x0b, - 0x61, 0x91, 0xb9, 0xe4, 0x64, 0x47, 0xf7, 0x02, 0xf7, 0xa0, 0x07, 0x60, 0x97, 0x4a, 0x56, 0xd1, - 0x9d, 0xda, 0xe8, 0xa1, 0xc0, 0xfc, 0xb8, 0x84, 0x0c, 0x05, 0x3e, 0x3d, 0xbf, 0x3d, 0xa2, 0xf2, - 0xd3, 0xc5, 0x98, 0x49, 0x9a, 0xf3, 0x6f, 0x9f, 0x2e, 0x48, 0x72, 0x6b, 0xe7, 0xa1, 0x18, 0x0b, - 0x5b, 0xfe, 0xf7, 0x73, 0x1b, 0x1f, 0x84, 0x7f, 0x0f, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x80, - 0x7f, 0xc1, 0x6a, 0xea, 0x02, 0x00, 0x00, +var fileDescriptor_annotations_5c08d9c4d454b0f0 = []byte{ + // 344 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4f, 0x4f, 0xea, 0x40, + 0x14, 0xc5, 0xc3, 0xe6, 0xe5, 0xbd, 0x3e, 0x8d, 0x58, 0x37, 0x86, 0xf8, 0x87, 0x9d, 0xc6, 0xc0, + 0x8c, 0xc1, 0x5d, 0x77, 0x6a, 0xe2, 0xc2, 0x44, 0x48, 0x0a, 0x2b, 0x37, 0x64, 0x18, 0xae, 0x97, + 0x1a, 0x3a, 0x77, 0x32, 0x33, 0x40, 0x48, 0x58, 0xfa, 0x09, 0xfc, 0xc4, 0xc6, 0x69, 0x69, 0x11, + 0xd1, 0x74, 0xd7, 0x7b, 0x3b, 0xe7, 0xfc, 0x4e, 0xce, 0x4c, 0xd0, 0xd2, 0x86, 0x1c, 0xc9, 0x36, + 0x82, 0x6a, 0xdb, 0x85, 0x40, 0x04, 0xc3, 0x49, 0xbb, 0x84, 0x94, 0xe5, 0x42, 0x29, 0x72, 0xc2, + 0x7f, 0x33, 0x7f, 0x2c, 0xbc, 0x40, 0xa3, 0x25, 0x43, 0xe1, 0x60, 0x21, 0x96, 0xd9, 0x4e, 0x0e, + 0x11, 0xd4, 0x30, 0x97, 0xb2, 0x5c, 0xda, 0xb8, 0xfa, 0xc5, 0x96, 0x34, 0x28, 0xa1, 0x93, 0x79, + 0x27, 0x33, 0x68, 0x34, 0x91, 0x08, 0xa7, 0xc0, 0xfd, 0x34, 0x9a, 0xbd, 0xf0, 0x31, 0x58, 0x69, + 0x12, 0xed, 0xc8, 0x64, 0x27, 0xa2, 0x55, 0x70, 0x58, 0x88, 0xd6, 0xa8, 0xf0, 0x84, 0x65, 0x3a, + 0xb6, 0xd6, 0xb1, 0x87, 0x64, 0x0a, 0xbd, 0x0c, 0x72, 0xfc, 0xfe, 0xb7, 0x59, 0xbb, 0xfc, 0xdf, + 0xb9, 0x66, 0x15, 0x13, 0xb3, 0x7e, 0x36, 0xc7, 0xf5, 0x82, 0x94, 0x6f, 0xa2, 0xb7, 0x5a, 0x70, + 0x54, 0xe2, 0x49, 0x83, 0xf1, 0x9d, 0x84, 0x67, 0xdf, 0x02, 0x3c, 0x81, 0x9b, 0xd0, 0x78, 0x2b, + 0x42, 0xa7, 0x72, 0x84, 0xde, 0xda, 0x3a, 0x0e, 0x0b, 0x5e, 0xb1, 0x8b, 0x56, 0x41, 0x7d, 0xa3, + 0x04, 0x39, 0x81, 0x54, 0x84, 0xe7, 0x3b, 0x22, 0x58, 0x2b, 0x70, 0xbb, 0x06, 0x5e, 0xbd, 0x06, + 0x6f, 0x1c, 0x1f, 0x94, 0x2d, 0xf8, 0x45, 0x64, 0x83, 0xfd, 0x92, 0xee, 0x04, 0xee, 0x40, 0xf7, + 0xc1, 0xcc, 0x13, 0xb9, 0x8d, 0x6e, 0x55, 0x46, 0x0f, 0x04, 0xc6, 0x7b, 0x05, 0x64, 0x20, 0x30, + 0xea, 0x6e, 0x16, 0xff, 0x6a, 0x49, 0x0d, 0x95, 0x48, 0x21, 0x3c, 0xdd, 0x71, 0xf3, 0x30, 0xfd, + 0xda, 0xfb, 0xbf, 0xb8, 0x7c, 0x32, 0x8f, 0x96, 0x54, 0x57, 0xa4, 0x70, 0x77, 0xff, 0x7c, 0x8b, + 0x89, 0x9b, 0xcc, 0x46, 0x4c, 0x52, 0xca, 0x3f, 0x73, 0xb5, 0x41, 0x92, 0x5d, 0x5a, 0x07, 0xf9, + 0x98, 0xc7, 0xe4, 0x3f, 0x3f, 0xdf, 0xd1, 0x1f, 0xff, 0xef, 0xe6, 0x23, 0x00, 0x00, 0xff, 0xff, + 0xe0, 0x90, 0x95, 0xdd, 0x3a, 0x03, 0x00, 0x00, } diff --git a/protoc-gen-swagger/options/annotations.proto b/protoc-gen-swagger/options/annotations.proto index 8746192b7a8..d548fe519ce 100644 --- a/protoc-gen-swagger/options/annotations.proto +++ b/protoc-gen-swagger/options/annotations.proto @@ -35,3 +35,10 @@ extend google.protobuf.ServiceOptions { // different descriptor messages. Tag openapiv2_tag = 1042; } +extend google.protobuf.FieldOptions { + // ID assigned by protobuf-global-extension-registry@google.com for grpc-gateway project. + // + // All IDs are the same, as assigned. It is okay that they are the same, as they extend + // different descriptor messages. + string openapiv2_json_name = 1042; +}