diff --git a/Makefile b/Makefile index c8791a64f37..2c366325411 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ $(GENERATE_UNBOUND_METHODS_EXAMPLE_SRCS): $(GENERATE_UNBOUND_METHODS_EXAMPLE_SPE install: go install github.com/bufbuild/buf/cmd/buf@v1.45.0 - go install \ + go install -buildvcs=false \ ./protoc-gen-openapiv2 \ ./protoc-gen-grpc-gateway diff --git a/examples/internal/clients/abe/api/swagger.yaml b/examples/internal/clients/abe/api/swagger.yaml index f90b99b5eb0..7b65eaeffee 100644 --- a/examples/internal/clients/abe/api/swagger.yaml +++ b/examples/internal/clients/abe/api/swagger.yaml @@ -149,17 +149,15 @@ paths: - name: "singleNested.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "SingleNestedName" - x-optionalDataType: "String" - name: "singleNested.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "SingleNestedAmount" - x-optionalDataType: "Int64" - name: "uuid" in: "query" required: true @@ -190,120 +188,105 @@ paths: x-exportParamName: "Int64Value" - name: "uint64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Uint64Value" - x-optionalDataType: "String" - name: "int32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Int32Value" - x-optionalDataType: "Int32" - name: "fixed64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Fixed64Value" - x-optionalDataType: "String" - name: "fixed32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Fixed32Value" - x-optionalDataType: "Int64" - name: "boolValue" in: "query" - required: false + required: true type: "boolean" x-exportParamName: "BoolValue" - x-optionalDataType: "Bool" - name: "stringValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "StringValue" - x-optionalDataType: "String" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "uint32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Uint32Value" - x-optionalDataType: "Int64" - name: "enumValue" in: "query" description: " - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValue" - x-optionalDataType: "String" - name: "pathEnumValue" in: "query" - required: false + required: true type: "string" default: "ABC" enum: - "ABC" - "DEF" x-exportParamName: "PathEnumValue" - x-optionalDataType: "String" - name: "nestedPathEnumValue" in: "query" - required: false + required: true type: "string" default: "GHI" enum: - "GHI" - "JKL" x-exportParamName: "NestedPathEnumValue" - x-optionalDataType: "String" - name: "sfixed32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sfixed32Value" - x-optionalDataType: "Int32" - name: "sfixed64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sfixed64Value" - x-optionalDataType: "String" - name: "sint32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sint32Value" - x-optionalDataType: "Int32" - name: "sint64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sint64Value" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -311,49 +294,45 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "nonConventionalNameValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "NonConventionalNameValue" - x-optionalDataType: "String" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -366,7 +345,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -379,18 +358,17 @@ paths: in: "query" description: "Numeric enum title\n\nNumeric enum description.\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValueAnnotation" - x-optionalDataType: "String" - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -399,24 +377,21 @@ paths: - name: "nestedAnnotation.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "NestedAnnotationName" - x-optionalDataType: "String" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -426,10 +401,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -440,7 +414,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -453,10 +427,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -481,36 +454,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -557,23 +526,21 @@ paths: x-exportParamName: "SingleNestedName" - name: "singleNested.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "SingleNestedAmount" - x-optionalDataType: "Int64" - name: "singleNested.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "SingleNestedOk" - x-optionalDataType: "String" - name: "uuid" in: "query" required: true @@ -604,120 +571,105 @@ paths: x-exportParamName: "Int64Value" - name: "uint64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Uint64Value" - x-optionalDataType: "String" - name: "int32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Int32Value" - x-optionalDataType: "Int32" - name: "fixed64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Fixed64Value" - x-optionalDataType: "String" - name: "fixed32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Fixed32Value" - x-optionalDataType: "Int64" - name: "boolValue" in: "query" - required: false + required: true type: "boolean" x-exportParamName: "BoolValue" - x-optionalDataType: "Bool" - name: "stringValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "StringValue" - x-optionalDataType: "String" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "uint32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Uint32Value" - x-optionalDataType: "Int64" - name: "enumValue" in: "query" description: " - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValue" - x-optionalDataType: "String" - name: "pathEnumValue" in: "query" - required: false + required: true type: "string" default: "ABC" enum: - "ABC" - "DEF" x-exportParamName: "PathEnumValue" - x-optionalDataType: "String" - name: "nestedPathEnumValue" in: "query" - required: false + required: true type: "string" default: "GHI" enum: - "GHI" - "JKL" x-exportParamName: "NestedPathEnumValue" - x-optionalDataType: "String" - name: "sfixed32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sfixed32Value" - x-optionalDataType: "Int32" - name: "sfixed64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sfixed64Value" - x-optionalDataType: "String" - name: "sint32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sint32Value" - x-optionalDataType: "Int32" - name: "sint64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sint64Value" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -725,49 +677,45 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "nonConventionalNameValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "NonConventionalNameValue" - x-optionalDataType: "String" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -780,7 +728,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -793,18 +741,17 @@ paths: in: "query" description: "Numeric enum title\n\nNumeric enum description.\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValueAnnotation" - x-optionalDataType: "String" - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -812,30 +759,27 @@ paths: x-exportParamName: "RepeatedStringAnnotation" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "nestedAnnotation.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "NestedAnnotationOk" - x-optionalDataType: "String" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -845,10 +789,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -859,7 +802,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -872,10 +815,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -900,36 +842,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -1009,114 +947,100 @@ paths: x-exportParamName: "Int64Value" - name: "uint64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Uint64Value" - x-optionalDataType: "String" - name: "int32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Int32Value" - x-optionalDataType: "Int32" - name: "fixed64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Fixed64Value" - x-optionalDataType: "String" - name: "fixed32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Fixed32Value" - x-optionalDataType: "Int64" - name: "boolValue" in: "query" - required: false + required: true type: "boolean" x-exportParamName: "BoolValue" - x-optionalDataType: "Bool" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "uint32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Uint32Value" - x-optionalDataType: "Int64" - name: "enumValue" in: "query" description: " - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValue" - x-optionalDataType: "String" - name: "pathEnumValue" in: "query" - required: false + required: true type: "string" default: "ABC" enum: - "ABC" - "DEF" x-exportParamName: "PathEnumValue" - x-optionalDataType: "String" - name: "nestedPathEnumValue" in: "query" - required: false + required: true type: "string" default: "GHI" enum: - "GHI" - "JKL" x-exportParamName: "NestedPathEnumValue" - x-optionalDataType: "String" - name: "sfixed32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sfixed32Value" - x-optionalDataType: "Int32" - name: "sfixed64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sfixed64Value" - x-optionalDataType: "String" - name: "sint32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sint32Value" - x-optionalDataType: "Int32" - name: "sint64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sint64Value" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -1124,49 +1048,45 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "nonConventionalNameValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "NonConventionalNameValue" - x-optionalDataType: "String" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -1179,7 +1099,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -1192,18 +1112,17 @@ paths: in: "query" description: "Numeric enum title\n\nNumeric enum description.\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValueAnnotation" - x-optionalDataType: "String" - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -1212,36 +1131,32 @@ paths: - name: "nestedAnnotation.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "NestedAnnotationName" - x-optionalDataType: "String" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "nestedAnnotation.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "NestedAnnotationOk" - x-optionalDataType: "String" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -1251,10 +1166,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -1265,7 +1179,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -1278,10 +1192,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -1306,36 +1219,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -1384,29 +1293,26 @@ paths: - name: "singleNested.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "SingleNestedName" - x-optionalDataType: "String" - name: "singleNested.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "SingleNestedAmount" - x-optionalDataType: "Int64" - name: "singleNested.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "SingleNestedOk" - x-optionalDataType: "String" - name: "floatValue" in: "query" description: "Float value field" @@ -1429,120 +1335,105 @@ paths: x-exportParamName: "Int64Value" - name: "uint64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Uint64Value" - x-optionalDataType: "String" - name: "int32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Int32Value" - x-optionalDataType: "Int32" - name: "fixed64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Fixed64Value" - x-optionalDataType: "String" - name: "fixed32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Fixed32Value" - x-optionalDataType: "Int64" - name: "boolValue" in: "query" - required: false + required: true type: "boolean" x-exportParamName: "BoolValue" - x-optionalDataType: "Bool" - name: "stringValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "StringValue" - x-optionalDataType: "String" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "uint32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Uint32Value" - x-optionalDataType: "Int64" - name: "enumValue" in: "query" description: " - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValue" - x-optionalDataType: "String" - name: "pathEnumValue" in: "query" - required: false + required: true type: "string" default: "ABC" enum: - "ABC" - "DEF" x-exportParamName: "PathEnumValue" - x-optionalDataType: "String" - name: "nestedPathEnumValue" in: "query" - required: false + required: true type: "string" default: "GHI" enum: - "GHI" - "JKL" x-exportParamName: "NestedPathEnumValue" - x-optionalDataType: "String" - name: "sfixed32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sfixed32Value" - x-optionalDataType: "Int32" - name: "sfixed64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sfixed64Value" - x-optionalDataType: "String" - name: "sint32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sint32Value" - x-optionalDataType: "Int32" - name: "sint64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sint64Value" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -1550,49 +1441,45 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "nonConventionalNameValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "NonConventionalNameValue" - x-optionalDataType: "String" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -1605,7 +1492,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -1618,18 +1505,17 @@ paths: in: "query" description: "Numeric enum title\n\nNumeric enum description.\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValueAnnotation" - x-optionalDataType: "String" - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -1638,36 +1524,32 @@ paths: - name: "nestedAnnotation.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "NestedAnnotationName" - x-optionalDataType: "String" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "nestedAnnotation.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "NestedAnnotationOk" - x-optionalDataType: "String" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -1677,10 +1559,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -1691,7 +1572,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -1704,10 +1585,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -1732,36 +1612,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -1933,29 +1809,26 @@ paths: - name: "singleNested.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "SingleNestedName" - x-optionalDataType: "String" - name: "singleNested.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "SingleNestedAmount" - x-optionalDataType: "Int64" - name: "singleNested.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "SingleNestedOk" - x-optionalDataType: "String" - name: "uuid" in: "query" required: true @@ -1966,14 +1839,13 @@ paths: x-exportParamName: "Uuid" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -1981,43 +1853,40 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -2030,7 +1899,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -2042,7 +1911,7 @@ paths: - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -2051,36 +1920,32 @@ paths: - name: "nestedAnnotation.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "NestedAnnotationName" - x-optionalDataType: "String" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "nestedAnnotation.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "NestedAnnotationOk" - x-optionalDataType: "String" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -2090,10 +1955,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -2104,7 +1968,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -2117,10 +1981,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -2145,36 +2008,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -2223,29 +2082,26 @@ paths: - name: "singleNested.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "SingleNestedName" - x-optionalDataType: "String" - name: "singleNested.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "SingleNestedAmount" - x-optionalDataType: "Int64" - name: "singleNested.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "SingleNestedOk" - x-optionalDataType: "String" - name: "floatValue" in: "query" description: "Float value field" @@ -2268,120 +2124,105 @@ paths: x-exportParamName: "Int64Value" - name: "uint64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Uint64Value" - x-optionalDataType: "String" - name: "int32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Int32Value" - x-optionalDataType: "Int32" - name: "fixed64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Fixed64Value" - x-optionalDataType: "String" - name: "fixed32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Fixed32Value" - x-optionalDataType: "Int64" - name: "boolValue" in: "query" - required: false + required: true type: "boolean" x-exportParamName: "BoolValue" - x-optionalDataType: "Bool" - name: "stringValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "StringValue" - x-optionalDataType: "String" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "uint32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Uint32Value" - x-optionalDataType: "Int64" - name: "enumValue" in: "query" description: " - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValue" - x-optionalDataType: "String" - name: "pathEnumValue" in: "query" - required: false + required: true type: "string" default: "ABC" enum: - "ABC" - "DEF" x-exportParamName: "PathEnumValue" - x-optionalDataType: "String" - name: "nestedPathEnumValue" in: "query" - required: false + required: true type: "string" default: "GHI" enum: - "GHI" - "JKL" x-exportParamName: "NestedPathEnumValue" - x-optionalDataType: "String" - name: "sfixed32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sfixed32Value" - x-optionalDataType: "Int32" - name: "sfixed64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sfixed64Value" - x-optionalDataType: "String" - name: "sint32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sint32Value" - x-optionalDataType: "Int32" - name: "sint64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sint64Value" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -2389,49 +2230,45 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "nonConventionalNameValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "NonConventionalNameValue" - x-optionalDataType: "String" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -2444,7 +2281,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -2457,18 +2294,17 @@ paths: in: "query" description: "Numeric enum title\n\nNumeric enum description.\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValueAnnotation" - x-optionalDataType: "String" - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -2477,36 +2313,32 @@ paths: - name: "nestedAnnotation.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "NestedAnnotationName" - x-optionalDataType: "String" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "nestedAnnotation.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "NestedAnnotationOk" - x-optionalDataType: "String" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -2516,10 +2348,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -2530,7 +2361,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -2543,10 +2374,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -2571,36 +2401,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -2675,29 +2501,26 @@ paths: - name: "singleNested.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "SingleNestedName" - x-optionalDataType: "String" - name: "singleNested.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "SingleNestedAmount" - x-optionalDataType: "Int64" - name: "singleNested.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "SingleNestedOk" - x-optionalDataType: "String" - name: "floatValue" in: "query" description: "Float value field" @@ -2720,120 +2543,105 @@ paths: x-exportParamName: "Int64Value" - name: "uint64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Uint64Value" - x-optionalDataType: "String" - name: "int32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Int32Value" - x-optionalDataType: "Int32" - name: "fixed64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Fixed64Value" - x-optionalDataType: "String" - name: "fixed32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Fixed32Value" - x-optionalDataType: "Int64" - name: "boolValue" in: "query" - required: false + required: true type: "boolean" x-exportParamName: "BoolValue" - x-optionalDataType: "Bool" - name: "stringValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "StringValue" - x-optionalDataType: "String" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "uint32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Uint32Value" - x-optionalDataType: "Int64" - name: "enumValue" in: "query" description: " - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValue" - x-optionalDataType: "String" - name: "pathEnumValue" in: "query" - required: false + required: true type: "string" default: "ABC" enum: - "ABC" - "DEF" x-exportParamName: "PathEnumValue" - x-optionalDataType: "String" - name: "nestedPathEnumValue" in: "query" - required: false + required: true type: "string" default: "GHI" enum: - "GHI" - "JKL" x-exportParamName: "NestedPathEnumValue" - x-optionalDataType: "String" - name: "sfixed32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sfixed32Value" - x-optionalDataType: "Int32" - name: "sfixed64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sfixed64Value" - x-optionalDataType: "String" - name: "sint32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sint32Value" - x-optionalDataType: "Int32" - name: "sint64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sint64Value" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -2841,49 +2649,45 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "nonConventionalNameValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "NonConventionalNameValue" - x-optionalDataType: "String" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -2896,7 +2700,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -2909,18 +2713,17 @@ paths: in: "query" description: "Numeric enum title\n\nNumeric enum description.\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValueAnnotation" - x-optionalDataType: "String" - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -2929,36 +2732,32 @@ paths: - name: "nestedAnnotation.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "NestedAnnotationName" - x-optionalDataType: "String" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "nestedAnnotation.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "NestedAnnotationOk" - x-optionalDataType: "String" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -2968,10 +2767,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -2982,7 +2780,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -2995,10 +2793,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -3023,36 +2820,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -3084,29 +2877,26 @@ paths: - name: "singleNested.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "SingleNestedName" - x-optionalDataType: "String" - name: "singleNested.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "SingleNestedAmount" - x-optionalDataType: "Int64" - name: "singleNested.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "SingleNestedOk" - x-optionalDataType: "String" - name: "floatValue" in: "query" description: "Float value field" @@ -3129,120 +2919,105 @@ paths: x-exportParamName: "Int64Value" - name: "uint64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Uint64Value" - x-optionalDataType: "String" - name: "int32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Int32Value" - x-optionalDataType: "Int32" - name: "fixed64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Fixed64Value" - x-optionalDataType: "String" - name: "fixed32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Fixed32Value" - x-optionalDataType: "Int64" - name: "boolValue" in: "query" - required: false + required: true type: "boolean" x-exportParamName: "BoolValue" - x-optionalDataType: "Bool" - name: "stringValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "StringValue" - x-optionalDataType: "String" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "uint32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Uint32Value" - x-optionalDataType: "Int64" - name: "enumValue" in: "query" description: " - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValue" - x-optionalDataType: "String" - name: "pathEnumValue" in: "query" - required: false + required: true type: "string" default: "ABC" enum: - "ABC" - "DEF" x-exportParamName: "PathEnumValue" - x-optionalDataType: "String" - name: "nestedPathEnumValue" in: "query" - required: false + required: true type: "string" default: "GHI" enum: - "GHI" - "JKL" x-exportParamName: "NestedPathEnumValue" - x-optionalDataType: "String" - name: "sfixed32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sfixed32Value" - x-optionalDataType: "Int32" - name: "sfixed64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sfixed64Value" - x-optionalDataType: "String" - name: "sint32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sint32Value" - x-optionalDataType: "Int32" - name: "sint64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sint64Value" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -3250,49 +3025,45 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "nonConventionalNameValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "NonConventionalNameValue" - x-optionalDataType: "String" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -3305,7 +3076,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -3318,18 +3089,17 @@ paths: in: "query" description: "Numeric enum title\n\nNumeric enum description.\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValueAnnotation" - x-optionalDataType: "String" - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -3338,36 +3108,32 @@ paths: - name: "nestedAnnotation.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "NestedAnnotationName" - x-optionalDataType: "String" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "nestedAnnotation.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "NestedAnnotationOk" - x-optionalDataType: "String" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -3377,10 +3143,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -3391,7 +3156,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -3404,10 +3169,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -3432,36 +3196,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -3510,29 +3270,26 @@ paths: - name: "singleNested.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "SingleNestedName" - x-optionalDataType: "String" - name: "singleNested.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "SingleNestedAmount" - x-optionalDataType: "Int64" - name: "singleNested.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "SingleNestedOk" - x-optionalDataType: "String" - name: "floatValue" in: "query" description: "Float value field" @@ -3555,120 +3312,105 @@ paths: x-exportParamName: "Int64Value" - name: "uint64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Uint64Value" - x-optionalDataType: "String" - name: "int32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Int32Value" - x-optionalDataType: "Int32" - name: "fixed64Value" in: "query" - required: false + required: true type: "string" format: "uint64" x-exportParamName: "Fixed64Value" - x-optionalDataType: "String" - name: "fixed32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Fixed32Value" - x-optionalDataType: "Int64" - name: "boolValue" in: "query" - required: false + required: true type: "boolean" x-exportParamName: "BoolValue" - x-optionalDataType: "Bool" - name: "stringValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "StringValue" - x-optionalDataType: "String" - name: "bytesValue" in: "query" - required: false + required: true type: "string" format: "byte" x-exportParamName: "BytesValue" - x-optionalDataType: "String" - name: "uint32Value" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Uint32Value" - x-optionalDataType: "Int64" - name: "enumValue" in: "query" description: " - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValue" - x-optionalDataType: "String" - name: "pathEnumValue" in: "query" - required: false + required: true type: "string" default: "ABC" enum: - "ABC" - "DEF" x-exportParamName: "PathEnumValue" - x-optionalDataType: "String" - name: "nestedPathEnumValue" in: "query" - required: false + required: true type: "string" default: "GHI" enum: - "GHI" - "JKL" x-exportParamName: "NestedPathEnumValue" - x-optionalDataType: "String" - name: "sfixed32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sfixed32Value" - x-optionalDataType: "Int32" - name: "sfixed64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sfixed64Value" - x-optionalDataType: "String" - name: "sint32Value" in: "query" - required: false + required: true type: "integer" format: "int32" x-exportParamName: "Sint32Value" - x-optionalDataType: "Int32" - name: "sint64Value" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Sint64Value" - x-optionalDataType: "String" - name: "repeatedStringValue" in: "query" - required: false + required: true type: "array" items: type: "string" @@ -3676,49 +3418,45 @@ paths: x-exportParamName: "RepeatedStringValue" - name: "oneofEmpty" in: "query" - required: false + required: true type: "object" x-exportParamName: "OneofEmpty" - name: "oneofString" in: "query" - required: false + required: true type: "string" x-exportParamName: "OneofString" - x-optionalDataType: "String" - name: "mapValue" in: "query" description: "map of numeric enum" - required: false + required: true x-exportParamName: "MapValue" - name: "mappedStringValue" in: "query" description: "Map of string title\n\nMap of string description." - required: false + required: true type: "string" x-exportParamName: "MappedStringValue" - x-optionalDataType: "String" - name: "mappedNestedValue" in: "query" - required: false + required: true x-exportParamName: "MappedNestedValue" - name: "nonConventionalNameValue" in: "query" - required: false + required: true type: "string" x-exportParamName: "NonConventionalNameValue" - x-optionalDataType: "String" - name: "timestampValue" in: "query" - required: false + required: true type: "string" format: "date-time" x-exportParamName: "TimestampValue" - x-optionalDataType: "Time" - name: "repeatedEnumValue" in: "query" description: "repeated enum value. it is comma-separated in query\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -3731,7 +3469,7 @@ paths: in: "query" description: "Repeated numeric enum title\n\nRepeated numeric enum description.\n\ \n - ZERO: ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "array" items: type: "string" @@ -3744,18 +3482,17 @@ paths: in: "query" description: "Numeric enum title\n\nNumeric enum description.\n\n - ZERO:\ \ ZERO means 0\n - ONE: ONE means 1" - required: false + required: true type: "string" default: "ZERO" enum: - "ZERO" - "ONE" x-exportParamName: "EnumValueAnnotation" - x-optionalDataType: "String" - name: "repeatedStringAnnotation" in: "query" description: "Repeated string title\n\nRepeated string description." - required: false + required: true type: "array" items: type: "string" @@ -3764,36 +3501,32 @@ paths: - name: "nestedAnnotation.name" in: "query" description: "name is nested field." - required: false + required: true type: "string" x-exportParamName: "NestedAnnotationName" - x-optionalDataType: "String" - name: "nestedAnnotation.amount" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "NestedAnnotationAmount" - x-optionalDataType: "Int64" - name: "nestedAnnotation.ok" in: "query" description: "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE:\ \ TRUE is true." - required: false + required: true type: "string" default: "FALSE" enum: - "FALSE" - "TRUE" x-exportParamName: "NestedAnnotationOk" - x-optionalDataType: "String" - name: "int64OverrideType" in: "query" - required: false + required: true type: "integer" format: "int64" x-exportParamName: "Int64OverrideType" - x-optionalDataType: "Int64" - name: "requiredStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as required in Open API definition" @@ -3803,10 +3536,9 @@ paths: - name: "outputOnlyStringViaFieldBehaviorAnnotation" in: "query" description: "mark a field as readonly in Open API definition" - required: false + required: true type: "string" x-exportParamName: "OutputOnlyStringViaFieldBehaviorAnnotation" - x-optionalDataType: "String" - name: "optionalStringValue" in: "query" required: false @@ -3817,7 +3549,7 @@ paths: in: "query" description: "Test openapiv2 generation of repeated fields\n\nOnly digits\ \ are allowed." - required: false + required: true type: "array" items: type: "string" @@ -3830,10 +3562,9 @@ paths: in: "query" description: "Test openapiv2 generation of required fields with annotation\ \ and jsonschema to reproduce" - required: false + required: true type: "string" x-exportParamName: "OptionalStringField" - x-optionalDataType: "String" - name: "requiredStringField1" in: "query" required: true @@ -3858,36 +3589,32 @@ paths: - name: "trailingOnly" in: "query" description: "Trailing only" - required: false + required: true type: "string" x-exportParamName: "TrailingOnly" - x-optionalDataType: "String" - name: "trailingOnlyDot" in: "query" description: "Trailing only dot." - required: false + required: true type: "string" x-exportParamName: "TrailingOnlyDot" - x-optionalDataType: "String" - name: "trailingBoth" in: "query" description: "Leading both\n\nTrailing both." - required: false + required: true type: "string" x-exportParamName: "TrailingBoth" - x-optionalDataType: "String" - name: "trailingMultiline" in: "query" description: "Leading multiline\n\nThis is an example of a multi-line comment.\n\ \nTrailing multiline." - required: false + required: true type: "string" x-exportParamName: "TrailingMultiline" - x-optionalDataType: "String" - name: "uuids" in: "query" description: "Specify a custom format of repeated field items" - required: false + required: true type: "array" items: type: "string" @@ -4427,10 +4154,9 @@ paths: in: "query" description: "If set to true, and the book is not found, a new book will be\ \ created.\nIn this situation, `update_mask` is ignored." - required: false + required: true type: "boolean" x-exportParamName: "AllowMissing" - x-optionalDataType: "Bool" responses: 200: description: "A successful response." @@ -4483,10 +4209,9 @@ paths: in: "query" description: "The ID to use for the book.\n\nThis must start with an alphanumeric\ \ character." - required: false + required: true type: "string" x-exportParamName: "BookId" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -4537,10 +4262,9 @@ paths: - name: "updateMask" in: "query" description: "The paths to update." - required: false + required: true type: "string" x-exportParamName: "UpdateMask" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -4623,10 +4347,9 @@ paths: parameters: - name: "value" in: "query" - required: false + required: true type: "string" x-exportParamName: "Value" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -5116,6 +4839,10 @@ securityDefinitions: definitions: ABitOfEverythingNested: type: "object" + required: + - "amount" + - "name" + - "ok" properties: name: type: "string" @@ -5132,15 +4859,55 @@ definitions: ABitOfEverythingServiceDeepPathEchoBody: type: "object" required: + - "boolValue" + - "bytesValue" - "doubleValue" + - "enumValue" + - "enumValueAnnotation" + - "fixed32Value" + - "fixed64Value" - "floatValue" + - "int32Value" + - "int64OverrideType" - "int64Value" + - "mapValue" + - "mappedNestedValue" + - "mappedStringValue" + - "nested" + - "nestedAnnotation" + - "nestedPathEnumValue" + - "nonConventionalNameValue" + - "oneofEmpty" + - "oneofString" + - "optionalStringField" + - "outputOnlyStringViaFieldBehaviorAnnotation" + - "pathEnumValue" + - "productId" + - "repeatedEnumAnnotation" + - "repeatedEnumValue" + - "repeatedNestedAnnotation" + - "repeatedStringAnnotation" + - "repeatedStringValue" - "requiredStringField1" - "requiredStringField2" - "requiredStringViaFieldBehaviorAnnotation" - "required_field_behavior_json_name_custom" - "required_field_schema_json_name_custom" + - "sfixed32Value" + - "sfixed64Value" + - "singleNested" + - "sint32Value" + - "sint64Value" + - "stringValue" + - "timestampValue" + - "trailingBoth" + - "trailingMultiline" + - "trailingOnly" + - "trailingOnlyDot" + - "uint32Value" + - "uint64Value" - "uuid" + - "uuids" properties: singleNested: $ref: "#/definitions/ABitOfEverythingServiceDeepPathEchoBody_singleNested" @@ -5334,6 +5101,9 @@ definitions: type: "object" ABitOfEverythingServiceUpdateV2Body: type: "object" + required: + - "abe" + - "updateMask" properties: abe: $ref: "#/definitions/A bit of everything_2" @@ -5362,15 +5132,55 @@ definitions: examplepbABitOfEverything: type: "object" required: + - "boolValue" + - "bytesValue" - "doubleValue" + - "enumValue" + - "enumValueAnnotation" + - "fixed32Value" + - "fixed64Value" - "floatValue" + - "int32Value" + - "int64OverrideType" - "int64Value" + - "mapValue" + - "mappedNestedValue" + - "mappedStringValue" + - "nested" + - "nestedAnnotation" + - "nestedPathEnumValue" + - "nonConventionalNameValue" + - "oneofEmpty" + - "oneofString" + - "optionalStringField" + - "outputOnlyStringViaFieldBehaviorAnnotation" + - "pathEnumValue" + - "productId" + - "repeatedEnumAnnotation" + - "repeatedEnumValue" + - "repeatedNestedAnnotation" + - "repeatedStringAnnotation" + - "repeatedStringValue" - "requiredStringField1" - "requiredStringField2" - "requiredStringViaFieldBehaviorAnnotation" - "required_field_behavior_json_name_custom" - "required_field_schema_json_name_custom" + - "sfixed32Value" + - "sfixed64Value" + - "singleNested" + - "sint32Value" + - "sint64Value" + - "stringValue" + - "timestampValue" + - "trailingBoth" + - "trailingMultiline" + - "trailingOnly" + - "trailingOnlyDot" + - "uint32Value" + - "uint64Value" - "uuid" + - "uuids" properties: singleNested: $ref: "#/definitions/ABitOfEverythingNested" @@ -5562,6 +5372,23 @@ definitions: x-a-bit-of-everything-foo: "bar" examplepbABitOfEverythingRepeated: type: "object" + required: + - "pathRepeatedBoolValue" + - "pathRepeatedBytesValue" + - "pathRepeatedDoubleValue" + - "pathRepeatedEnumValue" + - "pathRepeatedFixed32Value" + - "pathRepeatedFixed64Value" + - "pathRepeatedFloatValue" + - "pathRepeatedInt32Value" + - "pathRepeatedInt64Value" + - "pathRepeatedSfixed32Value" + - "pathRepeatedSfixed64Value" + - "pathRepeatedSint32Value" + - "pathRepeatedSint64Value" + - "pathRepeatedStringValue" + - "pathRepeatedUint32Value" + - "pathRepeatedUint64Value" properties: pathRepeatedFloatValue: type: "array" @@ -5656,14 +5483,54 @@ definitions: examplepbABitOfEverythingServiceUpdateBody: type: "object" required: + - "boolValue" + - "bytesValue" - "doubleValue" + - "enumValue" + - "enumValueAnnotation" + - "fixed32Value" + - "fixed64Value" - "floatValue" + - "int32Value" + - "int64OverrideType" - "int64Value" + - "mapValue" + - "mappedNestedValue" + - "mappedStringValue" + - "nested" + - "nestedAnnotation" + - "nestedPathEnumValue" + - "nonConventionalNameValue" + - "oneofEmpty" + - "oneofString" + - "optionalStringField" + - "outputOnlyStringViaFieldBehaviorAnnotation" + - "pathEnumValue" + - "productId" + - "repeatedEnumAnnotation" + - "repeatedEnumValue" + - "repeatedNestedAnnotation" + - "repeatedStringAnnotation" + - "repeatedStringValue" - "requiredStringField1" - "requiredStringField2" - "requiredStringViaFieldBehaviorAnnotation" - "required_field_behavior_json_name_custom" - "required_field_schema_json_name_custom" + - "sfixed32Value" + - "sfixed64Value" + - "singleNested" + - "sint32Value" + - "sint64Value" + - "stringValue" + - "timestampValue" + - "trailingBoth" + - "trailingMultiline" + - "trailingOnly" + - "trailingOnlyDot" + - "uint32Value" + - "uint64Value" + - "uuids" properties: singleNested: $ref: "#/definitions/ABitOfEverythingNested" @@ -5856,11 +5723,17 @@ definitions: type: "string" examplepbBody: type: "object" + required: + - "name" properties: name: type: "string" examplepbBook: type: "object" + required: + - "createTime" + - "id" + - "name" properties: name: type: "string" @@ -5883,6 +5756,8 @@ definitions: id: "id" examplepbCheckStatusResponse: type: "object" + required: + - "status" properties: status: $ref: "#/definitions/rpcStatus" @@ -5895,6 +5770,9 @@ definitions: message: "message" examplepbErrorObject: type: "object" + required: + - "code" + - "message" properties: code: type: "integer" @@ -5908,6 +5786,9 @@ definitions: pattern: "^[a-zA-Z0-9]{1, 32}$" examplepbErrorResponse: type: "object" + required: + - "correlationId" + - "error" properties: correlationId: type: "string" @@ -6053,6 +5934,10 @@ definitions: $ref: "#/definitions/examplepbBar" rpcStatus: type: "object" + required: + - "code" + - "details" + - "message" properties: code: type: "integer" @@ -6083,11 +5968,16 @@ definitions: message: "message" subStringMessage: type: "object" + required: + - "value" properties: value: type: "string" The book to update.: type: "object" + required: + - "createTime" + - "id" properties: id: type: "string" @@ -6104,14 +5994,54 @@ definitions: A bit of everything: type: "object" required: + - "boolValue" + - "bytesValue" - "doubleValue" + - "enumValue" + - "enumValueAnnotation" + - "fixed32Value" + - "fixed64Value" - "floatValue" + - "int32Value" + - "int64OverrideType" - "int64Value" + - "mapValue" + - "mappedNestedValue" + - "mappedStringValue" + - "nested" + - "nestedAnnotation" + - "nestedPathEnumValue" + - "nonConventionalNameValue" + - "oneofEmpty" + - "oneofString" + - "optionalStringField" + - "outputOnlyStringViaFieldBehaviorAnnotation" + - "pathEnumValue" + - "productId" + - "repeatedEnumAnnotation" + - "repeatedEnumValue" + - "repeatedNestedAnnotation" + - "repeatedStringAnnotation" + - "repeatedStringValue" - "requiredStringField1" - "requiredStringField2" - "requiredStringViaFieldBehaviorAnnotation" - "required_field_behavior_json_name_custom" - "required_field_schema_json_name_custom" + - "sfixed32Value" + - "sfixed64Value" + - "singleNested" + - "sint32Value" + - "sint64Value" + - "stringValue" + - "timestampValue" + - "trailingBoth" + - "trailingMultiline" + - "trailingOnly" + - "trailingOnlyDot" + - "uint32Value" + - "uint64Value" + - "uuids" properties: singleNested: $ref: "#/definitions/ABitOfEverythingNested" @@ -6298,14 +6228,54 @@ definitions: A bit of everything_1: type: "object" required: + - "boolValue" + - "bytesValue" - "doubleValue" + - "enumValue" + - "enumValueAnnotation" + - "fixed32Value" + - "fixed64Value" - "floatValue" + - "int32Value" + - "int64OverrideType" - "int64Value" + - "mapValue" + - "mappedNestedValue" + - "mappedStringValue" + - "nested" + - "nestedAnnotation" + - "nestedPathEnumValue" + - "nonConventionalNameValue" + - "oneofEmpty" + - "oneofString" + - "optionalStringField" + - "outputOnlyStringViaFieldBehaviorAnnotation" + - "pathEnumValue" + - "productId" + - "repeatedEnumAnnotation" + - "repeatedEnumValue" + - "repeatedNestedAnnotation" + - "repeatedStringAnnotation" + - "repeatedStringValue" - "requiredStringField1" - "requiredStringField2" - "requiredStringViaFieldBehaviorAnnotation" - "required_field_behavior_json_name_custom" - "required_field_schema_json_name_custom" + - "sfixed32Value" + - "sfixed64Value" + - "singleNested" + - "sint32Value" + - "sint64Value" + - "stringValue" + - "timestampValue" + - "trailingBoth" + - "trailingMultiline" + - "trailingOnly" + - "trailingOnlyDot" + - "uint32Value" + - "uint64Value" + - "uuids" properties: singleNested: $ref: "#/definitions/ABitOfEverythingNested" diff --git a/examples/internal/clients/abe/api_a_bit_of_everything.go b/examples/internal/clients/abe/api_a_bit_of_everything.go index 3b0cbb26dfb..61558d11e86 100644 --- a/examples/internal/clients/abe/api_a_bit_of_everything.go +++ b/examples/internal/clients/abe/api_a_bit_of_everything.go @@ -12,12 +12,13 @@ package abe import ( "context" + "fmt" + "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" + "time" ) // Linger please @@ -27,19 +28,19 @@ var ( type ABitOfEverythingApiService service -/* +/* ABitOfEverythingApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuid + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuid @return interface{} */ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceDelete(ctx context.Context, uuid string) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Delete") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Delete") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -78,7 +79,7 @@ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceDelete(ctx context.C key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -99,202 +100,160 @@ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceDelete(ctx context.C if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName + * @param singleNestedName name is nested field. + * @param singleNestedAmount + * @param singleNestedOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. * @param floatValue Float value field * @param doubleValue * @param int64Value + * @param uint64Value + * @param int32Value + * @param fixed64Value + * @param fixed32Value + * @param boolValue + * @param stringValue + * @param bytesValue + * @param uint32Value + * @param enumValue - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param pathEnumValue + * @param nestedPathEnumValue + * @param sfixed32Value + * @param sfixed64Value + * @param sint32Value + * @param sint64Value + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param nonConventionalNameValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param enumValueAnnotation Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationName name is nested field. + * @param nestedAnnotationAmount + * @param nestedAnnotationOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceGetQueryOpts - Optional Parameters: - * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return interface{} */ -type ABitOfEverythingServiceGetQueryOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceGetQueryOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingApiService) ABitOfEverythingServiceGetQuery(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceGetQueryOpts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingApiService) ABitOfEverythingServiceGetQuery(ctx context.Context, uuidName 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, pathEnumValue string, nestedPathEnumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, enumValueAnnotation string, repeatedStringAnnotation []string, nestedAnnotationName string, nestedAnnotationAmount int64, nestedAnnotationOk string, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceGetQueryOpts) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -306,143 +265,59 @@ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceGetQuery(ctx context localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SingleNestedName.IsSet() { - localVarQueryParams.Add("singleNested.name", parameterToString(localVarOptionals.SingleNestedName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedAmount.IsSet() { - localVarQueryParams.Add("singleNested.amount", parameterToString(localVarOptionals.SingleNestedAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedOk.IsSet() { - localVarQueryParams.Add("singleNested.ok", parameterToString(localVarOptionals.SingleNestedOk.Value(), "")) - } + localVarQueryParams.Add("singleNested.name", parameterToString(singleNestedName, "")) + localVarQueryParams.Add("singleNested.amount", parameterToString(singleNestedAmount, "")) + localVarQueryParams.Add("singleNested.ok", parameterToString(singleNestedOk, "")) localVarQueryParams.Add("floatValue", parameterToString(floatValue, "")) localVarQueryParams.Add("doubleValue", parameterToString(doubleValue, "")) localVarQueryParams.Add("int64Value", parameterToString(int64Value, "")) - if localVarOptionals != nil && localVarOptionals.Uint64Value.IsSet() { - localVarQueryParams.Add("uint64Value", parameterToString(localVarOptionals.Uint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int32Value.IsSet() { - localVarQueryParams.Add("int32Value", parameterToString(localVarOptionals.Int32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed64Value.IsSet() { - localVarQueryParams.Add("fixed64Value", parameterToString(localVarOptionals.Fixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed32Value.IsSet() { - localVarQueryParams.Add("fixed32Value", parameterToString(localVarOptionals.Fixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BoolValue.IsSet() { - localVarQueryParams.Add("boolValue", parameterToString(localVarOptionals.BoolValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StringValue.IsSet() { - localVarQueryParams.Add("stringValue", parameterToString(localVarOptionals.StringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uint32Value.IsSet() { - localVarQueryParams.Add("uint32Value", parameterToString(localVarOptionals.Uint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EnumValue.IsSet() { - localVarQueryParams.Add("enumValue", parameterToString(localVarOptionals.EnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.PathEnumValue.IsSet() { - localVarQueryParams.Add("pathEnumValue", parameterToString(localVarOptionals.PathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedPathEnumValue.IsSet() { - localVarQueryParams.Add("nestedPathEnumValue", parameterToString(localVarOptionals.NestedPathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed32Value.IsSet() { - localVarQueryParams.Add("sfixed32Value", parameterToString(localVarOptionals.Sfixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed64Value.IsSet() { - localVarQueryParams.Add("sfixed64Value", parameterToString(localVarOptionals.Sfixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint32Value.IsSet() { - localVarQueryParams.Add("sint32Value", parameterToString(localVarOptionals.Sint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint64Value.IsSet() { - localVarQueryParams.Add("sint64Value", parameterToString(localVarOptionals.Sint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NonConventionalNameValue.IsSet() { - localVarQueryParams.Add("nonConventionalNameValue", parameterToString(localVarOptionals.NonConventionalNameValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.EnumValueAnnotation.IsSet() { - localVarQueryParams.Add("enumValueAnnotation", parameterToString(localVarOptionals.EnumValueAnnotation.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationName.IsSet() { - localVarQueryParams.Add("nestedAnnotation.name", parameterToString(localVarOptionals.NestedAnnotationName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationOk.IsSet() { - localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(localVarOptionals.NestedAnnotationOk.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("uint64Value", parameterToString(uint64Value, "")) + localVarQueryParams.Add("int32Value", parameterToString(int32Value, "")) + localVarQueryParams.Add("fixed64Value", parameterToString(fixed64Value, "")) + localVarQueryParams.Add("fixed32Value", parameterToString(fixed32Value, "")) + localVarQueryParams.Add("boolValue", parameterToString(boolValue, "")) + localVarQueryParams.Add("stringValue", parameterToString(stringValue, "")) + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("uint32Value", parameterToString(uint32Value, "")) + localVarQueryParams.Add("enumValue", parameterToString(enumValue, "")) + localVarQueryParams.Add("pathEnumValue", parameterToString(pathEnumValue, "")) + localVarQueryParams.Add("nestedPathEnumValue", parameterToString(nestedPathEnumValue, "")) + localVarQueryParams.Add("sfixed32Value", parameterToString(sfixed32Value, "")) + localVarQueryParams.Add("sfixed64Value", parameterToString(sfixed64Value, "")) + localVarQueryParams.Add("sint32Value", parameterToString(sint32Value, "")) + localVarQueryParams.Add("sint64Value", parameterToString(sint64Value, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("nonConventionalNameValue", parameterToString(nonConventionalNameValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("enumValueAnnotation", parameterToString(enumValueAnnotation, "")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.name", parameterToString(nestedAnnotationName, "")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(nestedAnnotationOk, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -478,103 +353,103 @@ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceGetQuery(ctx context if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body @return interface{} */ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceOverwriteRequestContentType(ctx context.Context, body ExamplepbBody) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -614,7 +489,7 @@ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceOverwriteRequestCont key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -635,102 +510,102 @@ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceOverwriteRequestCont if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return string */ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceOverwriteResponseContentType(ctx context.Context) (string, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue string ) @@ -768,7 +643,7 @@ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceOverwriteResponseCon key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -789,84 +664,84 @@ func (a *ABitOfEverythingApiService) ABitOfEverythingServiceOverwriteResponseCon if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/abe/api_a_bit_of_everything_service.go b/examples/internal/clients/abe/api_a_bit_of_everything_service.go index cc9a36e48e0..7ea302cbc6d 100644 --- a/examples/internal/clients/abe/api_a_bit_of_everything_service.go +++ b/examples/internal/clients/abe/api_a_bit_of_everything_service.go @@ -12,12 +12,13 @@ package abe import ( "context" + "fmt" + "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" + "time" ) // Linger please @@ -27,19 +28,19 @@ var ( type ABitOfEverythingServiceApiService service -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternalNestedPathEnum(ctx context.Context, value string) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -78,7 +79,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternal key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -99,103 +100,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternal if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternalPathEnum(ctx context.Context, value string) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -234,7 +235,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternal key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -255,199 +256,159 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternal if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param singleNestedName name is nested field. + * @param singleNestedAmount + * @param singleNestedOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. * @param uuid * @param floatValue Float value field * @param doubleValue * @param int64Value + * @param uint64Value + * @param int32Value + * @param fixed64Value + * @param fixed32Value + * @param boolValue + * @param stringValue + * @param bytesValue + * @param uint32Value + * @param enumValue - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param pathEnumValue + * @param nestedPathEnumValue + * @param sfixed32Value + * @param sfixed64Value + * @param sint32Value + * @param sint64Value + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param nonConventionalNameValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param enumValueAnnotation Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationAmount + * @param nestedAnnotationOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceCheckGetQueryParamsOpts - Optional Parameters: - * @param "SingleNestedAmount" (optional.Int64) - - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCheckGetQueryParamsOpts struct { - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceCheckGetQueryParamsOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckGetQueryParams(ctx context.Context, singleNestedName string, uuid string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceCheckGetQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckGetQueryParams(ctx context.Context, singleNestedName string, singleNestedAmount int64, singleNestedOk string, uuid 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, pathEnumValue string, nestedPathEnumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, enumValueAnnotation string, repeatedStringAnnotation []string, nestedAnnotationAmount int64, nestedAnnotationOk string, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceCheckGetQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -459,138 +420,58 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckGetQuery localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SingleNestedAmount.IsSet() { - localVarQueryParams.Add("singleNested.amount", parameterToString(localVarOptionals.SingleNestedAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedOk.IsSet() { - localVarQueryParams.Add("singleNested.ok", parameterToString(localVarOptionals.SingleNestedOk.Value(), "")) - } + localVarQueryParams.Add("singleNested.amount", parameterToString(singleNestedAmount, "")) + localVarQueryParams.Add("singleNested.ok", parameterToString(singleNestedOk, "")) localVarQueryParams.Add("uuid", parameterToString(uuid, "")) localVarQueryParams.Add("floatValue", parameterToString(floatValue, "")) localVarQueryParams.Add("doubleValue", parameterToString(doubleValue, "")) localVarQueryParams.Add("int64Value", parameterToString(int64Value, "")) - if localVarOptionals != nil && localVarOptionals.Uint64Value.IsSet() { - localVarQueryParams.Add("uint64Value", parameterToString(localVarOptionals.Uint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int32Value.IsSet() { - localVarQueryParams.Add("int32Value", parameterToString(localVarOptionals.Int32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed64Value.IsSet() { - localVarQueryParams.Add("fixed64Value", parameterToString(localVarOptionals.Fixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed32Value.IsSet() { - localVarQueryParams.Add("fixed32Value", parameterToString(localVarOptionals.Fixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BoolValue.IsSet() { - localVarQueryParams.Add("boolValue", parameterToString(localVarOptionals.BoolValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StringValue.IsSet() { - localVarQueryParams.Add("stringValue", parameterToString(localVarOptionals.StringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uint32Value.IsSet() { - localVarQueryParams.Add("uint32Value", parameterToString(localVarOptionals.Uint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EnumValue.IsSet() { - localVarQueryParams.Add("enumValue", parameterToString(localVarOptionals.EnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.PathEnumValue.IsSet() { - localVarQueryParams.Add("pathEnumValue", parameterToString(localVarOptionals.PathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedPathEnumValue.IsSet() { - localVarQueryParams.Add("nestedPathEnumValue", parameterToString(localVarOptionals.NestedPathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed32Value.IsSet() { - localVarQueryParams.Add("sfixed32Value", parameterToString(localVarOptionals.Sfixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed64Value.IsSet() { - localVarQueryParams.Add("sfixed64Value", parameterToString(localVarOptionals.Sfixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint32Value.IsSet() { - localVarQueryParams.Add("sint32Value", parameterToString(localVarOptionals.Sint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint64Value.IsSet() { - localVarQueryParams.Add("sint64Value", parameterToString(localVarOptionals.Sint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NonConventionalNameValue.IsSet() { - localVarQueryParams.Add("nonConventionalNameValue", parameterToString(localVarOptionals.NonConventionalNameValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.EnumValueAnnotation.IsSet() { - localVarQueryParams.Add("enumValueAnnotation", parameterToString(localVarOptionals.EnumValueAnnotation.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationOk.IsSet() { - localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(localVarOptionals.NestedAnnotationOk.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("uint64Value", parameterToString(uint64Value, "")) + localVarQueryParams.Add("int32Value", parameterToString(int32Value, "")) + localVarQueryParams.Add("fixed64Value", parameterToString(fixed64Value, "")) + localVarQueryParams.Add("fixed32Value", parameterToString(fixed32Value, "")) + localVarQueryParams.Add("boolValue", parameterToString(boolValue, "")) + localVarQueryParams.Add("stringValue", parameterToString(stringValue, "")) + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("uint32Value", parameterToString(uint32Value, "")) + localVarQueryParams.Add("enumValue", parameterToString(enumValue, "")) + localVarQueryParams.Add("pathEnumValue", parameterToString(pathEnumValue, "")) + localVarQueryParams.Add("nestedPathEnumValue", parameterToString(nestedPathEnumValue, "")) + localVarQueryParams.Add("sfixed32Value", parameterToString(sfixed32Value, "")) + localVarQueryParams.Add("sfixed64Value", parameterToString(sfixed64Value, "")) + localVarQueryParams.Add("sint32Value", parameterToString(sint32Value, "")) + localVarQueryParams.Add("sint64Value", parameterToString(sint64Value, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("nonConventionalNameValue", parameterToString(nonConventionalNameValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("enumValueAnnotation", parameterToString(enumValueAnnotation, "")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(nestedAnnotationOk, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -618,7 +499,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckGetQuery key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -639,199 +520,159 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckGetQuery if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param singleNestedOk DeepEnum description. + * @param singleNestedName name is nested field. + * @param singleNestedAmount * @param uuid * @param floatValue Float value field * @param doubleValue * @param int64Value + * @param uint64Value + * @param int32Value + * @param fixed64Value + * @param fixed32Value + * @param boolValue + * @param stringValue + * @param bytesValue + * @param uint32Value + * @param enumValue - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param pathEnumValue + * @param nestedPathEnumValue + * @param sfixed32Value + * @param sfixed64Value + * @param sint32Value + * @param sint64Value + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param nonConventionalNameValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param enumValueAnnotation Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationName name is nested field. + * @param nestedAnnotationAmount + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts - Optional Parameters: - * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckNestedEnumGetQueryParams(ctx context.Context, singleNestedOk string, uuid string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckNestedEnumGetQueryParams(ctx context.Context, singleNestedOk string, singleNestedName string, singleNestedAmount int64, uuid 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, pathEnumValue string, nestedPathEnumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, enumValueAnnotation string, repeatedStringAnnotation []string, nestedAnnotationName string, nestedAnnotationAmount int64, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -843,138 +684,58 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckNestedEn localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SingleNestedName.IsSet() { - localVarQueryParams.Add("singleNested.name", parameterToString(localVarOptionals.SingleNestedName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedAmount.IsSet() { - localVarQueryParams.Add("singleNested.amount", parameterToString(localVarOptionals.SingleNestedAmount.Value(), "")) - } + localVarQueryParams.Add("singleNested.name", parameterToString(singleNestedName, "")) + localVarQueryParams.Add("singleNested.amount", parameterToString(singleNestedAmount, "")) localVarQueryParams.Add("uuid", parameterToString(uuid, "")) localVarQueryParams.Add("floatValue", parameterToString(floatValue, "")) localVarQueryParams.Add("doubleValue", parameterToString(doubleValue, "")) localVarQueryParams.Add("int64Value", parameterToString(int64Value, "")) - if localVarOptionals != nil && localVarOptionals.Uint64Value.IsSet() { - localVarQueryParams.Add("uint64Value", parameterToString(localVarOptionals.Uint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int32Value.IsSet() { - localVarQueryParams.Add("int32Value", parameterToString(localVarOptionals.Int32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed64Value.IsSet() { - localVarQueryParams.Add("fixed64Value", parameterToString(localVarOptionals.Fixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed32Value.IsSet() { - localVarQueryParams.Add("fixed32Value", parameterToString(localVarOptionals.Fixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BoolValue.IsSet() { - localVarQueryParams.Add("boolValue", parameterToString(localVarOptionals.BoolValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StringValue.IsSet() { - localVarQueryParams.Add("stringValue", parameterToString(localVarOptionals.StringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uint32Value.IsSet() { - localVarQueryParams.Add("uint32Value", parameterToString(localVarOptionals.Uint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EnumValue.IsSet() { - localVarQueryParams.Add("enumValue", parameterToString(localVarOptionals.EnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.PathEnumValue.IsSet() { - localVarQueryParams.Add("pathEnumValue", parameterToString(localVarOptionals.PathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedPathEnumValue.IsSet() { - localVarQueryParams.Add("nestedPathEnumValue", parameterToString(localVarOptionals.NestedPathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed32Value.IsSet() { - localVarQueryParams.Add("sfixed32Value", parameterToString(localVarOptionals.Sfixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed64Value.IsSet() { - localVarQueryParams.Add("sfixed64Value", parameterToString(localVarOptionals.Sfixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint32Value.IsSet() { - localVarQueryParams.Add("sint32Value", parameterToString(localVarOptionals.Sint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint64Value.IsSet() { - localVarQueryParams.Add("sint64Value", parameterToString(localVarOptionals.Sint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NonConventionalNameValue.IsSet() { - localVarQueryParams.Add("nonConventionalNameValue", parameterToString(localVarOptionals.NonConventionalNameValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.EnumValueAnnotation.IsSet() { - localVarQueryParams.Add("enumValueAnnotation", parameterToString(localVarOptionals.EnumValueAnnotation.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationName.IsSet() { - localVarQueryParams.Add("nestedAnnotation.name", parameterToString(localVarOptionals.NestedAnnotationName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("uint64Value", parameterToString(uint64Value, "")) + localVarQueryParams.Add("int32Value", parameterToString(int32Value, "")) + localVarQueryParams.Add("fixed64Value", parameterToString(fixed64Value, "")) + localVarQueryParams.Add("fixed32Value", parameterToString(fixed32Value, "")) + localVarQueryParams.Add("boolValue", parameterToString(boolValue, "")) + localVarQueryParams.Add("stringValue", parameterToString(stringValue, "")) + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("uint32Value", parameterToString(uint32Value, "")) + localVarQueryParams.Add("enumValue", parameterToString(enumValue, "")) + localVarQueryParams.Add("pathEnumValue", parameterToString(pathEnumValue, "")) + localVarQueryParams.Add("nestedPathEnumValue", parameterToString(nestedPathEnumValue, "")) + localVarQueryParams.Add("sfixed32Value", parameterToString(sfixed32Value, "")) + localVarQueryParams.Add("sfixed64Value", parameterToString(sfixed64Value, "")) + localVarQueryParams.Add("sint32Value", parameterToString(sint32Value, "")) + localVarQueryParams.Add("sint64Value", parameterToString(sint64Value, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("nonConventionalNameValue", parameterToString(nonConventionalNameValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("enumValueAnnotation", parameterToString(enumValueAnnotation, "")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.name", parameterToString(nestedAnnotationName, "")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -1002,7 +763,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckNestedEn key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -1023,91 +784,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckNestedEn if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param stringValue @@ -1116,103 +877,65 @@ ABitOfEverythingServiceApiService * @param floatValue Float value field * @param doubleValue * @param int64Value + * @param uint64Value + * @param int32Value + * @param fixed64Value + * @param fixed32Value + * @param boolValue + * @param bytesValue + * @param uint32Value + * @param enumValue - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param pathEnumValue + * @param nestedPathEnumValue + * @param sfixed32Value + * @param sfixed64Value + * @param sint32Value + * @param sint64Value + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param nonConventionalNameValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param enumValueAnnotation Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationName name is nested field. + * @param nestedAnnotationAmount + * @param nestedAnnotationOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceCheckPostQueryParamsOpts - Optional Parameters: - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCheckPostQueryParamsOpts struct { - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceCheckPostQueryParamsOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckPostQueryParams(ctx context.Context, stringValue string, singleNested ABitOfEverythingNested, uuid string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceCheckPostQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckPostQueryParams(ctx context.Context, stringValue string, singleNested ABitOfEverythingNested, uuid string, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, bytesValue string, uint32Value int64, enumValue string, pathEnumValue string, nestedPathEnumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, enumValueAnnotation string, repeatedStringAnnotation []string, nestedAnnotationName string, nestedAnnotationAmount int64, nestedAnnotationOk string, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceCheckPostQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -1228,128 +951,52 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckPostQuer localVarQueryParams.Add("floatValue", parameterToString(floatValue, "")) localVarQueryParams.Add("doubleValue", parameterToString(doubleValue, "")) localVarQueryParams.Add("int64Value", parameterToString(int64Value, "")) - if localVarOptionals != nil && localVarOptionals.Uint64Value.IsSet() { - localVarQueryParams.Add("uint64Value", parameterToString(localVarOptionals.Uint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int32Value.IsSet() { - localVarQueryParams.Add("int32Value", parameterToString(localVarOptionals.Int32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed64Value.IsSet() { - localVarQueryParams.Add("fixed64Value", parameterToString(localVarOptionals.Fixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed32Value.IsSet() { - localVarQueryParams.Add("fixed32Value", parameterToString(localVarOptionals.Fixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BoolValue.IsSet() { - localVarQueryParams.Add("boolValue", parameterToString(localVarOptionals.BoolValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uint32Value.IsSet() { - localVarQueryParams.Add("uint32Value", parameterToString(localVarOptionals.Uint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EnumValue.IsSet() { - localVarQueryParams.Add("enumValue", parameterToString(localVarOptionals.EnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.PathEnumValue.IsSet() { - localVarQueryParams.Add("pathEnumValue", parameterToString(localVarOptionals.PathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedPathEnumValue.IsSet() { - localVarQueryParams.Add("nestedPathEnumValue", parameterToString(localVarOptionals.NestedPathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed32Value.IsSet() { - localVarQueryParams.Add("sfixed32Value", parameterToString(localVarOptionals.Sfixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed64Value.IsSet() { - localVarQueryParams.Add("sfixed64Value", parameterToString(localVarOptionals.Sfixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint32Value.IsSet() { - localVarQueryParams.Add("sint32Value", parameterToString(localVarOptionals.Sint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint64Value.IsSet() { - localVarQueryParams.Add("sint64Value", parameterToString(localVarOptionals.Sint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NonConventionalNameValue.IsSet() { - localVarQueryParams.Add("nonConventionalNameValue", parameterToString(localVarOptionals.NonConventionalNameValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.EnumValueAnnotation.IsSet() { - localVarQueryParams.Add("enumValueAnnotation", parameterToString(localVarOptionals.EnumValueAnnotation.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationName.IsSet() { - localVarQueryParams.Add("nestedAnnotation.name", parameterToString(localVarOptionals.NestedAnnotationName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationOk.IsSet() { - localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(localVarOptionals.NestedAnnotationOk.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("uint64Value", parameterToString(uint64Value, "")) + localVarQueryParams.Add("int32Value", parameterToString(int32Value, "")) + localVarQueryParams.Add("fixed64Value", parameterToString(fixed64Value, "")) + localVarQueryParams.Add("fixed32Value", parameterToString(fixed32Value, "")) + localVarQueryParams.Add("boolValue", parameterToString(boolValue, "")) + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("uint32Value", parameterToString(uint32Value, "")) + localVarQueryParams.Add("enumValue", parameterToString(enumValue, "")) + localVarQueryParams.Add("pathEnumValue", parameterToString(pathEnumValue, "")) + localVarQueryParams.Add("nestedPathEnumValue", parameterToString(nestedPathEnumValue, "")) + localVarQueryParams.Add("sfixed32Value", parameterToString(sfixed32Value, "")) + localVarQueryParams.Add("sfixed64Value", parameterToString(sfixed64Value, "")) + localVarQueryParams.Add("sint32Value", parameterToString(sint32Value, "")) + localVarQueryParams.Add("sint64Value", parameterToString(sint64Value, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("nonConventionalNameValue", parameterToString(nonConventionalNameValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("enumValueAnnotation", parameterToString(enumValueAnnotation, "")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.name", parameterToString(nestedAnnotationName, "")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(nestedAnnotationOk, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -1379,7 +1026,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckPostQuer key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -1400,102 +1047,102 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckPostQuer if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return ExamplepbCheckStatusResponse */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckStatus(ctx context.Context) (ExamplepbCheckStatusResponse, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbCheckStatusResponse ) @@ -1533,7 +1180,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckStatus(c key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -1554,91 +1201,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckStatus(c if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbCheckStatusResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService Create a new ABitOfEverything This API creates a new ABitOfEverything * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @@ -1661,80 +1308,54 @@ This API creates a new ABitOfEverything * @param pathEnumValue * @param nestedPathEnumValue * @param enumValueAnnotation Numeric enum description. + * @param singleNestedName name is nested field. + * @param singleNestedAmount + * @param singleNestedOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. * @param uuid + * @param bytesValue + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationName name is nested field. + * @param nestedAnnotationAmount + * @param nestedAnnotationOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceCreateOpts - Optional Parameters: - * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "BytesValue" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCreateOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - BytesValue optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceCreateOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreate(ctx context.Context, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, uint32Value int64, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, nonConventionalNameValue string, enumValue string, pathEnumValue string, nestedPathEnumValue string, enumValueAnnotation string, uuid string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceCreateOpts) (ExamplepbABitOfEverything, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreate(ctx context.Context, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, uint32Value int64, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, nonConventionalNameValue string, enumValue string, pathEnumValue string, nestedPathEnumValue string, enumValueAnnotation string, singleNestedName string, singleNestedAmount int64, singleNestedOk string, uuid string, bytesValue string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, repeatedStringAnnotation []string, nestedAnnotationName string, nestedAnnotationAmount int64, nestedAnnotationOk string, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceCreateOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -1764,93 +1385,41 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreate(ctx co localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SingleNestedName.IsSet() { - localVarQueryParams.Add("singleNested.name", parameterToString(localVarOptionals.SingleNestedName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedAmount.IsSet() { - localVarQueryParams.Add("singleNested.amount", parameterToString(localVarOptionals.SingleNestedAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedOk.IsSet() { - localVarQueryParams.Add("singleNested.ok", parameterToString(localVarOptionals.SingleNestedOk.Value(), "")) - } + localVarQueryParams.Add("singleNested.name", parameterToString(singleNestedName, "")) + localVarQueryParams.Add("singleNested.amount", parameterToString(singleNestedAmount, "")) + localVarQueryParams.Add("singleNested.ok", parameterToString(singleNestedOk, "")) localVarQueryParams.Add("uuid", parameterToString(uuid, "")) - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationName.IsSet() { - localVarQueryParams.Add("nestedAnnotation.name", parameterToString(localVarOptionals.NestedAnnotationName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationOk.IsSet() { - localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(localVarOptionals.NestedAnnotationOk.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.name", parameterToString(nestedAnnotationName, "")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(nestedAnnotationOk, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -1878,7 +1447,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreate(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -1899,103 +1468,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreate(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body Intentionally complicated message type to cover many features of Protobuf. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body Intentionally complicated message type to cover many features of Protobuf. @return ExamplepbABitOfEverything */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBody(ctx context.Context, body ExamplepbABitOfEverything) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -2035,7 +1604,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBody(ct key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -2056,111 +1625,105 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBody(ct if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService Create a book. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param parent The publisher in which to create the book. Format: `publishers/{publisher}` Example: `publishers/1257894000000000000` - * @param book The book to create. - * @param optional nil or *ABitOfEverythingServiceCreateBookOpts - Optional Parameters: - * @param "BookId" (optional.String) - The ID to use for the book. This must start with an alphanumeric character. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param parent The publisher in which to create the book. Format: `publishers/{publisher}` Example: `publishers/1257894000000000000` + - @param book The book to create. + - @param bookId The ID to use for the book. This must start with an alphanumeric character. @return ExamplepbBook */ - -type ABitOfEverythingServiceCreateBookOpts struct { - BookId optional.String -} - -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBook(ctx context.Context, parent string, book ExamplepbBook, localVarOptionals *ABitOfEverythingServiceCreateBookOpts) (ExamplepbBook, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBook(ctx context.Context, parent string, book ExamplepbBook, bookId string) (ExamplepbBook, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbBook ) @@ -2172,9 +1735,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBook(ct localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.BookId.IsSet() { - localVarQueryParams.Add("bookId", parameterToString(localVarOptionals.BookId.Value(), "")) - } + localVarQueryParams.Add("bookId", parameterToString(bookId, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -2204,7 +1765,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBook(ct key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -2225,202 +1786,160 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBook(ct if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbBook - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName + * @param singleNestedName name is nested field. + * @param singleNestedAmount + * @param singleNestedOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. * @param floatValue Float value field * @param doubleValue * @param int64Value + * @param uint64Value + * @param int32Value + * @param fixed64Value + * @param fixed32Value + * @param boolValue + * @param stringValue + * @param bytesValue + * @param uint32Value + * @param enumValue - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param pathEnumValue + * @param nestedPathEnumValue + * @param sfixed32Value + * @param sfixed64Value + * @param sint32Value + * @param sint64Value + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param nonConventionalNameValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param enumValueAnnotation Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationName name is nested field. + * @param nestedAnnotationAmount + * @param nestedAnnotationOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceCustomOpts - Optional Parameters: - * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCustomOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceCustomOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustom(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceCustomOpts) (ExamplepbABitOfEverything, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustom(ctx context.Context, uuidName 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, pathEnumValue string, nestedPathEnumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, enumValueAnnotation string, repeatedStringAnnotation []string, nestedAnnotationName string, nestedAnnotationAmount int64, nestedAnnotationOk string, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceCustomOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -2432,143 +1951,59 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustom(ctx co localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SingleNestedName.IsSet() { - localVarQueryParams.Add("singleNested.name", parameterToString(localVarOptionals.SingleNestedName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedAmount.IsSet() { - localVarQueryParams.Add("singleNested.amount", parameterToString(localVarOptionals.SingleNestedAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedOk.IsSet() { - localVarQueryParams.Add("singleNested.ok", parameterToString(localVarOptionals.SingleNestedOk.Value(), "")) - } + localVarQueryParams.Add("singleNested.name", parameterToString(singleNestedName, "")) + localVarQueryParams.Add("singleNested.amount", parameterToString(singleNestedAmount, "")) + localVarQueryParams.Add("singleNested.ok", parameterToString(singleNestedOk, "")) localVarQueryParams.Add("floatValue", parameterToString(floatValue, "")) localVarQueryParams.Add("doubleValue", parameterToString(doubleValue, "")) localVarQueryParams.Add("int64Value", parameterToString(int64Value, "")) - if localVarOptionals != nil && localVarOptionals.Uint64Value.IsSet() { - localVarQueryParams.Add("uint64Value", parameterToString(localVarOptionals.Uint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int32Value.IsSet() { - localVarQueryParams.Add("int32Value", parameterToString(localVarOptionals.Int32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed64Value.IsSet() { - localVarQueryParams.Add("fixed64Value", parameterToString(localVarOptionals.Fixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed32Value.IsSet() { - localVarQueryParams.Add("fixed32Value", parameterToString(localVarOptionals.Fixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BoolValue.IsSet() { - localVarQueryParams.Add("boolValue", parameterToString(localVarOptionals.BoolValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StringValue.IsSet() { - localVarQueryParams.Add("stringValue", parameterToString(localVarOptionals.StringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uint32Value.IsSet() { - localVarQueryParams.Add("uint32Value", parameterToString(localVarOptionals.Uint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EnumValue.IsSet() { - localVarQueryParams.Add("enumValue", parameterToString(localVarOptionals.EnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.PathEnumValue.IsSet() { - localVarQueryParams.Add("pathEnumValue", parameterToString(localVarOptionals.PathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedPathEnumValue.IsSet() { - localVarQueryParams.Add("nestedPathEnumValue", parameterToString(localVarOptionals.NestedPathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed32Value.IsSet() { - localVarQueryParams.Add("sfixed32Value", parameterToString(localVarOptionals.Sfixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed64Value.IsSet() { - localVarQueryParams.Add("sfixed64Value", parameterToString(localVarOptionals.Sfixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint32Value.IsSet() { - localVarQueryParams.Add("sint32Value", parameterToString(localVarOptionals.Sint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint64Value.IsSet() { - localVarQueryParams.Add("sint64Value", parameterToString(localVarOptionals.Sint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NonConventionalNameValue.IsSet() { - localVarQueryParams.Add("nonConventionalNameValue", parameterToString(localVarOptionals.NonConventionalNameValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.EnumValueAnnotation.IsSet() { - localVarQueryParams.Add("enumValueAnnotation", parameterToString(localVarOptionals.EnumValueAnnotation.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationName.IsSet() { - localVarQueryParams.Add("nestedAnnotation.name", parameterToString(localVarOptionals.NestedAnnotationName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationOk.IsSet() { - localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(localVarOptionals.NestedAnnotationOk.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("uint64Value", parameterToString(uint64Value, "")) + localVarQueryParams.Add("int32Value", parameterToString(int32Value, "")) + localVarQueryParams.Add("fixed64Value", parameterToString(fixed64Value, "")) + localVarQueryParams.Add("fixed32Value", parameterToString(fixed32Value, "")) + localVarQueryParams.Add("boolValue", parameterToString(boolValue, "")) + localVarQueryParams.Add("stringValue", parameterToString(stringValue, "")) + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("uint32Value", parameterToString(uint32Value, "")) + localVarQueryParams.Add("enumValue", parameterToString(enumValue, "")) + localVarQueryParams.Add("pathEnumValue", parameterToString(pathEnumValue, "")) + localVarQueryParams.Add("nestedPathEnumValue", parameterToString(nestedPathEnumValue, "")) + localVarQueryParams.Add("sfixed32Value", parameterToString(sfixed32Value, "")) + localVarQueryParams.Add("sfixed64Value", parameterToString(sfixed64Value, "")) + localVarQueryParams.Add("sint32Value", parameterToString(sint32Value, "")) + localVarQueryParams.Add("sint64Value", parameterToString(sint64Value, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("nonConventionalNameValue", parameterToString(nonConventionalNameValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("enumValueAnnotation", parameterToString(enumValueAnnotation, "")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.name", parameterToString(nestedAnnotationName, "")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(nestedAnnotationOk, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -2596,7 +2031,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustom(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -2617,202 +2052,160 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustom(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName + * @param singleNestedName name is nested field. + * @param singleNestedAmount + * @param singleNestedOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. * @param floatValue Float value field * @param doubleValue * @param int64Value + * @param uint64Value + * @param int32Value + * @param fixed64Value + * @param fixed32Value + * @param boolValue + * @param stringValue + * @param bytesValue + * @param uint32Value + * @param enumValue - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param pathEnumValue + * @param nestedPathEnumValue + * @param sfixed32Value + * @param sfixed64Value + * @param sint32Value + * @param sint64Value + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param nonConventionalNameValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param enumValueAnnotation Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationName name is nested field. + * @param nestedAnnotationAmount + * @param nestedAnnotationOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceCustomOptionsRequestOpts - Optional Parameters: - * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return interface{} */ -type ABitOfEverythingServiceCustomOptionsRequestOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceCustomOptionsRequestOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptionsRequest(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceCustomOptionsRequestOpts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptionsRequest(ctx context.Context, uuidName 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, pathEnumValue string, nestedPathEnumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, enumValueAnnotation string, repeatedStringAnnotation []string, nestedAnnotationName string, nestedAnnotationAmount int64, nestedAnnotationOk string, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceCustomOptionsRequestOpts) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Options") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Options") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -2824,143 +2217,59 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptions localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SingleNestedName.IsSet() { - localVarQueryParams.Add("singleNested.name", parameterToString(localVarOptionals.SingleNestedName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedAmount.IsSet() { - localVarQueryParams.Add("singleNested.amount", parameterToString(localVarOptionals.SingleNestedAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedOk.IsSet() { - localVarQueryParams.Add("singleNested.ok", parameterToString(localVarOptionals.SingleNestedOk.Value(), "")) - } + localVarQueryParams.Add("singleNested.name", parameterToString(singleNestedName, "")) + localVarQueryParams.Add("singleNested.amount", parameterToString(singleNestedAmount, "")) + localVarQueryParams.Add("singleNested.ok", parameterToString(singleNestedOk, "")) localVarQueryParams.Add("floatValue", parameterToString(floatValue, "")) localVarQueryParams.Add("doubleValue", parameterToString(doubleValue, "")) localVarQueryParams.Add("int64Value", parameterToString(int64Value, "")) - if localVarOptionals != nil && localVarOptionals.Uint64Value.IsSet() { - localVarQueryParams.Add("uint64Value", parameterToString(localVarOptionals.Uint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int32Value.IsSet() { - localVarQueryParams.Add("int32Value", parameterToString(localVarOptionals.Int32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed64Value.IsSet() { - localVarQueryParams.Add("fixed64Value", parameterToString(localVarOptionals.Fixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed32Value.IsSet() { - localVarQueryParams.Add("fixed32Value", parameterToString(localVarOptionals.Fixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BoolValue.IsSet() { - localVarQueryParams.Add("boolValue", parameterToString(localVarOptionals.BoolValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StringValue.IsSet() { - localVarQueryParams.Add("stringValue", parameterToString(localVarOptionals.StringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uint32Value.IsSet() { - localVarQueryParams.Add("uint32Value", parameterToString(localVarOptionals.Uint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EnumValue.IsSet() { - localVarQueryParams.Add("enumValue", parameterToString(localVarOptionals.EnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.PathEnumValue.IsSet() { - localVarQueryParams.Add("pathEnumValue", parameterToString(localVarOptionals.PathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedPathEnumValue.IsSet() { - localVarQueryParams.Add("nestedPathEnumValue", parameterToString(localVarOptionals.NestedPathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed32Value.IsSet() { - localVarQueryParams.Add("sfixed32Value", parameterToString(localVarOptionals.Sfixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed64Value.IsSet() { - localVarQueryParams.Add("sfixed64Value", parameterToString(localVarOptionals.Sfixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint32Value.IsSet() { - localVarQueryParams.Add("sint32Value", parameterToString(localVarOptionals.Sint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint64Value.IsSet() { - localVarQueryParams.Add("sint64Value", parameterToString(localVarOptionals.Sint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NonConventionalNameValue.IsSet() { - localVarQueryParams.Add("nonConventionalNameValue", parameterToString(localVarOptionals.NonConventionalNameValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.EnumValueAnnotation.IsSet() { - localVarQueryParams.Add("enumValueAnnotation", parameterToString(localVarOptionals.EnumValueAnnotation.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationName.IsSet() { - localVarQueryParams.Add("nestedAnnotation.name", parameterToString(localVarOptionals.NestedAnnotationName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationOk.IsSet() { - localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(localVarOptionals.NestedAnnotationOk.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("uint64Value", parameterToString(uint64Value, "")) + localVarQueryParams.Add("int32Value", parameterToString(int32Value, "")) + localVarQueryParams.Add("fixed64Value", parameterToString(fixed64Value, "")) + localVarQueryParams.Add("fixed32Value", parameterToString(fixed32Value, "")) + localVarQueryParams.Add("boolValue", parameterToString(boolValue, "")) + localVarQueryParams.Add("stringValue", parameterToString(stringValue, "")) + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("uint32Value", parameterToString(uint32Value, "")) + localVarQueryParams.Add("enumValue", parameterToString(enumValue, "")) + localVarQueryParams.Add("pathEnumValue", parameterToString(pathEnumValue, "")) + localVarQueryParams.Add("nestedPathEnumValue", parameterToString(nestedPathEnumValue, "")) + localVarQueryParams.Add("sfixed32Value", parameterToString(sfixed32Value, "")) + localVarQueryParams.Add("sfixed64Value", parameterToString(sfixed64Value, "")) + localVarQueryParams.Add("sint32Value", parameterToString(sint32Value, "")) + localVarQueryParams.Add("sint64Value", parameterToString(sint64Value, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("nonConventionalNameValue", parameterToString(nonConventionalNameValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("enumValueAnnotation", parameterToString(enumValueAnnotation, "")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.name", parameterToString(nestedAnnotationName, "")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(nestedAnnotationOk, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -2988,7 +2297,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptions key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -3009,60 +2318,60 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptions if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param singleNestedName name is nested field. - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param singleNestedName name is nested field. + - @param body @return ExamplepbABitOfEverything */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDeepPathEcho(ctx context.Context, singleNestedName string, body ABitOfEverythingServiceDeepPathEchoBody) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -3103,7 +2412,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDeepPathEcho( key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -3124,202 +2433,160 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDeepPathEcho( if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName + * @param singleNestedName name is nested field. + * @param singleNestedAmount + * @param singleNestedOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. * @param floatValue Float value field * @param doubleValue * @param int64Value + * @param uint64Value + * @param int32Value + * @param fixed64Value + * @param fixed32Value + * @param boolValue + * @param stringValue + * @param bytesValue + * @param uint32Value + * @param enumValue - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param pathEnumValue + * @param nestedPathEnumValue + * @param sfixed32Value + * @param sfixed64Value + * @param sint32Value + * @param sint64Value + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param nonConventionalNameValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param enumValueAnnotation Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationName name is nested field. + * @param nestedAnnotationAmount + * @param nestedAnnotationOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceDoubleColonOpts - Optional Parameters: - * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceDoubleColonOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceDoubleColonOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDoubleColon(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceDoubleColonOpts) (ExamplepbABitOfEverything, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDoubleColon(ctx context.Context, uuidName 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, pathEnumValue string, nestedPathEnumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, enumValueAnnotation string, repeatedStringAnnotation []string, nestedAnnotationName string, nestedAnnotationAmount int64, nestedAnnotationOk string, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceDoubleColonOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -3331,143 +2598,59 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDoubleColon(c localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SingleNestedName.IsSet() { - localVarQueryParams.Add("singleNested.name", parameterToString(localVarOptionals.SingleNestedName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedAmount.IsSet() { - localVarQueryParams.Add("singleNested.amount", parameterToString(localVarOptionals.SingleNestedAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedOk.IsSet() { - localVarQueryParams.Add("singleNested.ok", parameterToString(localVarOptionals.SingleNestedOk.Value(), "")) - } + localVarQueryParams.Add("singleNested.name", parameterToString(singleNestedName, "")) + localVarQueryParams.Add("singleNested.amount", parameterToString(singleNestedAmount, "")) + localVarQueryParams.Add("singleNested.ok", parameterToString(singleNestedOk, "")) localVarQueryParams.Add("floatValue", parameterToString(floatValue, "")) localVarQueryParams.Add("doubleValue", parameterToString(doubleValue, "")) localVarQueryParams.Add("int64Value", parameterToString(int64Value, "")) - if localVarOptionals != nil && localVarOptionals.Uint64Value.IsSet() { - localVarQueryParams.Add("uint64Value", parameterToString(localVarOptionals.Uint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int32Value.IsSet() { - localVarQueryParams.Add("int32Value", parameterToString(localVarOptionals.Int32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed64Value.IsSet() { - localVarQueryParams.Add("fixed64Value", parameterToString(localVarOptionals.Fixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed32Value.IsSet() { - localVarQueryParams.Add("fixed32Value", parameterToString(localVarOptionals.Fixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BoolValue.IsSet() { - localVarQueryParams.Add("boolValue", parameterToString(localVarOptionals.BoolValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StringValue.IsSet() { - localVarQueryParams.Add("stringValue", parameterToString(localVarOptionals.StringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uint32Value.IsSet() { - localVarQueryParams.Add("uint32Value", parameterToString(localVarOptionals.Uint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EnumValue.IsSet() { - localVarQueryParams.Add("enumValue", parameterToString(localVarOptionals.EnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.PathEnumValue.IsSet() { - localVarQueryParams.Add("pathEnumValue", parameterToString(localVarOptionals.PathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedPathEnumValue.IsSet() { - localVarQueryParams.Add("nestedPathEnumValue", parameterToString(localVarOptionals.NestedPathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed32Value.IsSet() { - localVarQueryParams.Add("sfixed32Value", parameterToString(localVarOptionals.Sfixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed64Value.IsSet() { - localVarQueryParams.Add("sfixed64Value", parameterToString(localVarOptionals.Sfixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint32Value.IsSet() { - localVarQueryParams.Add("sint32Value", parameterToString(localVarOptionals.Sint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint64Value.IsSet() { - localVarQueryParams.Add("sint64Value", parameterToString(localVarOptionals.Sint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NonConventionalNameValue.IsSet() { - localVarQueryParams.Add("nonConventionalNameValue", parameterToString(localVarOptionals.NonConventionalNameValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.EnumValueAnnotation.IsSet() { - localVarQueryParams.Add("enumValueAnnotation", parameterToString(localVarOptionals.EnumValueAnnotation.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationName.IsSet() { - localVarQueryParams.Add("nestedAnnotation.name", parameterToString(localVarOptionals.NestedAnnotationName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationOk.IsSet() { - localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(localVarOptionals.NestedAnnotationOk.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("uint64Value", parameterToString(uint64Value, "")) + localVarQueryParams.Add("int32Value", parameterToString(int32Value, "")) + localVarQueryParams.Add("fixed64Value", parameterToString(fixed64Value, "")) + localVarQueryParams.Add("fixed32Value", parameterToString(fixed32Value, "")) + localVarQueryParams.Add("boolValue", parameterToString(boolValue, "")) + localVarQueryParams.Add("stringValue", parameterToString(stringValue, "")) + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("uint32Value", parameterToString(uint32Value, "")) + localVarQueryParams.Add("enumValue", parameterToString(enumValue, "")) + localVarQueryParams.Add("pathEnumValue", parameterToString(pathEnumValue, "")) + localVarQueryParams.Add("nestedPathEnumValue", parameterToString(nestedPathEnumValue, "")) + localVarQueryParams.Add("sfixed32Value", parameterToString(sfixed32Value, "")) + localVarQueryParams.Add("sfixed64Value", parameterToString(sfixed64Value, "")) + localVarQueryParams.Add("sint32Value", parameterToString(sint32Value, "")) + localVarQueryParams.Add("sint64Value", parameterToString(sint64Value, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("nonConventionalNameValue", parameterToString(nonConventionalNameValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("enumValueAnnotation", parameterToString(enumValueAnnotation, "")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.name", parameterToString(nestedAnnotationName, "")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(nestedAnnotationOk, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -3495,7 +2678,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDoubleColon(c key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -3516,102 +2699,102 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDoubleColon(c if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceErrorWithDetails(ctx context.Context) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -3649,7 +2832,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceErrorWithDeta key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -3670,202 +2853,160 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceErrorWithDeta if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName + * @param singleNestedName name is nested field. + * @param singleNestedAmount + * @param singleNestedOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. * @param floatValue Float value field * @param doubleValue * @param int64Value + * @param uint64Value + * @param int32Value + * @param fixed64Value + * @param fixed32Value + * @param boolValue + * @param stringValue + * @param bytesValue + * @param uint32Value + * @param enumValue - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param pathEnumValue + * @param nestedPathEnumValue + * @param sfixed32Value + * @param sfixed64Value + * @param sint32Value + * @param sint64Value + * @param repeatedStringValue + * @param oneofEmpty + * @param oneofString + * @param mapValue map of numeric enum + * @param mappedStringValue Map of string title Map of string description. + * @param mappedNestedValue + * @param nonConventionalNameValue + * @param timestampValue + * @param repeatedEnumValue repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedEnumAnnotation Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param enumValueAnnotation Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 + * @param repeatedStringAnnotation Repeated string title Repeated string description. + * @param nestedAnnotationName name is nested field. + * @param nestedAnnotationAmount + * @param nestedAnnotationOk DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. + * @param int64OverrideType * @param requiredStringViaFieldBehaviorAnnotation mark a field as required in Open API definition + * @param outputOnlyStringViaFieldBehaviorAnnotation mark a field as readonly in Open API definition + * @param productId Test openapiv2 generation of repeated fields Only digits are allowed. + * @param optionalStringField Test openapiv2 generation of required fields with annotation and jsonschema to reproduce * @param requiredStringField1 * @param requiredStringField2 * @param requiredFieldBehaviorJsonNameCustom Test openapiv2 handling of required json_name fields * @param requiredFieldSchemaJsonNameCustom + * @param trailingOnly Trailing only + * @param trailingOnlyDot Trailing only dot. + * @param trailingBoth Leading both Trailing both. + * @param trailingMultiline Leading multiline This is an example of a multi-line comment. Trailing multiline. + * @param uuids Specify a custom format of repeated field items * @param optional nil or *ABitOfEverythingServiceExistsOpts - Optional Parameters: - * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofEmpty" (optional.Interface of map[string]string) - - * @param "OneofString" (optional.String) - - * @param "MapValue" (optional.Interface of interface{}) - map of numeric enum - * @param "MappedStringValue" (optional.String) - Map of string title Map of string description. - * @param "MappedNestedValue" (optional.Interface of interface{}) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. - * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce - * @param "TrailingOnly" (optional.String) - Trailing only - * @param "TrailingOnlyDot" (optional.String) - Trailing only dot. - * @param "TrailingBoth" (optional.String) - Leading both Trailing both. - * @param "TrailingMultiline" (optional.String) - Leading multiline This is an example of a multi-line comment. Trailing multiline. - * @param "Uuids" (optional.Interface of []string) - Specify a custom format of repeated field items + * @param "OptionalStringValue" (optional.String) - @return interface{} */ -type ABitOfEverythingServiceExistsOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofEmpty optional.Interface - OneofString optional.String - MapValue optional.Interface - MappedStringValue optional.String - MappedNestedValue optional.Interface - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 - OutputOnlyStringViaFieldBehaviorAnnotation optional.String +type ABitOfEverythingServiceExistsOpts struct { OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String - TrailingOnly optional.String - TrailingOnlyDot optional.String - TrailingBoth optional.String - TrailingMultiline optional.String - Uuids optional.Interface } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, localVarOptionals *ABitOfEverythingServiceExistsOpts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx context.Context, uuidName 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, pathEnumValue string, nestedPathEnumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofEmpty map[string]string, oneofString string, mapValue interface{}, mappedStringValue string, mappedNestedValue interface{}, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string, repeatedEnumAnnotation []string, enumValueAnnotation string, repeatedStringAnnotation []string, nestedAnnotationName string, nestedAnnotationAmount int64, nestedAnnotationOk string, int64OverrideType int64, requiredStringViaFieldBehaviorAnnotation string, outputOnlyStringViaFieldBehaviorAnnotation string, productId []string, optionalStringField string, requiredStringField1 string, requiredStringField2 string, requiredFieldBehaviorJsonNameCustom string, requiredFieldSchemaJsonNameCustom string, trailingOnly string, trailingOnlyDot string, trailingBoth string, trailingMultiline string, uuids []string, localVarOptionals *ABitOfEverythingServiceExistsOpts) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Head") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Head") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -3877,143 +3018,59 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx co localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SingleNestedName.IsSet() { - localVarQueryParams.Add("singleNested.name", parameterToString(localVarOptionals.SingleNestedName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedAmount.IsSet() { - localVarQueryParams.Add("singleNested.amount", parameterToString(localVarOptionals.SingleNestedAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.SingleNestedOk.IsSet() { - localVarQueryParams.Add("singleNested.ok", parameterToString(localVarOptionals.SingleNestedOk.Value(), "")) - } + localVarQueryParams.Add("singleNested.name", parameterToString(singleNestedName, "")) + localVarQueryParams.Add("singleNested.amount", parameterToString(singleNestedAmount, "")) + localVarQueryParams.Add("singleNested.ok", parameterToString(singleNestedOk, "")) localVarQueryParams.Add("floatValue", parameterToString(floatValue, "")) localVarQueryParams.Add("doubleValue", parameterToString(doubleValue, "")) localVarQueryParams.Add("int64Value", parameterToString(int64Value, "")) - if localVarOptionals != nil && localVarOptionals.Uint64Value.IsSet() { - localVarQueryParams.Add("uint64Value", parameterToString(localVarOptionals.Uint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int32Value.IsSet() { - localVarQueryParams.Add("int32Value", parameterToString(localVarOptionals.Int32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed64Value.IsSet() { - localVarQueryParams.Add("fixed64Value", parameterToString(localVarOptionals.Fixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Fixed32Value.IsSet() { - localVarQueryParams.Add("fixed32Value", parameterToString(localVarOptionals.Fixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BoolValue.IsSet() { - localVarQueryParams.Add("boolValue", parameterToString(localVarOptionals.BoolValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StringValue.IsSet() { - localVarQueryParams.Add("stringValue", parameterToString(localVarOptionals.StringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.BytesValue.IsSet() { - localVarQueryParams.Add("bytesValue", parameterToString(localVarOptionals.BytesValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uint32Value.IsSet() { - localVarQueryParams.Add("uint32Value", parameterToString(localVarOptionals.Uint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.EnumValue.IsSet() { - localVarQueryParams.Add("enumValue", parameterToString(localVarOptionals.EnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.PathEnumValue.IsSet() { - localVarQueryParams.Add("pathEnumValue", parameterToString(localVarOptionals.PathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedPathEnumValue.IsSet() { - localVarQueryParams.Add("nestedPathEnumValue", parameterToString(localVarOptionals.NestedPathEnumValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed32Value.IsSet() { - localVarQueryParams.Add("sfixed32Value", parameterToString(localVarOptionals.Sfixed32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sfixed64Value.IsSet() { - localVarQueryParams.Add("sfixed64Value", parameterToString(localVarOptionals.Sfixed64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint32Value.IsSet() { - localVarQueryParams.Add("sint32Value", parameterToString(localVarOptionals.Sint32Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Sint64Value.IsSet() { - localVarQueryParams.Add("sint64Value", parameterToString(localVarOptionals.Sint64Value.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringValue.IsSet() { - localVarQueryParams.Add("repeatedStringValue", parameterToString(localVarOptionals.RepeatedStringValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OneofEmpty.IsSet() { - localVarQueryParams.Add("oneofEmpty", parameterToString(localVarOptionals.OneofEmpty.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.OneofString.IsSet() { - localVarQueryParams.Add("oneofString", parameterToString(localVarOptionals.OneofString.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MapValue.IsSet() { - localVarQueryParams.Add("mapValue", parameterToString(localVarOptionals.MapValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedStringValue.IsSet() { - localVarQueryParams.Add("mappedStringValue", parameterToString(localVarOptionals.MappedStringValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.MappedNestedValue.IsSet() { - localVarQueryParams.Add("mappedNestedValue", parameterToString(localVarOptionals.MappedNestedValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NonConventionalNameValue.IsSet() { - localVarQueryParams.Add("nonConventionalNameValue", parameterToString(localVarOptionals.NonConventionalNameValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TimestampValue.IsSet() { - localVarQueryParams.Add("timestampValue", parameterToString(localVarOptionals.TimestampValue.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumValue.IsSet() { - localVarQueryParams.Add("repeatedEnumValue", parameterToString(localVarOptionals.RepeatedEnumValue.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedEnumAnnotation.IsSet() { - localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(localVarOptionals.RepeatedEnumAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.EnumValueAnnotation.IsSet() { - localVarQueryParams.Add("enumValueAnnotation", parameterToString(localVarOptionals.EnumValueAnnotation.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.RepeatedStringAnnotation.IsSet() { - localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(localVarOptionals.RepeatedStringAnnotation.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationName.IsSet() { - localVarQueryParams.Add("nestedAnnotation.name", parameterToString(localVarOptionals.NestedAnnotationName.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationAmount.IsSet() { - localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(localVarOptionals.NestedAnnotationAmount.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NestedAnnotationOk.IsSet() { - localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(localVarOptionals.NestedAnnotationOk.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Int64OverrideType.IsSet() { - localVarQueryParams.Add("int64OverrideType", parameterToString(localVarOptionals.Int64OverrideType.Value(), "")) - } + localVarQueryParams.Add("uint64Value", parameterToString(uint64Value, "")) + localVarQueryParams.Add("int32Value", parameterToString(int32Value, "")) + localVarQueryParams.Add("fixed64Value", parameterToString(fixed64Value, "")) + localVarQueryParams.Add("fixed32Value", parameterToString(fixed32Value, "")) + localVarQueryParams.Add("boolValue", parameterToString(boolValue, "")) + localVarQueryParams.Add("stringValue", parameterToString(stringValue, "")) + localVarQueryParams.Add("bytesValue", parameterToString(bytesValue, "")) + localVarQueryParams.Add("uint32Value", parameterToString(uint32Value, "")) + localVarQueryParams.Add("enumValue", parameterToString(enumValue, "")) + localVarQueryParams.Add("pathEnumValue", parameterToString(pathEnumValue, "")) + localVarQueryParams.Add("nestedPathEnumValue", parameterToString(nestedPathEnumValue, "")) + localVarQueryParams.Add("sfixed32Value", parameterToString(sfixed32Value, "")) + localVarQueryParams.Add("sfixed64Value", parameterToString(sfixed64Value, "")) + localVarQueryParams.Add("sint32Value", parameterToString(sint32Value, "")) + localVarQueryParams.Add("sint64Value", parameterToString(sint64Value, "")) + localVarQueryParams.Add("repeatedStringValue", parameterToString(repeatedStringValue, "multi")) + localVarQueryParams.Add("oneofEmpty", parameterToString(oneofEmpty, "")) + localVarQueryParams.Add("oneofString", parameterToString(oneofString, "")) + localVarQueryParams.Add("mapValue", parameterToString(mapValue, "")) + localVarQueryParams.Add("mappedStringValue", parameterToString(mappedStringValue, "")) + localVarQueryParams.Add("mappedNestedValue", parameterToString(mappedNestedValue, "")) + localVarQueryParams.Add("nonConventionalNameValue", parameterToString(nonConventionalNameValue, "")) + localVarQueryParams.Add("timestampValue", parameterToString(timestampValue, "")) + localVarQueryParams.Add("repeatedEnumValue", parameterToString(repeatedEnumValue, "multi")) + localVarQueryParams.Add("repeatedEnumAnnotation", parameterToString(repeatedEnumAnnotation, "multi")) + localVarQueryParams.Add("enumValueAnnotation", parameterToString(enumValueAnnotation, "")) + localVarQueryParams.Add("repeatedStringAnnotation", parameterToString(repeatedStringAnnotation, "multi")) + localVarQueryParams.Add("nestedAnnotation.name", parameterToString(nestedAnnotationName, "")) + localVarQueryParams.Add("nestedAnnotation.amount", parameterToString(nestedAnnotationAmount, "")) + localVarQueryParams.Add("nestedAnnotation.ok", parameterToString(nestedAnnotationOk, "")) + localVarQueryParams.Add("int64OverrideType", parameterToString(int64OverrideType, "")) localVarQueryParams.Add("requiredStringViaFieldBehaviorAnnotation", parameterToString(requiredStringViaFieldBehaviorAnnotation, "")) - if localVarOptionals != nil && localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.IsSet() { - localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(localVarOptionals.OutputOnlyStringViaFieldBehaviorAnnotation.Value(), "")) - } + localVarQueryParams.Add("outputOnlyStringViaFieldBehaviorAnnotation", parameterToString(outputOnlyStringViaFieldBehaviorAnnotation, "")) if localVarOptionals != nil && localVarOptionals.OptionalStringValue.IsSet() { localVarQueryParams.Add("optionalStringValue", parameterToString(localVarOptionals.OptionalStringValue.Value(), "")) } - if localVarOptionals != nil && localVarOptionals.ProductId.IsSet() { - localVarQueryParams.Add("productId", parameterToString(localVarOptionals.ProductId.Value(), "multi")) - } - if localVarOptionals != nil && localVarOptionals.OptionalStringField.IsSet() { - localVarQueryParams.Add("optionalStringField", parameterToString(localVarOptionals.OptionalStringField.Value(), "")) - } + localVarQueryParams.Add("productId", parameterToString(productId, "multi")) + localVarQueryParams.Add("optionalStringField", parameterToString(optionalStringField, "")) localVarQueryParams.Add("requiredStringField1", parameterToString(requiredStringField1, "")) localVarQueryParams.Add("requiredStringField2", parameterToString(requiredStringField2, "")) localVarQueryParams.Add("required_field_behavior_json_name_custom", parameterToString(requiredFieldBehaviorJsonNameCustom, "")) localVarQueryParams.Add("required_field_schema_json_name_custom", parameterToString(requiredFieldSchemaJsonNameCustom, "")) - if localVarOptionals != nil && localVarOptionals.TrailingOnly.IsSet() { - localVarQueryParams.Add("trailingOnly", parameterToString(localVarOptionals.TrailingOnly.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingOnlyDot.IsSet() { - localVarQueryParams.Add("trailingOnlyDot", parameterToString(localVarOptionals.TrailingOnlyDot.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingBoth.IsSet() { - localVarQueryParams.Add("trailingBoth", parameterToString(localVarOptionals.TrailingBoth.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.TrailingMultiline.IsSet() { - localVarQueryParams.Add("trailingMultiline", parameterToString(localVarOptionals.TrailingMultiline.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Uuids.IsSet() { - localVarQueryParams.Add("uuids", parameterToString(localVarOptionals.Uuids.Value(), "multi")) - } + localVarQueryParams.Add("trailingOnly", parameterToString(trailingOnly, "")) + localVarQueryParams.Add("trailingOnlyDot", parameterToString(trailingOnlyDot, "")) + localVarQueryParams.Add("trailingBoth", parameterToString(trailingBoth, "")) + localVarQueryParams.Add("trailingMultiline", parameterToString(trailingMultiline, "")) + localVarQueryParams.Add("uuids", parameterToString(uuids, "multi")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -4041,7 +3098,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4062,60 +3119,60 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id - * @param data + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id + - @param data @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetMessageWithBody(ctx context.Context, id string, data ExamplepbBody) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -4156,7 +3213,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetMessageWit key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4177,118 +3234,118 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetMessageWit if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param pathRepeatedFloatValue repeated values. they are comma-separated in path - * @param pathRepeatedDoubleValue - * @param pathRepeatedInt64Value - * @param pathRepeatedUint64Value - * @param pathRepeatedInt32Value - * @param pathRepeatedFixed64Value - * @param pathRepeatedFixed32Value - * @param pathRepeatedBoolValue - * @param pathRepeatedStringValue - * @param pathRepeatedBytesValue - * @param pathRepeatedUint32Value - * @param pathRepeatedEnumValue - * @param pathRepeatedSfixed32Value - * @param pathRepeatedSfixed64Value - * @param pathRepeatedSint32Value - * @param pathRepeatedSint64Value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param pathRepeatedFloatValue repeated values. they are comma-separated in path + - @param pathRepeatedDoubleValue + - @param pathRepeatedInt64Value + - @param pathRepeatedUint64Value + - @param pathRepeatedInt32Value + - @param pathRepeatedFixed64Value + - @param pathRepeatedFixed32Value + - @param pathRepeatedBoolValue + - @param pathRepeatedStringValue + - @param pathRepeatedBytesValue + - @param pathRepeatedUint32Value + - @param pathRepeatedEnumValue + - @param pathRepeatedSfixed32Value + - @param pathRepeatedSfixed64Value + - @param pathRepeatedSint32Value + - @param pathRepeatedSint64Value @return ExamplepbABitOfEverythingRepeated */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetRepeatedQuery(ctx context.Context, pathRepeatedFloatValue []float32, pathRepeatedDoubleValue []float64, pathRepeatedInt64Value []string, pathRepeatedUint64Value []string, pathRepeatedInt32Value []int32, pathRepeatedFixed64Value []string, pathRepeatedFixed32Value []int64, pathRepeatedBoolValue []bool, pathRepeatedStringValue []string, pathRepeatedBytesValue []string, pathRepeatedUint32Value []int64, pathRepeatedEnumValue []string, pathRepeatedSfixed32Value []int32, pathRepeatedSfixed64Value []string, pathRepeatedSint32Value []int32, pathRepeatedSint64Value []string) (ExamplepbABitOfEverythingRepeated, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverythingRepeated ) @@ -4390,7 +3447,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetRepeatedQu key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4411,103 +3468,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetRepeatedQu if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverythingRepeated - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuid + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuid @return ExamplepbABitOfEverything */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceLookup(ctx context.Context, uuid string) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -4546,7 +3603,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceLookup(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4567,103 +3624,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceLookup(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param exampleEnum + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param exampleEnum @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostOneofEnum(ctx context.Context, exampleEnum OneofenumExampleEnum) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -4703,7 +3760,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostOneofEnum key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4724,103 +3781,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostOneofEnum if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostRequiredMessageType(ctx context.Context, body ExamplepbRequiredMessageTypeRequest) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -4860,7 +3917,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostRequiredM key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4881,104 +3938,104 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostRequiredM if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param name - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param name + - @param body @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostWithEmptyBody(ctx context.Context, name string, body ABitOfEverythingServicePostWithEmptyBodyBody) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -5019,7 +4076,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostWithEmpty key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5040,102 +4097,102 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostWithEmpty if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceTimeout(ctx context.Context) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -5173,7 +4230,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceTimeout(ctx c key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5194,104 +4251,104 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceTimeout(ctx c if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuidName - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuidName + - @param body @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdate(ctx context.Context, uuidName string, body ExamplepbABitOfEverythingServiceUpdateBody) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Put") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Put") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -5332,7 +4389,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdate(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5353,111 +4410,105 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdate(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param bookName The resource name of the book. Format: `publishers/{publisher}/books/{book}` Example: `publishers/1257894000000000000/books/my-book` - * @param book The book to update. The book's `name` field is used to identify the book to be updated. Format: publishers/{publisher}/books/{book} - * @param optional nil or *ABitOfEverythingServiceUpdateBookOpts - Optional Parameters: - * @param "AllowMissing" (optional.Bool) - If set to true, and the book is not found, a new book will be created. In this situation, `update_mask` is ignored. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param bookName The resource name of the book. Format: `publishers/{publisher}/books/{book}` Example: `publishers/1257894000000000000/books/my-book` + - @param book The book to update. The book's `name` field is used to identify the book to be updated. Format: publishers/{publisher}/books/{book} + - @param allowMissing If set to true, and the book is not found, a new book will be created. In this situation, `update_mask` is ignored. @return ExamplepbBook */ - -type ABitOfEverythingServiceUpdateBookOpts struct { - AllowMissing optional.Bool -} - -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateBook(ctx context.Context, bookName string, book TheBookToUpdate_, localVarOptionals *ABitOfEverythingServiceUpdateBookOpts) (ExamplepbBook, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateBook(ctx context.Context, bookName string, book TheBookToUpdate_, allowMissing bool) (ExamplepbBook, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Patch") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Patch") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbBook ) @@ -5469,9 +4520,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateBook(ct localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.AllowMissing.IsSet() { - localVarQueryParams.Add("allowMissing", parameterToString(localVarOptionals.AllowMissing.Value(), "")) - } + localVarQueryParams.Add("allowMissing", parameterToString(allowMissing, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -5501,7 +4550,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateBook(ct key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5522,111 +4571,105 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateBook(ct if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbBook - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuidName - * @param abe A bit of everything Intentionally complicated message type to cover many features of Protobuf. - * @param optional nil or *ABitOfEverythingServiceUpdateV2Opts - Optional Parameters: - * @param "UpdateMask" (optional.String) - The paths to update. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuidName + - @param abe A bit of everything Intentionally complicated message type to cover many features of Protobuf. + - @param updateMask The paths to update. @return interface{} */ - -type ABitOfEverythingServiceUpdateV2Opts struct { - UpdateMask optional.String -} - -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx context.Context, uuidName string, abe ABitOfEverything, localVarOptionals *ABitOfEverythingServiceUpdateV2Opts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx context.Context, uuidName string, abe ABitOfEverything, updateMask string) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Put") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Put") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -5638,9 +4681,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.UpdateMask.IsSet() { - localVarQueryParams.Add("updateMask", parameterToString(localVarOptionals.UpdateMask.Value(), "")) - } + localVarQueryParams.Add("updateMask", parameterToString(updateMask, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -5670,7 +4711,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5691,104 +4732,104 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuidName - * @param abe A bit of everything Intentionally complicated message type to cover many features of Protobuf. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuidName + - @param abe A bit of everything Intentionally complicated message type to cover many features of Protobuf. @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV22(ctx context.Context, uuidName string, abe ABitOfEverything1) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Patch") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Patch") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -5829,7 +4870,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV22(ctx key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5850,104 +4891,104 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV22(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuidName - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuidName + - @param body @return interface{} */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV23(ctx context.Context, uuidName string, body ABitOfEverythingServiceUpdateV2Body) (interface{}, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Patch") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Patch") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue interface{} ) @@ -5988,7 +5029,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV23(ctx key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -6009,84 +5050,84 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV23(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/abe/api_echo_rpc.go b/examples/internal/clients/abe/api_echo_rpc.go index 1578fbff89b..4ec850eb6c0 100644 --- a/examples/internal/clients/abe/api_echo_rpc.go +++ b/examples/internal/clients/abe/api_echo_rpc.go @@ -12,12 +12,11 @@ package abe import ( "context" + "fmt" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" ) // Linger please @@ -27,20 +26,20 @@ var ( type EchoRpcApiService service -/* +/* EchoRpcApiService Summary: Echo rpc Description Echo - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return SubStringMessage */ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho(ctx context.Context, value string) (SubStringMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue SubStringMessage ) @@ -79,7 +78,7 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho(ctx context.Context, val key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -100,115 +99,115 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho(ctx context.Context, val if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v SubStringMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoRpcApiService Summary: Echo rpc Description Echo - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return SubStringMessage */ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho2(ctx context.Context, value string) (SubStringMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue SubStringMessage ) @@ -248,7 +247,7 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho2(ctx context.Context, va key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -269,121 +268,115 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho2(ctx context.Context, va if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v SubStringMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoRpcApiService Summary: Echo rpc Description Echo - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param optional nil or *ABitOfEverythingServiceEcho3Opts - Optional Parameters: - * @param "Value" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return SubStringMessage */ - -type ABitOfEverythingServiceEcho3Opts struct { - Value optional.String -} - -func (a *EchoRpcApiService) ABitOfEverythingServiceEcho3(ctx context.Context, localVarOptionals *ABitOfEverythingServiceEcho3Opts) (SubStringMessage, *http.Response, error) { +func (a *EchoRpcApiService) ABitOfEverythingServiceEcho3(ctx context.Context, value string) (SubStringMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue SubStringMessage ) @@ -394,9 +387,7 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho3(ctx context.Context, lo localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Value.IsSet() { - localVarQueryParams.Add("value", parameterToString(localVarOptionals.Value.Value(), "")) - } + localVarQueryParams.Add("value", parameterToString(value, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -424,7 +415,7 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho3(ctx context.Context, lo key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -445,95 +436,95 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho3(ctx context.Context, lo if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v SubStringMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything.go b/examples/internal/clients/abe/model_a_bit_of_everything.go index 80fe399f711..b2dcfb201f6 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything.go @@ -16,64 +16,64 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested"` + Nested []ABitOfEverythingNested `json:"nested"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value"` + Int32Value int32 `json:"int32Value"` + Fixed64Value string `json:"fixed64Value"` + Fixed32Value int64 `json:"fixed32Value"` + BoolValue bool `json:"boolValue"` + StringValue string `json:"stringValue"` + BytesValue string `json:"bytesValue"` + Uint32Value int64 `json:"uint32Value"` + EnumValue *ExamplepbNumericEnum `json:"enumValue"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue"` + Sfixed32Value int32 `json:"sfixed32Value"` + Sfixed64Value string `json:"sfixed64Value"` + Sint32Value int32 `json:"sint32Value"` + Sint64Value string `json:"sint64Value"` + RepeatedStringValue []string `json:"repeatedStringValue"` + OneofEmpty *interface{} `json:"oneofEmpty"` + OneofString string `json:"oneofString"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue"` // Map of string description. - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue"` + NonConventionalNameValue string `json:"nonConventionalNameValue"` + TimestampValue time.Time `json:"timestampValue"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue"` // Repeated numeric enum description. - RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` + RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation"` // Numeric enum description. - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation"` // Repeated string description. - RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` + RepeatedStringAnnotation []string `json:"repeatedStringAnnotation"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation"` + Int64OverrideType int64 `json:"int64OverrideType"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` - RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` - RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` - TrailingOnly string `json:"trailingOnly,omitempty"` + ProductId []string `json:"productId"` + OptionalStringField string `json:"optionalStringField"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` + RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` + RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` + TrailingOnly string `json:"trailingOnly"` // Trailing only dot. - TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"` + TrailingOnlyDot string `json:"trailingOnlyDot"` // Trailing both. - TrailingBoth string `json:"trailingBoth,omitempty"` + TrailingBoth string `json:"trailingBoth"` // This is an example of a multi-line comment. Trailing multiline. - TrailingMultiline string `json:"trailingMultiline,omitempty"` - Uuids []string `json:"uuids,omitempty"` + TrailingMultiline string `json:"trailingMultiline"` + Uuids []string `json:"uuids"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_1.go b/examples/internal/clients/abe/model_a_bit_of_everything_1.go index bef01473473..9a937e38952 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_1.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_1.go @@ -16,64 +16,64 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything1 struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested"` + Nested []ABitOfEverythingNested `json:"nested"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value"` + Int32Value int32 `json:"int32Value"` + Fixed64Value string `json:"fixed64Value"` + Fixed32Value int64 `json:"fixed32Value"` + BoolValue bool `json:"boolValue"` + StringValue string `json:"stringValue"` + BytesValue string `json:"bytesValue"` + Uint32Value int64 `json:"uint32Value"` + EnumValue *ExamplepbNumericEnum `json:"enumValue"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue"` + Sfixed32Value int32 `json:"sfixed32Value"` + Sfixed64Value string `json:"sfixed64Value"` + Sint32Value int32 `json:"sint32Value"` + Sint64Value string `json:"sint64Value"` + RepeatedStringValue []string `json:"repeatedStringValue"` + OneofEmpty *interface{} `json:"oneofEmpty"` + OneofString string `json:"oneofString"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue"` // Map of string description. - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue"` + NonConventionalNameValue string `json:"nonConventionalNameValue"` + TimestampValue time.Time `json:"timestampValue"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue"` // Repeated numeric enum description. - RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` + RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation"` // Numeric enum description. - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation"` // Repeated string description. - RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` + RepeatedStringAnnotation []string `json:"repeatedStringAnnotation"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation"` + Int64OverrideType int64 `json:"int64OverrideType"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` - RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` - RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` - TrailingOnly string `json:"trailingOnly,omitempty"` + ProductId []string `json:"productId"` + OptionalStringField string `json:"optionalStringField"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` + RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` + RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` + TrailingOnly string `json:"trailingOnly"` // Trailing only dot. - TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"` + TrailingOnlyDot string `json:"trailingOnlyDot"` // Trailing both. - TrailingBoth string `json:"trailingBoth,omitempty"` + TrailingBoth string `json:"trailingBoth"` // This is an example of a multi-line comment. Trailing multiline. - TrailingMultiline string `json:"trailingMultiline,omitempty"` - Uuids []string `json:"uuids,omitempty"` + TrailingMultiline string `json:"trailingMultiline"` + Uuids []string `json:"uuids"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_nested.go b/examples/internal/clients/abe/model_a_bit_of_everything_nested.go index 586778feaaa..3b62c9a71f7 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_nested.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_nested.go @@ -13,8 +13,8 @@ package abe // Nested is nested type. type ABitOfEverythingNested struct { // name is nested field. - Name string `json:"name,omitempty"` - Amount int64 `json:"amount,omitempty"` + Name string `json:"name"` + Amount int64 `json:"amount"` // DeepEnum description. - Ok *NestedDeepEnum `json:"ok,omitempty"` + Ok *NestedDeepEnum `json:"ok"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_service_deep_path_echo_body.go b/examples/internal/clients/abe/model_a_bit_of_everything_service_deep_path_echo_body.go index 28f63ffccdf..47a219c6a39 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_service_deep_path_echo_body.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_service_deep_path_echo_body.go @@ -16,65 +16,65 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverythingServiceDeepPathEchoBody struct { - SingleNested *ABitOfEverythingServiceDeepPathEchoBodySingleNested `json:"singleNested,omitempty"` - Uuid string `json:"uuid"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingServiceDeepPathEchoBodySingleNested `json:"singleNested"` + Uuid string `json:"uuid"` + Nested []ABitOfEverythingNested `json:"nested"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value"` + Int32Value int32 `json:"int32Value"` + Fixed64Value string `json:"fixed64Value"` + Fixed32Value int64 `json:"fixed32Value"` + BoolValue bool `json:"boolValue"` + StringValue string `json:"stringValue"` + BytesValue string `json:"bytesValue"` + Uint32Value int64 `json:"uint32Value"` + EnumValue *ExamplepbNumericEnum `json:"enumValue"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue"` + Sfixed32Value int32 `json:"sfixed32Value"` + Sfixed64Value string `json:"sfixed64Value"` + Sint32Value int32 `json:"sint32Value"` + Sint64Value string `json:"sint64Value"` + RepeatedStringValue []string `json:"repeatedStringValue"` + OneofEmpty *interface{} `json:"oneofEmpty"` + OneofString string `json:"oneofString"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue"` // Map of string description. - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue"` + NonConventionalNameValue string `json:"nonConventionalNameValue"` + TimestampValue time.Time `json:"timestampValue"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue"` // Repeated numeric enum description. - RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` + RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation"` // Numeric enum description. - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation"` // Repeated string description. - RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` + RepeatedStringAnnotation []string `json:"repeatedStringAnnotation"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation"` + Int64OverrideType int64 `json:"int64OverrideType"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` - RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` - RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` - TrailingOnly string `json:"trailingOnly,omitempty"` + ProductId []string `json:"productId"` + OptionalStringField string `json:"optionalStringField"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` + RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` + RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` + TrailingOnly string `json:"trailingOnly"` // Trailing only dot. - TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"` + TrailingOnlyDot string `json:"trailingOnlyDot"` // Trailing both. - TrailingBoth string `json:"trailingBoth,omitempty"` + TrailingBoth string `json:"trailingBoth"` // This is an example of a multi-line comment. Trailing multiline. - TrailingMultiline string `json:"trailingMultiline,omitempty"` - Uuids []string `json:"uuids,omitempty"` + TrailingMultiline string `json:"trailingMultiline"` + Uuids []string `json:"uuids"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_service_update_v2_body.go b/examples/internal/clients/abe/model_a_bit_of_everything_service_update_v2_body.go index b9c2a37682d..647fb545c14 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_service_update_v2_body.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_service_update_v2_body.go @@ -11,7 +11,7 @@ package abe type ABitOfEverythingServiceUpdateV2Body struct { - Abe *ABitOfEverything2 `json:"abe,omitempty"` + Abe *ABitOfEverything2 `json:"abe"` // The paths to update. - UpdateMask string `json:"updateMask,omitempty"` + UpdateMask string `json:"updateMask"` } diff --git a/examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go b/examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go index 12a19aa4cab..3682c566aff 100644 --- a/examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go +++ b/examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go @@ -16,65 +16,65 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ExamplepbABitOfEverything struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Uuid string `json:"uuid"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested"` + Uuid string `json:"uuid"` + Nested []ABitOfEverythingNested `json:"nested"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value"` + Int32Value int32 `json:"int32Value"` + Fixed64Value string `json:"fixed64Value"` + Fixed32Value int64 `json:"fixed32Value"` + BoolValue bool `json:"boolValue"` + StringValue string `json:"stringValue"` + BytesValue string `json:"bytesValue"` + Uint32Value int64 `json:"uint32Value"` + EnumValue *ExamplepbNumericEnum `json:"enumValue"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue"` + Sfixed32Value int32 `json:"sfixed32Value"` + Sfixed64Value string `json:"sfixed64Value"` + Sint32Value int32 `json:"sint32Value"` + Sint64Value string `json:"sint64Value"` + RepeatedStringValue []string `json:"repeatedStringValue"` + OneofEmpty *interface{} `json:"oneofEmpty"` + OneofString string `json:"oneofString"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue"` // Map of string description. - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue"` + NonConventionalNameValue string `json:"nonConventionalNameValue"` + TimestampValue time.Time `json:"timestampValue"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue"` // Repeated numeric enum description. - RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` + RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation"` // Numeric enum description. - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation"` // Repeated string description. - RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` + RepeatedStringAnnotation []string `json:"repeatedStringAnnotation"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation"` + Int64OverrideType int64 `json:"int64OverrideType"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` - RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` - RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` - TrailingOnly string `json:"trailingOnly,omitempty"` + ProductId []string `json:"productId"` + OptionalStringField string `json:"optionalStringField"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` + RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` + RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` + TrailingOnly string `json:"trailingOnly"` // Trailing only dot. - TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"` + TrailingOnlyDot string `json:"trailingOnlyDot"` // Trailing both. - TrailingBoth string `json:"trailingBoth,omitempty"` + TrailingBoth string `json:"trailingBoth"` // This is an example of a multi-line comment. Trailing multiline. - TrailingMultiline string `json:"trailingMultiline,omitempty"` - Uuids []string `json:"uuids,omitempty"` + TrailingMultiline string `json:"trailingMultiline"` + Uuids []string `json:"uuids"` } diff --git a/examples/internal/clients/abe/model_examplepb_a_bit_of_everything_repeated.go b/examples/internal/clients/abe/model_examplepb_a_bit_of_everything_repeated.go index 4e0b39bd9a1..0f3b0008d49 100644 --- a/examples/internal/clients/abe/model_examplepb_a_bit_of_everything_repeated.go +++ b/examples/internal/clients/abe/model_examplepb_a_bit_of_everything_repeated.go @@ -11,20 +11,20 @@ package abe type ExamplepbABitOfEverythingRepeated struct { - PathRepeatedFloatValue []float32 `json:"pathRepeatedFloatValue,omitempty"` - PathRepeatedDoubleValue []float64 `json:"pathRepeatedDoubleValue,omitempty"` - PathRepeatedInt64Value []string `json:"pathRepeatedInt64Value,omitempty"` - PathRepeatedUint64Value []string `json:"pathRepeatedUint64Value,omitempty"` - PathRepeatedInt32Value []int32 `json:"pathRepeatedInt32Value,omitempty"` - PathRepeatedFixed64Value []string `json:"pathRepeatedFixed64Value,omitempty"` - PathRepeatedFixed32Value []int64 `json:"pathRepeatedFixed32Value,omitempty"` - PathRepeatedBoolValue []bool `json:"pathRepeatedBoolValue,omitempty"` - PathRepeatedStringValue []string `json:"pathRepeatedStringValue,omitempty"` - PathRepeatedBytesValue []string `json:"pathRepeatedBytesValue,omitempty"` - PathRepeatedUint32Value []int64 `json:"pathRepeatedUint32Value,omitempty"` - PathRepeatedEnumValue []ExamplepbNumericEnum `json:"pathRepeatedEnumValue,omitempty"` - PathRepeatedSfixed32Value []int32 `json:"pathRepeatedSfixed32Value,omitempty"` - PathRepeatedSfixed64Value []string `json:"pathRepeatedSfixed64Value,omitempty"` - PathRepeatedSint32Value []int32 `json:"pathRepeatedSint32Value,omitempty"` - PathRepeatedSint64Value []string `json:"pathRepeatedSint64Value,omitempty"` + PathRepeatedFloatValue []float32 `json:"pathRepeatedFloatValue"` + PathRepeatedDoubleValue []float64 `json:"pathRepeatedDoubleValue"` + PathRepeatedInt64Value []string `json:"pathRepeatedInt64Value"` + PathRepeatedUint64Value []string `json:"pathRepeatedUint64Value"` + PathRepeatedInt32Value []int32 `json:"pathRepeatedInt32Value"` + PathRepeatedFixed64Value []string `json:"pathRepeatedFixed64Value"` + PathRepeatedFixed32Value []int64 `json:"pathRepeatedFixed32Value"` + PathRepeatedBoolValue []bool `json:"pathRepeatedBoolValue"` + PathRepeatedStringValue []string `json:"pathRepeatedStringValue"` + PathRepeatedBytesValue []string `json:"pathRepeatedBytesValue"` + PathRepeatedUint32Value []int64 `json:"pathRepeatedUint32Value"` + PathRepeatedEnumValue []ExamplepbNumericEnum `json:"pathRepeatedEnumValue"` + PathRepeatedSfixed32Value []int32 `json:"pathRepeatedSfixed32Value"` + PathRepeatedSfixed64Value []string `json:"pathRepeatedSfixed64Value"` + PathRepeatedSint32Value []int32 `json:"pathRepeatedSint32Value"` + PathRepeatedSint64Value []string `json:"pathRepeatedSint64Value"` } diff --git a/examples/internal/clients/abe/model_examplepb_a_bit_of_everything_service_update_body.go b/examples/internal/clients/abe/model_examplepb_a_bit_of_everything_service_update_body.go index 0d41a76308f..7beeaf5af91 100644 --- a/examples/internal/clients/abe/model_examplepb_a_bit_of_everything_service_update_body.go +++ b/examples/internal/clients/abe/model_examplepb_a_bit_of_everything_service_update_body.go @@ -16,64 +16,64 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ExamplepbABitOfEverythingServiceUpdateBody struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested"` + Nested []ABitOfEverythingNested `json:"nested"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value"` + Int32Value int32 `json:"int32Value"` + Fixed64Value string `json:"fixed64Value"` + Fixed32Value int64 `json:"fixed32Value"` + BoolValue bool `json:"boolValue"` + StringValue string `json:"stringValue"` + BytesValue string `json:"bytesValue"` + Uint32Value int64 `json:"uint32Value"` + EnumValue *ExamplepbNumericEnum `json:"enumValue"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue"` + Sfixed32Value int32 `json:"sfixed32Value"` + Sfixed64Value string `json:"sfixed64Value"` + Sint32Value int32 `json:"sint32Value"` + Sint64Value string `json:"sint64Value"` + RepeatedStringValue []string `json:"repeatedStringValue"` + OneofEmpty *interface{} `json:"oneofEmpty"` + OneofString string `json:"oneofString"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue"` // Map of string description. - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue"` + NonConventionalNameValue string `json:"nonConventionalNameValue"` + TimestampValue time.Time `json:"timestampValue"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue"` // Repeated numeric enum description. - RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` + RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation"` // Numeric enum description. - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation"` // Repeated string description. - RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` + RepeatedStringAnnotation []string `json:"repeatedStringAnnotation"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation"` + Int64OverrideType int64 `json:"int64OverrideType"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` - RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` - RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` - TrailingOnly string `json:"trailingOnly,omitempty"` + ProductId []string `json:"productId"` + OptionalStringField string `json:"optionalStringField"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` + RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"` + RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"` + TrailingOnly string `json:"trailingOnly"` // Trailing only dot. - TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"` + TrailingOnlyDot string `json:"trailingOnlyDot"` // Trailing both. - TrailingBoth string `json:"trailingBoth,omitempty"` + TrailingBoth string `json:"trailingBoth"` // This is an example of a multi-line comment. Trailing multiline. - TrailingMultiline string `json:"trailingMultiline,omitempty"` - Uuids []string `json:"uuids,omitempty"` + TrailingMultiline string `json:"trailingMultiline"` + Uuids []string `json:"uuids"` } diff --git a/examples/internal/clients/abe/model_examplepb_body.go b/examples/internal/clients/abe/model_examplepb_body.go index 0c3d9c9b5b1..2ea652b864a 100644 --- a/examples/internal/clients/abe/model_examplepb_body.go +++ b/examples/internal/clients/abe/model_examplepb_body.go @@ -11,5 +11,5 @@ package abe type ExamplepbBody struct { - Name string `json:"name,omitempty"` + Name string `json:"name"` } diff --git a/examples/internal/clients/abe/model_examplepb_book.go b/examples/internal/clients/abe/model_examplepb_book.go index 0246900a38c..611c283681f 100644 --- a/examples/internal/clients/abe/model_examplepb_book.go +++ b/examples/internal/clients/abe/model_examplepb_book.go @@ -17,9 +17,9 @@ import ( // An example resource type from AIP-123 used to test the behavior described in the CreateBookRequest message. See: https://google.aip.dev/123 type ExamplepbBook struct { // The resource name of the book. Format: `publishers/{publisher}/books/{book}` Example: `publishers/1257894000000000000/books/my-book` - Name string `json:"name,omitempty"` + Name string `json:"name"` // Output only. The book's ID. - Id string `json:"id,omitempty"` + Id string `json:"id"` // Output only. Creation time of the book. - CreateTime time.Time `json:"createTime,omitempty"` + CreateTime time.Time `json:"createTime"` } diff --git a/examples/internal/clients/abe/model_examplepb_check_status_response.go b/examples/internal/clients/abe/model_examplepb_check_status_response.go index 602a53dc1ed..19a92890b6a 100644 --- a/examples/internal/clients/abe/model_examplepb_check_status_response.go +++ b/examples/internal/clients/abe/model_examplepb_check_status_response.go @@ -11,5 +11,5 @@ package abe type ExamplepbCheckStatusResponse struct { - Status *RpcStatus `json:"status,omitempty"` + Status *RpcStatus `json:"status"` } diff --git a/examples/internal/clients/abe/model_examplepb_error_object.go b/examples/internal/clients/abe/model_examplepb_error_object.go index b41c68fa852..7c40af78889 100644 --- a/examples/internal/clients/abe/model_examplepb_error_object.go +++ b/examples/internal/clients/abe/model_examplepb_error_object.go @@ -12,7 +12,7 @@ package abe type ExamplepbErrorObject struct { // Response code - Code int32 `json:"code,omitempty"` + Code int32 `json:"code"` // Response message - Message string `json:"message,omitempty"` + Message string `json:"message"` } diff --git a/examples/internal/clients/abe/model_examplepb_error_response.go b/examples/internal/clients/abe/model_examplepb_error_response.go index 55e17df4a48..500e48d7d92 100644 --- a/examples/internal/clients/abe/model_examplepb_error_response.go +++ b/examples/internal/clients/abe/model_examplepb_error_response.go @@ -12,6 +12,6 @@ package abe type ExamplepbErrorResponse struct { // Unique event identifier for server requests - CorrelationId string `json:"correlationId,omitempty"` - Error_ *ExamplepbErrorObject `json:"error,omitempty"` + CorrelationId string `json:"correlationId"` + Error_ *ExamplepbErrorObject `json:"error"` } diff --git a/examples/internal/clients/abe/model_rpc_status.go b/examples/internal/clients/abe/model_rpc_status.go index 0bda0e2a94e..40acbe07829 100644 --- a/examples/internal/clients/abe/model_rpc_status.go +++ b/examples/internal/clients/abe/model_rpc_status.go @@ -13,9 +13,9 @@ package abe // The `Status` type defines a logical error model that is suitable for different programming environments, including REST APIs and RPC APIs. It is used by [gRPC](https://github.com/grpc). Each `Status` message contains three pieces of data: error code, error message, and error details. You can find out more about this error model and how to work with it in the [API Design Guide](https://cloud.google.com/apis/design/errors). type RpcStatus struct { // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. - Code int32 `json:"code,omitempty"` + Code int32 `json:"code"` // A developer-facing error message, which should be in English. Any user-facing error message should be localized and sent in the [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. - Message string `json:"message,omitempty"` + Message string `json:"message"` // A list of messages that carry the error details. There is a common set of message types for APIs to use. - Details []ProtobufAny `json:"details,omitempty"` + Details []ProtobufAny `json:"details"` } diff --git a/examples/internal/clients/abe/model_sub_string_message.go b/examples/internal/clients/abe/model_sub_string_message.go index d4dcf4ebf16..1d93757a27a 100644 --- a/examples/internal/clients/abe/model_sub_string_message.go +++ b/examples/internal/clients/abe/model_sub_string_message.go @@ -11,5 +11,5 @@ package abe type SubStringMessage struct { - Value string `json:"value,omitempty"` + Value string `json:"value"` } diff --git a/examples/internal/clients/abe/model_the_book_to_update_.go b/examples/internal/clients/abe/model_the_book_to_update_.go index 22b4e447e9c..2a79d921c5a 100644 --- a/examples/internal/clients/abe/model_the_book_to_update_.go +++ b/examples/internal/clients/abe/model_the_book_to_update_.go @@ -17,7 +17,7 @@ import ( // The book's `name` field is used to identify the book to be updated. Format: publishers/{publisher}/books/{book} type TheBookToUpdate_ struct { // Output only. The book's ID. - Id string `json:"id,omitempty"` + Id string `json:"id"` // Output only. Creation time of the book. - CreateTime time.Time `json:"createTime,omitempty"` + CreateTime time.Time `json:"createTime"` } diff --git a/examples/internal/clients/echo/api/swagger.yaml b/examples/internal/clients/echo/api/swagger.yaml index a7871cf2238..dca3c9429d2 100644 --- a/examples/internal/clients/echo/api/swagger.yaml +++ b/examples/internal/clients/echo/api/swagger.yaml @@ -27,75 +27,64 @@ paths: - name: "id" in: "query" description: "Id represents the message identifier." - required: false + required: true type: "string" x-exportParamName: "Id" - x-optionalDataType: "String" - name: "num" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Num" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -121,75 +110,64 @@ paths: - name: "id" in: "query" description: "Id represents the message identifier." - required: false + required: true type: "string" x-exportParamName: "Id" - x-optionalDataType: "String" - name: "num" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Num" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -215,75 +193,64 @@ paths: x-exportParamName: "Id" - name: "num" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Num" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -315,68 +282,58 @@ paths: x-exportParamName: "Num" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -413,62 +370,53 @@ paths: x-exportParamName: "Lang" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -505,56 +453,48 @@ paths: x-exportParamName: "StatusNote" - name: "num" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Num" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -580,69 +520,59 @@ paths: - name: "id" in: "query" description: "Id represents the message identifier." - required: false + required: true type: "string" x-exportParamName: "Id" - x-optionalDataType: "String" - name: "num" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Num" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -696,55 +626,47 @@ paths: x-exportParamName: "No" - name: "num" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Num" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -764,81 +686,69 @@ paths: - name: "id" in: "query" description: "Id represents the message identifier." - required: false + required: true type: "string" x-exportParamName: "Id" - x-optionalDataType: "String" - name: "num" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Num" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -882,81 +792,69 @@ paths: - name: "id" in: "query" description: "Id represents the message identifier." - required: false + required: true type: "string" x-exportParamName: "Id" - x-optionalDataType: "String" - name: "num" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "Num" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -969,6 +867,9 @@ paths: definitions: examplepbDynamicMessage: type: "object" + required: + - "structField" + - "valueField" properties: structField: type: "object" @@ -981,6 +882,9 @@ definitions: valueField: "" examplepbDynamicMessageUpdate: type: "object" + required: + - "body" + - "updateMask" properties: body: $ref: "#/definitions/examplepbDynamicMessage" @@ -993,6 +897,9 @@ definitions: updateMask: "updateMask" examplepbEmbedded: type: "object" + required: + - "note" + - "progress" properties: progress: type: "string" @@ -1005,6 +912,9 @@ definitions: progress: "progress" examplepbNestedMessage: type: "object" + required: + - "nId" + - "val" properties: nId: type: "string" @@ -1015,6 +925,16 @@ definitions: nId: "nId" examplepbSimpleMessage: type: "object" + required: + - "en" + - "id" + - "lang" + - "lineNum" + - "nId" + - "no" + - "num" + - "resourceId" + - "status" properties: id: type: "string" @@ -1121,6 +1041,10 @@ definitions: default: "NULL_VALUE" rpcStatus: type: "object" + required: + - "code" + - "details" + - "message" properties: code: type: "integer" diff --git a/examples/internal/clients/echo/api_echo_service.go b/examples/internal/clients/echo/api_echo_service.go index c5807965d34..27847bf0244 100644 --- a/examples/internal/clients/echo/api_echo_service.go +++ b/examples/internal/clients/echo/api_echo_service.go @@ -11,12 +11,11 @@ package echo import ( "context" + "fmt" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" ) // Linger please @@ -26,47 +25,31 @@ var ( type EchoServiceApiService service -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id Id represents the message identifier. - * @param optional nil or *EchoServiceEchoOpts - Optional Parameters: - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param num + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEchoOpts struct { - Num optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEcho(ctx context.Context, id string, localVarOptionals *EchoServiceEchoOpts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEcho(ctx context.Context, id string, num string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -78,39 +61,17 @@ func (a *EchoServiceApiService) EchoServiceEcho(ctx context.Context, id string, localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Num.IsSet() { - localVarQueryParams.Add("num", parameterToString(localVarOptionals.Num.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("num", parameterToString(num, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -146,86 +107,71 @@ func (a *EchoServiceApiService) EchoServiceEcho(ctx context.Context, id string, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id Id represents the message identifier. - * @param num - * @param optional nil or *EchoServiceEcho2Opts - Optional Parameters: - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param num + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEcho2Opts struct { - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEcho2(ctx context.Context, id string, num string, localVarOptionals *EchoServiceEcho2Opts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEcho2(ctx context.Context, id string, num string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -238,36 +184,16 @@ func (a *EchoServiceApiService) EchoServiceEcho2(ctx context.Context, id string, localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -303,85 +229,71 @@ func (a *EchoServiceApiService) EchoServiceEcho2(ctx context.Context, id string, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id Id represents the message identifier. - * @param num - * @param lang - * @param optional nil or *EchoServiceEcho3Opts - Optional Parameters: - * @param "LineNum" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param num + - @param lang + - @param lineNum + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEcho3Opts struct { - LineNum optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEcho3(ctx context.Context, id string, num string, lang string, localVarOptionals *EchoServiceEcho3Opts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEcho3(ctx context.Context, id string, num string, lang string, lineNum string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -395,33 +307,15 @@ func (a *EchoServiceApiService) EchoServiceEcho3(ctx context.Context, id string, localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -457,83 +351,70 @@ func (a *EchoServiceApiService) EchoServiceEcho3(ctx context.Context, id string, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id Id represents the message identifier. - * @param lineNum - * @param statusNote - * @param optional nil or *EchoServiceEcho4Opts - Optional Parameters: - * @param "Num" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param lineNum + - @param statusNote + - @param num + - @param lang + - @param statusProgress + - @param en + - @param noProgress + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEcho4Opts struct { - Num optional.String - Lang optional.String - StatusProgress optional.String - En optional.String - NoProgress optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEcho4(ctx context.Context, id string, lineNum string, statusNote string, localVarOptionals *EchoServiceEcho4Opts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEcho4(ctx context.Context, id string, lineNum string, statusNote string, num string, lang string, statusProgress string, en string, noProgress string, resourceId string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -547,30 +428,14 @@ func (a *EchoServiceApiService) EchoServiceEcho4(ctx context.Context, id string, localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Num.IsSet() { - localVarQueryParams.Add("num", parameterToString(localVarOptionals.Num.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("num", parameterToString(num, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -606,85 +471,70 @@ func (a *EchoServiceApiService) EchoServiceEcho4(ctx context.Context, id string, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param noNote - * @param optional nil or *EchoServiceEcho5Opts - Optional Parameters: - * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param noNote + - @param id Id represents the message identifier. + - @param num + - @param lineNum + - @param lang + - @param statusProgress + - @param en + - @param noProgress + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEcho5Opts struct { - Id optional.String - Num optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - En optional.String - NoProgress optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEcho5(ctx context.Context, noNote string, localVarOptionals *EchoServiceEcho5Opts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEcho5(ctx context.Context, noNote string, id string, num string, lineNum string, lang string, statusProgress string, en string, noProgress string, resourceId string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -696,36 +546,16 @@ func (a *EchoServiceApiService) EchoServiceEcho5(ctx context.Context, noNote str localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Id.IsSet() { - localVarQueryParams.Add("id", parameterToString(localVarOptionals.Id.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Num.IsSet() { - localVarQueryParams.Add("num", parameterToString(localVarOptionals.Num.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("id", parameterToString(id, "")) + localVarQueryParams.Add("num", parameterToString(num, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -761,87 +591,71 @@ func (a *EchoServiceApiService) EchoServiceEcho5(ctx context.Context, noNote str if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param resourceId - * @param optional nil or *EchoServiceEcho6Opts - Optional Parameters: - * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param resourceId + - @param id Id represents the message identifier. + - @param num + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEcho6Opts struct { - Id optional.String - Num optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEcho6(ctx context.Context, resourceId string, localVarOptionals *EchoServiceEcho6Opts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEcho6(ctx context.Context, resourceId string, id string, num string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -853,39 +667,17 @@ func (a *EchoServiceApiService) EchoServiceEcho6(ctx context.Context, resourceId localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Id.IsSet() { - localVarQueryParams.Add("id", parameterToString(localVarOptionals.Id.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Num.IsSet() { - localVarQueryParams.Add("num", parameterToString(localVarOptionals.Num.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("id", parameterToString(id, "")) + localVarQueryParams.Add("num", parameterToString(num, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -921,87 +713,71 @@ func (a *EchoServiceApiService) EchoServiceEcho6(ctx context.Context, resourceId if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param nIdNId - * @param optional nil or *EchoServiceEcho7Opts - Optional Parameters: - * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param nIdNId + - @param id Id represents the message identifier. + - @param num + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEcho7Opts struct { - Id optional.String - Num optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEcho7(ctx context.Context, nIdNId string, localVarOptionals *EchoServiceEcho7Opts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEcho7(ctx context.Context, nIdNId string, id string, num string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -1013,39 +789,17 @@ func (a *EchoServiceApiService) EchoServiceEcho7(ctx context.Context, nIdNId str localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Id.IsSet() { - localVarQueryParams.Add("id", parameterToString(localVarOptionals.Id.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Num.IsSet() { - localVarQueryParams.Add("num", parameterToString(localVarOptionals.Num.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("id", parameterToString(id, "")) + localVarQueryParams.Add("num", parameterToString(num, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -1081,59 +835,59 @@ func (a *EchoServiceApiService) EchoServiceEcho7(ctx context.Context, nIdNId str if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoBody method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body SimpleMessage represents a simple message sent to the Echo service. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body SimpleMessage represents a simple message sent to the Echo service. @return ExamplepbSimpleMessage */ func (a *EchoServiceApiService) EchoServiceEchoBody(ctx context.Context, body ExamplepbSimpleMessage) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -1181,81 +935,68 @@ func (a *EchoServiceApiService) EchoServiceEchoBody(ctx context.Context, body Ex if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoBody method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id Id represents the message identifier. - * @param no - * @param optional nil or *EchoServiceEchoBody2Opts - Optional Parameters: - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param no + - @param num + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEchoBody2Opts struct { - Num optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEchoBody2(ctx context.Context, id string, no ExamplepbEmbedded, localVarOptionals *EchoServiceEchoBody2Opts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEchoBody2(ctx context.Context, id string, no ExamplepbEmbedded, num string, lineNum string, lang string, statusProgress string, statusNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Put") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Put") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -1267,30 +1008,14 @@ func (a *EchoServiceApiService) EchoServiceEchoBody2(ctx context.Context, id str localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Num.IsSet() { - localVarQueryParams.Add("num", parameterToString(localVarOptionals.Num.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("num", parameterToString(num, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -1328,87 +1053,70 @@ func (a *EchoServiceApiService) EchoServiceEchoBody2(ctx context.Context, id str if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoDelete method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param optional nil or *EchoServiceEchoDeleteOpts - Optional Parameters: - * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param num + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEchoDeleteOpts struct { - Id optional.String - Num optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEchoDelete(ctx context.Context, localVarOptionals *EchoServiceEchoDeleteOpts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEchoDelete(ctx context.Context, id string, num string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Delete") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Delete") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -1419,42 +1127,18 @@ func (a *EchoServiceApiService) EchoServiceEchoDelete(ctx context.Context, local localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Id.IsSet() { - localVarQueryParams.Add("id", parameterToString(localVarOptionals.Id.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Num.IsSet() { - localVarQueryParams.Add("num", parameterToString(localVarOptionals.Num.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("id", parameterToString(id, "")) + localVarQueryParams.Add("num", parameterToString(num, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -1490,59 +1174,59 @@ func (a *EchoServiceApiService) EchoServiceEchoDelete(ctx context.Context, local if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoPatch method receives a NonStandardUpdateRequest and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body @return ExamplepbDynamicMessageUpdate */ func (a *EchoServiceApiService) EchoServiceEchoPatch(ctx context.Context, body ExamplepbDynamicMessage) (ExamplepbDynamicMessageUpdate, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Patch") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Patch") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbDynamicMessageUpdate ) @@ -1590,87 +1274,70 @@ func (a *EchoServiceApiService) EchoServiceEchoPatch(ctx context.Context, body E if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbDynamicMessageUpdate - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoUnauthorized method receives a simple message and returns it. It must always return a google.rpc.Code of `UNAUTHENTICATED` and a HTTP Status code of 401. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param optional nil or *EchoServiceEchoUnauthorizedOpts - Optional Parameters: - * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param num + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbSimpleMessage */ - -type EchoServiceEchoUnauthorizedOpts struct { - Id optional.String - Num optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *EchoServiceApiService) EchoServiceEchoUnauthorized(ctx context.Context, localVarOptionals *EchoServiceEchoUnauthorizedOpts) (ExamplepbSimpleMessage, *http.Response, error) { +func (a *EchoServiceApiService) EchoServiceEchoUnauthorized(ctx context.Context, id string, num string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -1681,42 +1348,18 @@ func (a *EchoServiceApiService) EchoServiceEchoUnauthorized(ctx context.Context, localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Id.IsSet() { - localVarQueryParams.Add("id", parameterToString(localVarOptionals.Id.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Num.IsSet() { - localVarQueryParams.Add("num", parameterToString(localVarOptionals.Num.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("id", parameterToString(id, "")) + localVarQueryParams.Add("num", parameterToString(num, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json"} @@ -1752,40 +1395,40 @@ func (a *EchoServiceApiService) EchoServiceEchoUnauthorized(ctx context.Context, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/echo/model_examplepb_dynamic_message.go b/examples/internal/clients/echo/model_examplepb_dynamic_message.go index dae5858f199..cc583f9a278 100644 --- a/examples/internal/clients/echo/model_examplepb_dynamic_message.go +++ b/examples/internal/clients/echo/model_examplepb_dynamic_message.go @@ -11,6 +11,6 @@ package echo // DynamicMessage represents a message which can have its structure built dynamically using Struct and Values. type ExamplepbDynamicMessage struct { - StructField *interface{} `json:"structField,omitempty"` - ValueField *interface{} `json:"valueField,omitempty"` + StructField *interface{} `json:"structField"` + ValueField *interface{} `json:"valueField"` } diff --git a/examples/internal/clients/echo/model_examplepb_dynamic_message_update.go b/examples/internal/clients/echo/model_examplepb_dynamic_message_update.go index 086ab7c045e..77ed8d876d8 100644 --- a/examples/internal/clients/echo/model_examplepb_dynamic_message_update.go +++ b/examples/internal/clients/echo/model_examplepb_dynamic_message_update.go @@ -10,6 +10,6 @@ package echo type ExamplepbDynamicMessageUpdate struct { - Body *ExamplepbDynamicMessage `json:"body,omitempty"` - UpdateMask string `json:"updateMask,omitempty"` + Body *ExamplepbDynamicMessage `json:"body"` + UpdateMask string `json:"updateMask"` } diff --git a/examples/internal/clients/echo/model_examplepb_embedded.go b/examples/internal/clients/echo/model_examplepb_embedded.go index 7f6ff8a7848..3dd123aa087 100644 --- a/examples/internal/clients/echo/model_examplepb_embedded.go +++ b/examples/internal/clients/echo/model_examplepb_embedded.go @@ -11,6 +11,6 @@ package echo // Embedded represents a message embedded in SimpleMessage. type ExamplepbEmbedded struct { - Progress string `json:"progress,omitempty"` - Note string `json:"note,omitempty"` + Progress string `json:"progress"` + Note string `json:"note"` } diff --git a/examples/internal/clients/echo/model_examplepb_nested_message.go b/examples/internal/clients/echo/model_examplepb_nested_message.go index fc20b232123..9bf6c8acd7d 100644 --- a/examples/internal/clients/echo/model_examplepb_nested_message.go +++ b/examples/internal/clients/echo/model_examplepb_nested_message.go @@ -10,6 +10,6 @@ package echo type ExamplepbNestedMessage struct { - NId string `json:"nId,omitempty"` - Val string `json:"val,omitempty"` + NId string `json:"nId"` + Val string `json:"val"` } diff --git a/examples/internal/clients/echo/model_examplepb_simple_message.go b/examples/internal/clients/echo/model_examplepb_simple_message.go index c6e66072a0a..b28c2a182bf 100644 --- a/examples/internal/clients/echo/model_examplepb_simple_message.go +++ b/examples/internal/clients/echo/model_examplepb_simple_message.go @@ -12,13 +12,13 @@ package echo // SimpleMessage represents a simple message sent to the Echo service. type ExamplepbSimpleMessage struct { // Id represents the message identifier. - Id string `json:"id,omitempty"` - Num string `json:"num,omitempty"` - LineNum string `json:"lineNum,omitempty"` - Lang string `json:"lang,omitempty"` - Status *ExamplepbEmbedded `json:"status,omitempty"` - En string `json:"en,omitempty"` - No *ExamplepbEmbedded `json:"no,omitempty"` - ResourceId string `json:"resourceId,omitempty"` - NId *ExamplepbNestedMessage `json:"nId,omitempty"` + Id string `json:"id"` + Num string `json:"num"` + LineNum string `json:"lineNum"` + Lang string `json:"lang"` + Status *ExamplepbEmbedded `json:"status"` + En string `json:"en"` + No *ExamplepbEmbedded `json:"no"` + ResourceId string `json:"resourceId"` + NId *ExamplepbNestedMessage `json:"nId"` } diff --git a/examples/internal/clients/echo/model_rpc_status.go b/examples/internal/clients/echo/model_rpc_status.go index f87184fd029..e6a1df1a325 100644 --- a/examples/internal/clients/echo/model_rpc_status.go +++ b/examples/internal/clients/echo/model_rpc_status.go @@ -12,9 +12,9 @@ package echo // The `Status` type defines a logical error model that is suitable for different programming environments, including REST APIs and RPC APIs. It is used by [gRPC](https://github.com/grpc). Each `Status` message contains three pieces of data: error code, error message, and error details. You can find out more about this error model and how to work with it in the [API Design Guide](https://cloud.google.com/apis/design/errors). type RpcStatus struct { // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. - Code int32 `json:"code,omitempty"` + Code int32 `json:"code"` // A developer-facing error message, which should be in English. Any user-facing error message should be localized and sent in the [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. - Message string `json:"message,omitempty"` + Message string `json:"message"` // A list of messages that carry the error details. There is a common set of message types for APIs to use. - Details []ProtobufAny `json:"details,omitempty"` + Details []ProtobufAny `json:"details"` } diff --git a/examples/internal/clients/generateunboundmethods/api/swagger.yaml b/examples/internal/clients/generateunboundmethods/api/swagger.yaml index 746556eff27..a961399eaff 100644 --- a/examples/internal/clients/generateunboundmethods/api/swagger.yaml +++ b/examples/internal/clients/generateunboundmethods/api/swagger.yaml @@ -89,6 +89,10 @@ paths: definitions: examplepbGenerateUnboundMethodsSimpleMessage: type: "object" + required: + - "duration" + - "id" + - "num" properties: id: type: "string" @@ -112,6 +116,10 @@ definitions: additionalProperties: {} rpcStatus: type: "object" + required: + - "code" + - "details" + - "message" properties: code: type: "integer" diff --git a/examples/internal/clients/generateunboundmethods/docs/ExamplepbGenerateUnboundMethodsSimpleMessage.md b/examples/internal/clients/generateunboundmethods/docs/ExamplepbGenerateUnboundMethodsSimpleMessage.md index aba65365948..09fa0533344 100644 --- a/examples/internal/clients/generateunboundmethods/docs/ExamplepbGenerateUnboundMethodsSimpleMessage.md +++ b/examples/internal/clients/generateunboundmethods/docs/ExamplepbGenerateUnboundMethodsSimpleMessage.md @@ -3,9 +3,9 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Id** | **string** | Id represents the message identifier. | [optional] [default to null] -**Num** | **string** | | [optional] [default to null] -**Duration** | **string** | | [optional] [default to null] +**Id** | **string** | Id represents the message identifier. | [default to null] +**Num** | **string** | | [default to null] +**Duration** | **string** | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/examples/internal/clients/generateunboundmethods/model_examplepb_generate_unbound_methods_simple_message.go b/examples/internal/clients/generateunboundmethods/model_examplepb_generate_unbound_methods_simple_message.go index 9f884625983..9f135a5daee 100644 --- a/examples/internal/clients/generateunboundmethods/model_examplepb_generate_unbound_methods_simple_message.go +++ b/examples/internal/clients/generateunboundmethods/model_examplepb_generate_unbound_methods_simple_message.go @@ -12,7 +12,7 @@ package generateunboundmethods // GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service. type ExamplepbGenerateUnboundMethodsSimpleMessage struct { // Id represents the message identifier. - Id string `json:"id,omitempty"` - Num string `json:"num,omitempty"` - Duration string `json:"duration,omitempty"` + Id string `json:"id"` + Num string `json:"num"` + Duration string `json:"duration"` } diff --git a/examples/internal/clients/generateunboundmethods/model_rpc_status.go b/examples/internal/clients/generateunboundmethods/model_rpc_status.go index c1054032159..50176351682 100644 --- a/examples/internal/clients/generateunboundmethods/model_rpc_status.go +++ b/examples/internal/clients/generateunboundmethods/model_rpc_status.go @@ -10,7 +10,7 @@ package generateunboundmethods type RpcStatus struct { - Code int32 `json:"code,omitempty"` - Message string `json:"message,omitempty"` - Details []ProtobufAny `json:"details,omitempty"` + Code int32 `json:"code"` + Message string `json:"message"` + Details []ProtobufAny `json:"details"` } diff --git a/examples/internal/clients/responsebody/api/swagger.yaml b/examples/internal/clients/responsebody/api/swagger.yaml index 833b9ef524c..f9a4974a673 100644 --- a/examples/internal/clients/responsebody/api/swagger.yaml +++ b/examples/internal/clients/responsebody/api/swagger.yaml @@ -111,6 +111,8 @@ definitions: default: "UNKNOWN" examplepbRepeatedResponseBodyOut: type: "object" + required: + - "response" properties: response: type: "array" @@ -118,6 +120,9 @@ definitions: $ref: "#/definitions/examplepbRepeatedResponseBodyOutResponse" examplepbRepeatedResponseBodyOutResponse: type: "object" + required: + - "data" + - "type" properties: data: type: "string" @@ -128,6 +133,8 @@ definitions: type: {} examplepbRepeatedResponseStrings: type: "object" + required: + - "values" properties: values: type: "array" @@ -135,11 +142,15 @@ definitions: type: "string" examplepbResponseBodyOut: type: "object" + required: + - "response" properties: response: $ref: "#/definitions/examplepbResponseBodyOutResponse" examplepbResponseBodyOutResponse: type: "object" + required: + - "data" properties: data: type: "string" @@ -205,6 +216,10 @@ definitions: additionalProperties: {} rpcStatus: type: "object" + required: + - "code" + - "details" + - "message" properties: code: type: "integer" diff --git a/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseBodyOut.md b/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseBodyOut.md index 1a78a92234c..c53c58de7c5 100644 --- a/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseBodyOut.md +++ b/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseBodyOut.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Response** | [**[]ExamplepbRepeatedResponseBodyOutResponse**](examplepbRepeatedResponseBodyOutResponse.md) | | [optional] [default to null] +**Response** | [**[]ExamplepbRepeatedResponseBodyOutResponse**](examplepbRepeatedResponseBodyOutResponse.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseBodyOutResponse.md b/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseBodyOutResponse.md index f7169959b1b..5a70320482b 100644 --- a/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseBodyOutResponse.md +++ b/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseBodyOutResponse.md @@ -3,8 +3,8 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Data** | **string** | | [optional] [default to null] -**Type_** | [***ResponseResponseType**](ResponseResponseType.md) | | [optional] [default to null] +**Data** | **string** | | [default to null] +**Type_** | [***ResponseResponseType**](ResponseResponseType.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseStrings.md b/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseStrings.md index 702cfa03868..77fad7c121d 100644 --- a/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseStrings.md +++ b/examples/internal/clients/responsebody/docs/ExamplepbRepeatedResponseStrings.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Values** | **[]string** | | [optional] [default to null] +**Values** | **[]string** | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/examples/internal/clients/responsebody/docs/ExamplepbResponseBodyOut.md b/examples/internal/clients/responsebody/docs/ExamplepbResponseBodyOut.md index 5a7146581bf..3ee5085190e 100644 --- a/examples/internal/clients/responsebody/docs/ExamplepbResponseBodyOut.md +++ b/examples/internal/clients/responsebody/docs/ExamplepbResponseBodyOut.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Response** | [***ExamplepbResponseBodyOutResponse**](examplepbResponseBodyOutResponse.md) | | [optional] [default to null] +**Response** | [***ExamplepbResponseBodyOutResponse**](examplepbResponseBodyOutResponse.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/examples/internal/clients/responsebody/docs/ExamplepbResponseBodyOutResponse.md b/examples/internal/clients/responsebody/docs/ExamplepbResponseBodyOutResponse.md index aff3fe461e4..75128661553 100644 --- a/examples/internal/clients/responsebody/docs/ExamplepbResponseBodyOutResponse.md +++ b/examples/internal/clients/responsebody/docs/ExamplepbResponseBodyOutResponse.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Data** | **string** | | [optional] [default to null] +**Data** | **string** | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/examples/internal/clients/responsebody/docs/RpcStatus.md b/examples/internal/clients/responsebody/docs/RpcStatus.md index 52a18490d9e..0cd33641b03 100644 --- a/examples/internal/clients/responsebody/docs/RpcStatus.md +++ b/examples/internal/clients/responsebody/docs/RpcStatus.md @@ -3,9 +3,9 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Code** | **int32** | The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. | [optional] [default to null] -**Message** | **string** | A developer-facing error message, which should be in English. Any user-facing error message should be localized and sent in the [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. | [optional] [default to null] -**Details** | [**[]ProtobufAny**](protobufAny.md) | A list of messages that carry the error details. There is a common set of message types for APIs to use. | [optional] [default to null] +**Code** | **int32** | The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. | [default to null] +**Message** | **string** | A developer-facing error message, which should be in English. Any user-facing error message should be localized and sent in the [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. | [default to null] +**Details** | [**[]ProtobufAny**](protobufAny.md) | A list of messages that carry the error details. There is a common set of message types for APIs to use. | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/examples/internal/clients/responsebody/model_examplepb_repeated_response_body_out.go b/examples/internal/clients/responsebody/model_examplepb_repeated_response_body_out.go index 574246373eb..7c1718a5199 100644 --- a/examples/internal/clients/responsebody/model_examplepb_repeated_response_body_out.go +++ b/examples/internal/clients/responsebody/model_examplepb_repeated_response_body_out.go @@ -10,5 +10,5 @@ package responsebody type ExamplepbRepeatedResponseBodyOut struct { - Response []ExamplepbRepeatedResponseBodyOutResponse `json:"response,omitempty"` + Response []ExamplepbRepeatedResponseBodyOutResponse `json:"response"` } diff --git a/examples/internal/clients/responsebody/model_examplepb_repeated_response_body_out_response.go b/examples/internal/clients/responsebody/model_examplepb_repeated_response_body_out_response.go index 1ea5daf3fae..da051cfa32c 100644 --- a/examples/internal/clients/responsebody/model_examplepb_repeated_response_body_out_response.go +++ b/examples/internal/clients/responsebody/model_examplepb_repeated_response_body_out_response.go @@ -10,6 +10,6 @@ package responsebody type ExamplepbRepeatedResponseBodyOutResponse struct { - Data string `json:"data,omitempty"` - Type_ *ResponseResponseType `json:"type,omitempty"` + Data string `json:"data"` + Type_ *ResponseResponseType `json:"type"` } diff --git a/examples/internal/clients/responsebody/model_examplepb_repeated_response_strings.go b/examples/internal/clients/responsebody/model_examplepb_repeated_response_strings.go index 47ec55c7f12..97113269545 100644 --- a/examples/internal/clients/responsebody/model_examplepb_repeated_response_strings.go +++ b/examples/internal/clients/responsebody/model_examplepb_repeated_response_strings.go @@ -10,5 +10,5 @@ package responsebody type ExamplepbRepeatedResponseStrings struct { - Values []string `json:"values,omitempty"` + Values []string `json:"values"` } diff --git a/examples/internal/clients/responsebody/model_examplepb_response_body_out.go b/examples/internal/clients/responsebody/model_examplepb_response_body_out.go index ea912e8976d..e996ef5bf4e 100644 --- a/examples/internal/clients/responsebody/model_examplepb_response_body_out.go +++ b/examples/internal/clients/responsebody/model_examplepb_response_body_out.go @@ -10,5 +10,5 @@ package responsebody type ExamplepbResponseBodyOut struct { - Response *ExamplepbResponseBodyOutResponse `json:"response,omitempty"` + Response *ExamplepbResponseBodyOutResponse `json:"response"` } diff --git a/examples/internal/clients/responsebody/model_examplepb_response_body_out_response.go b/examples/internal/clients/responsebody/model_examplepb_response_body_out_response.go index b78f80ec655..b3286456fc2 100644 --- a/examples/internal/clients/responsebody/model_examplepb_response_body_out_response.go +++ b/examples/internal/clients/responsebody/model_examplepb_response_body_out_response.go @@ -10,5 +10,5 @@ package responsebody type ExamplepbResponseBodyOutResponse struct { - Data string `json:"data,omitempty"` + Data string `json:"data"` } diff --git a/examples/internal/clients/responsebody/model_rpc_status.go b/examples/internal/clients/responsebody/model_rpc_status.go index 9ad2f03a053..1a117b49139 100644 --- a/examples/internal/clients/responsebody/model_rpc_status.go +++ b/examples/internal/clients/responsebody/model_rpc_status.go @@ -12,9 +12,9 @@ package responsebody // The `Status` type defines a logical error model that is suitable for different programming environments, including REST APIs and RPC APIs. It is used by [gRPC](https://github.com/grpc). Each `Status` message contains three pieces of data: error code, error message, and error details. You can find out more about this error model and how to work with it in the [API Design Guide](https://cloud.google.com/apis/design/errors). type RpcStatus struct { // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. - Code int32 `json:"code,omitempty"` + Code int32 `json:"code"` // A developer-facing error message, which should be in English. Any user-facing error message should be localized and sent in the [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. - Message string `json:"message,omitempty"` + Message string `json:"message"` // A list of messages that carry the error details. There is a common set of message types for APIs to use. - Details []ProtobufAny `json:"details,omitempty"` + Details []ProtobufAny `json:"details"` } diff --git a/examples/internal/clients/unannotatedecho/api/swagger.yaml b/examples/internal/clients/unannotatedecho/api/swagger.yaml index 8cbe6190278..d1a14288e09 100644 --- a/examples/internal/clients/unannotatedecho/api/swagger.yaml +++ b/examples/internal/clients/unannotatedecho/api/swagger.yaml @@ -69,74 +69,63 @@ paths: x-exportParamName: "Num" - name: "duration" in: "query" - required: false + required: true type: "string" x-exportParamName: "Duration" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -189,74 +178,63 @@ paths: x-exportParamName: "Num" - name: "duration" in: "query" - required: false + required: true type: "string" x-exportParamName: "Duration" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -327,10 +305,9 @@ paths: - name: "id" in: "query" description: "Id represents the message identifier." - required: false + required: true type: "string" x-exportParamName: "Id" - x-optionalDataType: "String" - name: "num" in: "query" description: "Int value field" @@ -341,74 +318,63 @@ paths: x-exportParamName: "Num" - name: "duration" in: "query" - required: false + required: true type: "string" x-exportParamName: "Duration" - x-optionalDataType: "String" - name: "lineNum" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "LineNum" - x-optionalDataType: "String" - name: "lang" in: "query" - required: false + required: true type: "string" x-exportParamName: "Lang" - x-optionalDataType: "String" - name: "status.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "StatusProgress" - x-optionalDataType: "String" - name: "status.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "StatusNote" - x-optionalDataType: "String" - name: "en" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "En" - x-optionalDataType: "String" - name: "no.progress" in: "query" - required: false + required: true type: "string" format: "int64" x-exportParamName: "NoProgress" - x-optionalDataType: "String" - name: "no.note" in: "query" - required: false + required: true type: "string" x-exportParamName: "NoNote" - x-optionalDataType: "String" - name: "resourceId" in: "query" - required: false + required: true type: "string" x-exportParamName: "ResourceId" - x-optionalDataType: "String" - name: "nId.nId" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdNId" - x-optionalDataType: "String" - name: "nId.val" in: "query" - required: false + required: true type: "string" x-exportParamName: "NIdVal" - x-optionalDataType: "String" responses: 200: description: "A successful response." @@ -441,6 +407,9 @@ securityDefinitions: definitions: examplepbUnannotatedEmbedded: type: "object" + required: + - "note" + - "progress" properties: progress: type: "string" @@ -450,6 +419,9 @@ definitions: description: "Embedded represents a message embedded in SimpleMessage." examplepbUnannotatedNestedMessage: type: "object" + required: + - "nId" + - "val" properties: nId: type: "string" @@ -458,8 +430,16 @@ definitions: examplepbUnannotatedSimpleMessage: type: "object" required: + - "duration" + - "en" - "id" + - "lang" + - "lineNum" + - "nId" + - "no" - "num" + - "resourceId" + - "status" properties: id: type: "string" @@ -502,6 +482,10 @@ definitions: additionalProperties: {} rpcStatus: type: "object" + required: + - "code" + - "details" + - "message" properties: code: type: "integer" diff --git a/examples/internal/clients/unannotatedecho/api_unannotated_echo_service.go b/examples/internal/clients/unannotatedecho/api_unannotated_echo_service.go index d896a6ac217..a6f918d1a01 100644 --- a/examples/internal/clients/unannotatedecho/api_unannotated_echo_service.go +++ b/examples/internal/clients/unannotatedecho/api_unannotated_echo_service.go @@ -12,12 +12,11 @@ package unannotatedecho import ( "context" + "fmt" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" ) // Linger please @@ -27,48 +26,32 @@ var ( type UnannotatedEchoServiceApiService service -/* +/* UnannotatedEchoServiceApiService Summary: Echo rpc Description Echo - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id Id represents the message identifier. - * @param num Int value field - * @param optional nil or *UnannotatedEchoServiceEchoOpts - Optional Parameters: - * @param "Duration" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param num Int value field + - @param duration + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbUnannotatedSimpleMessage */ - -type UnannotatedEchoServiceEchoOpts struct { - Duration optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho(ctx context.Context, id string, num string, localVarOptionals *UnannotatedEchoServiceEchoOpts) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { +func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho(ctx context.Context, id string, num string, duration string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbUnannotatedSimpleMessage ) @@ -81,39 +64,17 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho(ctx contex localVarFormParams := url.Values{} localVarQueryParams.Add("num", parameterToString(num, "")) - if localVarOptionals != nil && localVarOptionals.Duration.IsSet() { - localVarQueryParams.Add("duration", parameterToString(localVarOptionals.Duration.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("duration", parameterToString(duration, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -141,7 +102,7 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho(ctx contex key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -162,121 +123,105 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho(ctx contex if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbUnannotatedSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* UnannotatedEchoServiceApiService Summary: Echo rpc Description Echo - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id Id represents the message identifier. - * @param num Int value field - * @param optional nil or *UnannotatedEchoServiceEcho2Opts - Optional Parameters: - * @param "Duration" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param num Int value field + - @param duration + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbUnannotatedSimpleMessage */ - -type UnannotatedEchoServiceEcho2Opts struct { - Duration optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho2(ctx context.Context, id string, num string, localVarOptionals *UnannotatedEchoServiceEcho2Opts) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { +func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho2(ctx context.Context, id string, num string, duration string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbUnannotatedSimpleMessage ) @@ -289,39 +234,17 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho2(ctx conte localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Duration.IsSet() { - localVarQueryParams.Add("duration", parameterToString(localVarOptionals.Duration.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("duration", parameterToString(duration, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -349,7 +272,7 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho2(ctx conte key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -370,92 +293,92 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho2(ctx conte if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbUnannotatedSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* UnannotatedEchoServiceApiService EchoBody method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body A simple message with many types + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body A simple message with many types @return ExamplepbUnannotatedSimpleMessage */ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoBody(ctx context.Context, body ExamplepbUnannotatedSimpleMessage) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbUnannotatedSimpleMessage ) @@ -495,7 +418,7 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoBody(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -516,110 +439,93 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoBody(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbUnannotatedSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* UnannotatedEchoServiceApiService EchoDelete method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param num Int value field - * @param optional nil or *UnannotatedEchoServiceEchoDeleteOpts - Optional Parameters: - * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Duration" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - - * @param "ResourceId" (optional.String) - - * @param "NIdNId" (optional.String) - - * @param "NIdVal" (optional.String) - + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id Id represents the message identifier. + - @param num Int value field + - @param duration + - @param lineNum + - @param lang + - @param statusProgress + - @param statusNote + - @param en + - @param noProgress + - @param noNote + - @param resourceId + - @param nIdNId + - @param nIdVal @return ExamplepbUnannotatedSimpleMessage */ - -type UnannotatedEchoServiceEchoDeleteOpts struct { - Id optional.String - Duration optional.String - LineNum optional.String - Lang optional.String - StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String - ResourceId optional.String - NIdNId optional.String - NIdVal optional.String -} - -func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoDelete(ctx context.Context, num string, localVarOptionals *UnannotatedEchoServiceEchoDeleteOpts) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { +func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoDelete(ctx context.Context, id string, num string, duration string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string, resourceId string, nIdNId string, nIdVal string) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Delete") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Delete") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbUnannotatedSimpleMessage ) @@ -630,43 +536,19 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoDelete(ctx localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.Id.IsSet() { - localVarQueryParams.Add("id", parameterToString(localVarOptionals.Id.Value(), "")) - } + localVarQueryParams.Add("id", parameterToString(id, "")) localVarQueryParams.Add("num", parameterToString(num, "")) - if localVarOptionals != nil && localVarOptionals.Duration.IsSet() { - localVarQueryParams.Add("duration", parameterToString(localVarOptionals.Duration.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.LineNum.IsSet() { - localVarQueryParams.Add("lineNum", parameterToString(localVarOptionals.LineNum.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.Lang.IsSet() { - localVarQueryParams.Add("lang", parameterToString(localVarOptionals.Lang.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusProgress.IsSet() { - localVarQueryParams.Add("status.progress", parameterToString(localVarOptionals.StatusProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.StatusNote.IsSet() { - localVarQueryParams.Add("status.note", parameterToString(localVarOptionals.StatusNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.En.IsSet() { - localVarQueryParams.Add("en", parameterToString(localVarOptionals.En.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoProgress.IsSet() { - localVarQueryParams.Add("no.progress", parameterToString(localVarOptionals.NoProgress.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NoNote.IsSet() { - localVarQueryParams.Add("no.note", parameterToString(localVarOptionals.NoNote.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.ResourceId.IsSet() { - localVarQueryParams.Add("resourceId", parameterToString(localVarOptionals.ResourceId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdNId.IsSet() { - localVarQueryParams.Add("nId.nId", parameterToString(localVarOptionals.NIdNId.Value(), "")) - } - if localVarOptionals != nil && localVarOptionals.NIdVal.IsSet() { - localVarQueryParams.Add("nId.val", parameterToString(localVarOptionals.NIdVal.Value(), "")) - } + localVarQueryParams.Add("duration", parameterToString(duration, "")) + localVarQueryParams.Add("lineNum", parameterToString(lineNum, "")) + localVarQueryParams.Add("lang", parameterToString(lang, "")) + localVarQueryParams.Add("status.progress", parameterToString(statusProgress, "")) + localVarQueryParams.Add("status.note", parameterToString(statusNote, "")) + localVarQueryParams.Add("en", parameterToString(en, "")) + localVarQueryParams.Add("no.progress", parameterToString(noProgress, "")) + localVarQueryParams.Add("no.note", parameterToString(noNote, "")) + localVarQueryParams.Add("resourceId", parameterToString(resourceId, "")) + localVarQueryParams.Add("nId.nId", parameterToString(nIdNId, "")) + localVarQueryParams.Add("nId.val", parameterToString(nIdVal, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{"application/json", "application/x-foo-mime"} @@ -694,7 +576,7 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoDelete(ctx key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -715,62 +597,62 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoDelete(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbUnannotatedSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_embedded.go b/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_embedded.go index e91de2d8a02..142f68c736f 100644 --- a/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_embedded.go +++ b/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_embedded.go @@ -12,6 +12,6 @@ package unannotatedecho // Embedded represents a message embedded in SimpleMessage. type ExamplepbUnannotatedEmbedded struct { - Progress string `json:"progress,omitempty"` - Note string `json:"note,omitempty"` + Progress string `json:"progress"` + Note string `json:"note"` } diff --git a/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_nested_message.go b/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_nested_message.go index 8f212000c8b..80a30a5ee01 100644 --- a/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_nested_message.go +++ b/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_nested_message.go @@ -11,6 +11,6 @@ package unannotatedecho type ExamplepbUnannotatedNestedMessage struct { - NId string `json:"nId,omitempty"` - Val string `json:"val,omitempty"` + NId string `json:"nId"` + Val string `json:"val"` } diff --git a/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_simple_message.go b/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_simple_message.go index 99099038bf6..6b4e5083138 100644 --- a/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_simple_message.go +++ b/examples/internal/clients/unannotatedecho/model_examplepb_unannotated_simple_message.go @@ -15,13 +15,13 @@ type ExamplepbUnannotatedSimpleMessage struct { // Id represents the message identifier. Id string `json:"id"` // Int value field - Num string `json:"num"` - Duration string `json:"duration,omitempty"` - LineNum string `json:"lineNum,omitempty"` - Lang string `json:"lang,omitempty"` - Status *ExamplepbUnannotatedEmbedded `json:"status,omitempty"` - En string `json:"en,omitempty"` - No *ExamplepbUnannotatedEmbedded `json:"no,omitempty"` - ResourceId string `json:"resourceId,omitempty"` - NId *ExamplepbUnannotatedNestedMessage `json:"nId,omitempty"` + Num string `json:"num"` + Duration string `json:"duration"` + LineNum string `json:"lineNum"` + Lang string `json:"lang"` + Status *ExamplepbUnannotatedEmbedded `json:"status"` + En string `json:"en"` + No *ExamplepbUnannotatedEmbedded `json:"no"` + ResourceId string `json:"resourceId"` + NId *ExamplepbUnannotatedNestedMessage `json:"nId"` } diff --git a/examples/internal/clients/unannotatedecho/model_rpc_status.go b/examples/internal/clients/unannotatedecho/model_rpc_status.go index d97aeea06d4..6dc1defff68 100644 --- a/examples/internal/clients/unannotatedecho/model_rpc_status.go +++ b/examples/internal/clients/unannotatedecho/model_rpc_status.go @@ -11,7 +11,7 @@ package unannotatedecho type RpcStatus struct { - Code int32 `json:"code,omitempty"` - Message string `json:"message,omitempty"` - Details []ProtobufAny `json:"details,omitempty"` + Code int32 `json:"code"` + Message string `json:"message"` + Details []ProtobufAny `json:"details"` } diff --git a/examples/internal/helloworld/helloworld.swagger.json b/examples/internal/helloworld/helloworld.swagger.json index d3dc44e6408..f2c71e04175 100644 --- a/examples/internal/helloworld/helloworld.swagger.json +++ b/examples/internal/helloworld/helloworld.swagger.json @@ -43,61 +43,61 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -135,60 +135,60 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -226,60 +226,60 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -317,60 +317,60 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -408,60 +408,60 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -499,60 +499,60 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -589,61 +589,61 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -681,60 +681,60 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -772,60 +772,60 @@ { "name": "name", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" } @@ -862,61 +862,61 @@ { "name": "strVal", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "floatVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "float" }, { "name": "doubleVal", "in": "query", - "required": false, + "required": true, "type": "number", "format": "double" }, { "name": "boolVal", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesVal", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "int32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "uint32Val", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "uint64Val", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" } @@ -934,7 +934,10 @@ "message": { "type": "string" } - } + }, + "required": [ + "message" + ] }, "protobufAny": { "type": "object", @@ -943,7 +946,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -962,7 +969,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/a_bit_of_everything.swagger.json b/examples/internal/proto/examplepb/a_bit_of_everything.swagger.json index 9146135163a..90758b71184 100644 --- a/examples/internal/proto/examplepb/a_bit_of_everything.swagger.json +++ b/examples/internal/proto/examplepb/a_bit_of_everything.swagger.json @@ -233,13 +233,13 @@ "name": "singleNested.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "singleNested.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -278,54 +278,54 @@ { "name": "uint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "int32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "fixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "fixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "boolValue", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "stringValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -333,7 +333,7 @@ "name": "enumValue", "description": " - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -344,7 +344,7 @@ { "name": "pathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ABC", @@ -355,7 +355,7 @@ { "name": "nestedPathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "GHI", @@ -366,35 +366,35 @@ { "name": "sfixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sfixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "sint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -404,43 +404,43 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "nonConventionalNameValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -448,7 +448,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -463,7 +463,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -478,7 +478,7 @@ "name": "enumValueAnnotation", "description": "Numeric enum title\n\nNumeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -490,7 +490,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -501,20 +501,20 @@ "name": "nestedAnnotation.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -529,7 +529,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -542,7 +542,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -556,7 +556,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -588,35 +588,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -681,7 +681,7 @@ { "name": "singleNested.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -689,7 +689,7 @@ "name": "singleNested.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -732,54 +732,54 @@ { "name": "uint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "int32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "fixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "fixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "boolValue", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "stringValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -787,7 +787,7 @@ "name": "enumValue", "description": " - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -798,7 +798,7 @@ { "name": "pathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ABC", @@ -809,7 +809,7 @@ { "name": "nestedPathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "GHI", @@ -820,35 +820,35 @@ { "name": "sfixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sfixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "sint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -858,43 +858,43 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "nonConventionalNameValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -902,7 +902,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -917,7 +917,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -932,7 +932,7 @@ "name": "enumValueAnnotation", "description": "Numeric enum title\n\nNumeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -944,7 +944,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -954,7 +954,7 @@ { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -962,7 +962,7 @@ "name": "nestedAnnotation.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -973,7 +973,7 @@ { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -988,7 +988,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -1001,7 +1001,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1015,7 +1015,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -1047,35 +1047,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1141,7 +1141,10 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ABitOfEverythingNested" + "$ref": "#/definitions/ABitOfEverythingNested", + "required": [ + "singleNested" + ] } }, { @@ -1179,48 +1182,48 @@ { "name": "uint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "int32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "fixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "fixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "boolValue", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -1228,7 +1231,7 @@ "name": "enumValue", "description": " - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -1239,7 +1242,7 @@ { "name": "pathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ABC", @@ -1250,7 +1253,7 @@ { "name": "nestedPathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "GHI", @@ -1261,35 +1264,35 @@ { "name": "sfixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sfixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "sint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -1299,43 +1302,43 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "nonConventionalNameValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -1343,7 +1346,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1358,7 +1361,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1373,7 +1376,7 @@ "name": "enumValueAnnotation", "description": "Numeric enum title\n\nNumeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -1385,7 +1388,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -1396,13 +1399,13 @@ "name": "nestedAnnotation.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -1410,7 +1413,7 @@ "name": "nestedAnnotation.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -1421,7 +1424,7 @@ { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -1436,7 +1439,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -1449,7 +1452,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1463,7 +1466,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -1495,35 +1498,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1591,13 +1594,13 @@ "name": "singleNested.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "singleNested.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -1605,7 +1608,7 @@ "name": "singleNested.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -1639,54 +1642,54 @@ { "name": "uint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "int32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "fixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "fixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "boolValue", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "stringValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -1694,7 +1697,7 @@ "name": "enumValue", "description": " - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -1705,7 +1708,7 @@ { "name": "pathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ABC", @@ -1716,7 +1719,7 @@ { "name": "nestedPathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "GHI", @@ -1727,35 +1730,35 @@ { "name": "sfixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sfixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "sint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -1765,43 +1768,43 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "nonConventionalNameValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -1809,7 +1812,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1824,7 +1827,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1839,7 +1842,7 @@ "name": "enumValueAnnotation", "description": "Numeric enum title\n\nNumeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -1851,7 +1854,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -1862,13 +1865,13 @@ "name": "nestedAnnotation.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -1876,7 +1879,7 @@ "name": "nestedAnnotation.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -1887,7 +1890,7 @@ { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -1902,7 +1905,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -1915,7 +1918,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -1929,7 +1932,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -1961,35 +1964,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -2202,13 +2205,13 @@ "name": "singleNested.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "singleNested.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -2216,7 +2219,7 @@ "name": "singleNested.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -2236,14 +2239,14 @@ { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -2253,37 +2256,37 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -2291,7 +2294,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -2306,7 +2309,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -2321,7 +2324,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -2332,13 +2335,13 @@ "name": "nestedAnnotation.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -2346,7 +2349,7 @@ "name": "nestedAnnotation.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -2357,7 +2360,7 @@ { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -2372,7 +2375,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -2385,7 +2388,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -2399,7 +2402,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -2431,35 +2434,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -2566,13 +2569,13 @@ "name": "singleNested.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "singleNested.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -2580,7 +2583,7 @@ "name": "singleNested.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -2614,54 +2617,54 @@ { "name": "uint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "int32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "fixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "fixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "boolValue", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "stringValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -2669,7 +2672,7 @@ "name": "enumValue", "description": " - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -2680,7 +2683,7 @@ { "name": "pathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ABC", @@ -2691,7 +2694,7 @@ { "name": "nestedPathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "GHI", @@ -2702,35 +2705,35 @@ { "name": "sfixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sfixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "sint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -2740,43 +2743,43 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "nonConventionalNameValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -2784,7 +2787,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -2799,7 +2802,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -2814,7 +2817,7 @@ "name": "enumValueAnnotation", "description": "Numeric enum title\n\nNumeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -2826,7 +2829,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -2837,13 +2840,13 @@ "name": "nestedAnnotation.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -2851,7 +2854,7 @@ "name": "nestedAnnotation.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -2862,7 +2865,7 @@ { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -2877,7 +2880,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -2890,7 +2893,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -2904,7 +2907,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -2936,35 +2939,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3007,13 +3010,13 @@ "name": "singleNested.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "singleNested.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3021,7 +3024,7 @@ "name": "singleNested.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -3055,54 +3058,54 @@ { "name": "uint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "int32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "fixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "fixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "boolValue", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "stringValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3110,7 +3113,7 @@ "name": "enumValue", "description": " - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -3121,7 +3124,7 @@ { "name": "pathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ABC", @@ -3132,7 +3135,7 @@ { "name": "nestedPathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "GHI", @@ -3143,35 +3146,35 @@ { "name": "sfixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sfixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "sint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -3181,43 +3184,43 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "nonConventionalNameValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -3225,7 +3228,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3240,7 +3243,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3255,7 +3258,7 @@ "name": "enumValueAnnotation", "description": "Numeric enum title\n\nNumeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -3267,7 +3270,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -3278,13 +3281,13 @@ "name": "nestedAnnotation.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3292,7 +3295,7 @@ "name": "nestedAnnotation.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -3303,7 +3306,7 @@ { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3318,7 +3321,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -3331,7 +3334,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3345,7 +3348,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -3377,35 +3380,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3472,13 +3475,13 @@ "name": "singleNested.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "singleNested.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3486,7 +3489,7 @@ "name": "singleNested.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -3520,54 +3523,54 @@ { "name": "uint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "int32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "fixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "fixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "boolValue", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "stringValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3575,7 +3578,7 @@ "name": "enumValue", "description": " - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -3586,7 +3589,7 @@ { "name": "pathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ABC", @@ -3597,7 +3600,7 @@ { "name": "nestedPathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "GHI", @@ -3608,35 +3611,35 @@ { "name": "sfixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sfixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "sint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -3646,43 +3649,43 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "nonConventionalNameValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -3690,7 +3693,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3705,7 +3708,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3720,7 +3723,7 @@ "name": "enumValueAnnotation", "description": "Numeric enum title\n\nNumeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -3732,7 +3735,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -3743,13 +3746,13 @@ "name": "nestedAnnotation.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3757,7 +3760,7 @@ "name": "nestedAnnotation.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -3768,7 +3771,7 @@ { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3783,7 +3786,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -3796,7 +3799,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3810,7 +3813,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -3842,35 +3845,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -3937,13 +3940,13 @@ "name": "singleNested.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "singleNested.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -3951,7 +3954,7 @@ "name": "singleNested.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -3985,54 +3988,54 @@ { "name": "uint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "int32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "fixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "uint64" }, { "name": "fixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, { "name": "boolValue", "in": "query", - "required": false, + "required": true, "type": "boolean" }, { "name": "stringValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "bytesValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "byte" }, { "name": "uint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -4040,7 +4043,7 @@ "name": "enumValue", "description": " - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -4051,7 +4054,7 @@ { "name": "pathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ABC", @@ -4062,7 +4065,7 @@ { "name": "nestedPathEnumValue", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "GHI", @@ -4073,35 +4076,35 @@ { "name": "sfixed32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sfixed64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "sint32Value", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int32" }, { "name": "sint64Value", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "repeatedStringValue", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -4111,43 +4114,43 @@ { "name": "oneofEmpty", "in": "query", - "required": false, + "required": true, "type": "object" }, { "name": "oneofString", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mapValue", "description": "map of numeric enum", "in": "query", - "required": false + "required": true }, { "name": "mappedStringValue", "description": "Map of string title\n\nMap of string description.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "mappedNestedValue", "in": "query", - "required": false + "required": true }, { "name": "nonConventionalNameValue", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "timestampValue", "in": "query", - "required": false, + "required": true, "type": "string", "format": "date-time" }, @@ -4155,7 +4158,7 @@ "name": "repeatedEnumValue", "description": "repeated enum value. it is comma-separated in query\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -4170,7 +4173,7 @@ "name": "repeatedEnumAnnotation", "description": "Repeated numeric enum title\n\nRepeated numeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -4185,7 +4188,7 @@ "name": "enumValueAnnotation", "description": "Numeric enum title\n\nNumeric enum description.\n\n - ZERO: ZERO means 0\n - ONE: ONE means 1", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "ZERO", @@ -4197,7 +4200,7 @@ "name": "repeatedStringAnnotation", "description": "Repeated string title\n\nRepeated string description.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string" @@ -4208,13 +4211,13 @@ "name": "nestedAnnotation.name", "description": "name is nested field.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nestedAnnotation.amount", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -4222,7 +4225,7 @@ "name": "nestedAnnotation.ok", "description": "DeepEnum description.\n\n - FALSE: FALSE is false.\n - TRUE: TRUE is true.", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "FALSE", @@ -4233,7 +4236,7 @@ { "name": "int64OverrideType", "in": "query", - "required": false, + "required": true, "type": "integer", "format": "int64" }, @@ -4248,7 +4251,7 @@ "name": "outputOnlyStringViaFieldBehaviorAnnotation", "description": "mark a field as readonly in Open API definition", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -4261,7 +4264,7 @@ "name": "productId", "description": "Test openapiv2 generation of repeated fields\n\nOnly digits are allowed.", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -4275,7 +4278,7 @@ "name": "optionalStringField", "description": "Test openapiv2 generation of required fields with annotation and jsonschema to reproduce", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -4307,35 +4310,35 @@ "name": "trailingOnly", "description": "Trailing only", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingOnlyDot", "description": "Trailing only dot.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingBoth", "description": "Leading both\n\nTrailing both.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "trailingMultiline", "description": "Leading multiline\n\nThis is an example of a multi-line comment.\n\nTrailing multiline.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "uuids", "description": "Specify a custom format of repeated field items", "in": "query", - "required": false, + "required": true, "type": "array", "items": { "type": "string", @@ -4859,7 +4862,10 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/oneofenumExampleEnum" + "$ref": "#/definitions/oneofenumExampleEnum", + "required": [ + "exampleEnum" + ] } } ], @@ -5073,6 +5079,8 @@ "description": "The book's `name` field is used to identify the book to be updated.\nFormat: publishers/{publisher}/books/{book}", "title": "The book to update.", "required": [ + "id", + "createTime", "book" ] } @@ -5081,7 +5089,7 @@ "name": "allowMissing", "description": "If set to true, and the book is not found, a new book will be created.\nIn this situation, `update_mask` is ignored.", "in": "query", - "required": false, + "required": true, "type": "boolean" } ], @@ -5146,14 +5154,17 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/examplepbBook" + "$ref": "#/definitions/examplepbBook", + "required": [ + "book" + ] } }, { "name": "bookId", "description": "The ID to use for the book.\n\nThis must start with an alphanumeric character.", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -5464,14 +5475,55 @@ "url": "https://github.com/grpc-ecosystem/grpc-gateway" }, "required": [ - "int64Value", - "doubleValue", - "required_field_schema_json_name_custom", + "singleNested", + "nested", "floatValue", + "doubleValue", + "int64Value", + "uint64Value", + "int32Value", + "fixed64Value", + "fixed32Value", + "boolValue", + "stringValue", + "bytesValue", + "uint32Value", + "enumValue", + "pathEnumValue", + "nestedPathEnumValue", + "sfixed32Value", + "sfixed64Value", + "sint32Value", + "sint64Value", + "repeatedStringValue", + "oneofEmpty", + "oneofString", + "mapValue", + "mappedStringValue", + "mappedNestedValue", + "nonConventionalNameValue", + "timestampValue", + "repeatedEnumValue", + "repeatedEnumAnnotation", + "enumValueAnnotation", + "repeatedStringAnnotation", + "repeatedNestedAnnotation", + "nestedAnnotation", + "int64OverrideType", "requiredStringViaFieldBehaviorAnnotation", + "outputOnlyStringViaFieldBehaviorAnnotation", + "productId", + "optionalStringField", "requiredStringField1", "requiredStringField2", - "required_field_behavior_json_name_custom" + "required_field_behavior_json_name_custom", + "required_field_schema_json_name_custom", + "trailingOnly", + "trailingOnlyDot", + "trailingBoth", + "trailingMultiline", + "uuids", + "abe" ], "x-a-bit-of-everything-foo": "bar" } @@ -5480,7 +5532,7 @@ "name": "updateMask", "description": "The paths to update.", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -5789,14 +5841,55 @@ "url": "https://github.com/grpc-ecosystem/grpc-gateway" }, "required": [ - "int64Value", - "doubleValue", - "required_field_schema_json_name_custom", + "singleNested", + "nested", "floatValue", + "doubleValue", + "int64Value", + "uint64Value", + "int32Value", + "fixed64Value", + "fixed32Value", + "boolValue", + "stringValue", + "bytesValue", + "uint32Value", + "enumValue", + "pathEnumValue", + "nestedPathEnumValue", + "sfixed32Value", + "sfixed64Value", + "sint32Value", + "sint64Value", + "repeatedStringValue", + "oneofEmpty", + "oneofString", + "mapValue", + "mappedStringValue", + "mappedNestedValue", + "nonConventionalNameValue", + "timestampValue", + "repeatedEnumValue", + "repeatedEnumAnnotation", + "enumValueAnnotation", + "repeatedStringAnnotation", + "repeatedNestedAnnotation", + "nestedAnnotation", + "int64OverrideType", "requiredStringViaFieldBehaviorAnnotation", + "outputOnlyStringViaFieldBehaviorAnnotation", + "productId", + "optionalStringField", "requiredStringField1", "requiredStringField2", - "required_field_behavior_json_name_custom" + "required_field_behavior_json_name_custom", + "required_field_schema_json_name_custom", + "trailingOnly", + "trailingOnlyDot", + "trailingBoth", + "trailingMultiline", + "uuids", + "abe" ], "x-a-bit-of-everything-foo": "bar" } @@ -5863,7 +5956,7 @@ { "name": "value", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -5932,7 +6025,10 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "value" + ] } } ], @@ -6305,7 +6401,10 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/examplepbBody" + "$ref": "#/definitions/examplepbBody", + "required": [ + "data" + ] } } ], @@ -6515,7 +6614,12 @@ "description": "DeepEnum description." } }, - "description": "Nested is nested type." + "description": "Nested is nested type.", + "required": [ + "name", + "amount", + "ok" + ] }, "ABitOfEverythingServiceDeepPathEchoBody": { "type": "object", @@ -6785,15 +6889,57 @@ "url": "https://github.com/grpc-ecosystem/grpc-gateway" }, "required": [ + "amount", + "ok", + "singleNested", "uuid", - "int64Value", - "doubleValue", - "required_field_schema_json_name_custom", + "nested", "floatValue", + "doubleValue", + "int64Value", + "uint64Value", + "int32Value", + "fixed64Value", + "fixed32Value", + "boolValue", + "stringValue", + "bytesValue", + "uint32Value", + "enumValue", + "pathEnumValue", + "nestedPathEnumValue", + "sfixed32Value", + "sfixed64Value", + "sint32Value", + "sint64Value", + "repeatedStringValue", + "oneofEmpty", + "oneofString", + "mapValue", + "mappedStringValue", + "mappedNestedValue", + "nonConventionalNameValue", + "timestampValue", + "repeatedEnumValue", + "repeatedEnumAnnotation", + "enumValueAnnotation", + "repeatedStringAnnotation", + "repeatedNestedAnnotation", + "nestedAnnotation", + "int64OverrideType", "requiredStringViaFieldBehaviorAnnotation", + "outputOnlyStringViaFieldBehaviorAnnotation", + "productId", + "optionalStringField", "requiredStringField1", "requiredStringField2", - "required_field_behavior_json_name_custom" + "required_field_behavior_json_name_custom", + "required_field_schema_json_name_custom", + "trailingOnly", + "trailingOnlyDot", + "trailingBoth", + "trailingMultiline", + "uuids" ], "x-a-bit-of-everything-foo": "bar" }, @@ -7058,14 +7204,56 @@ }, "title": "UpdateV2Request request for update includes the message and the update mask", "required": [ - "int64Value", - "doubleValue", - "required_field_schema_json_name_custom", + "singleNested", + "nested", "floatValue", + "doubleValue", + "int64Value", + "uint64Value", + "int32Value", + "fixed64Value", + "fixed32Value", + "boolValue", + "stringValue", + "bytesValue", + "uint32Value", + "enumValue", + "pathEnumValue", + "nestedPathEnumValue", + "sfixed32Value", + "sfixed64Value", + "sint32Value", + "sint64Value", + "repeatedStringValue", + "oneofEmpty", + "oneofString", + "mapValue", + "mappedStringValue", + "mappedNestedValue", + "nonConventionalNameValue", + "timestampValue", + "repeatedEnumValue", + "repeatedEnumAnnotation", + "enumValueAnnotation", + "repeatedStringAnnotation", + "repeatedNestedAnnotation", + "nestedAnnotation", + "int64OverrideType", "requiredStringViaFieldBehaviorAnnotation", + "outputOnlyStringViaFieldBehaviorAnnotation", + "productId", + "optionalStringField", "requiredStringField1", "requiredStringField2", - "required_field_behavior_json_name_custom" + "required_field_behavior_json_name_custom", + "required_field_schema_json_name_custom", + "trailingOnly", + "trailingOnlyDot", + "trailingBoth", + "trailingMultiline", + "uuids", + "abe", + "updateMask" ] }, "MessagePathEnumNestedPathEnum": { @@ -7339,15 +7527,55 @@ "url": "https://github.com/grpc-ecosystem/grpc-gateway" }, "required": [ + "singleNested", "uuid", - "int64Value", - "doubleValue", - "required_field_schema_json_name_custom", + "nested", "floatValue", + "doubleValue", + "int64Value", + "uint64Value", + "int32Value", + "fixed64Value", + "fixed32Value", + "boolValue", + "stringValue", + "bytesValue", + "uint32Value", + "enumValue", + "pathEnumValue", + "nestedPathEnumValue", + "sfixed32Value", + "sfixed64Value", + "sint32Value", + "sint64Value", + "repeatedStringValue", + "oneofEmpty", + "oneofString", + "mapValue", + "mappedStringValue", + "mappedNestedValue", + "nonConventionalNameValue", + "timestampValue", + "repeatedEnumValue", + "repeatedEnumAnnotation", + "enumValueAnnotation", + "repeatedStringAnnotation", + "repeatedNestedAnnotation", + "nestedAnnotation", + "int64OverrideType", "requiredStringViaFieldBehaviorAnnotation", + "outputOnlyStringViaFieldBehaviorAnnotation", + "productId", + "optionalStringField", "requiredStringField1", "requiredStringField2", - "required_field_behavior_json_name_custom" + "required_field_behavior_json_name_custom", + "required_field_schema_json_name_custom", + "trailingOnly", + "trailingOnlyDot", + "trailingBoth", + "trailingMultiline", + "uuids" ], "x-a-bit-of-everything-foo": "bar" }, @@ -7478,7 +7706,25 @@ } } }, - "title": "ABitOfEverythingRepeated is used to validate repeated path parameter functionality" + "title": "ABitOfEverythingRepeated is used to validate repeated path parameter functionality", + "required": [ + "pathRepeatedFloatValue", + "pathRepeatedDoubleValue", + "pathRepeatedInt64Value", + "pathRepeatedUint64Value", + "pathRepeatedInt32Value", + "pathRepeatedFixed64Value", + "pathRepeatedFixed32Value", + "pathRepeatedBoolValue", + "pathRepeatedStringValue", + "pathRepeatedBytesValue", + "pathRepeatedUint32Value", + "pathRepeatedEnumValue", + "pathRepeatedSfixed32Value", + "pathRepeatedSfixed64Value", + "pathRepeatedSint32Value", + "pathRepeatedSint64Value" + ] }, "examplepbABitOfEverythingServiceUpdateBody": { "type": "object", @@ -7727,14 +7973,54 @@ "url": "https://github.com/grpc-ecosystem/grpc-gateway" }, "required": [ - "int64Value", - "doubleValue", - "required_field_schema_json_name_custom", + "singleNested", + "nested", "floatValue", + "doubleValue", + "int64Value", + "uint64Value", + "int32Value", + "fixed64Value", + "fixed32Value", + "boolValue", + "stringValue", + "bytesValue", + "uint32Value", + "enumValue", + "pathEnumValue", + "nestedPathEnumValue", + "sfixed32Value", + "sfixed64Value", + "sint32Value", + "sint64Value", + "repeatedStringValue", + "oneofEmpty", + "oneofString", + "mapValue", + "mappedStringValue", + "mappedNestedValue", + "nonConventionalNameValue", + "timestampValue", + "repeatedEnumValue", + "repeatedEnumAnnotation", + "enumValueAnnotation", + "repeatedStringAnnotation", + "repeatedNestedAnnotation", + "nestedAnnotation", + "int64OverrideType", "requiredStringViaFieldBehaviorAnnotation", + "outputOnlyStringViaFieldBehaviorAnnotation", + "productId", + "optionalStringField", "requiredStringField1", "requiredStringField2", - "required_field_behavior_json_name_custom" + "required_field_behavior_json_name_custom", + "required_field_schema_json_name_custom", + "trailingOnly", + "trailingOnlyDot", + "trailingBoth", + "trailingMultiline", + "uuids" ], "x-a-bit-of-everything-foo": "bar" }, @@ -7755,7 +8041,10 @@ "name": { "type": "string" } - } + }, + "required": [ + "name" + ] }, "examplepbBook": { "type": "object", @@ -7776,7 +8065,12 @@ "readOnly": true } }, - "description": "An example resource type from AIP-123 used to test the behavior described in\nthe CreateBookRequest message.\n\nSee: https://google.aip.dev/123" + "description": "An example resource type from AIP-123 used to test the behavior described in\nthe CreateBookRequest message.\n\nSee: https://google.aip.dev/123", + "required": [ + "name", + "id", + "createTime" + ] }, "examplepbCheckStatusResponse": { "type": "object", @@ -7784,7 +8078,10 @@ "status": { "$ref": "#/definitions/rpcStatus" } - } + }, + "required": [ + "status" + ] }, "examplepbErrorObject": { "type": "object", @@ -7802,7 +8099,11 @@ "title": "message", "pattern": "^[a-zA-Z0-9]{1, 32}$" } - } + }, + "required": [ + "code", + "message" + ] }, "examplepbErrorResponse": { "type": "object", @@ -7818,7 +8119,11 @@ "error": { "$ref": "#/definitions/examplepbErrorObject" } - } + }, + "required": [ + "correlationId", + "error" + ] }, "examplepbNumericEnum": { "type": "string", @@ -7910,7 +8215,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "protoexamplepbFoo": { "type": "object", @@ -7944,7 +8253,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] }, "subStringMessage": { "type": "object", @@ -7952,7 +8266,10 @@ "value": { "type": "string" } - } + }, + "required": [ + "value" + ] } }, "securityDefinitions": { diff --git a/examples/internal/proto/examplepb/echo_service.swagger.json b/examples/internal/proto/examplepb/echo_service.swagger.json index 4270e770ab2..b5d93e0f5e8 100644 --- a/examples/internal/proto/examplepb/echo_service.swagger.json +++ b/examples/internal/proto/examplepb/echo_service.swagger.json @@ -47,72 +47,72 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -151,72 +151,72 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -255,72 +255,72 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -366,65 +366,65 @@ { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -476,59 +476,59 @@ { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -580,53 +580,53 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -665,66 +665,66 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -798,58 +798,61 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/examplepbEmbedded" + "$ref": "#/definitions/examplepbEmbedded", + "required": [ + "no" + ] } }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -881,78 +884,78 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -985,7 +988,10 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/examplepbDynamicMessage" + "$ref": "#/definitions/examplepbDynamicMessage", + "required": [ + "body" + ] } } ], @@ -1017,78 +1023,78 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -1107,7 +1113,11 @@ }, "valueField": {} }, - "description": "DynamicMessage represents a message which can have its structure\nbuilt dynamically using Struct and Values." + "description": "DynamicMessage represents a message which can have its structure\nbuilt dynamically using Struct and Values.", + "required": [ + "structField", + "valueField" + ] }, "examplepbDynamicMessageUpdate": { "type": "object", @@ -1118,7 +1128,11 @@ "updateMask": { "type": "string" } - } + }, + "required": [ + "body", + "updateMask" + ] }, "examplepbEmbedded": { "type": "object", @@ -1131,7 +1145,11 @@ "type": "string" } }, - "description": "Embedded represents a message embedded in SimpleMessage." + "description": "Embedded represents a message embedded in SimpleMessage.", + "required": [ + "progress", + "note" + ] }, "examplepbNestedMessage": { "type": "object", @@ -1142,7 +1160,11 @@ "val": { "type": "string" } - } + }, + "required": [ + "nId", + "val" + ] }, "examplepbSimpleMessage": { "type": "object", @@ -1179,7 +1201,18 @@ "$ref": "#/definitions/examplepbNestedMessage" } }, - "description": "SimpleMessage represents a simple message sent to the Echo service." + "description": "SimpleMessage represents a simple message sent to the Echo service.", + "required": [ + "id", + "num", + "lineNum", + "lang", + "status", + "en", + "no", + "resourceId", + "nId" + ] }, "protobufAny": { "type": "object", @@ -1190,7 +1223,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "protobufNullValue": { "type": "string", @@ -1221,7 +1258,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/enum_with_single_value.swagger.json b/examples/internal/proto/examplepb/enum_with_single_value.swagger.json index 1405a717b39..a89ef456c72 100644 --- a/examples/internal/proto/examplepb/enum_with_single_value.swagger.json +++ b/examples/internal/proto/examplepb/enum_with_single_value.swagger.json @@ -60,7 +60,10 @@ "value": { "$ref": "#/definitions/examplepbEnumWithSingleValue" } - } + }, + "required": [ + "value" + ] }, "examplepbEnumWithSingleValueServiceEchoResponse": { "type": "object" @@ -72,7 +75,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -91,7 +98,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/flow_combination.swagger.json b/examples/internal/proto/examplepb/flow_combination.swagger.json index 36d4c5d7c4c..4c7ef7cb38a 100644 --- a/examples/internal/proto/examplepb/flow_combination.swagger.json +++ b/examples/internal/proto/examplepb/flow_combination.swagger.json @@ -45,13 +45,16 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } }, { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -98,13 +101,16 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } }, { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -148,7 +154,10 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } } ], @@ -201,7 +210,10 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } } ], @@ -233,19 +245,22 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } }, { "name": "a", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -286,19 +301,22 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } }, { "name": "a", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -537,7 +555,10 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } } ], @@ -590,7 +611,10 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } } ], @@ -626,13 +650,13 @@ { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "c", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -677,13 +701,13 @@ { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "c", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -721,13 +745,16 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } }, { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -774,13 +801,16 @@ "in": "body", "required": true, "schema": { - "type": "string" + "type": "string", + "required": [ + "c" + ] } }, { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -816,13 +846,13 @@ { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "c", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -867,13 +897,13 @@ { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "c", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -996,19 +1026,19 @@ { "name": "a", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "c", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -1047,19 +1077,19 @@ { "name": "a", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "b", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "c", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -1138,7 +1168,12 @@ "c": { "type": "string" } - } + }, + "required": [ + "a", + "b", + "c" + ] }, "examplepbUnaryProto": { "type": "object", @@ -1146,7 +1181,10 @@ "str": { "type": "string" } - } + }, + "required": [ + "str" + ] }, "protobufAny": { "type": "object", @@ -1157,7 +1195,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -1180,7 +1222,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/generate_unbound_methods.swagger.json b/examples/internal/proto/examplepb/generate_unbound_methods.swagger.json index 7f8d20533a0..fae097bd084 100644 --- a/examples/internal/proto/examplepb/generate_unbound_methods.swagger.json +++ b/examples/internal/proto/examplepb/generate_unbound_methods.swagger.json @@ -137,7 +137,12 @@ "type": "string" } }, - "description": "GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service." + "description": "GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service.", + "required": [ + "id", + "num", + "duration" + ] }, "protobufAny": { "type": "object", @@ -146,7 +151,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -165,7 +174,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/generated_input.swagger.json b/examples/internal/proto/examplepb/generated_input.swagger.json index a6245e19c02..ef714934180 100644 --- a/examples/internal/proto/examplepb/generated_input.swagger.json +++ b/examples/internal/proto/examplepb/generated_input.swagger.json @@ -71,7 +71,12 @@ "description": "DeepEnum description." } }, - "description": "Nested is nested type." + "description": "Nested is nested type.", + "required": [ + "name", + "amount", + "ok" + ] }, "MessagePathEnumNestedPathEnum": { "type": "string", @@ -344,15 +349,55 @@ "url": "https://github.com/grpc-ecosystem/grpc-gateway" }, "required": [ + "singleNested", "uuid", - "int64Value", - "doubleValue", - "required_field_schema_json_name_custom", + "nested", "floatValue", + "doubleValue", + "int64Value", + "uint64Value", + "int32Value", + "fixed64Value", + "fixed32Value", + "boolValue", + "stringValue", + "bytesValue", + "uint32Value", + "enumValue", + "pathEnumValue", + "nestedPathEnumValue", + "sfixed32Value", + "sfixed64Value", + "sint32Value", + "sint64Value", + "repeatedStringValue", + "oneofEmpty", + "oneofString", + "mapValue", + "mappedStringValue", + "mappedNestedValue", + "nonConventionalNameValue", + "timestampValue", + "repeatedEnumValue", + "repeatedEnumAnnotation", + "enumValueAnnotation", + "repeatedStringAnnotation", + "repeatedNestedAnnotation", + "nestedAnnotation", + "int64OverrideType", "requiredStringViaFieldBehaviorAnnotation", + "outputOnlyStringViaFieldBehaviorAnnotation", + "productId", + "optionalStringField", "requiredStringField1", "requiredStringField2", - "required_field_behavior_json_name_custom" + "required_field_behavior_json_name_custom", + "required_field_schema_json_name_custom", + "trailingOnly", + "trailingOnlyDot", + "trailingBoth", + "trailingMultiline", + "uuids" ], "x-a-bit-of-everything-foo": "bar" }, @@ -389,7 +434,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -412,7 +461,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/ignore_comment.swagger.json b/examples/internal/proto/examplepb/ignore_comment.swagger.json index fc15ce2f72d..335a4244915 100644 --- a/examples/internal/proto/examplepb/ignore_comment.swagger.json +++ b/examples/internal/proto/examplepb/ignore_comment.swagger.json @@ -64,7 +64,11 @@ "type": "string", "title": "This annotation should be preserved" } - } + }, + "required": [ + "username", + "password" + ] }, "protobufAny": { "type": "object", @@ -73,7 +77,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -92,7 +100,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/no_body_post.swagger.json b/examples/internal/proto/examplepb/no_body_post.swagger.json index 68716b2eb05..ddf056122c6 100644 --- a/examples/internal/proto/examplepb/no_body_post.swagger.json +++ b/examples/internal/proto/examplepb/no_body_post.swagger.json @@ -80,7 +80,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -103,7 +107,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/non_standard_names.swagger.json b/examples/internal/proto/examplepb/non_standard_names.swagger.json index d88b109f8e3..fac654f5e11 100644 --- a/examples/internal/proto/examplepb/non_standard_names.swagger.json +++ b/examples/internal/proto/examplepb/non_standard_names.swagger.json @@ -40,7 +40,10 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/examplepbNonStandardMessage" + "$ref": "#/definitions/examplepbNonStandardMessage", + "required": [ + "body" + ] } } ], @@ -73,7 +76,10 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/examplepbNonStandardMessageWithJSONNames" + "$ref": "#/definitions/examplepbNonStandardMessageWithJSONNames", + "required": [ + "body" + ] } } ], @@ -116,7 +122,17 @@ "$ref": "#/definitions/examplepbNonStandardMessageThing" } }, - "description": "NonStandardMessage has oddly named fields." + "description": "NonStandardMessage has oddly named fields.", + "required": [ + "id", + "Num", + "lineNum", + "langIdent", + "STATUS", + "enGB", + "no", + "thing" + ] }, "examplepbNonStandardMessageThing": { "type": "object", @@ -124,7 +140,10 @@ "subThing": { "$ref": "#/definitions/examplepbNonStandardMessageThingSubThing" } - } + }, + "required": [ + "subThing" + ] }, "examplepbNonStandardMessageThingSubThing": { "type": "object", @@ -132,7 +151,10 @@ "subValue": { "type": "string" } - } + }, + "required": [ + "subValue" + ] }, "examplepbNonStandardMessageWithJSONNames": { "type": "object", @@ -166,7 +188,17 @@ "$ref": "#/definitions/examplepbNonStandardMessageWithJSONNamesThing" } }, - "description": "NonStandardMessageWithJSONNames maps odd field names to odd JSON names for maximum confusion." + "description": "NonStandardMessageWithJSONNames maps odd field names to odd JSON names for maximum confusion.", + "required": [ + "ID", + "Num", + "LineNum", + "langIdent", + "status", + "En_GB", + "yes", + "Thingy" + ] }, "examplepbNonStandardMessageWithJSONNamesThing": { "type": "object", @@ -174,7 +206,10 @@ "SubThing": { "$ref": "#/definitions/examplepbNonStandardMessageWithJSONNamesThingSubThing" } - } + }, + "required": [ + "SubThing" + ] }, "examplepbNonStandardMessageWithJSONNamesThingSubThing": { "type": "object", @@ -182,7 +217,10 @@ "sub_Value": { "type": "string" } - } + }, + "required": [ + "sub_Value" + ] }, "protobufAny": { "type": "object", @@ -193,7 +231,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -216,7 +258,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/openapi_merge.swagger.json b/examples/internal/proto/examplepb/openapi_merge.swagger.json index f60c2a4b8db..3fcc83be524 100644 --- a/examples/internal/proto/examplepb/openapi_merge.swagger.json +++ b/examples/internal/proto/examplepb/openapi_merge.swagger.json @@ -246,7 +246,10 @@ "title": "Here is the explanation about InMessageA.values" } }, - "description": "InMessageA represents a message to ServiceA and ServiceC." + "description": "InMessageA represents a message to ServiceA and ServiceC.", + "required": [ + "values" + ] }, "examplepbInMessageB": { "type": "object", @@ -256,7 +259,10 @@ "title": "Here is the explanation about InMessageB.values" } }, - "description": "InMessageB represents a message to ServiceB." + "description": "InMessageB represents a message to ServiceB.", + "required": [ + "value" + ] }, "examplepbOutMessageA": { "type": "object", @@ -266,7 +272,10 @@ "title": "Here is the explanation about OutMessageA.value" } }, - "description": "OutMessageA represents a message returned from ServiceA." + "description": "OutMessageA represents a message returned from ServiceA.", + "required": [ + "value" + ] }, "examplepbOutMessageB": { "type": "object", @@ -279,7 +288,10 @@ "title": "Here is the explanation about OutMessageB.value" } }, - "description": "OutMessageB represents a message returned from ServiceB." + "description": "OutMessageB represents a message returned from ServiceB.", + "required": [ + "values" + ] }, "examplepbOutMessageC": { "type": "object", @@ -289,7 +301,10 @@ "title": "Here is the explanation about OutMessageC.value" } }, - "description": "OutMessageC represents a message returned from ServiceC." + "description": "OutMessageC represents a message returned from ServiceC.", + "required": [ + "value" + ] }, "protobufAny": { "type": "object", @@ -298,7 +313,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -317,7 +336,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/openapi_merge_a.swagger.json b/examples/internal/proto/examplepb/openapi_merge_a.swagger.json index 87a33da8fd5..cf0f633690e 100644 --- a/examples/internal/proto/examplepb/openapi_merge_a.swagger.json +++ b/examples/internal/proto/examplepb/openapi_merge_a.swagger.json @@ -173,7 +173,10 @@ "title": "Here is the explanation about InMessageA.values" } }, - "description": "InMessageA represents a message to ServiceA and ServiceC." + "description": "InMessageA represents a message to ServiceA and ServiceC.", + "required": [ + "values" + ] }, "examplepbOutMessageA": { "type": "object", @@ -183,7 +186,10 @@ "title": "Here is the explanation about OutMessageA.value" } }, - "description": "OutMessageA represents a message returned from ServiceA." + "description": "OutMessageA represents a message returned from ServiceA.", + "required": [ + "value" + ] }, "examplepbOutMessageC": { "type": "object", @@ -193,7 +199,10 @@ "title": "Here is the explanation about OutMessageC.value" } }, - "description": "OutMessageC represents a message returned from ServiceC." + "description": "OutMessageC represents a message returned from ServiceC.", + "required": [ + "value" + ] }, "protobufAny": { "type": "object", @@ -204,7 +213,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -227,7 +240,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/openapi_merge_b.swagger.json b/examples/internal/proto/examplepb/openapi_merge_b.swagger.json index 7fce1fa0870..5c9fffb1768 100644 --- a/examples/internal/proto/examplepb/openapi_merge_b.swagger.json +++ b/examples/internal/proto/examplepb/openapi_merge_b.swagger.json @@ -97,7 +97,10 @@ "title": "Here is the explanation about InMessageB.values" } }, - "description": "InMessageB represents a message to ServiceB." + "description": "InMessageB represents a message to ServiceB.", + "required": [ + "value" + ] }, "examplepbOutMessageB": { "type": "object", @@ -110,7 +113,10 @@ "title": "Here is the explanation about OutMessageB.value" } }, - "description": "OutMessageB represents a message returned from ServiceB." + "description": "OutMessageB represents a message returned from ServiceB.", + "required": [ + "values" + ] }, "protobufAny": { "type": "object", @@ -121,7 +127,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -144,7 +154,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/remove_internal_comment.swagger.json b/examples/internal/proto/examplepb/remove_internal_comment.swagger.json index c4d25ec5e4c..527b6dbc70a 100644 --- a/examples/internal/proto/examplepb/remove_internal_comment.swagger.json +++ b/examples/internal/proto/examplepb/remove_internal_comment.swagger.json @@ -67,7 +67,11 @@ "description": "Password.\n\nNew row." } }, - "title": "Foo2Request" + "title": "Foo2Request", + "required": [ + "username", + "password" + ] }, "protobufAny": { "type": "object", @@ -76,7 +80,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -95,7 +103,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/response_body_service.swagger.json b/examples/internal/proto/examplepb/response_body_service.swagger.json index 034ce969375..ceb655ed9b4 100644 --- a/examples/internal/proto/examplepb/response_body_service.swagger.json +++ b/examples/internal/proto/examplepb/response_body_service.swagger.json @@ -27,7 +27,10 @@ "items": { "type": "object", "$ref": "#/definitions/examplepbRepeatedResponseBodyOutResponse" - } + }, + "required": [ + "response" + ] } }, "default": { @@ -66,7 +69,10 @@ "$ref": "#/definitions/rpcStatus" } }, - "title": "Stream result of examplepbResponseBodyOut" + "title": "Stream result of examplepbResponseBodyOut", + "required": [ + "response" + ] } }, "default": { @@ -96,7 +102,10 @@ "200": { "description": "", "schema": { - "$ref": "#/definitions/examplepbResponseBodyOutResponse" + "$ref": "#/definitions/examplepbResponseBodyOutResponse", + "required": [ + "response" + ] } }, "default": { @@ -129,7 +138,10 @@ "type": "array", "items": { "type": "string" - } + }, + "required": [ + "values" + ] } }, "default": { @@ -174,7 +186,10 @@ "$ref": "#/definitions/examplepbRepeatedResponseBodyOutResponse" } } - } + }, + "required": [ + "response" + ] }, "examplepbRepeatedResponseBodyOutResponse": { "type": "object", @@ -185,7 +200,11 @@ "type": { "$ref": "#/definitions/ResponseResponseType" } - } + }, + "required": [ + "data", + "type" + ] }, "examplepbRepeatedResponseStrings": { "type": "object", @@ -196,7 +215,10 @@ "type": "string" } } - } + }, + "required": [ + "values" + ] }, "examplepbResponseBodyOut": { "type": "object", @@ -204,7 +226,10 @@ "response": { "$ref": "#/definitions/examplepbResponseBodyOutResponse" } - } + }, + "required": [ + "response" + ] }, "examplepbResponseBodyOutResponse": { "type": "object", @@ -212,7 +237,10 @@ "data": { "type": "string" } - } + }, + "required": [ + "data" + ] }, "protobufAny": { "type": "object", @@ -223,7 +251,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -246,7 +278,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/stream.swagger.json b/examples/internal/proto/examplepb/stream.swagger.json index 09d0ade89bc..cc699c13b8e 100644 --- a/examples/internal/proto/examplepb/stream.swagger.json +++ b/examples/internal/proto/examplepb/stream.swagger.json @@ -46,7 +46,7 @@ { "name": "error", "in": "query", - "required": false, + "required": true, "type": "boolean" } ], @@ -195,7 +195,7 @@ { "name": "error", "in": "query", - "required": false, + "required": true, "type": "boolean" } ], @@ -225,7 +225,12 @@ "description": "DeepEnum description." } }, - "description": "Nested is nested type." + "description": "Nested is nested type.", + "required": [ + "name", + "amount", + "ok" + ] }, "MessagePathEnumNestedPathEnum": { "type": "string", @@ -265,7 +270,12 @@ "description": "Application specific response metadata. Must be set in the first response\nfor streaming APIs." } }, - "description": "Message that represents an arbitrary HTTP body. It should only be used for\npayload formats that can't be represented as JSON, such as raw binary or\nan HTML page.\n\n\nThis message can be used both in streaming and non-streaming API methods in\nthe request as well as the response.\n\nIt can be used as a top-level request field, which is convenient if one\nwants to extract parameters from either the URL or HTTP template into the\nrequest fields and also want access to the raw HTTP body.\n\nExample:\n\n message GetResourceRequest {\n // A unique request id.\n string request_id = 1;\n\n // The raw HTTP body is bound to this field.\n google.api.HttpBody http_body = 2;\n\n }\n\n service ResourceService {\n rpc GetResource(GetResourceRequest)\n returns (google.api.HttpBody);\n rpc UpdateResource(google.api.HttpBody)\n returns (google.protobuf.Empty);\n\n }\n\nExample with streaming methods:\n\n service CaldavService {\n rpc GetCalendar(stream google.api.HttpBody)\n returns (stream google.api.HttpBody);\n rpc UpdateCalendar(stream google.api.HttpBody)\n returns (stream google.api.HttpBody);\n\n }\n\nUse of this type only changes how the request and response bodies are\nhandled, all other features will continue to work unchanged." + "description": "Message that represents an arbitrary HTTP body. It should only be used for\npayload formats that can't be represented as JSON, such as raw binary or\nan HTML page.\n\n\nThis message can be used both in streaming and non-streaming API methods in\nthe request as well as the response.\n\nIt can be used as a top-level request field, which is convenient if one\nwants to extract parameters from either the URL or HTTP template into the\nrequest fields and also want access to the raw HTTP body.\n\nExample:\n\n message GetResourceRequest {\n // A unique request id.\n string request_id = 1;\n\n // The raw HTTP body is bound to this field.\n google.api.HttpBody http_body = 2;\n\n }\n\n service ResourceService {\n rpc GetResource(GetResourceRequest)\n returns (google.api.HttpBody);\n rpc UpdateResource(google.api.HttpBody)\n returns (google.protobuf.Empty);\n\n }\n\nExample with streaming methods:\n\n service CaldavService {\n rpc GetCalendar(stream google.api.HttpBody)\n returns (stream google.api.HttpBody);\n rpc UpdateCalendar(stream google.api.HttpBody)\n returns (stream google.api.HttpBody);\n\n }\n\nUse of this type only changes how the request and response bodies are\nhandled, all other features will continue to work unchanged.", + "required": [ + "contentType", + "data", + "extensions" + ] }, "examplepbABitOfEverything": { "type": "object", @@ -521,15 +531,55 @@ "url": "https://github.com/grpc-ecosystem/grpc-gateway" }, "required": [ + "singleNested", "uuid", - "int64Value", - "doubleValue", - "required_field_schema_json_name_custom", + "nested", "floatValue", + "doubleValue", + "int64Value", + "uint64Value", + "int32Value", + "fixed64Value", + "fixed32Value", + "boolValue", + "stringValue", + "bytesValue", + "uint32Value", + "enumValue", + "pathEnumValue", + "nestedPathEnumValue", + "sfixed32Value", + "sfixed64Value", + "sint32Value", + "sint64Value", + "repeatedStringValue", + "oneofEmpty", + "oneofString", + "mapValue", + "mappedStringValue", + "mappedNestedValue", + "nonConventionalNameValue", + "timestampValue", + "repeatedEnumValue", + "repeatedEnumAnnotation", + "enumValueAnnotation", + "repeatedStringAnnotation", + "repeatedNestedAnnotation", + "nestedAnnotation", + "int64OverrideType", "requiredStringViaFieldBehaviorAnnotation", + "outputOnlyStringViaFieldBehaviorAnnotation", + "productId", + "optionalStringField", "requiredStringField1", "requiredStringField2", - "required_field_behavior_json_name_custom" + "required_field_behavior_json_name_custom", + "required_field_schema_json_name_custom", + "trailingOnly", + "trailingOnlyDot", + "trailingBoth", + "trailingMultiline", + "uuids" ], "x-a-bit-of-everything-foo": "bar" }, @@ -566,7 +616,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -589,7 +643,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] }, "subStringMessage": { "type": "object", @@ -597,7 +656,10 @@ "value": { "type": "string" } - } + }, + "required": [ + "value" + ] } } } diff --git a/examples/internal/proto/examplepb/unannotated_echo_service.swagger.json b/examples/internal/proto/examplepb/unannotated_echo_service.swagger.json index 6a497a0a17c..ddd701c4cd9 100644 --- a/examples/internal/proto/examplepb/unannotated_echo_service.swagger.json +++ b/examples/internal/proto/examplepb/unannotated_echo_service.swagger.json @@ -108,71 +108,71 @@ { "name": "duration", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -245,71 +245,71 @@ { "name": "duration", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -401,7 +401,7 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { @@ -416,71 +416,71 @@ { "name": "duration", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "resourceId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.nId", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "nId.val", "in": "query", - "required": false, + "required": true, "type": "string" } ], @@ -502,7 +502,11 @@ "type": "string" } }, - "description": "Embedded represents a message embedded in SimpleMessage." + "description": "Embedded represents a message embedded in SimpleMessage.", + "required": [ + "progress", + "note" + ] }, "examplepbUnannotatedNestedMessage": { "type": "object", @@ -513,7 +517,11 @@ "val": { "type": "string" } - } + }, + "required": [ + "nId", + "val" + ] }, "examplepbUnannotatedSimpleMessage": { "type": "object", @@ -566,7 +574,15 @@ }, "required": [ "id", - "num" + "num", + "duration", + "lineNum", + "lang", + "status", + "en", + "no", + "resourceId", + "nId" ] }, "protobufAny": { @@ -576,7 +592,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -595,7 +615,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } }, "securityDefinitions": { diff --git a/examples/internal/proto/examplepb/use_go_template.swagger.json b/examples/internal/proto/examplepb/use_go_template.swagger.json index 61ee945e3a9..1e168089f24 100644 --- a/examples/internal/proto/examplepb/use_go_template.swagger.json +++ b/examples/internal/proto/examplepb/use_go_template.swagger.json @@ -96,7 +96,11 @@ "type": "boolean", "title": "Whether you have access or not" } - } + }, + "required": [ + "message", + "access" + ] }, "examplepbLoginRequest": { "type": "object", @@ -109,7 +113,11 @@ "type": "string", "title": "The entered password" } - } + }, + "required": [ + "username", + "password" + ] }, "examplepbLogoutReply": { "type": "object", @@ -118,7 +126,10 @@ "type": "string", "title": "Message that tells you whether your\nlogout was successful or not" } - } + }, + "required": [ + "message" + ] }, "examplepbLogoutRequest": { "type": "object", @@ -141,7 +152,12 @@ "description": "It displays that using [] in front of the type", "title": "This is an array" } - } + }, + "required": [ + "timeoflogout", + "test", + "stringarray" + ] }, "protobufAny": { "type": "object", @@ -150,7 +166,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -169,7 +189,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/visibility_rule_enums_as_ints_echo_service.swagger.json b/examples/internal/proto/examplepb/visibility_rule_enums_as_ints_echo_service.swagger.json index b123055cfe9..b38648bff61 100644 --- a/examples/internal/proto/examplepb/visibility_rule_enums_as_ints_echo_service.swagger.json +++ b/examples/internal/proto/examplepb/visibility_rule_enums_as_ints_echo_service.swagger.json @@ -46,60 +46,60 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "integer", "enum": [ 0, @@ -110,7 +110,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "integer", "enum": [ 1 @@ -153,7 +153,11 @@ "type": "string" } }, - "description": "Embedded represents a message embedded in SimpleMessage." + "description": "Embedded represents a message embedded in SimpleMessage.", + "required": [ + "progress", + "note" + ] }, "examplepbVisibilityRuleSimpleMessage": { "type": "object", @@ -190,7 +194,18 @@ "$ref": "#/definitions/VisibilityRuleSimpleMessageVisibilityEnumHiddenDefault" } }, - "description": "SimpleMessage represents a simple message sent to the Echo service." + "description": "SimpleMessage represents a simple message sent to the Echo service.", + "required": [ + "id", + "num", + "lineNum", + "lang", + "status", + "en", + "no", + "anEnum", + "ahiddenDefaultEnum" + ] }, "protobufAny": { "type": "object", @@ -199,7 +214,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -218,7 +237,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/visibility_rule_internal_echo_service.swagger.json b/examples/internal/proto/examplepb/visibility_rule_internal_echo_service.swagger.json index 4069716dbdd..3855374dfdd 100644 --- a/examples/internal/proto/examplepb/visibility_rule_internal_echo_service.swagger.json +++ b/examples/internal/proto/examplepb/visibility_rule_internal_echo_service.swagger.json @@ -49,96 +49,96 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -151,7 +151,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -188,102 +188,102 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -296,7 +296,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -333,102 +333,102 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -441,7 +441,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -484,96 +484,96 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -586,7 +586,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -637,7 +637,13 @@ "type": "string" } }, - "description": "Embedded represents a message embedded in SimpleMessage." + "description": "Embedded represents a message embedded in SimpleMessage.", + "required": [ + "progress", + "note", + "internalField", + "previewField" + ] }, "examplepbVisibilityRuleSimpleMessage": { "type": "object", @@ -680,7 +686,20 @@ "$ref": "#/definitions/VisibilityRuleSimpleMessageVisibilityEnumHiddenDefault" } }, - "description": "SimpleMessage represents a simple message sent to the Echo service." + "description": "SimpleMessage represents a simple message sent to the Echo service.", + "required": [ + "id", + "num", + "lineNum", + "lang", + "status", + "en", + "no", + "internalField", + "previewField", + "anEnum", + "ahiddenDefaultEnum" + ] }, "protobufAny": { "type": "object", @@ -689,7 +708,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -708,7 +731,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/visibility_rule_none_echo_service.swagger.json b/examples/internal/proto/examplepb/visibility_rule_none_echo_service.swagger.json index 477e08c4227..b551f53091e 100644 --- a/examples/internal/proto/examplepb/visibility_rule_none_echo_service.swagger.json +++ b/examples/internal/proto/examplepb/visibility_rule_none_echo_service.swagger.json @@ -46,60 +46,60 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -110,7 +110,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_VISIBLE" @@ -149,7 +149,11 @@ "type": "string" } }, - "description": "Embedded represents a message embedded in SimpleMessage." + "description": "Embedded represents a message embedded in SimpleMessage.", + "required": [ + "progress", + "note" + ] }, "examplepbVisibilityRuleSimpleMessage": { "type": "object", @@ -186,7 +190,18 @@ "$ref": "#/definitions/VisibilityRuleSimpleMessageVisibilityEnumHiddenDefault" } }, - "description": "SimpleMessage represents a simple message sent to the Echo service." + "description": "SimpleMessage represents a simple message sent to the Echo service.", + "required": [ + "id", + "num", + "lineNum", + "lang", + "status", + "en", + "no", + "anEnum", + "ahiddenDefaultEnum" + ] }, "protobufAny": { "type": "object", @@ -195,7 +210,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -214,7 +233,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/visibility_rule_preview_and_internal_echo_service.swagger.json b/examples/internal/proto/examplepb/visibility_rule_preview_and_internal_echo_service.swagger.json index 047a672deb5..536054afa38 100644 --- a/examples/internal/proto/examplepb/visibility_rule_preview_and_internal_echo_service.swagger.json +++ b/examples/internal/proto/examplepb/visibility_rule_preview_and_internal_echo_service.swagger.json @@ -49,96 +49,96 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -151,7 +151,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -188,102 +188,102 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -296,7 +296,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -333,102 +333,102 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -441,7 +441,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -478,102 +478,102 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -586,7 +586,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -629,96 +629,96 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "internalField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -731,7 +731,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_UNSPECIFIED", @@ -782,7 +782,13 @@ "type": "string" } }, - "description": "Embedded represents a message embedded in SimpleMessage." + "description": "Embedded represents a message embedded in SimpleMessage.", + "required": [ + "progress", + "note", + "internalField", + "previewField" + ] }, "examplepbVisibilityRuleEnumInPreviewMethod": { "type": "string", @@ -805,7 +811,12 @@ "$ref": "#/definitions/examplepbVisibilityRuleEnumInPreviewMethod" } }, - "description": "MessageInPreviewMethod doesn't define its own visibility restrictions,\nbut is only included in a method marked as \"PREVIEW\", so it will only\nappear if `visibility_restriction_selectors` include \"PREVIEW\"." + "description": "MessageInPreviewMethod doesn't define its own visibility restrictions,\nbut is only included in a method marked as \"PREVIEW\", so it will only\nappear if `visibility_restriction_selectors` include \"PREVIEW\".", + "required": [ + "id", + "subMessage", + "enum" + ] }, "examplepbVisibilityRuleSimpleMessage": { "type": "object", @@ -848,7 +859,20 @@ "$ref": "#/definitions/VisibilityRuleSimpleMessageVisibilityEnumHiddenDefault" } }, - "description": "SimpleMessage represents a simple message sent to the Echo service." + "description": "SimpleMessage represents a simple message sent to the Echo service.", + "required": [ + "id", + "num", + "lineNum", + "lang", + "status", + "en", + "no", + "internalField", + "previewField", + "anEnum", + "ahiddenDefaultEnum" + ] }, "examplepbVisibilityRuleSubMessageInPreviewMethod": { "type": "object", @@ -857,7 +881,10 @@ "type": "string" } }, - "description": "SubMessageInPreviewMethod doesn't define its own visibility restrictions,\nbut is only included in a method marked as \"PREVIEW\", so it will only\nappear if `visibility_restriction_selectors` include \"PREVIEW\"." + "description": "SubMessageInPreviewMethod doesn't define its own visibility restrictions,\nbut is only included in a method marked as \"PREVIEW\", so it will only\nappear if `visibility_restriction_selectors` include \"PREVIEW\".", + "required": [ + "id" + ] }, "protobufAny": { "type": "object", @@ -866,7 +893,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -885,7 +916,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/visibility_rule_preview_echo_service.swagger.json b/examples/internal/proto/examplepb/visibility_rule_preview_echo_service.swagger.json index 04164e13ab8..2995047984d 100644 --- a/examples/internal/proto/examplepb/visibility_rule_preview_echo_service.swagger.json +++ b/examples/internal/proto/examplepb/visibility_rule_preview_echo_service.swagger.json @@ -46,78 +46,78 @@ { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -129,7 +129,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_VISIBLE" @@ -164,84 +164,84 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -253,7 +253,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_VISIBLE" @@ -288,84 +288,84 @@ "name": "id", "description": "Id represents the message identifier.", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "num", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lineNum", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "lang", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "status.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "status.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "en", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.progress", "in": "query", - "required": false, + "required": true, "type": "string", "format": "int64" }, { "name": "no.note", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "no.previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "previewField", "in": "query", - "required": false, + "required": true, "type": "string" }, { "name": "anEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_UNSPECIFIED", @@ -377,7 +377,7 @@ { "name": "ahiddenDefaultEnum", "in": "query", - "required": false, + "required": true, "type": "string", "enum": [ "VISIBILITY_ENUM_HIDDEN_DEFAULT_VISIBLE" @@ -420,7 +420,12 @@ "type": "string" } }, - "description": "Embedded represents a message embedded in SimpleMessage." + "description": "Embedded represents a message embedded in SimpleMessage.", + "required": [ + "progress", + "note", + "previewField" + ] }, "examplepbVisibilityRuleEnumInPreviewMethod": { "type": "string", @@ -443,7 +448,12 @@ "$ref": "#/definitions/examplepbVisibilityRuleEnumInPreviewMethod" } }, - "description": "MessageInPreviewMethod doesn't define its own visibility restrictions,\nbut is only included in a method marked as \"PREVIEW\", so it will only\nappear if `visibility_restriction_selectors` include \"PREVIEW\"." + "description": "MessageInPreviewMethod doesn't define its own visibility restrictions,\nbut is only included in a method marked as \"PREVIEW\", so it will only\nappear if `visibility_restriction_selectors` include \"PREVIEW\".", + "required": [ + "id", + "subMessage", + "enum" + ] }, "examplepbVisibilityRuleSimpleMessage": { "type": "object", @@ -483,7 +493,19 @@ "$ref": "#/definitions/VisibilityRuleSimpleMessageVisibilityEnumHiddenDefault" } }, - "description": "SimpleMessage represents a simple message sent to the Echo service." + "description": "SimpleMessage represents a simple message sent to the Echo service.", + "required": [ + "id", + "num", + "lineNum", + "lang", + "status", + "en", + "no", + "previewField", + "anEnum", + "ahiddenDefaultEnum" + ] }, "examplepbVisibilityRuleSubMessageInPreviewMethod": { "type": "object", @@ -492,7 +514,10 @@ "type": "string" } }, - "description": "SubMessageInPreviewMethod doesn't define its own visibility restrictions,\nbut is only included in a method marked as \"PREVIEW\", so it will only\nappear if `visibility_restriction_selectors` include \"PREVIEW\"." + "description": "SubMessageInPreviewMethod doesn't define its own visibility restrictions,\nbut is only included in a method marked as \"PREVIEW\", so it will only\nappear if `visibility_restriction_selectors` include \"PREVIEW\".", + "required": [ + "id" + ] }, "protobufAny": { "type": "object", @@ -501,7 +526,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -520,7 +549,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/examplepb/wrappers.swagger.json b/examples/internal/proto/examplepb/wrappers.swagger.json index 184b4d529a9..121a74d1a2e 100644 --- a/examples/internal/proto/examplepb/wrappers.swagger.json +++ b/examples/internal/proto/examplepb/wrappers.swagger.json @@ -423,7 +423,18 @@ "type": "string", "format": "byte" } - } + }, + "required": [ + "stringValue", + "int32Value", + "int64Value", + "floatValue", + "doubleValue", + "boolValue", + "uint32Value", + "uint64Value", + "bytesValue" + ] }, "protobufAny": { "type": "object", @@ -434,7 +445,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -457,7 +472,12 @@ "description": "A list of messages that carry the error details. There is a common set of\nmessage types for APIs to use." } }, - "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)." + "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors).", + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/oneofenum/oneof_enum.swagger.json b/examples/internal/proto/oneofenum/oneof_enum.swagger.json index 7a9110d4de0..c57bea6bbdc 100644 --- a/examples/internal/proto/oneofenum/oneof_enum.swagger.json +++ b/examples/internal/proto/oneofenum/oneof_enum.swagger.json @@ -19,7 +19,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -38,7 +42,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/pathenum/path_enum.swagger.json b/examples/internal/proto/pathenum/path_enum.swagger.json index 9a8e14b3219..74fe289dce0 100644 --- a/examples/internal/proto/pathenum/path_enum.swagger.json +++ b/examples/internal/proto/pathenum/path_enum.swagger.json @@ -19,7 +19,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -38,7 +42,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/sub/message.swagger.json b/examples/internal/proto/sub/message.swagger.json index 7ca6a1e999b..6d4b0439508 100644 --- a/examples/internal/proto/sub/message.swagger.json +++ b/examples/internal/proto/sub/message.swagger.json @@ -19,7 +19,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -38,7 +42,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/examples/internal/proto/sub2/message.swagger.json b/examples/internal/proto/sub2/message.swagger.json index 4a68e489c27..ac80039e423 100644 --- a/examples/internal/proto/sub2/message.swagger.json +++ b/examples/internal/proto/sub2/message.swagger.json @@ -19,7 +19,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -38,7 +42,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/internal/descriptor/apiconfig/apiconfig.swagger.json b/internal/descriptor/apiconfig/apiconfig.swagger.json index 41e0c7350a4..aa9331fdf3d 100644 --- a/internal/descriptor/apiconfig/apiconfig.swagger.json +++ b/internal/descriptor/apiconfig/apiconfig.swagger.json @@ -19,7 +19,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -38,7 +42,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/internal/descriptor/openapiconfig/openapiconfig.swagger.json b/internal/descriptor/openapiconfig/openapiconfig.swagger.json index fdd9111eecc..44883d133f8 100644 --- a/internal/descriptor/openapiconfig/openapiconfig.swagger.json +++ b/internal/descriptor/openapiconfig/openapiconfig.swagger.json @@ -19,7 +19,11 @@ "type": "string" } }, - "additionalProperties": {} + "additionalProperties": {}, + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -38,7 +42,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/protoc-gen-openapiv2/internal/genopenapi/template.go b/protoc-gen-openapiv2/internal/genopenapi/template.go index ad02e54698c..0fabc4867f7 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/template.go +++ b/protoc-gen-openapiv2/internal/genopenapi/template.go @@ -849,6 +849,8 @@ func schemaOfField(f *descriptor.Field, reg *descriptor.Registry, refs refMap) o } } + ret.Required = arrayUniq(ret.Required) + if reg.GetProto3OptionalNullable() && f.GetProto3Optional() { ret.XNullable = true } @@ -856,6 +858,20 @@ func schemaOfField(f *descriptor.Field, reg *descriptor.Registry, refs refMap) o return ret } +func arrayUniq[T comparable](array []T) []T { + seen := make(map[T]struct{}) + j := 0 + for _, v := range array { + if _, ok := seen[v]; ok { + continue + } + seen[v] = struct{}{} + array[j] = v + j++ + } + return array[:j] +} + // primitiveSchema returns a pair of "Type" and "Format" in JSON Schema for // the given primitive field type. // The last return parameter is true iff the field type is actually primitive. diff --git a/protoc-gen-openapiv2/internal/genopenapi/template_test.go b/protoc-gen-openapiv2/internal/genopenapi/template_test.go index d59fbe1129d..c2975abb0ed 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/template_test.go +++ b/protoc-gen-openapiv2/internal/genopenapi/template_test.go @@ -150,20 +150,20 @@ func TestMessageToQueryParametersWithEnumAsInt(t *testing.T) { { Name: "a", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "b", In: "query", - Required: false, + Required: true, Type: "number", Format: "double", }, { Name: "c", In: "query", - Required: false, + Required: true, Type: "array", CollectionFormat: "multi", }, @@ -229,19 +229,19 @@ func TestMessageToQueryParametersWithEnumAsInt(t *testing.T) { { Name: "nested.a", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "nested.deep.b", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "nested.deep.c", In: "query", - Required: false, + Required: true, Type: "integer", Enum: []int{0, 1}, Default: 0, @@ -337,20 +337,20 @@ func TestMessageToQueryParametersWithOmitEnumDefaultValue(t *testing.T) { { Name: "a", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "b", In: "query", - Required: false, + Required: true, Type: "number", Format: "double", }, { Name: "c", In: "query", - Required: false, + Required: true, Type: "array", CollectionFormat: "multi", }, @@ -416,19 +416,19 @@ func TestMessageToQueryParametersWithOmitEnumDefaultValue(t *testing.T) { { Name: "nested.a", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "nested.deep.b", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "nested.deep.c", In: "query", - Required: false, + Required: true, Type: "string", Enum: []string{"TRUE"}, }, @@ -523,20 +523,20 @@ func TestMessageToQueryParameters(t *testing.T) { { Name: "a", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "b", In: "query", - Required: false, + Required: true, Type: "number", Format: "double", }, { Name: "c", In: "query", - Required: false, + Required: true, Type: "array", CollectionFormat: "multi", }, @@ -602,19 +602,19 @@ func TestMessageToQueryParameters(t *testing.T) { { Name: "nested.a", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "nested.deep.b", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "nested.deep.c", In: "query", - Required: false, + Required: true, Type: "string", Enum: []string{"FALSE", "TRUE"}, Default: "FALSE", @@ -954,7 +954,7 @@ func TestMessageToQueryParametersWithJsonName(t *testing.T) { { Name: "testFieldA", In: "query", - Required: false, + Required: true, Type: "string", }, }, @@ -990,7 +990,7 @@ func TestMessageToQueryParametersWithJsonName(t *testing.T) { { Name: "subMessage.testFieldA", In: "query", - Required: false, + Required: true, Type: "string", }, }, @@ -1143,13 +1143,13 @@ func TestMessageToQueryParametersWellKnownTypes(t *testing.T) { { Name: "a_field_mask", In: "query", - Required: false, + Required: true, Type: "string", }, { Name: "a_timestamp", In: "query", - Required: false, + Required: true, Type: "string", Format: "date-time", }, @@ -1269,7 +1269,7 @@ func TestMessageToQueryParametersWithRequiredField(t *testing.T) { { Name: "c", In: "query", - Required: false, + Required: true, Type: "array", CollectionFormat: "multi", }, @@ -1382,29 +1382,33 @@ func TestMessageToQueryParametersWithEnumFieldOption(t *testing.T) { Message: "ExampleMessage", Params: []openapiParameterObject{ { - Name: "a", - In: "query", - Type: "string", - Enum: []string{"enum1", "enum2"}, + Name: "a", + In: "query", + Type: "string", + Enum: []string{"enum1", "enum2"}, + Required: true, }, { - Name: "b", - In: "query", - Type: "string", + Name: "b", + In: "query", + Type: "string", + Required: true, }, { - Name: "c", - In: "query", - Type: "string", - Enum: []string{"FALSE", "TRUE"}, - Default: "FALSE", + Name: "c", + In: "query", + Type: "string", + Enum: []string{"FALSE", "TRUE"}, + Default: "FALSE", + Required: true, }, { - Name: "d", - In: "query", - Type: "string", - Enum: []string{"FALSE", "TRUE"}, - Default: "FALSE", + Name: "d", + In: "query", + Type: "string", + Enum: []string{"FALSE", "TRUE"}, + Default: "FALSE", + Required: true, }, }, }, @@ -3518,7 +3522,7 @@ func TestApplyTemplateRequestWithBodyQueryParameters(t *testing.T) { want: []paramOut{ {"parent", "path", true}, {"book", "body", true}, - {"book_id", "query", false}, + {"book_id", "query", true}, }, }, { @@ -3530,8 +3534,8 @@ func TestApplyTemplateRequestWithBodyQueryParameters(t *testing.T) { }()}, want: []paramOut{ {"parent", "path", true}, - {"book", "query", false}, - {"book_id", "query", false}, + {"book", "query", true}, + {"book_id", "query", true}, }, }, } @@ -4199,6 +4203,7 @@ func TestExpandedPathParametersStringType(t *testing.T) { for _, param := range actualParams { refs := make(refMap) actualParamType := schemaOfField(param.Target, reg, refs) + actualParamType.Required = nil // Required is not relevant for path parameters if !reflect.DeepEqual(actualParamType, expectedParamType) { t.Errorf("Expected all path parameters to be type of 'string', actual: %#+v", actualParamType) } @@ -4441,6 +4446,7 @@ func TestSchemaOfField(t *testing.T) { schemaCore: schemaCore{ Type: "string", }, + Required: []string{"primitive_field"}, }, }, { @@ -4461,6 +4467,7 @@ func TestSchemaOfField(t *testing.T) { }, }, }, + Required: []string{"repeated_primitive_field"}, }, }, { @@ -4477,6 +4484,7 @@ func TestSchemaOfField(t *testing.T) { Type: "object", }, Properties: &openapiSchemaObjectProperties{}, + Required: []string{"empty_field"}, }, }, { @@ -4492,6 +4500,7 @@ func TestSchemaOfField(t *testing.T) { schemaCore: schemaCore{ Type: "string", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4508,6 +4517,7 @@ func TestSchemaOfField(t *testing.T) { Type: "string", Format: "date-time", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4523,6 +4533,7 @@ func TestSchemaOfField(t *testing.T) { schemaCore: schemaCore{ Type: "string", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4538,6 +4549,7 @@ func TestSchemaOfField(t *testing.T) { schemaCore: schemaCore{ Type: "string", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4559,6 +4571,7 @@ func TestSchemaOfField(t *testing.T) { }, }, }, + Required: []string{"repeated_wrapped_field"}, }, }, { @@ -4575,6 +4588,7 @@ func TestSchemaOfField(t *testing.T) { Type: "string", Format: "byte", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4591,6 +4605,7 @@ func TestSchemaOfField(t *testing.T) { Type: "integer", Format: "int32", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4607,6 +4622,7 @@ func TestSchemaOfField(t *testing.T) { Type: "integer", Format: "int64", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4623,6 +4639,7 @@ func TestSchemaOfField(t *testing.T) { Type: "string", Format: "int64", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4639,6 +4656,7 @@ func TestSchemaOfField(t *testing.T) { Type: "string", Format: "uint64", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4655,6 +4673,7 @@ func TestSchemaOfField(t *testing.T) { Type: "number", Format: "float", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4671,6 +4690,7 @@ func TestSchemaOfField(t *testing.T) { Type: "number", Format: "double", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4686,6 +4706,7 @@ func TestSchemaOfField(t *testing.T) { schemaCore: schemaCore{ Type: "boolean", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4701,6 +4722,7 @@ func TestSchemaOfField(t *testing.T) { schemaCore: schemaCore{ Type: "object", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4714,6 +4736,7 @@ func TestSchemaOfField(t *testing.T) { refs: make(refMap), expected: openapiSchemaObject{ schemaCore: schemaCore{}, + Required: []string{"wrapped_field"}, }, }, { @@ -4732,6 +4755,7 @@ func TestSchemaOfField(t *testing.T) { Type: "object", }}, }, + Required: []string{"wrapped_field"}, }, }, { @@ -4747,6 +4771,7 @@ func TestSchemaOfField(t *testing.T) { schemaCore: schemaCore{ Type: "string", }, + Required: []string{"wrapped_field"}, }, }, { @@ -4762,6 +4787,7 @@ func TestSchemaOfField(t *testing.T) { schemaCore: schemaCore{ Ref: "#/definitions/exampleMessage", }, + Required: []string{"message_field"}, }, }, { @@ -4784,6 +4810,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"map_field"}, }, }, { @@ -4805,6 +4832,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"array_field"}, }, }, { @@ -4824,6 +4852,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"primitive_field"}, }, }, { @@ -4843,6 +4872,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"message_field"}, }, }, { @@ -4872,6 +4902,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"map_field"}, }, }, { @@ -4900,6 +4931,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"array_field_option"}, }, }, { @@ -4926,6 +4958,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"primitive_field_option"}, }, }, { @@ -4956,6 +4989,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"primitive_field_option"}, }, }, { @@ -4982,6 +5016,7 @@ func TestSchemaOfField(t *testing.T) { }, Title: "field title", Description: "field description", + Required: []string{"message_field_option"}, }, }, { @@ -5014,6 +5049,7 @@ func TestSchemaOfField(t *testing.T) { Type: "string", }, ReadOnly: true, + Required: []string{"readonly_via_field_behavior_field"}, }, }, { @@ -5076,6 +5112,7 @@ func TestSchemaOfField(t *testing.T) { UniqueItems: true, MaxItems: 20, MinItems: 2, + Required: []string{"array_field_option"}, }, }, { @@ -5122,6 +5159,7 @@ func TestSchemaOfField(t *testing.T) { UniqueItems: true, MaxItems: 20, MinItems: 2, + Required: []string{"array_field_option"}, }, }, { @@ -5151,6 +5189,7 @@ func TestSchemaOfField(t *testing.T) { }, }, }, + Required: []string{"array_field_format"}, }, }, { @@ -5743,7 +5782,7 @@ func TestRenderMessagesAsDefinition(t *testing.T) { }, Title: "title", Description: "desc", - Required: []string{"req"}, + Required: []string{"req", "aPreviewField", "aVisibleField"}, Properties: &openapiSchemaObjectProperties{ { Key: "aPreviewField", @@ -5863,7 +5902,7 @@ func TestRenderMessagesAsDefinition(t *testing.T) { }, Title: "title", Description: "desc", - Required: []string{"req", "aRequiredField"}, + Required: []string{"req", "aRequiredField", "aOutputOnlyField"}, Properties: &openapiSchemaObjectProperties{ { Key: "aRequiredField", @@ -6010,7 +6049,7 @@ func TestRenderMessagesAsDefinition(t *testing.T) { }, Title: "title", Description: "desc", - Required: nil, + Required: []string{"nested"}, Properties: &openapiSchemaObjectProperties{ { Key: "nested", @@ -9919,7 +9958,7 @@ func TestRenderServicesOpenapiRequiredBodyFieldContainingPathParam(t *testing.T) } } - correctRequiredFields := []string{"book", "libraryId"} + correctRequiredFields := []string{"name", "book", "libraryId", "isLatestEdition"} if got, want := definition.Required, correctRequiredFields; !reflect.DeepEqual(got, want) { t.Fatalf("Wrong required fields in body definition, got = %s, want = %s", got, want) } @@ -10052,6 +10091,7 @@ func TestArrayMessageItemsType(t *testing.T) { schemaCore: schemaCore{ Type: "object", }, + Required: []string{"code", "message", "details"}, Properties: &openapiSchemaObjectProperties{ keyVal{ Key: "code", @@ -10090,6 +10130,7 @@ func TestArrayMessageItemsType(t *testing.T) { schemaCore: schemaCore{ Type: "object", }, + Required: []string{"children"}, Properties: &openapiSchemaObjectProperties{ keyVal{ Key: "children", @@ -10111,6 +10152,7 @@ func TestArrayMessageItemsType(t *testing.T) { schemaCore: schemaCore{ Type: "object", }, + Required: []string{"children"}, Properties: &openapiSchemaObjectProperties{ keyVal{ Key: "children", @@ -10132,6 +10174,7 @@ func TestArrayMessageItemsType(t *testing.T) { schemaCore: schemaCore{ Type: "object", }, + Required: []string{"typeUrl", "value"}, Properties: &openapiSchemaObjectProperties{ keyVal{ Key: "@type", @@ -10155,7 +10198,7 @@ func TestArrayMessageItemsType(t *testing.T) { t.Errorf("applyTemplate(%#v).%s = %s want to be %s", file, name, is, want) } if want, is, name := expect, result.Definitions, "Produces"; !reflect.DeepEqual(is, want) { - t.Errorf("applyTemplate(%#v).%s = %v want to be %v", file, name, is, want) + t.Errorf("applyTemplate(%#v).%s = %+v want to be %+v", file, name, is, want) } // If there was a failure, print out the input and the json result for debugging. if t.Failed() { @@ -10310,9 +10353,9 @@ func TestQueryParameterType(t *testing.T) { Get: &openapiOperationObject{ Parameters: openapiParametersObject{ { - Name: "Address[string]", - In: "query", - Type: "integer", + Name: "Address[string]", + In: "query", + Type: "integer", }, }, }, diff --git a/protoc-gen-openapiv2/internal/genopenapi/testdata/generator/path_item_object.swagger.yaml b/protoc-gen-openapiv2/internal/genopenapi/testdata/generator/path_item_object.swagger.yaml index 89b65a9007f..ed704099874 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/testdata/generator/path_item_object.swagger.yaml +++ b/protoc-gen-openapiv2/internal/genopenapi/testdata/generator/path_item_object.swagger.yaml @@ -20,7 +20,7 @@ paths: parameters: - name: value in: query - required: false + required: true type: string tags: - YourService @@ -30,3 +30,5 @@ definitions: properties: value: type: string + required: + - value diff --git a/runtime/internal/examplepb/example.swagger.json b/runtime/internal/examplepb/example.swagger.json index b0c4ce0a45b..cad3ca34fee 100644 --- a/runtime/internal/examplepb/example.swagger.json +++ b/runtime/internal/examplepb/example.swagger.json @@ -21,7 +21,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -40,7 +44,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/runtime/internal/examplepb/non_standard_names.swagger.json b/runtime/internal/examplepb/non_standard_names.swagger.json index 904c78fabc0..00708222f7e 100644 --- a/runtime/internal/examplepb/non_standard_names.swagger.json +++ b/runtime/internal/examplepb/non_standard_names.swagger.json @@ -40,7 +40,10 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/examplepbNonStandardMessage" + "$ref": "#/definitions/examplepbNonStandardMessage", + "required": [ + "body" + ] } } ], @@ -73,7 +76,10 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/examplepbNonStandardMessageWithJSONNames" + "$ref": "#/definitions/examplepbNonStandardMessageWithJSONNames", + "required": [ + "body" + ] } } ], @@ -120,7 +126,19 @@ }, "valueField": {} }, - "description": "NonStandardMessage has oddly named fields." + "description": "NonStandardMessage has oddly named fields.", + "required": [ + "id", + "Num", + "lineNum", + "langIdent", + "STATUS", + "enGB", + "no", + "thing", + "structField", + "valueField" + ] }, "examplepbNonStandardMessageThing": { "type": "object", @@ -128,7 +146,10 @@ "subThing": { "$ref": "#/definitions/examplepbNonStandardMessageThingSubThing" } - } + }, + "required": [ + "subThing" + ] }, "examplepbNonStandardMessageThingSubThing": { "type": "object", @@ -136,7 +157,10 @@ "subValue": { "type": "string" } - } + }, + "required": [ + "subValue" + ] }, "examplepbNonStandardMessageWithJSONNames": { "type": "object", @@ -174,7 +198,19 @@ }, "ValueField": {} }, - "description": "NonStandardMessageWithJSONNames maps odd field names to odd JSON names for maximum confusion." + "description": "NonStandardMessageWithJSONNames maps odd field names to odd JSON names for maximum confusion.", + "required": [ + "ID", + "Num", + "LineNum", + "langIdent", + "status", + "En_GB", + "yes", + "Thingy", + "StructField", + "ValueField" + ] }, "examplepbNonStandardMessageWithJSONNamesThing": { "type": "object", @@ -182,7 +218,10 @@ "SubThing": { "$ref": "#/definitions/examplepbNonStandardMessageWithJSONNamesThingSubThing" } - } + }, + "required": [ + "SubThing" + ] }, "examplepbNonStandardMessageWithJSONNamesThingSubThing": { "type": "object", @@ -190,7 +229,10 @@ "sub_Value": { "type": "string" } - } + }, + "required": [ + "sub_Value" + ] }, "protobufAny": { "type": "object", @@ -201,7 +243,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "protobufNullValue": { "type": "string", @@ -228,7 +274,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/runtime/internal/examplepb/proto2.swagger.json b/runtime/internal/examplepb/proto2.swagger.json index ef673186f12..d622f8908ff 100644 --- a/runtime/internal/examplepb/proto2.swagger.json +++ b/runtime/internal/examplepb/proto2.swagger.json @@ -21,7 +21,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -40,7 +44,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } } diff --git a/runtime/internal/examplepb/proto3.swagger.json b/runtime/internal/examplepb/proto3.swagger.json index b4cdc168974..21043a1dc6e 100644 --- a/runtime/internal/examplepb/proto3.swagger.json +++ b/runtime/internal/examplepb/proto3.swagger.json @@ -21,7 +21,11 @@ } }, "additionalProperties": {}, - "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }" + "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n // or ...\n if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n foo = any.unpack(Foo.getDefaultInstance());\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }", + "required": [ + "typeUrl", + "value" + ] }, "rpcStatus": { "type": "object", @@ -40,7 +44,12 @@ "$ref": "#/definitions/protobufAny" } } - } + }, + "required": [ + "code", + "message", + "details" + ] } } }